diff options
Diffstat (limited to 'sfx2/source/appl')
29 files changed, 1555 insertions, 802 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index cfda5883dff6..a6936b77cd53 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: cd $ $Date: 2002-10-11 15:13:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -207,6 +207,7 @@ #include "sfxdir.hxx" #include "event.hxx" #include "appimp.hxx" +#include "imestatuswindow.hxx" #ifdef DBG_UTIL #include "tbxctrl.hxx" @@ -542,6 +543,7 @@ SfxApplication::SfxApplication() pAppData_Impl = new SfxAppData_Impl( this ); pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() ); + pAppData_Impl->m_xImeStatusWindow->init(); pApp->PreInit(); #if SUPD>637 @@ -1036,7 +1038,7 @@ void SfxApplication::SetViewFrame( SfxViewFrame *pFrame ) // otherwise BaseURL is set in activation of document INetURLObject aObject( SvtPathOptions().GetWorkPath() ); aObject.setFinalSlash(); - INetURLObject::SetBaseURL( aObject.GetMainURL() ); + INetURLObject::SetBaseURL( aObject.GetMainURL( INetURLObject::NO_DECODE ) ); } if( pNewContainerFrame ) @@ -1126,8 +1128,7 @@ sal_uInt32 SfxApplication::DetectFilter( else { // Finden anhand der Extension - pFilter = rMatcher.GetFilter4Extension( - rMedium.GetURLObject().GetName() ); + pFilter = rMatcher.GetFilter4Extension( INetURLObject( rMedium.GetName() ).GetName() ); if ( pFilter && pFilter->UsesStorage() ) pFilter = 0; } @@ -1225,7 +1226,7 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError ) SfxRequest aReq(SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, pIter->GetPool()); sal_Bool bHadName = pIter->HasName() ; - INetURLObject aOldURL = pIter->GetMedium()->GetURLObject(); + INetURLObject aOldURL( pIter->GetMedium()->GetName() ); String aOldName = pIter->GetTitle() ; const SfxFilter *pFilter = pIter->GetMedium()->GetFilter(); @@ -1234,7 +1235,7 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError ) // packed files must be saved with default format, but remember original filter ! pFilter = pIter->GetFactory().GetFilter(0); - String aSaveName, aSavePath = aSaveObj.GetMainURL(); + String aSaveName, aSavePath = aSaveObj.GetMainURL( INetURLObject::NO_DECODE ); String aFilterName; if ( pFilter ) { @@ -1256,7 +1257,7 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError ) pIter->ExecuteSlot(aReq); - pInternalOptions->PushRecoveryItem( bHadName ? aOldURL.GetMainURL() : aOldName , + pInternalOptions->PushRecoveryItem( bHadName ? aOldURL.GetMainURL( INetURLObject::NO_DECODE ) : aOldName , pOrigFilter ? pOrigFilter->GetFilterName() : aFilterName , aSaveName ); } @@ -1273,65 +1274,6 @@ sal_uInt16 SfxApplication::Exception( sal_uInt16 nError ) } } -#if SUPD<613//MUSTINI -/*TODO: We need a new key to save informations for SenCrashMail feature.*/ - sal_Bool bSendMail = pInternalOptions->CrashMailEnabled(); - if ( !pAppData_Impl->bBean && bSendMail ) - { - String aInfo = System::GetSummarySystemInfos(); - if ( aInfo.Len() ) - { - TempFile aTempFile( aSaveObj.GetMainURL() ); - String aFileName = aTempFile.GetName(); - SvFileStream aStr( aFileName, STREAM_STD_READWRITE ); - aStr.WriteByteString(aInfo); - aStr << "\n<Build>\n"; - aStr << BUILD; - aStr << '\n'; - aStr << "</Build>\n"; - aStr << "\n<Plattform>\n"; -#ifdef WNT - ByteString aPlattform( "wntmsci3" ); -#elif defined ( C50 ) -# if defined ( SPARC ) - ByteString aPlattform( "unxsols2" ); -# elif defined ( INTEL ) - ByteString aPlattform( "unxsoli2" ); -# endif -#elif defined ( C52 ) -# if defined ( SPARC ) - ByteString aPlattform( "unxsols3" ); -# elif defined ( INTEL ) - ByteString aPlattform( "unxsoli3" ); -# endif -#elif GLIBC == 2 - ByteString aPlattform( "unxlngi2" ); -#elif defined ( SPARC ) && defined ( GCC ) - ByteString aPlattform( "unxsogs" ); -#endif -#ifndef DBG_UTIL - aPlattform += ".pro"; -#endif - aStr << aPlattform.GetBuffer(); - aStr << '\n'; - aStr << "</Plattform>\n"; - aStr << "\n<OfficeLanguage>\n"; - aStr.WriteByteString( ByteString( osl_getThreadTextencoding() ) ); - aStr << '\n'; - aStr << "</OfficeLanguage>\n"; - aStr << "\n<ExceptionType>\n"; - aStr << nError; - aStr << '\n'; - aStr << "</ExceptionType>\n"; - aStr.Close(); - - pAppIniMgr->WriteKey( pAppIniMgr->GetGroupName( SFX_GROUP_WORKINGSET_IMPL ), - DEFINE_CONST_UNICODE("Info"), aFileName ); - pAppIniMgr->Flush(); - } - } -#endif//MUSTINI - // transfer configuration data ::utl::ConfigManager::GetConfigManager()->StoreConfigItems(); diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 5fd1c2ba6662..32a4c7b84e2d 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -2,9 +2,9 @@ * * $RCSfile: app.hrc,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: pb $ $Date: 2002-08-13 13:25:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,6 +288,9 @@ #define RID_SECURITY_WARNING_HYPERLINK (RID_SFX_APP_START + 180) #define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181) +#define RID_INVALID_URL_MSG (RID_SFX_APP_START + 182) +#define RID_INVALID_URL_TITLE (RID_SFX_APP_START + 183) + #endif // #ifndef _SFX_APP_HRC // ******************************************************************* EOF diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index f645fd8c4837..e6f2a0cd1933 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -2,9 +2,9 @@ * * $RCSfile: app.src,v $ * - * $Revision: 1.81 $ + * $Revision: 1.82 $ * - * last change: $Author: hro $ $Date: 2002-11-29 12:54:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ InfoBox RID_DOCALREADYLOADED_DLG Message [ spanish ] = "El documento ya est cargado y activado." ; Message [ english_us ] = "Document already open." ; Message[ chinese_simplified ] = "已经装入这个文件并处于使用状态。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Dokument zosta ju zaadowany i uaktywniony."; Message[ japanese ] = "ドキュメントはすでに読み込まれアクティブになっています。"; Message[ chinese_traditional ] = "已經載入這個檔案並處於使用狀態。"; @@ -112,7 +112,7 @@ ErrorBox RID_CANTLOADDOC_DLG Message [ spanish ] = "No es posible cargar el documento." ; Message [ english_us ] = "Cannot open document." ; Message[ chinese_simplified ] = "无法装入这个文档。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Dokument nie moe by zaadowany."; Message[ japanese ] = "ドキュメントは読み込みできません。"; Message[ chinese_traditional ] = "無法載入這個文件。"; @@ -137,23 +137,23 @@ ErrorBox MSG_ERR_READ_CFG Message [ italian ] = "Errore durante la lettura del file di configurazione." ; Message [ portuguese_brazilian ] = "Erro ao ler o arquivo de configura??o." ; Message [ portuguese ] = "Erro durante a leitura do ficheiro de configurao." ; - Message [ finnish ] = "Kokoonpanotiedoston lukemisessa on ilmennyt virhe" ; + Message [ finnish ] = "Kokoonpanotiedoston lukemisessa on ilmennyt virhe." ; Message [ danish ] = "Fejl under lsning af konfiguration." ; Message [ french ] = "Erreur de lecture de la configuration." ; Message [ swedish ] = "Fel vid lsning av konfiguration." ; - Message [ dutch ] = "Fout bij het lezen van het configuratiebestand." ; + Message [ dutch ] = "Fout bij lezen van configuratiebestand." ; Message [ spanish ] = "Error al leer el archivo de configuracin." ; Message [ english_us ] = "Error reading configuration file." ; Message[ chinese_simplified ] = "在读取配置文件时发生错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd w odczytywaniu konfiguracji."; Message[ japanese ] = "設定ファイル読み取りの際のエラー。"; Message[ chinese_traditional ] = "在讀取配置檔案時發生錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij het lezen van het configuratiebestand."; + Message[ dutch ] = "Fout bij lezen van configuratiebestand."; Message[ chinese_simplified ] = "在读取配置文件时发生错误。"; Message[ greek ] = " "; - Message[ korean ] = "구성 파일 읽기 오류."; + Message[ korean ] = "구성 파일을 읽던 중 오류"; Message[ turkish ] = "Konfigrasyon dosyas okunurken hata olutu."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha produt un error al llegir el fitxer de configuraci."; @@ -170,23 +170,23 @@ ErrorBox MSG_ERR_WRITE_CFG Message [ italian ] = "Errore durante la scrittura del file di configurazione." ; Message [ portuguese_brazilian ] = "Erro ao gravar o arquivo de configura??o." ; Message [ portuguese ] = "Erro ao gravar o ficheiro de configurao." ; - Message [ finnish ] = "Kokoonpanotiedostoon kirjoittamisessa on ilmennyt virhe" ; + Message [ finnish ] = "Kokoonpanotiedostoon kirjoittamisessa on ilmennyt virhe." ; Message [ danish ] = "Fejl under skrivning af konfiguration." ; Message [ french ] = "Erreur lors de l'criture du fichier de configuration." ; Message [ swedish ] = "Fel vid skrivning av konfigurationsfil." ; - Message [ dutch ] = "Fout bij het schrijven van het configuratiebestand." ; + Message [ dutch ] = "Fout bij schrijven van configuratiebestand." ; Message [ spanish ] = "Error al escribir el archivo de configuracin." ; Message [ english_us ] = "Error writing configuration file." ; Message[ chinese_simplified ] = "在写入配置文件时发出错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd przy zapisie konfiguracji."; Message[ japanese ] = "設定を読み込む際のエラー。"; Message[ chinese_traditional ] = "在寫入配置檔案時發出錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij het schrijven van het configuratiebestand."; + Message[ dutch ] = "Fout bij schrijven van configuratiebestand."; Message[ chinese_simplified ] = "在写入配置文件时发出错误。"; Message[ greek ] = " ."; - Message[ korean ] = "구성 파일 쓰기 오류."; + Message[ korean ] = "구성 파일을 쓰던 중 오류"; Message[ turkish ] = "Konfigrasyon dosyasna yazlrken hata olutu."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha produt un error en escriure al fitxer de configuraci."; @@ -203,23 +203,23 @@ ErrorBox MSG_ERR_OPEN_CFG Message [ italian ] = "Errore durante l'apertura del file di configurazione." ; Message [ portuguese_brazilian ] = "Erro ao abrir o arquivo de configura??o." ; Message [ portuguese ] = "Erro ao abrir o ficheiro de configurao." ; - Message [ finnish ] = "Kokoonpanotiedoston avaamisessa on ilmennyt virhe" ; + Message [ finnish ] = "Kokoonpanotiedoston avaamisessa on ilmennyt virhe." ; Message [ danish ] = "Fejl ved bning af konfiguration." ; Message [ french ] = "Erreur lors de l'ouverture du fichier de configuration." ; Message [ swedish ] = "Fel vid ppning av konfiguration." ; - Message [ dutch ] = "Fout bij het openen van het configuratiebestand." ; + Message [ dutch ] = "Fout bij openen van configuratiebestand." ; Message [ spanish ] = "Error al abrir el archivo de configuracin." ; Message [ english_us ] = "Error opening configuration file." ; Message[ chinese_simplified ] = "在打开配置文件时发生错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd przy otwieraniu konfiguracji."; Message[ japanese ] = "設定を開く際のエラー｡"; Message[ chinese_traditional ] = "在開啟配置檔時發生錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij het openen van het configuratiebestand."; + Message[ dutch ] = "Fout bij openen van configuratiebestand."; Message[ chinese_simplified ] = "在打开配置文件时发生错误。"; Message[ greek ] = " ."; - Message[ korean ] = "구성 열기시에 오류."; + Message[ korean ] = "구성 파일을 열던 중 오류"; Message[ turkish ] = "Konfigrasyon dosyas alrken hata olutu."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha produt un error al obrir el fitxer de configuraci."; @@ -244,7 +244,7 @@ ErrorBox MSG_ERR_FILETYPE_CFG Message [ spanish ] = "El archivo no es un archivo de configuracin." ; Message [ english_us ] = "File is not a configuration file." ; Message[ chinese_simplified ] = "文件不是配置文件。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Ten plik nie jest plikiem konfiguracyjnym."; Message[ japanese ] = "ファイルは設定ファイルではありません。"; Message[ chinese_traditional ] = "檔案不是配置檔案。"; @@ -273,16 +273,16 @@ ErrorBox MSG_ERR_VERSION_CFG Message [ danish ] = "Konfigurationsfilen indeholder forkert version." ; Message [ french ] = "Version incorrecte du fichier de configuration." ; Message [ swedish ] = "Konfigurationsfil har fel version." ; - Message [ dutch ] = "Verkeerde versie van configuratiebestand." ; + Message [ dutch ] = "Foutieve versie van configuratiebestand." ; Message [ spanish ] = "El archivo de configuracin tiene una versin falsa." ; Message [ english_us ] = "Configuration file contains the wrong version." ; Message[ chinese_simplified ] = "配置文件版本错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Plik konfiguracji zawiera nieprawidow wersj."; Message[ japanese ] = "設定ファイルのバージョンが正しくありません。"; Message[ chinese_traditional ] = "配置檔案版本錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Verkeerde versie van configuratiebestand."; + Message[ dutch ] = "Foutieve versie van configuratiebestand."; Message[ chinese_simplified ] = "配置文件版本错误。"; Message[ greek ] = " ."; Message[ korean ] = "구성 파일의 버전이 틀립니다."; @@ -306,16 +306,16 @@ ErrorBox MSG_ERR_WRITE_SBL Message [ danish ] = "Fejl under skrivning af BASIC-biblioteket til \n'@'." ; Message [ french ] = "Erreur lors de l'criture de la bibliothque BASIC dans \n'@'." ; Message [ swedish ] = "Fel vid skrivning av BASIC-bibliotek i\n'@'." ; - Message [ dutch ] = "Fout bij het schrijven van de BASIC-bibliotheek in\n'@'." ; + Message [ dutch ] = "Fout bij schrijven van BASIC-bibliotheek in\n'@'." ; Message [ spanish ] = "Error al escribir la biblioteca BASIC en\n'@'." ; Message [ english_us ] = "Error recording BASIC library in\n'@'." ; Message[ chinese_simplified ] = "BASIC 库在写入\n'@' 时发生错误。"; - Message[ russian ] = " BASIC \n'@'."; + Message[ russian ] = " BASIC \n'@'."; Message[ polish ] = "Bd przy zapisie biblioteki BASIC w in\n'@'."; Message[ japanese ] = "BASIC ライブラリを読み込む際のエラー｡\n読み込み先:'@'"; Message[ chinese_traditional ] = "BASIC 庫在寫入\n'@' 時發生錯誤。"; Message[ arabic ] = " BASIC \n'@'."; - Message[ dutch ] = "Fout bij het schrijven van de BASIC-bibliotheek in\n'@'."; + Message[ dutch ] = "Fout bij schrijven van BASIC-bibliotheek in\n'@'."; Message[ chinese_simplified ] = "BASIC 库在写入\n'@' 时发生错误。"; Message[ greek ] = " BASIC \n'@'."; Message[ korean ] = "BASIC 라이브러리\n'@'에 쓰기시에 오류 ."; @@ -331,7 +331,7 @@ ErrorBox MSG_SIGNAL DEFBUTTON = WB_DEF_YES ; Message = "Es ist ein unerwarter Anwendungsfehler aufgetreten!\nSie knnen jetzt auf eigene Gefahr hin versuchen,\nalle offenen Dokumente zu sichern!\n\nSoll versucht werden, Ihre Arbeit zu sichern, bevor die Applikation beendet wird?" ; Message [ ENGLISH ] = "-" ; - Message [ dutch ] = "Er is een onverwachte programmafout opgetreden!\nU kunt nu op eigen risico proberen,\nalle geopende documenten op te slaan!\n\nWilt u proberen uw werk op te slaan voordat de applicatie wordt beindigd?" ; + Message [ dutch ] = "Er is een onverwachte programmafout opgetreden!\nU kunt nu op eigen risico proberen\nalle geopende documenten op te slaan!\n\nWilt u proberen uw werk op te slaan voordat de toepassing wordt beindigd?" ; Message [ swedish ] = "Ett ovntat programfel har uppsttt!\nDu kan nu p eget bevg frska\nspara alla ppna dokument!\n\nVill du frska spara alla ndringar i dokumenten innan programmet avslutas?" ; Message [ danish ] = "Der opstod en uventet programfejl\nDu kan p eget ansvar prve p at\ngemme alle bne dokumenter!\n\nVil du prve p at gemme dine dokumenter, fr programmet afsluttes?" ; Message [ italian ] = "Nell'applicazione si verificato un errore inatteso!\nAdesso potete provare, a proprio rischio, di\nsalvare tutti i documenti aperti!\n\nVolete che si provi a salvare il lavoro prima di chiudere l'applicazione?" ; @@ -341,12 +341,12 @@ ErrorBox MSG_SIGNAL Message [ portuguese ] = "Surgiu um erro de programa inesperado!\n\nPoder agora, sob o seu prprio risco, \ntentar guardar todos os documentos abertos.\nTentar guardar o seu trabalho antes que a aplicao seja fechada?" ; Message [ portuguese_brazilian ] = "Es ist ein unerwarter Anwendungsfehler aufgetreten!\nSie k?nen jetzt auf eigene Gefahr hin versuchen,\nalle offenen Dokumente zu sichern!\n\nSoll versucht werden, Ihre Arbeit zu sichern, bevor die Applikation beendet wird?" ; Message[ chinese_simplified ] = "发生了一个意外的程序错误！\n您现在可以尝试保存所有被打开的文件！\n您要在关闭这个应用程序之前保存所有的文件吗？"; - Message[ russian ] = " !\n \n !\n\n , ?"; + Message[ russian ] = " . \n ?"; Message[ polish ] = "Wystpi nieoczekiwany bd w programie!\nNa wasn odpowiedzialno moesz sprbowa \nzapisa wszystkie otwarte dokumenty!\n\nCzy sprbowa zapisa twoj prac przed zamkniciem aplikacji?"; Message[ japanese ] = "予期しないプログラム エラーが発生しました。\nリスクはありますが\n開かれているドキュメントをすべて保存します。\n\nアプリケーションを終了する前に、作業中のドキュメントを保存しますか。"; Message[ chinese_traditional ] = "發生了一個意外的程式錯誤！\n您現在可以嘗試保存所有被開啟的檔案！\n您要在關閉這個應用程式之前儲存所有的檔案？"; Message[ arabic ] = " !\n ɡ \n !\n\n ߡ "; - Message[ dutch ] = "Er is een onverwachte programmafout opgetreden!\nU kunt nu op eigen risico proberen,\nalle geopende documenten op te slaan!\n\nWilt u proberen uw werk op te slaan voordat de applicatie wordt beindigd?"; + Message[ dutch ] = "Er is een onverwachte programmafout opgetreden!\nU kunt nu op eigen risico proberen\nalle geopende documenten op te slaan!\n\nWilt u proberen uw werk op te slaan voordat de toepassing wordt beindigd?"; Message[ chinese_simplified ] = "发生了一个意外的程序错误！\n您现在可以尝试保存所有被打开的文件！\n您要在关闭这个应用程序之前保存所有的文件吗？"; Message[ greek ] = " !\n\n ( ) "; Message[ korean ] = "예기치 않은 응용 프로그램 오류가 발생했습니다.\n사용자에게 위험 부담이 있지만 열려있는 모든 문서의 저장을 시도해 볼 수 있습니다!\n\n 응용 프로그램을 종료하기 전에 작업 내용을 저장하겠습니까?"; @@ -365,12 +365,12 @@ ErrorBox MSG_ERR_WEBBROWSER_NOT_STARTED Message [ ENGLISH ] = "An error occurred in starting the web browser. Please check the %PRODUCTNAME settings under 'Tools - Options - %PRODUCTNAME - External Programs' and the settings for your web browser." ; Message[ english_us ] = "An error occurred in starting the web browser. Please check the %PRODUCTNAME settings under 'Tools - Options - %PRODUCTNAME - External Programs' and the settings for your web browser."; Message[ portuguese ] = "An error occurred in starting a webbrowser.\nPlease check the %PRODUCTNAME and webbrowser settings."; - Message[ russian ] = "An error occurred in starting a webbrowser.\nPlease check the %PRODUCTNAME and webbrowser settings."; + Message[ russian ] = " -.\n %PRODUCTNAME -."; Message[ greek ] = "An error occurred in starting a webbrowser.\nPlease check the %PRODUCTNAME and webbrowser settings."; - Message[ dutch ] = "An error occurred in starting a webbrowser.\nPlease check the %PRODUCTNAME and webbrowser settings."; + Message[ dutch ] = "Fout bij starten van webbrowser.\nControleer de instellingen van %PRODUCTNAME en van de webbrowser."; Message[ french ] = "Erreur lors du lancement du navigateur Web. Vrifiez les paramtres de %PRODUCTNAME sous 'Outils - Options - %PRODUCTNAME - Programmes auxiliaires', ainsi que ceux du navigateur Web."; - Message[ spanish ] = "Se ha producido un error al iniciar el navegador web. Compruebe la configuracin de %PRODUCTNAME en 'Herramientas - Opciones - %PRODUCTNAME - Programas de ayuda' as como la del navegador web. "; - Message[ finnish ] = "An error occurred in starting a webbrowser.\nPlease check the %PRODUCTNAME and webbrowser settings."; + Message[ spanish ] = "Se ha producido un error al iniciar el navegador web. Compruebe la configuracin de %PRODUCTNAME en 'Herramientas - Opciones - %PRODUCTNAME - Programas auxiliares' as como la del navegador web. "; + Message[ finnish ] = "Web-selaimen kynnistyksess tapahtui virhe.\nTarkista %PRODUCTNAMEn ja Web-selaimen asetukset."; Message[ italian ] = "Si verificato un errore durante l'avvio del browser Web. Verificate le impostazioni di %PRODUCTNAME al menu 'Strumenti - Opzioni - %PRODUCTNAME - Programmi ausiliari' e le impostazioni del browser Web."; Message[ danish ] = "Fejl ved start af webbrowseren.\nKontroller indstillingerne for %PRODUCTNAME og for webbrowseren."; Message[ swedish ] = "Det uppstod ett fel nr webblsaren skulle startas. Kontrollera instllningarna i %PRODUCTNAME under 'Verktyg - Alternativ - %PRODUCTNAME - Hjlpprogram' och instllningarna i din webblsare."; @@ -394,19 +394,19 @@ ErrorBox MSG_ERR_EXTERNAL_APP_NOT_FOUND Message [ ENGLISH ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings." ; Message[ english_us ] = "No corresponding external application could be found for the given file type.\nPlease check the %PRODUCTNAME settings."; Message[ portuguese ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; - Message[ russian ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; + Message[ russian ] = " .\n %PRODUCTNAME."; Message[ greek ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; - Message[ dutch ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; + Message[ dutch ] = "Er is geen bijbehorende externe toepassing voor de geselecteerde bestandstypen gevonden.\nControleer de instellingen van %PRODUCTNAME."; Message[ french ] = "Impossible de dtecter une application externe correspondant au type de fichier spcifi.\nVrifiez le paramtrage de %PRODUCTNAME."; Message[ spanish ] = "No se pudo encontrar ninguna aplicacin exterior correspondiente al tipo de archivo seleccionado.\nCompruebe la configuracin del %PRODUCTNAME."; - Message[ finnish ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; + Message[ finnish ] = "Annetulle tiedostotyypille ei lytynyt vastaavaa ulkoista sovellusta.\nTarkista %PRODUCTNAME-asetukset."; Message[ italian ] = "Impossibile trovare le applicazioni esterne per il tipo di file selezionato.\\Verificate le impostazioni di %PRODUCTNAME."; Message[ danish ] = "Der kunne ikke findes nogen tilhrende ekstern applikation til den valgte filtype.\nKontroller indstillingerne for %PRODUCTNAME."; Message[ swedish ] = "Det gick inte att hitta ngot tillhrande externt program fr den valda filtypen.\nKontrollera instllningarna i %PRODUCTNAME."; Message[ polish ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; Message[ portuguese_brazilian ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; Message[ japanese ] = "選択したファイルの種類を開く外部アプリケーションが見つかりませんでした。\n%PRODUCTNAME 設定をもう一度確認してください。"; - Message[ korean ] = "지정된 파일 형식에 대해 외부 응용 프로그램을 시작하는 동안 오류가 발생했습니다.\n%PRODUCTNAME 설정을 확인하십시오."; + Message[ korean ] = "지정하신 파일 형식에 해당하는 응용 프로그램을 찾지 못했습니다.\n%PRODUCTNAME의 설정을 확인해보십시오."; Message[ chinese_simplified ] = "没有找到用于打开指定文件类型的外来的应用程序。\n请您检查 %PRODUCTNAME 的设定。"; Message[ chinese_traditional ] = "沒有找到用於開啟指定檔案類型的外來的應用程式。\n請檢查 %PRODUCTNAME 的設定。"; Message[ turkish ] = "An error occurred in starting the external application for the given file type.\nPlease check the %PRODUCTNAME settings."; @@ -500,17 +500,17 @@ WarningBox RID_WARN_POST_MAILTO Message [ italian ] = "Un formulario deve essere inviato via eMail.\nIn tal modo il destinatario verr a conoscenza dell'indirizzo eMail dell'utente." ; Message [ spanish ] = "Se debe enviar un formulario por correo electrnico.\nCon ello se dar a conocer al destinatario su direccin electrnica." ; Message [ french ] = "Vous voulez envoyer un formulaire par e-mail.\nVous communiquerez ainsi votre adresse e-mail au destinataire." ; - Message [ dutch ] = "Een formulier moet per e-mail gestuurd worden.\nDaardoor wordt uw e-mail adres door de ontvanger bekend." ; + Message [ dutch ] = "Een formulier moet per e-mail gestuurd worden.\nDaardoor wordt uw e-mailadres bij de ontvanger bekend." ; Message[ chinese_simplified ] = "应该借助电子邮件寄发表单。\n这样您的电子邮件地址也就传递给了收件人。"; - Message[ russian ] = " .\n . ."; + Message[ russian ] = " .\n ."; Message[ polish ] = "Formularz ma zosta wysany jako e-mail.\nPrzez to adresat otrzyma twj adres e-mail."; Message[ japanese ] = "フォームは E-mail で送信してください。\nそうすることでユーザーの E-mail アドレスが受信者に伝わります。"; Message[ chinese_traditional ] = "應該透過電子郵件寄發表單。\n這樣您的電子郵件地址也就傳遞給了收件者。"; Message[ arabic ] = " .\n ."; - Message[ dutch ] = "Een formulier moet per e-mail gestuurd worden.\nDaardoor wordt uw e-mail adres door de ontvanger bekend."; + Message[ dutch ] = "Een formulier moet per e-mail gestuurd worden.\nDaardoor wordt uw e-mailadres bij de ontvanger bekend."; Message[ chinese_simplified ] = "应该借助电子邮件寄发表单。\n这样您的电子邮件地址也就传递给了收件人。"; Message[ greek ] = " e-mail.\n "; - Message[ korean ] = "이 양식은 E-Mail로 전송될 것입니다 .\n이 경우, 받는 사람에게 귀하의 E-mail 주소가 알려지게 됩니다."; + Message[ korean ] = "양식을 전자 메일로 보냅니다 .\n그러면 받는 사람은 사용자의 전자 메일 주소를 보게됩니다."; Message[ turkish ] = "E-posta ile form gnderilecek.\nBu ekilde alc e-posta adresinizi de grecektir."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha d'enviar un formulari per correu electrnic.\nAmb aix el destinatari podr saber la vostra direcci de correu electrnic."; @@ -529,7 +529,7 @@ String STR_RECOVER_TITLE Text [ italian ] = "Recupero file" ; Text [ spanish ] = "Recuperar archivo" ; Text [ french ] = "Restauration de fichier" ; - Text [ dutch ] = "Herstel bestand" ; + Text [ dutch ] = "Bestandsherstel" ; Text [ portuguese ] = "Restaurar ficheiro" ; Text[ chinese_simplified ] = "修复文件"; Text[ russian ] = " "; @@ -537,7 +537,7 @@ String STR_RECOVER_TITLE Text[ japanese ] = "ファイルの復元"; Text[ chinese_traditional ] = "修復檔案"; Text[ arabic ] = " "; - Text[ dutch ] = "Herstel bestand"; + Text[ dutch ] = "Bestandsherstel"; Text[ chinese_simplified ] = "修复文件"; Text[ greek ] = " "; Text[ korean ] = "파일 복구"; @@ -560,14 +560,14 @@ String STR_RECOVER_QUERY Text [ italian ] = "Volete recuperare il file \"$1\"?" ; Text [ spanish ] = "Desea restaurar el archivo \"$1\"?" ; Text [ french ] = "Restaurer le fichier \"$1\" ?" ; - Text [ dutch ] = "Wilt u dat het bestand \"$1\" hersteld wordt?" ; + Text [ dutch ] = "Wilt u het bestand \"$1\" herstellen?" ; Text[ chinese_simplified ] = "要修复这个文件 \"$1\" 吗？"; Text[ russian ] = " \"$1\"?"; Text[ polish ] = "Odtworzy plik \"$1\"?"; Text[ japanese ] = "ファイル \"$1\" を復元しますか。"; Text[ chinese_traditional ] = "要還原檔案 $1 ?"; Text[ arabic ] = " \"$1\""; - Text[ dutch ] = "Wilt u dat het bestand \"$1\" hersteld wordt?"; + Text[ dutch ] = "Wilt u het bestand \"$1\" herstellen?"; Text[ chinese_simplified ] = "要修复这个文件 \"$1\" 吗？"; Text[ greek ] = " \"$1\";"; Text[ korean ] = "파일 \"$1\"을(를）복구하겠습니까?"; @@ -602,7 +602,7 @@ String GID_INTERN Text[ dutch ] = "Intern"; Text[ chinese_simplified ] = "内部"; Text[ greek ] = ""; - Text[ korean ] = "내부의"; + Text[ korean ] = "내부"; Text[ turkish ] = ""; Text[ language_user1 ] = " "; Text[ catalan ] = "Intern"; @@ -621,7 +621,7 @@ String GID_APPLICATION Text [ danish ] = "Applikation" ; Text [ french ] = "Application" ; Text [ swedish ] = "Tillmpning" ; - Text [ dutch ] = "Applicatie" ; + Text [ dutch ] = "Toepassing" ; Text [ spanish ] = "Aplicacin" ; Text [ english_us ] = "Application" ; Text[ chinese_simplified ] = "应用程序"; @@ -630,7 +630,7 @@ String GID_APPLICATION Text[ japanese ] = "アプリケーション"; Text[ chinese_traditional ] = "應用程式"; Text[ arabic ] = ""; - Text[ dutch ] = "Applicatie"; + Text[ dutch ] = "Toepassing"; Text[ chinese_simplified ] = "应用程序"; Text[ greek ] = ""; Text[ korean ] = "응용 프로그램"; @@ -718,7 +718,7 @@ String GID_EDIT Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; Text[ chinese_simplified ] = "编辑"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Edytuj"; Text[ japanese ] = "編集"; Text[ chinese_traditional ] = "編輯"; @@ -779,7 +779,7 @@ String GID_OPTIONS Text [ spanish ] = "Opciones" ; Text [ english_us ] = "Options" ; Text[ chinese_simplified ] = "其它"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Narzdzia"; Text[ japanese ] = "ツール"; Text[ chinese_traditional ] = "其它"; @@ -787,7 +787,7 @@ String GID_OPTIONS Text[ dutch ] = "Extra"; Text[ chinese_simplified ] = "其它"; Text[ greek ] = ""; - Text[ korean ] = "도구"; + Text[ korean ] = "옵션"; Text[ turkish ] = "Aralar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Opcions"; @@ -839,7 +839,7 @@ String GID_NAVIGATOR Text [ portuguese ] = "Navegar" ; Text [ portuguese_brazilian ] = "Navigieren" ; Text[ chinese_simplified ] = "浏览"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Nawigacja"; Text[ japanese ] = "ナビゲート"; Text[ chinese_traditional ] = "瀏覽"; @@ -937,11 +937,11 @@ String GID_TEMPLATE Text[ dutch ] = "Sjablonen"; Text[ chinese_simplified ] = "样式"; Text[ greek ] = ""; - Text[ korean ] = "템플릿"; + Text[ korean ] = "서식 파일"; Text[ turkish ] = "ablon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Plantilles"; - Text[ finnish ] = "Mallipohjat"; + Text[ finnish ] = "Mallit"; Text[ thai ] = "แม่แบบ"; }; @@ -1019,7 +1019,7 @@ String GID_GRAPHIC Text [ portuguese ] = "Imagem" ; Text [ portuguese_brazilian ] = "Grafik" ; Text[ chinese_simplified ] = "图形"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Grafika"; Text[ japanese ] = "図"; Text[ chinese_traditional ] = "圖形"; @@ -1087,7 +1087,7 @@ String GID_ENUMERATION Text[ dutch ] = "Nummering"; Text[ chinese_simplified ] = "编号"; Text[ greek ] = ""; - Text[ korean ] = "번호"; + Text[ korean ] = "번호 매기기"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Numeraci"; @@ -1169,7 +1169,7 @@ String GID_IMAGE Text [ portuguese ] = "Imagem" ; Text [ portuguese_brazilian ] = "Image" ; Text[ chinese_simplified ] = "图像"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Obraz"; Text[ japanese ] = "イメージ"; Text[ chinese_traditional ] = "影像"; @@ -1259,7 +1259,7 @@ String GID_CONNECTOR Text [ french ] = "Connecteur" ; Text [ dutch ] = "Verbinding" ; Text[ chinese_simplified ] = "连接符"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "cznik"; Text[ japanese ] = "コネクタ"; Text[ chinese_traditional ] = "連接符"; @@ -1271,7 +1271,7 @@ String GID_CONNECTOR Text[ turkish ] = "Balayc"; Text[ language_user1 ] = " "; Text[ catalan ] = "Connector"; - Text[ finnish ] = "Liitin"; + Text[ finnish ] = "Yhdysviiva"; Text[ thai ] = "ตัวเชื่อมต่อ"; }; @@ -1297,11 +1297,11 @@ String GID_MODIFY Text[ dutch ] = "Wijzigen"; Text[ chinese_simplified ] = "更改"; Text[ greek ] = ""; - Text[ korean ] = "수정"; + Text[ korean ] = "변경"; Text[ turkish ] = "Deitir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Modifica"; - Text[ finnish ] = "Muokkaa"; + Text[ finnish ] = "Muuta"; Text[ thai ] = "ดัดแปลง"; }; @@ -1361,7 +1361,7 @@ String GID_CONTROLS Text[ turkish ] = "Kumanda eleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Controls"; - Text[ finnish ] = "Ohjaimet"; + Text[ finnish ] = "Ohjausobjektit"; Text[ thai ] = "ตัวควบคุม"; }; @@ -1401,7 +1401,7 @@ TabDialog SID_OPTIONS Text [ italian ] = "Generale" ; Text [ portuguese_brazilian ] = "Geral" ; Text [ portuguese ] = "Geral" ; - Text [ finnish ] = "Yleist" ; + Text [ finnish ] = "Yleiset" ; Text [ danish ] = "Generelt" ; Text [ french ] = "En gnral" ; Text [ swedish ] = "Allmnt" ; @@ -1547,19 +1547,19 @@ InfoBox MSG_CANT_QUIT Message [ portuguese_brazilian ] = "N?o consigo sair do aplicativo neste momento.\nPlease wait until all print jobs and/or\nOLE-activations are terminated and close\nall dialogs." ; Message [ portuguese ] = "De momento impossvel sair desta aplicao.\nAguarde a impresso de todos os documentos\n e/ou o fim das activaes OLE e feche todos os dilogos." ; Message [ french ] = "Impossible de quitter l'application maintenant.\nVeuillez attendre la fin des activits d'impression et/ou des activations OLE\net fermez tous les dialogues." ; - Message [ dutch ] = "De applicatie kan op dit moment niet worden beindigd.\nWacht tot alle drukopdrachten en/of\nOLE-activiteiten zijn beindigd en \nsluit alle dialogen." ; + Message [ dutch ] = "De toepassing kan op dit moment niet worden beindigd.\nWacht tot alle afdrukopdrachten en/of\nOLE-activiteiten zijn beindigd en \nsluit alle dialoogvensters." ; Message [ spanish ] = "La aplicacin no se puede cerrar por el momento. \nPor favor espere hasta que finalice la impresin de\n todos los documentos y/o activaciones OLE\ny cierre todos los dilogos." ; Message [ danish ] = "Det er for tiden ikke muligt at afslutte programmet.\nVent venligst til alle udskriftsjob og/eller \nOLE-handlinger er afslutte og luk s alle dialoger." ; Message [ swedish ] = "Programmet kan inte avslutas fr tillfllet.\nVnta tills alla utskriftsuppdrag och/eller\nOLE-aktiveringar r utfrda och stng alla dialoger." ; - Message [ finnish ] = "Sovelluksen lopettaminen ei onnistu.\nOdota, ett kaikki tulostustyt ja/or\nOLE-toiminnot ovat valmiit ja sulje kaikki valintaikkunat." ; + Message [ finnish ] = "Sovelluksen lopettaminen ei onnistu.\nOdota, ett kaikki tulostustyt ja/tai\nOLE-toiminnot ovat valmiit ja sulje kaikki valintaikkunat." ; Message [ english_us ] = "The application cannot be terminated at the moment.\nPlease wait until all print jobs and/or\nOLE actions have finished and close all dialogs." ; Message[ chinese_simplified ] = "现在无法结束这个应用程序。\n请您稍等直到程序完成所有打印任务或OLE启动状态结束，\n然后再关闭所有对话框。"; - Message[ russian ] = " .\n, , /\n OLE ."; + Message[ russian ] = " .\n /\n OLE ."; Message[ polish ] = "Aplikacji nie mona zakoczy.\nProsz zaczeka na koniec zada wydruku i/lub\nakcji OLE i zamkn wszystkie aplikacje."; Message[ japanese ] = "現在プログラムは終了できません。\nすべての印刷ジョブまたは\nOLE アクションの終了を確認してから、すべてのダイアログを閉じてください。"; Message[ chinese_traditional ] = "現在無法結束這個應用程式。\n請等候所有列印任務或OLE使用狀態已經結束﹐\n然後再關閉所有的對話方塊。"; Message[ arabic ] = " .\n ɡ /\n OLE ."; - Message[ dutch ] = "De applicatie kan op dit moment niet worden beindigd.\nWacht tot alle drukopdrachten en/of\nOLE-activiteiten zijn beindigd en \nsluit alle dialogen."; + Message[ dutch ] = "De toepassing kan op dit moment niet worden beindigd.\nWacht tot alle afdrukopdrachten en/of\nOLE-activiteiten zijn beindigd en \nsluit alle dialoogvensters."; Message[ chinese_simplified ] = "现在无法结束这个应用程序。\n请您稍等直到程序完成所有打印任务或OLE启动状态结束，\n然后再关闭所有对话框。"; Message[ greek ] = " .\n /\n"; Message[ korean ] = "응용 프로그램을 현재 종료할 수 없습니다.\n인쇄 작업이 모두 끝날 때까지 또는\nOLE가 활성화될 때까지 기다렸다가 모든 대화상자를 닫으십시오."; @@ -1583,16 +1583,16 @@ QueryBox MSG_IS_SERVER Message [ danish ] = "Denne applikation er stadig aktiv som objekt- eller printserver.\nSkal der lukkes alligevel?" ; Message [ french ] = "Cette application est encore active en tant que serveur d'objets ou d'imprimante.\nInterrompre malgr tout ?" ; Message [ swedish ] = "Tillmpningen r fortfarande aktiv antingen som objekt- eller skrivarserver.\nVill du nd stnga den?" ; - Message [ dutch ] = "Deze toepassing is nog actief als object- of afdrukserver.\nToch afsluiten ?" ; + Message [ dutch ] = "Deze toepassing is nog actief als object- of afdrukserver.\nToch afsluiten?" ; Message [ spanish ] = "Esta aplicacin est an activa como servidor de objeto o de impresin.\nDesea finalizarla?" ; Message [ english_us ] = "This application is as object or print server active.\nDo you want to terminate anyway?" ; Message[ chinese_simplified ] = "这个应用程序作为对象或打印服务器还处于使用的状态。\n您还是要关闭它?"; - Message[ russian ] = " .\n ?"; + Message[ russian ] = " .\n , ?"; Message[ polish ] = "Aplikacja jest jeszcze aktywna jako obiekt lub serwer wydruku.\nCzy j mimo to zamkn?"; Message[ japanese ] = "アプリケーションは現在オブジェクトサーバーまたはプリントサーバーとしてアクティブです。\n閉じてもよろしいですか?"; Message[ chinese_traditional ] = "這個應用程式作為物件或列印伺服器還處於使用狀態。\n您還是要關閉它？"; Message[ arabic ] = " .\n ߿"; - Message[ dutch ] = "Deze toepassing is nog actief als object- of afdrukserver.\nToch afsluiten ?"; + Message[ dutch ] = "Deze toepassing is nog actief als object- of afdrukserver.\nToch afsluiten?"; Message[ chinese_simplified ] = "这个应用程序作为对象或打印服务器还处于使用的状态。\n您还是要关闭它?"; Message[ greek ] = " .\n ;"; Message[ korean ] = "개체 또는 프린터 서버로서 이 응용 프로그램이 아직 작동 중입니다.\n그래도 닫으시겠습니까?"; @@ -1616,7 +1616,7 @@ String STR_NODOUBLE Text [ dutch ] = "%PRODUCTNAME kan maar n keer tegelijk worden gestart." ; Text [ portuguese ] = "O %PRODUCTNAME no pode ser inicializado mais do que uma vez." ; Text[ chinese_simplified ] = "无法同时多次启动 %PRODUCTNAME 。"; - Text[ russian ] = " %PRODUCTNAME ."; + Text[ russian ] = " %PRODUCTNAME ."; Text[ polish ] = "%PRODUCTNAME nie mona kilkakrotnie uruchomi."; Text[ japanese ] = "%PRODUCTNAMEは何回もスタートできません。"; Text[ chinese_traditional ] = "無法同時多次啟動 %PRODUCTNAME。"; @@ -1628,7 +1628,7 @@ String STR_NODOUBLE Text[ turkish ] = "%PRODUCTNAME iin birden fazla oturum alamaz."; Text[ language_user1 ] = " "; Text[ catalan ] = "%PRODUCTNAME no es pot iniciar ms d'una vegada."; - Text[ finnish ] = "Ohjelmasta %PRODUCTNAME ei voi olla kytss kuin yksi istunto kerrallaan."; + Text[ finnish ] = "Vain yksi %PRODUCTNAME voi olla kytss kerrallaan."; Text[ thai ] = "ไม่สามารถเริ่ม %PRODUCTNAME มากกว่าหนึ่งครั้ง"; }; @@ -1646,7 +1646,7 @@ String STR_NOPRINTER Text [ portuguese_brazilian ] = "Einige %PRODUCTNAME-Funktionen k?nen ohne Druckertreiber nicht korrekt arbeiten.\nBitte installieren Sie einen Druckertreiber." ; Text [ portuguese ] = "Algumas das funes do %PRODUCTNAME no podem funcionar correctamente sem um controlador de impressora.\nFaa a respectiva instalao." ; Text[ chinese_simplified ] = "因为没有安装打印机驱动程序，一些%PRODUCTNAME功能可能不会正常运转。\n请您安装一个打印机驱动程序。"; - Text[ russian ] = " %PRODUCTNAME .\n, , ."; + Text[ russian ] = " %PRODUCTNAME .\n ."; Text[ polish ] = "Niektre funkcje w %PRODUCTNAME nie mog poprawnie pracowa bez sterownika drukarki.\nZainstaluj sterownik drukarki."; Text[ japanese ] = "%PRODUCTNAME の機能の中には、プリンタドライバがないと正しく起動しないものがあります。\nプリンタ ドライバをインストールしてください。"; Text[ chinese_traditional ] = "沒有安裝列印驅動程式﹐一些%PRODUCTNAME功能運轉不會正常。\n請您安裝一個列印驅動程式。"; @@ -1658,13 +1658,13 @@ String STR_NOPRINTER Text[ turkish ] = "Baz %PRODUCTNAME ilevleri yazc srcs olmadan doru alamaz.\nBir yazc srcs kurun."; Text[ language_user1 ] = " "; Text[ catalan ] = "Algunes funcions d'%PRODUCTNAME no poden treballar correctament sense un controlador d'impressora.\nInstal.leu-ne un."; - Text[ finnish ] = "Jotkin ohjelman %PRODUCTNAME toiminnot eivt toimi ilman tulostinajuria.\nAsenna tulostinajuri."; + Text[ finnish ] = "Jotkin %PRODUCTNAMEn toiminnot eivt toimi ilman tulostinohjainta.\nAsenna tulostinohjain."; Text[ thai ] = "บางฟังก์ชั่น %PRODUCTNAME จะไม่ทำงานอย่างเหมาะสมโดยไม่มีโปรแกรมขับเครื่องพิมพ์\nกรุณาติดตั้งโปรแกรมขับเครื่องพิมพ์"; }; String STR_ISMODIFIED { - TEXT[ language_user1 ] = "PB: waren frueher zwei String"; + TEXT[ language_user1 ] = "PB: ; PB: waren frueher zwei String"; TEXT = "Sollen nderungen in %1 gespeichert werden?" ; TEXT [ English ] = "Should the changes to %1 be saved?" ; TEXT [ norwegian ] = "Lagre endringer som " ; @@ -1709,7 +1709,7 @@ String STR_AUTOSAVE TEXT [ spanish ] = "Guardar automticamente" ; TEXT [ english_us ] = "AutoSave" ; TEXT[ chinese_simplified ] = "自动存盘"; - TEXT[ russian ] = " "; + TEXT[ russian ] = ""; TEXT[ polish ] = "Zapisz automatycznie"; TEXT[ japanese ] = "自動的に保存"; TEXT[ chinese_traditional ] = "自動儲存"; @@ -1736,19 +1736,19 @@ String STR_RESWARNING TEXT [ danish ] = "Begrnsede systemressourcer. Afslut venligst andre applikationer eller luk nogle vinduer, fr du fortstter." ; TEXT [ french ] = "Ressources insuffisantes. Veuillez quitter les autres applications ou fermer certaines fentres avant de continuer." ; TEXT [ swedish ] = "Inte tillrckligt med systemresurser. Avsluta andra program eller stng ngra fnster innan du fortstter." ; - TEXT [ dutch ] = "Onvoldoende systeemgeheugen beschikbaar. Sluit andere toepassingen af.of sluit een aantal vensters voordat u uw werkvoortzet." ; + TEXT [ dutch ] = "Onvoldoende systeemgeheugen beschikbaar. Sluit andere toepassingen af of sluit een aantal vensters voordat u uw werk voortzet." ; TEXT [ spanish ] = "No hay suficientes recursos del sistema. Por favor, elimine otras aplicaciones o cierre algunas ventanas antes de continuar." ; TEXT [ english_us ] = "Limited system resources. Please quit other applications or close some windows before continuing." ; TEXT[ chinese_simplified ] = "系统资源不足。请您关闭其它的程序或者关闭一些视窗，然后重新尝试执行命令。"; - TEXT[ russian ] = " . , , , ."; + TEXT[ russian ] = " . , ."; TEXT[ polish ] = "Zasoby systemu s ograniczone. Przed kontynuacj pracy zakocz kilka aplikacji lub zamknij kilka okien."; TEXT[ japanese ] = "システムリソースが限界に近づいています。作業を続ける前に、他のアプリケーションを終了するか、いくつかのウィンドウを閉じてください。"; TEXT[ chinese_traditional ] = "系統資源不足。請關閉其它的程式或者關閉一些視窗﹐然後重新嘗試執行指令。"; TEXT[ arabic ] = " . С ."; - TEXT[ dutch ] = "Onvoldoende systeemgeheugen beschikbaar. Sluit andere toepassingen af.of sluit een aantal vensters voordat u uw werkvoortzet."; + TEXT[ dutch ] = "Onvoldoende systeemgeheugen beschikbaar. Sluit andere toepassingen af of sluit een aantal vensters voordat u uw werk voortzet."; TEXT[ chinese_simplified ] = "系统资源不足。请您关闭其它的程序或者关闭一些视窗，然后重新尝试执行命令。"; TEXT[ greek ] = " . ."; - TEXT[ korean ] = "시스템 자원이 부족합니다 .계속 진행하기 전에 다른 응용 프로그램을 중지하거나 열려있는 창을 닫으십시오."; + TEXT[ korean ] = "시스템 자원이 부족합니다. 계속 진행하기 전에 다른 응용 프로그램을 중지하거나 열려있는 창을 닫으십시오."; TEXT[ turkish ] = "Sistem kaynaklar azalyor. almaya devam etmeden nce dier uygulamalar ya da bir ka pencere kapatn."; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "No hi ha prou recursos al sistema. Tanqueu altres aplicacions o finestres abans de continuar."; @@ -1766,16 +1766,16 @@ String STR_RESEXCEPTION TEXT [ danish ] = "Vigtige programdele blev ikke fundet. Kontroller venligst din installation." ; TEXT [ french ] = "Certains fichiers sont manquants. Veuillez vrifier le paramtrage de l'application." ; TEXT [ swedish ] = "Viktiga programdelar hittades inte. Kontrollera din installation." ; - TEXT [ dutch ] = "Er ontbreken belangrijke programmaonderdelen. Controleer of de installatie juist is doorgevoerd." ; + TEXT [ dutch ] = "Er ontbreken belangrijke programmaonderdelen. Controleer of de installatie correct is uitgevoerd." ; TEXT [ spanish ] = "No se encuentran archivos importantes del programa. Compruebe la instalacin." ; TEXT [ english_us ] = "There are files missing. Please check application setup." ; TEXT[ chinese_simplified ] = "没有找到必要的程序组件。请检查您的安装。"; - TEXT[ russian ] = " . , , ."; + TEXT[ russian ] = " . ."; TEXT[ polish ] = "Wane czci programu nie zostay znalezione.Sprawd instalacj aplikacji."; TEXT[ japanese ] = "プログラムの大切な部分が見つかりません。インストールをチェックしてください。"; TEXT[ chinese_traditional ] = "沒有找到必要的程式元件。請檢查您的安裝。"; TEXT[ arabic ] = " . ."; - TEXT[ dutch ] = "Er ontbreken belangrijke programmaonderdelen. Controleer of de installatie juist is doorgevoerd."; + TEXT[ dutch ] = "Er ontbreken belangrijke programmaonderdelen. Controleer of de installatie correct is uitgevoerd."; TEXT[ chinese_simplified ] = "没有找到必要的程序组件。请检查您的安装。"; TEXT[ greek ] = " . ."; TEXT[ korean ] = "중요한 프로그램 부분을 찾지 못했습니다. 설치를 검사하십시오."; @@ -1795,16 +1795,16 @@ String STR_DOUBLEEXCEPTION TEXT[ danish ] = "Der opstod en yderligere systemfejl ved alarmdatasikringen.\nAlle data er muligvis ikke gemt fuldstndigt."; TEXT[ french ] = "Au cours de la sauvegarde, une nouvelle erreur systme s'est produite.\nIl n'est par certain que toutes les donnes aient pas pu tre enregistres correctement."; TEXT[ swedish ] = "Ytterligare ett systemfel uppstod nr alarmdata sparades.\nEventuellt har inte alla data sparats fullstndigt."; - TEXT[ dutch ] = "Tijdens het opslaan van alarmgegevens is nog een systeemfout opgetreden.\nDe gegevens werden evtl. niet compleet opgeslagen."; + TEXT[ dutch ] = "Tijdens het opslaan van alarmgegevens is nog een systeemfout opgetreden.\nDe gegevens zijn wellicht niet volledig opgeslagen."; TEXT[ spanish ] = "Ha ocurrido otro error en el sistema mientras se guardaban los datos.\nEs posible que no se hayan guardado completamente."; TEXT[ english_us ] = "Another error occurred during the save recovery.\nPossibly, the data could not be entirely saved."; TEXT[ chinese_simplified ] = "在修复存盘时发生了一个错误。\n数据存盘很有可能不完整。"; - TEXT[ russian ] = " .\n ."; + TEXT[ russian ] = " .\n, ."; TEXT[ polish ] = "Podczas alarmowego zabezpieczenia danych wystpi dalszy bd w systemie.\nDane s event. niekompletnie zabezpieczone."; TEXT[ japanese ] = "警告ファイル保護の際に他のシステムエラーが発生しました。\nデータの保存が完全にできていない可能性があります。"; TEXT[ chinese_traditional ] = "還原資料備份時發生了一個錯誤。\n資料儲存很有可能不完整。"; TEXT[ arabic ] = " .\n ."; - TEXT[ dutch ] = "Tijdens het opslaan van alarmgegevens is nog een systeemfout opgetreden.\nDe gegevens werden evtl. niet compleet opgeslagen."; + TEXT[ dutch ] = "Tijdens het opslaan van alarmgegevens is nog een systeemfout opgetreden.\nDe gegevens zijn wellicht niet volledig opgeslagen."; TEXT[ chinese_simplified ] = "在修复存盘时发生了一个错误。\n数据存盘很有可能不完整。"; TEXT[ greek ] = " .\n ."; TEXT[ korean ] = "알람 데이터를 저장하는 동안 다른 시스템 오류가 발생했습니다.\n데이터가 완전히 저장되지 않았을 수도 있습니다."; @@ -1823,25 +1823,25 @@ String STR_SYSRESEXCEPTION Text [ italian ] = "Le risorse del sistema sono esaurite. Riavviare l'applicazione." ; Text [ spanish ] = "Los recursos del sistema se han acabado. Por favor reinicie la aplicacin." ; Text [ french ] = "Les ressources du systme sont puises. Veuillez relancer l'application ." ; - Text [ dutch ] = "De systeemresources zijn verbruikt. Start de applicatie opnieuw." ; + Text [ dutch ] = "De systeemresources zijn verbruikt. Start de toepassing opnieuw." ; Text [ swedish ] = "Inte tillrckligt med systemresurser. Starta om programmet." ; Text [ danish ] = "Systemressourcerne er opbrugt. Genstart venligst denne applikation." ; Text [ portuguese_brazilian ] = "Die Systemresourcen sind verbraucht. Bitte starten Sie die Anwendung neu." ; Text [ portuguese ] = "Recursos do sistema esgotados. Reinicie a aplicao." ; Text[ chinese_simplified ] = "系统资源已经用完。请您重新启动应用程序。"; - Text[ russian ] = " . ."; + Text[ russian ] = " . ."; Text[ polish ] = "Zasoby systemu s zuyte. Rozpocznij aplikacj ponownie."; Text[ japanese ] = "システムリソースが限界に達しました。アプリケーションを新しくスタートしてください。"; Text[ chinese_traditional ] = "系統資源已經用完。請您重新啟動應用程式。"; Text[ arabic ] = " . ."; - Text[ dutch ] = "De systeemresources zijn verbruikt. Start de applicatie opnieuw."; + Text[ dutch ] = "De systeemresources zijn verbruikt. Start de toepassing opnieuw."; Text[ chinese_simplified ] = "系统资源已经用完。请您重新启动应用程序。"; Text[ greek ] = " . ."; Text[ korean ] = "시스템 자원이 소모되었습니다. 응용 프로그램을 다시 시작하십시오."; Text[ turkish ] = "Sistem kaynaklar tkendi. Uygulamay yeniden balatnz."; Text[ language_user1 ] = " "; Text[ catalan ] = "Els recursos del sistema s'han esgotat. Reinicieu l'aplicaci."; - Text[ finnish ] = "Jrjestelmresurssit ovat loppu. Aloita sovellus uudelleen."; + Text[ finnish ] = "Jrjestelmresurssit ovat lopussa. Aloita sovellus uudelleen."; Text[ thai ] = "ใช้ทรัพยากรระบบหมด กรุณาเริ่มโปรแกรมประยุกต์ใหม่"; }; @@ -1857,16 +1857,16 @@ ErrorBox MSG_ERR_SOINIT Message [ danish ] = "Fejl ved initialisering af objekt-systemet." ; Message [ french ] = "Erreur lors de l'initialisation du systme d'objets." ; Message [ swedish ] = "Fel vid initiering av objektsystem." ; - Message [ dutch ] = "Fout bij de initialisatie van het objectsysteem." ; + Message [ dutch ] = "Fout bij initialisatie van objectsysteem." ; Message [ spanish ] = "Error al inicializar el sistema objeto." ; Message [ english_us ] = "Error initializing object-system." ; Message[ chinese_simplified ] = "在初始化对象系统时发生错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd inicjalizacji systemu obiektw."; Message[ japanese ] = "オブジェクト システムの初期化の際のエラー｡"; Message[ chinese_traditional ] = "在初始化物件系統時發生錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij de initialisatie van het objectsysteem."; + Message[ dutch ] = "Fout bij initialisatie van objectsysteem."; Message[ chinese_simplified ] = "在初始化对象系统时发生错误。"; Message[ greek ] = " ."; Message[ korean ] = "개체 시스템 초기화시에 오류."; @@ -1900,7 +1900,7 @@ String MSG_IOERR_FILE_NOT_FOUND Text[ dutch ] = "Bestand $(FILE) bestaat niet."; Text[ chinese_simplified ] = "文件$(FILE)不存在。"; Text[ greek ] = " $(FILE) ."; - Text[ korean ] = "파일 $(FILE)이(가) 존재하지 않습니다."; + Text[ korean ] = "파일 $(FILE)이(가) 없습니다."; Text[ turkish ] = "$(FILE) dosyas mevcut deil."; Text[ language_user1 ] = " "; Text[ catalan ] = "No existeix el fitxer $(FILE)."; @@ -1915,7 +1915,7 @@ String MSG_IOERR_PATH_NOT_FOUND Text [ italian ] = "Il percorso per il file $(FILE) non esiste." ; Text [ portuguese_brazilian ] = "O caminho do arquivo $(FILE) n?o existe." ; Text [ portuguese ] = "O atalho para o ficheiro $(FILE) no existe." ; - Text [ finnish ] = "Tiedoston $(FILE) hakemistoa ei ole." ; + Text [ finnish ] = "Polkua tiedostoon $(FILE) ei ole." ; Text [ danish ] = "Stien til filen $(FILE) eksisterer ikke." ; Text [ french ] = "Le chemin vers le fichier $(FILE) n'existe pas." ; Text [ swedish ] = "Skvgen till filen $(FILE) existerar inte." ; @@ -1923,7 +1923,7 @@ String MSG_IOERR_PATH_NOT_FOUND Text [ spanish ] = "No existe la ruta de acceso al archivo $(FILE)." ; Text [ english_us ] = "The path to file $(FILE) doesn't exist." ; Text[ chinese_simplified ] = "指向文件 $(FILE) 的路径不存在。"; - Text[ russian ] = " $(FILE) ."; + Text[ russian ] = " $(FILE) ."; Text[ polish ] = "cieka do pliku $(FILE) nie istnieje."; Text[ japanese ] = "ファイル$(FILE)へのパスはありません。"; Text[ chinese_traditional ] = "指向檔案 $(FILE) 的路徑不存在。"; @@ -1931,7 +1931,7 @@ String MSG_IOERR_PATH_NOT_FOUND Text[ dutch ] = "Pad naar bestand $(FILE) bestaat niet."; Text[ chinese_simplified ] = "指向文件 $(FILE) 的路径不存在。"; Text[ greek ] = " $(FILE) ."; - Text[ korean ] = "파일 $(FILE)의 경로가 존재하지 않습니다."; + Text[ korean ] = "파일 $(FILE)의 경로가 없습니다."; Text[ turkish ] = "$(FILE) dosyasnn veri yolu mevcut deil."; Text[ language_user1 ] = " "; Text[ catalan ] = "No existeix el cam d'accs al fitxer $(FILE)."; @@ -1950,16 +1950,16 @@ String MSG_IOERR_TOO_MANY_OPEN_FILES Text [ danish ] = "Det var ikke muligt at bne filen $(FILE),\nda der for tiden er for mange bne filer.\nLuk nogle filer og prv igen." ; Text [ french ] = "Impossible d'ouvrir le fichier $(FILE)\n cause d'un trop grand nombre de fichiers ouverts\n.Fermez en quelques-uns avant de ressayer." ; Text [ swedish ] = "Det gick inte att ppna filen $(FILE)\neftersom fr mnga filer r ppna fr tillfllet.\nStng ngra filer och frsk igen." ; - Text [ dutch ] = "Bestand $(FILE) kon niet worden geopend \nomdat er teveel bestanden gelijktijdig geopend zijn.\nSluit enkele bestanden en probeert u het opnieuw." ; + Text [ dutch ] = "Bestand $(FILE) kan niet worden geopend \nomdat er te veel bestanden gelijktijdig geopend zijn.\nSluit enkele bestanden en probeer het opnieuw." ; Text [ spanish ] = "No se pudo abrir el archivo $(FILE)\nya que hay muchos archivos abiertos.\nCierre algunos archivos e intntelo otra vez." ; Text [ english_us ] = "The file $(FILE) could not be opened,\nbecause too many files are open.\nPlease close some files and try again." ; Text[ chinese_simplified ] = "无法打开文件$(FILE) ，\n因为已经打开了太多的文件。\n请关闭一些文件，然后在重新尝试。"; - Text[ russian ] = " $(FILE) ,\n.. .\n ."; + Text[ russian ] = " $(FILE) ."; Text[ polish ] = "Plik $(FILE) nie mg zosta otwarty,\nponiewa w tym czasie byo otwarte za duo plikw.\nZamknij kilka plikw i sprbuj je otworzy ponownie."; Text[ japanese ] = "\n現在開いているファイルが多過ぎるため、\nファイル $(FILE) を開くことができません。\nファイルをいくつか閉じた上で再度試みてください。"; Text[ chinese_traditional ] = "無法開啟檔案$(FILE) ﹐\n因為已經開啟太多的檔案。\n請關閉一些檔案﹐然後在重新嘗試。"; Text[ arabic ] = " $(FILE) \n .\n ʡ ."; - Text[ dutch ] = "Bestand $(FILE) kon niet worden geopend \nomdat er teveel bestanden gelijktijdig geopend zijn.\nSluit enkele bestanden en probeert u het opnieuw."; + Text[ dutch ] = "Bestand $(FILE) kan niet worden geopend \nomdat er te veel bestanden gelijktijdig geopend zijn.\nSluit enkele bestanden en probeer het opnieuw."; Text[ chinese_simplified ] = "无法打开文件$(FILE) ，\n因为已经打开了太多的文件。\n请关闭一些文件，然后在重新尝试。"; Text[ greek ] = " $(FILE),\n .\n ? "; Text[ korean ] = "현재 너무 많은 파일이 열려 있어\n파일$(FILE)을 열지 못했습니다.\n일부 파일을 닫고 다시 시도하십시오."; @@ -1981,16 +1981,16 @@ String MSG_IOERR_ACCESS_DENIED Text [ danish ] = "Det var ikke muligt at bne filen $(FILE) pga. manglende adgangsrettigheder." ; Text [ french ] = "Le fichier $(FILE) n'a pas pu tre ouvert du fait de droits d'accs manquants." ; Text [ swedish ] = "Det gick inte att ppna filen $(FILE) eftersom tkomstrttigheter saknas." ; - Text [ dutch ] = "Bestand $(FILE) kon niet worden geopend omdat toegangsrechten ontbreken." ; + Text [ dutch ] = "Bestand $(FILE) kan niet worden geopend omdat toegangsrechten ontbreken." ; Text [ spanish ] = "No se pudo se abrir el archivo $(FILE) por falta de derechos." ; Text [ english_us ] = "The file $(FILE) could not be opened due to missing access rights." ; Text[ chinese_simplified ] = "因为没有读取权利而法读取文件$(FILE)。"; - Text[ russian ] = "- , $(FILE) ."; + Text[ russian ] = " $(FILE), ."; Text[ polish ] = "Brak dostpu do pliku $(FILE) z powodu brakujcych praw dostpu."; Text[ japanese ] = "権利がないため、ファイル $(FILE) にはアクセスできません。"; Text[ chinese_traditional ] = "因為沒有讀取權利而無法讀取檔案$(FILE)。"; Text[ arabic ] = " $(FILE) ."; - Text[ dutch ] = "Bestand $(FILE) kon niet worden geopend omdat toegangsrechten ontbreken."; + Text[ dutch ] = "Bestand $(FILE) kan niet worden geopend omdat toegangsrechten ontbreken."; Text[ chinese_simplified ] = "因为没有读取权利而法读取文件$(FILE)。"; Text[ greek ] = " $(FILE) , ."; Text[ korean ] = "액세스 권한이 없어 파일 $(FILE)을 열지 못했습니다."; @@ -2012,16 +2012,16 @@ String MSG_IOERR_INVALID_ACCESS Text [ danish ] = "Det var ikke muligt at f adgang til filen $(FILE)." ; Text [ french ] = "Le fichier $(FILE) n'a pas pu tre ouvert du fait de droits d'accs incorrects." ; Text [ swedish ] = "Det var inte mjligt att f tkomst till filen $(FILE)." ; - Text [ dutch ] = "Bestand $(FILE) kon niet worden geopend." ; + Text [ dutch ] = "Bestand $(FILE) kan niet worden geopend." ; Text [ spanish ] = "No se pudo acceder al archivo $(FILE)." ; Text [ english_us ] = "The file $(FILE) could not be accessed." ; Text[ chinese_simplified ] = "无法读取文件 $(FILE) 。"; - Text[ russian ] = " $(FILE) ."; + Text[ russian ] = " $(FILE) ."; Text[ polish ] = "Brak dostpu do pliku $(FILE)."; Text[ japanese ] = "ファイル$(FILE)にはアクセスできません。"; Text[ chinese_traditional ] = "無法讀取檔案 $(FILE) 。"; Text[ arabic ] = " $(FILE)."; - Text[ dutch ] = "Bestand $(FILE) kon niet worden geopend."; + Text[ dutch ] = "Bestand $(FILE) kan niet worden geopend."; Text[ chinese_simplified ] = "无法读取文件 $(FILE) 。"; Text[ greek ] = " $(FILE)."; Text[ korean ] = "파일 $(FILE)을 액세스하지 못했습니다."; @@ -2043,19 +2043,19 @@ String MSG_IOERR_INVALID_HANDLE Text [ danish ] = "Det var ikke muligt at bne filen $(FILE) pga. en ugyldig filhandle." ; Text [ french ] = "Le fichier $(FILE) n'a pas pu tre ouvert suite une erreur de numrisation." ; Text [ swedish ] = "Det gick inte att ppna filen $(FILE) p grund av en ogiltig fildescriptor." ; - Text [ dutch ] = "Bestand $(FILE) kon niet worden geopend als gevolg van ongeldige filedescriptor." ; + Text [ dutch ] = "Bestand $(FILE) kan niet worden geopend als gevolg van ongeldige bestand-descriptor." ; Text [ spanish ] = "No se pudo abrir el archivo $(FILE) debido a un controlador de archivos no vlido." ; Text [ english_us ] = "The file $(FILE) could not be opened due to an invalid file handle." ; Text[ chinese_simplified ] = "因无效的文件标识值而无法打开文件 $(FILE) 。"; - Text[ russian ] = "- , $(FILE) ."; + Text[ russian ] = " $(FILE) - ."; Text[ polish ] = "Pliku $(FILE) nie mona byo otworzy z powodu nieprawidowego dojcia."; Text[ japanese ] = "ファイル$(FILE)は無効なファイル記述語のために開かれません。"; Text[ chinese_traditional ] = "因無效的檔案標識值而無法開啟檔案$(FILE) 。"; Text[ arabic ] = " $(FILE) ."; - Text[ dutch ] = "Bestand $(FILE) kon niet worden geopend als gevolg van ongeldige filedescriptor."; + Text[ dutch ] = "Bestand $(FILE) kan niet worden geopend als gevolg van ongeldige bestand-descriptor."; Text[ chinese_simplified ] = "因无效的文件标识值而无法打开文件 $(FILE) 。"; Text[ greek ] = " $(FILE) ."; - Text[ korean ] = "유효하지 않은 파일 핸들로 인해 파일 $(FILE) 을(를) 열지 못했습니다."; + Text[ korean ] = "잘못된 파일 핸들로인해 파일 $(FILE)을(를) 열지 못했습니다."; Text[ turkish ] = "$(FILE) dosyas geersiz bir dosya tutamac nedeniyle alamad."; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha pogut obrir el fitxer $(FILE) ja que el controlador de discs no s vlid."; @@ -2074,16 +2074,16 @@ String MSG_IOERR_CANNOT_MAKE Text [ danish ] = "Det var ikke muligt at oprette filen $(FILE)." ; Text [ french ] = "Le fichier $(FILE) n'a pas pu tre cr." ; Text [ swedish ] = "Det gick inte att skapa filen $(FILE)." ; - Text [ dutch ] = "Bestand $(FILE) kon niet worden gemaakt." ; + Text [ dutch ] = "Bestand $(FILE) kan niet worden gemaakt." ; Text [ spanish ] = "No se pudo crear el archivo $(FILE)." ; Text [ english_us ] = "The file $(FILE) could not be created." ; Text[ chinese_simplified ] = "无法建立文件 $(FILE)。"; - Text[ russian ] = " $(FILE)."; + Text[ russian ] = " $(FILE)."; Text[ polish ] = "Pliku $(FILE) nie mona byo utworzy."; Text[ japanese ] = "ファイル$(FILE)は作成できませんでした。"; Text[ chinese_traditional ] = "無法開啟新檔$(FILE)。"; Text[ arabic ] = " $(FILE)."; - Text[ dutch ] = "Bestand $(FILE) kon niet worden gemaakt."; + Text[ dutch ] = "Bestand $(FILE) kan niet worden gemaakt."; Text[ chinese_simplified ] = "无法建立文件 $(FILE)。"; Text[ greek ] = " $(FILE)."; Text[ korean ] = "파일 $(FILE)을(를）만들지 못했습니다."; @@ -2109,7 +2109,7 @@ String MSG_IOERR_SHARING Text [ spanish ] = "Error durante el acceso compartido al archivo $(FILE)." ; Text [ english_us ] = "Error by shared access to $(FILE)." ; Text[ chinese_simplified ] = "在同时读取文件 $(FILE) 时发生错误。"; - Text[ russian ] = " $(FILE)."; + Text[ russian ] = " $(FILE)."; Text[ polish ] = "Brak wsplnego dostpu do pliku $(FILE)."; Text[ japanese ] = "ファイル $(FILE) への共有アクセスの際のエラー。"; Text[ chinese_traditional ] = "在同時讀取檔案$(FILE) 時發生錯誤。"; @@ -2148,18 +2148,18 @@ String MSG_IOERR_GENERAL Text [ norwegian ] = "" ; Text [ italian ] = "Errore generale di I/O nell'accesso a $(FILE)." ; Text [ portuguese_brazilian ] = "Allgemeiner Ein-/Ausgabefehler beim Zugriff auf $(FILE)." ; - Text [ french ] = "Erreur d'entre/sortie gnrale lors de l'accs $(FILE)." ; + Text [ french ] = "Erreur gnrale d'entre/sortie lors de l'accs $(FILE)" ; Text [ swedish ] = "Allmnt input/outputfel vid tkomst av $(FILE)." ; Text [ dutch ] = "Algemene in-/uitvoerfout bij toegang op $(FILE)." ; Text [ spanish ] = "Error general de entrada/salida al acceder a $(FILE)." ; Text [ english_us ] = "General I/O error accessing $(FILE)." ; Text [ dutch ] = "Algemene in-/uitvoerfout bij toegang op $(FILE)." ; Text [ italian ] = "Errore generale di I/O nell'accesso a $(FILE)." ; - Text [ french ] = "Erreur d'entre/sortie gnrale lors de l'accs $(FILE)." ; + Text [ french ] = "Erreur gnrale d'entre/sortie lors de l'accs $(FILE)" ; Text [ danish ] = "Generel I/O fejl ved adgang til $(FILE)." ; Text [ portuguese ] = "Erro geral de acesso/sada ao tentar entrar em $(FILE)." ; Text[ chinese_simplified ] = "在读取$(FILE)时发生一个一般的输入/输出错误。"; - Text[ russian ] = " $(FILE)."; + Text[ russian ] = " - $(FILE)."; Text[ polish ] = "Oglny bd w wejciu/wyjciu w dostpie do $(FILE)."; Text[ japanese ] = "$(FILE) へアクセスする際の一般的な入力/出力のエラー。"; Text[ chinese_traditional ] = "在讀取$(FILE)時發生一個一般的輸入/輸出錯誤。"; @@ -2167,11 +2167,11 @@ String MSG_IOERR_GENERAL Text[ dutch ] = "Algemene in-/uitvoerfout bij toegang op $(FILE)."; Text[ chinese_simplified ] = "在读取$(FILE)时发生一个一般的输入/输出错误。"; Text[ greek ] = " / $(FILE)."; - Text[ korean ] = "파일 $(FILE) 액세스시 일반 입／출력 오류 ."; + Text[ korean ] = "파일 $(FILE)에 액세스하던 중 일반 입력／출력 오류 "; Text[ turkish ] = "$(FILE) dosyasna eriimde genel girdi/kt hatas olutu.."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha produt un error d'E/S en accedir a $(FILE)."; - Text[ finnish ] = "On ilmennyt yleinen keskeytysvirhe kytettess tiedostoa $(FILE)."; + Text[ finnish ] = "On ilmennyt yleinen I/O-virhe kytettess tiedostoa $(FILE)."; Text[ thai ] = "ทั่วไป I/O การเข้าถึงผิดพลาด $(FILE)."; }; @@ -2271,7 +2271,7 @@ String STR_EVENT_STARTAPP Text [ spanish ] = "Iniciar aplicacin" ; Text [ ENGLISH_US ] = "Start Application" ; Text[ chinese_simplified ] = "启动程序"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pocztek programu"; Text[ japanese ] = "プログラムの開始時"; Text[ chinese_traditional ] = "啟動程式"; @@ -2300,7 +2300,7 @@ String STR_EVENT_ONERROR Text [ dutch ] = "Javascript runtime error" ; Text [ portuguese ] = "Erro na execuo de JavaScript" ; Text[ chinese_simplified ] = "Javascript-运行时间错误"; - Text[ russian ] = " JavaScript"; + Text[ russian ] = " . JavaScript"; Text[ polish ] = "JavaScript Runtime Error"; Text[ japanese ] = "JavaScript runtime エラー表示の時"; Text[ chinese_traditional ] = "Javascript 運行時間錯誤"; @@ -2308,7 +2308,7 @@ String STR_EVENT_ONERROR Text[ dutch ] = "Javascript runtime error"; Text[ chinese_simplified ] = "Javascript-运行时间错误"; Text[ greek ] = " . JavaScript"; - Text[ korean ] = "JavaScript 런타임 오류"; + Text[ korean ] = "JavaScript Runtime 오류"; Text[ turkish ] = "Javascript yrtm sresi hatas"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error d'execuci de Javascript"; @@ -2340,7 +2340,7 @@ String STR_EVENT_CLOSEAPP Text[ dutch ] = "Programma beindigen"; Text[ chinese_simplified ] = "结束程序"; Text[ greek ] = " "; - Text[ korean ] = "프로그램 종료"; + Text[ korean ] = "프로그램 닫기"; Text[ turkish ] = "Programdan k"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tanca l'aplicaci"; @@ -2388,11 +2388,11 @@ String STR_EVENT_CLOSEDOC Text [ danish ] = "Programmet lukkes" ; Text [ italian ] = "Il documento viene chiuso" ; Text [ spanish ] = "El documento se va a cerrar" ; - Text [ french ] = "Le document va tre ferm" ; + Text [ french ] = "Fermeture du document" ; Text [ dutch ] = "Document sluiten" ; Text [ portuguese ] = "Fechar documento" ; Text[ chinese_simplified ] = "现在关闭文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zamknij dokument"; Text[ japanese ] = "ドキュメントを閉じる時"; Text[ chinese_traditional ] = "現在關閉文件"; @@ -2664,7 +2664,7 @@ String STR_EVENT_PRINTDOC Text [ portuguese_brazilian ] = "Dokument drucken" ; Text [ portuguese ] = "Imprimir documento" ; Text[ chinese_simplified ] = "打印文档"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Drukuj dokument"; Text[ japanese ] = "ドキュメントの印刷時"; Text[ chinese_traditional ] = "列印文件"; @@ -2685,7 +2685,7 @@ String STR_ERR_NOTEMPLATE { Text = "Die Vorlage hat ein falsches Format" ; Text [ ENGLISH ] = "Chosen template has wrong format" ; - Text [ dutch ] = "De geselecteerde sjabloon heeft een verkeerd formaat" ; + Text [ dutch ] = "De geselecteerde sjabloon heeft een foutieve indeling" ; Text [ english_us ] = "The selected template has an incorrect format" ; Text [ italian ] = "Il modello ha un formato errato" ; Text [ spanish ] = "La plantilla tiene un formato incorrecto" ; @@ -2695,19 +2695,19 @@ String STR_ERR_NOTEMPLATE Text [ portuguese_brazilian ] = "Die Vorlage hat ein falsches Format" ; Text [ portuguese ] = "O modelo seleccionado tem um formato errado" ; Text[ chinese_simplified ] = "样式格式错误。"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Szablon ma nieprawidowy format"; Text[ japanese ] = "テンプレートは書式が正しくありません"; Text[ chinese_traditional ] = "樣式格式錯誤。"; Text[ arabic ] = " "; - Text[ dutch ] = "De geselecteerde sjabloon heeft een verkeerd formaat"; + Text[ dutch ] = "De geselecteerde sjabloon heeft een foutieve indeling"; Text[ chinese_simplified ] = "样式格式错误。"; Text[ greek ] = " "; - Text[ korean ] = "템플릿의 형식이 올바르지 않습니다."; + Text[ korean ] = "서식 파일의 서식이 올바르지 않습니다."; Text[ turkish ] = "Seilen ablonun format yanl"; Text[ language_user1 ] = " "; Text[ catalan ] = "La plantilla t un format incorrecte"; - Text[ finnish ] = "Valitun mallipohjan muoto ei ole kelvollinen."; + Text[ finnish ] = "Valitun mallin muoto ei ole kelvollinen."; Text[ thai ] = "แม่แบบที่เลือกมีรูปแบบที่ไม่ถูกต้อง"; }; @@ -2725,7 +2725,7 @@ String STR_ERR_NOFILE Text [ portuguese_brazilian ] = "Die Datei $ kann nicht ge?fnet werden." ; Text [ portuguese ] = "Foi impossvel abrir o ficheiro $." ; Text[ chinese_simplified ] = "无法打开文件 $ 。"; - Text[ russian ] = " $ ."; + Text[ russian ] = " $."; Text[ polish ] = "Plik $ nie moe zosta otworzony."; Text[ japanese ] = "ファイル$は開くことができません。"; Text[ chinese_traditional ] = "無法開啟檔案 $ 。"; @@ -2776,7 +2776,7 @@ String STR_EXITANDRETURN { Text = "~Beenden & zurck zu " ; Text [ ENGLISH ] = "E~xit & return to " ; - Text [ dutch ] = "~Beindigen & terug naar " ; + Text [ dutch ] = "~Beindigen & terug naar" ; Text [ english_us ] = "E~xit & return to " ; Text [ italian ] = "~Esci e ritorna a " ; Text [ spanish ] = "~Terminar y regresar a " ; @@ -2786,19 +2786,19 @@ String STR_EXITANDRETURN Text [ portuguese_brazilian ] = "~Beenden & zur?k zu " ; Text [ portuguese ] = "~Sair & Regressar a " ; Text[ chinese_simplified ] = "结束和返回(~X)"; - Text[ russian ] = " & "; + Text[ russian ] = " "; Text[ polish ] = "Zakocz & Powr do "; Text[ japanese ] = "終了 & 戻る(~X)"; Text[ chinese_traditional ] = "結束和返回(~X)"; Text[ arabic ] = " "; - Text[ dutch ] = "~Beindigen & terug naar "; + Text[ dutch ] = "~Beindigen & terug naar"; Text[ chinese_simplified ] = "结束和返回(~X)"; Text[ greek ] = "~ "; - Text[ korean ] = "끝내기 & 돌아가기 (~X)"; + Text[ korean ] = "종료 & 돌아가기(~X)"; Text[ turkish ] = "~k ve dn: "; Text[ language_user1 ] = " "; Text[ catalan ] = "~Surt i retorna a "; - Text[ finnish ] = "Lo~peta ja palaa"; + Text[ finnish ] = "Lo~peta ja palaa "; Text[ thai ] = "~ออกและกลับไปที่ "; }; @@ -2808,7 +2808,7 @@ String STR_EXTHELPSTATUS Text [ English ] = "Select a command or click for a overview." ; Text [ english_us ] = "Select a command or click to select a theme." ; Text [ italian ] = "Scegliete un comando o cliccate per scegliere un argomento." ; - Text [ spanish ] = "Seleccione un comando o pulse para seleccionar un tema." ; + Text [ spanish ] = "Seleccione una orden o pulse para seleccionar un tema." ; Text [ french ] = "Slectionnez une commande ou cliquez pour choisir une rubrique." ; Text [ dutch ] = "Kies een optie of klik om een onderwerp te kiezen." ; Text [ swedish ] = "Vlj ett kommando eller klicka fr att vlja ett tema." ; @@ -2816,7 +2816,7 @@ String STR_EXTHELPSTATUS Text [ portuguese_brazilian ] = "W?hlen Sie einen Befehl oder klicken Sie, um ein Thema auszuw?hlen." ; Text [ portuguese ] = "Seleccione um comando ou clique para escolher um tema." ; Text[ chinese_simplified ] = "请您选择或者按击一个命令，选择一个主题。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Wybierz polecenie lub kliknij, by wybra temat."; Text[ japanese ] = "クリックしてコマンドまたはテーマを選択してください。"; Text[ chinese_traditional ] = "請您選擇或者按一個指令﹐選擇一個主題。"; @@ -2824,7 +2824,7 @@ String STR_EXTHELPSTATUS Text[ dutch ] = "Kies een optie of klik om een onderwerp te kiezen."; Text[ chinese_simplified ] = "请您选择或者按击一个命令，选择一个主题。"; Text[ greek ] = " ."; - Text[ korean ] = "주제를 선택하려면 클릭하거나 명령어를 선택하십시오."; + Text[ korean ] = "주제를 선택하려면 클릭하거나 명령을 선택하십시오."; Text[ turkish ] = "Bir komut sein ya da bir konu semek iin tklayn."; Text[ language_user1 ] = " "; Text[ catalan ] = "Seleccioneu una ordre o feu clic per a seleccionar un tema."; @@ -2856,7 +2856,7 @@ String STR_MAIL Text[ dutch ] = "Post"; Text[ chinese_simplified ] = "电子邮件"; Text[ greek ] = ""; - Text[ korean ] = "메일"; + Text[ korean ] = "우편"; Text[ turkish ] = "Posta"; Text[ language_user1 ] = " "; Text[ catalan ] = "Correu"; @@ -2937,7 +2937,7 @@ String RID_STR_NOAUTOSTARTHELPAGENT Text [ dutch ] = "Bij 'XX' niet automatisch starten" ; Text [ portuguese ] = "No iniciar 'XX' automaticamente." ; Text[ chinese_simplified ] = "在 'XX' 时不自动运行。"; - Text[ russian ] = " 'XX'"; + Text[ russian ] = " 'XX'"; Text[ polish ] = "Przy 'XX' nie startuj automatycznie"; Text[ japanese ] = "'XX'で自動的に開始しない。"; Text[ chinese_traditional ] = "在<XX>時不自動運行。"; @@ -2949,7 +2949,7 @@ String RID_STR_NOAUTOSTARTHELPAGENT Text[ turkish ] = "'XX' olduunda otomatik balatma yaplmasn"; Text[ language_user1 ] = " "; Text[ catalan ] = "No iniciar automticament amb 'XX'"; - Text[ finnish ] = "Ei automaattista aloitusta kohteessa XX"; + Text[ finnish ] = "Ei automaattista aloitusta kohteessa XX."; Text[ thai ] = "ไม่เริ่มอัตโนมัติที่ 'XX'"; }; @@ -2967,7 +2967,7 @@ String RID_STR_NOWELCOMESCREEN Text [ dutch ] = "Tips niet meer weergeven" ; Text [ portuguese ] = "No mostrar sugestes" ; Text[ chinese_simplified ] = "不再显示提示"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie wywietlaj porad"; Text[ japanese ] = "ヒントを表示しない"; Text[ chinese_traditional ] = "不要再顯示提示"; @@ -2975,11 +2975,11 @@ String RID_STR_NOWELCOMESCREEN Text[ dutch ] = "Tips niet meer weergeven"; Text[ chinese_simplified ] = "不再显示提示"; Text[ greek ] = " "; - Text[ korean ] = "조언을 더 이상 표시하지 않음"; + Text[ korean ] = "팁! 표시하지 않음"; Text[ turkish ] = "neri grntleme"; Text[ language_user1 ] = " "; Text[ catalan ] = "No mostris els consells"; - Text[ finnish ] = "l nyt vihjeit"; + Text[ finnish ] = "l nyt vihjeit."; Text[ thai ] = "อย่าแสดงคำแนะนำ"; }; @@ -2995,21 +2995,21 @@ String RID_HELPBAR Text [ italian ] = "Barra della Guida" ; Text [ spanish ] = "Barra de ayuda" ; Text [ french ] = "Barre de l'aide" ; - Text [ dutch ] = "Helpbalk" ; + Text [ dutch ] = "Help-balk" ; Text[ chinese_simplified ] = "帮助栏"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pasek pomocy"; Text[ japanese ] = "ヘルプバー"; Text[ chinese_traditional ] = "說明列"; Text[ arabic ] = " "; - Text[ dutch ] = "Helpbalk"; + Text[ dutch ] = "Help-balk"; Text[ chinese_simplified ] = "帮助栏"; Text[ greek ] = " "; - Text[ korean ] = "도움말 모음"; + Text[ korean ] = "도움말 표시줄"; Text[ turkish ] = "Yardm ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'ajuda"; - Text[ finnish ] = "Ohjepalkki"; + Text[ finnish ] = "Ohjerivi"; Text[ thai ] = "แถบช่วยเหลือ"; }; @@ -3079,15 +3079,15 @@ String RID_STR_HLPFILENOTEXIST Text [ italian ] = "La Guida relativa a questo argomento non stata installata." ; Text [ spanish ] = "El archivo de ayuda para este tema no ha sido instalado." ; Text [ french ] = "Vous n'avez pas install l'aide correspondant ce sujet." ; - Text [ dutch ] = "Bij dit onderwerp werd geen Help genstalleerd." ; + Text [ dutch ] = "Bij dit onderwerp is geen Help genstalleerd." ; Text [ portuguese ] = "O ficheiro de ajuda para este tpico no est instalado." ; Text[ chinese_simplified ] = "没有安装有关这个主题的帮助文件。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Dla tego tematu nie zainstalowano pliku pomocy."; Text[ japanese ] = "このテーマに関するヘルプはインストールされていません。"; Text[ chinese_traditional ] = "沒有安裝關於這個主題的說明檔案。"; Text[ arabic ] = " ."; - Text[ dutch ] = "Bij dit onderwerp werd geen Help genstalleerd."; + Text[ dutch ] = "Bij dit onderwerp is geen Help genstalleerd."; Text[ chinese_simplified ] = "没有安装有关这个主题的帮助文件。"; Text[ greek ] = " ."; Text[ korean ] = "이 주제에 대한 도움말이 설치되지 않았습니다."; @@ -3102,7 +3102,7 @@ String RID_STR_HLPAPPNOTSTARTED { TEXT = "Die Hilfeapplikation konnte nicht gestartet werden" ; TEXT [ english ] = "The help application could not be started" ; - Text [ dutch ] = "De Help-applicatie kon niet worden opgestart" ; + Text [ dutch ] = "De Help-toepassing kan niet worden opgestart" ; Text [ english_us ] = "The help system could not be started" ; Text [ italian ] = "Non stato possibile avviare l'applicazione ausiliaria" ; Text [ spanish ] = "No se pudo iniciar la aplicacin de ayuda." ; @@ -3112,19 +3112,19 @@ String RID_STR_HLPAPPNOTSTARTED Text [ portuguese ] = "Foi impossvel iniciar o sistema de ajuda." ; Text [ portuguese_brazilian ] = "Die Hilfeapplikation konnte nicht gestartet werden" ; Text[ chinese_simplified ] = "无法启动帮助应用程序。"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Systemu pomocy nie mona byo uruchomi"; Text[ japanese ] = "ヘルプアプリケーションは開始できませんでした"; Text[ chinese_traditional ] = "無法啟動說明應用程式。"; Text[ arabic ] = " "; - Text[ dutch ] = "De Help-applicatie kon niet worden opgestart"; + Text[ dutch ] = "De Help-toepassing kan niet worden opgestart"; Text[ chinese_simplified ] = "无法启动帮助应用程序。"; Text[ greek ] = " "; Text[ korean ] = "도움말 응용 프로그램을 시작하지 못했습니다."; Text[ turkish ] = "Yardm uygulamas balatlamad"; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha pogut iniciar el sistema d'ajuda"; - Text[ finnish ] = "Ohjejrjestelmn kynnistminen ei onnistu"; + Text[ finnish ] = "Ohjejrjestelmn kynnistminen ei onnistu."; Text[ thai ] = "ไม่สามารถเริ่มระบบช่วยเหลือ"; }; @@ -3156,7 +3156,7 @@ String RID_ENVTOOLBOX Text[ turkish ] = "lev ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra de funcions"; - Text[ finnish ] = "Toimintopalkki"; + Text[ finnish ] = "Toimintorivi"; Text[ thai ] = "แถบฟังก์ชั่น"; }; @@ -3409,17 +3409,17 @@ String RID_SPECIALCONFIG_ERROR Text [ italian ] = "Nella configurazione speciale stato trovato un errore.\nRivolgetevi al vostro amministratore!" ; Text [ spanish ] = "En la configuracin especial se ha detectado un error.\nPngase por favor en contacto con su administrador." ; Text [ french ] = "Une erreur a t dtecte dans la configuration spciale.\nVeuillez consulter l'administrateur !" ; - Text [ dutch ] = "In de speciale configuratie is een fout opgetreden. Wendt u zich s.v.p. aan uw administrator!" ; + Text [ dutch ] = "In de speciale configuratie is een fout opgetreden. Neem contact op met de beheerder!" ; Text[ chinese_simplified ] = "在一个特殊的配置文件内发现一个错误。\n请和您的管理员联系！"; - Text[ russian ] = " .\n, !"; + Text[ russian ] = " .\n ."; Text[ polish ] = "W konfiguracji specjalnej stwierdzono bd.\nZwr si do swojego administratora!"; Text[ japanese ] = "特殊な設定でエラーが発生しました。\nアドミニストレータに連絡してください。"; Text[ chinese_traditional ] = "在一個特殊的配置檔案內發現一個錯誤。請和管理員聯絡﹗"; Text[ arabic ] = " .\n !"; - Text[ dutch ] = "In de speciale configuratie is een fout opgetreden. Wendt u zich s.v.p. aan uw administrator!"; + Text[ dutch ] = "In de speciale configuratie is een fout opgetreden. Neem contact op met de beheerder!"; Text[ chinese_simplified ] = "在一个特殊的配置文件内发现一个错误。\n请和您的管理员联系！"; Text[ greek ] = " .\n !"; - Text[ korean ] = "특수 구성에서 오류가 발생하였습니다. 관리자에게 문의하십시오 !"; + Text[ korean ] = "특수 설정에서 오류가 발생했습니다. 관리자에게 문의하십시오."; Text[ turkish ] = "zel konfigrasyonda bir hata bulundu.\nLtfen sistem yneticinize bavurun!"; Text[ catalan ] = "En la configuraci especial s'ha detectat un error.\nPoseu-vos en contacte amb el seu administrador."; Text[ finnish ] = "Erityiskokoonpanossa on ilmennyt virhe.\nOta yhteys pkyttjn."; @@ -3456,7 +3456,7 @@ String RID_PLUGIN Text [ french ] = "Activation de Plug-in" ; Text [ dutch ] = "PlugIn-activering" ; Text[ chinese_simplified ] = "启动 Plug-In"; - Text[ russian ] = " Plug-In"; + Text[ russian ] = " "; Text[ polish ] = "Wcz wtyczk plug-in"; Text[ japanese ] = "プラグインをアクティブにする"; Text[ chinese_traditional ] = "啟動 Plug-In"; @@ -3479,11 +3479,11 @@ String STR_CORRUPT_INSTALLATION Text [ English_us ] = "Important program components could not be initialized correctly.\nPlease start the setup program with the option /Repair."; Text[ portuguese ] = "Foi impossvel iniciar a importao dos componentes do programa correctamente.\nInicie o programa de instalao (Setup) com a opo /repair."; Text[ greek ] = " .\n ? "; - Text[ dutch ] = "Belangrijke programmaonderdelen konden niet correct worden genitialiseerd.\nStart het setup programma met de optie /Repareren."; + Text[ dutch ] = "Belangrijke programmaonderdelen kunnen niet correct worden genitialiseerd.\nStart Setup met de optie /Repareren."; Text[ french ] = "Certains composants importants du programme n'ont pas pu tre initialiss. Veuillez activer le programme d'installation (Setup) et y activer l'option de rparation (Repair)."; Text[ spanish ] = "Algunos componentes importantes del programa no se pudieron instalar.\nInicie por favor el programa de instalacin con la opcin /repair."; Text[ swedish ] = "Det gick inte att initiera viktiga programdelar korrekt.\nStarta setupprogrammet med alternativet /repair."; - Text[ russian ] = " .\n, , /repair."; + Text[ russian ] = " .\n ."; Text[ italian ] = "Impossibile inizializzare importanti componenti del programma.\nAvviate il setup con l'opzione /Riparazione."; Text[ danish ] = "Det var ikke muligt at initialisere vigtige programdele korrekt.\nStart venligst installationsprogrammet (Setup) med alternativet / reparation."; Text[ polish ] = "Wane czci programu nie mogy zosta prawidowo zainstalowane.\nProsz uruchomi program instalacyjny uywajc opcji / repair"; @@ -3508,17 +3508,17 @@ String IDS_SBERR_STOREREF Text [ danish ] = "Referencen bliver ikke gemt: "; Text [ french ] = "Impossible d'enregistrer la rfrence : "; Text [ swedish ] = "Referens sparas inte: "; - Text [ dutch ] = "Verwijzing wordt niet opgeslagen: "; + Text [ dutch ] = "Verwijzing wordt niet opgeslagen:"; Text [ spanish ] = "No se guardar la referencia: "; Text [ english_us ] = "Reference will not be saved: "; Text[ chinese_simplified ] = "不会保存引用 "; Text[ language_user1 ] = " "; - Text[ russian ] = " : "; + Text[ russian ] = " : "; Text[ polish ] = "Odwoanie nie zostao zapisane: "; Text[ japanese ] = "参照は保存されません: "; Text[ chinese_traditional ] = "不儲存參照： "; Text[ arabic ] = " :"; - Text[ dutch ] = "Verwijzing wordt niet opgeslagen: "; + Text[ dutch ] = "Verwijzing wordt niet opgeslagen:"; Text[ chinese_simplified ] = "不会保存引用 "; Text[ greek ] = " : "; Text[ korean ] = "참조가 저장되지 않을 것입니다: "; @@ -3544,7 +3544,7 @@ String STR_KEY_CONFIG_DIR Text [ spanish ] = "Configuracin" ; Text [ english_us ] = "Configuration" ; Text[ chinese_simplified ] = "配置"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Konfiguracje"; Text[ japanese ] = "設定"; Text[ chinese_traditional ] = "配置"; @@ -3552,7 +3552,7 @@ String STR_KEY_CONFIG_DIR Text[ dutch ] = "Configuratie"; Text[ chinese_simplified ] = "配置"; Text[ greek ] = ""; - Text[ korean ] = "구성"; + Text[ korean ] = "설정"; Text[ turkish ] = "Konfigrasyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Configuraci"; @@ -3571,10 +3571,10 @@ String STR_KEY_WORK_PATH Text [ french ] = "Dossier de travail" ; Text [ swedish ] = "Arbetskatalog" ; Text [ dutch ] = "Werkmap" ; - Text [ spanish ] = "Directorio de trabajo" ; + Text [ spanish ] = "Mis documentos" ; Text [ english_us ] = "My Documents" ; Text[ chinese_simplified ] = "工作目录"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Folder roboczy"; Text[ japanese ] = "ワーキングディレクトリ"; Text[ chinese_traditional ] = "我的文件夾"; @@ -3582,7 +3582,7 @@ String STR_KEY_WORK_PATH Text[ dutch ] = "Werkmap"; Text[ chinese_simplified ] = "工作目录"; Text[ greek ] = " "; - Text[ korean ] = "작업 디렉토리"; + Text[ korean ] = "내 문서"; Text[ turkish ] = "alma dizini"; Text[ language_user1 ] = " "; Text[ catalan ] = "Els meus documents"; @@ -3596,7 +3596,7 @@ String STR_KEY_GRAPHICS_PATH Text [ italian ] = "Immagini" ; Text [ portuguese_brazilian ] = "Gr?ficos" ; Text [ portuguese ] = "Imagens" ; - Text [ finnish ] = "Kuvat" ; + Text [ finnish ] = "Grafiikka" ; Text [ danish ] = "Grafik" ; Text [ french ] = "Images" ; Text [ swedish ] = "Grafik" ; @@ -3604,7 +3604,7 @@ String STR_KEY_GRAPHICS_PATH Text [ spanish ] = "Imgenes" ; Text [ english_us ] = "Graphics" ; Text[ chinese_simplified ] = "图形"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Grafiki"; Text[ japanese ] = "図"; Text[ chinese_traditional ] = "圖形"; @@ -3612,7 +3612,7 @@ String STR_KEY_GRAPHICS_PATH Text[ dutch ] = "Afbeeldingen"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imatges"; @@ -3632,7 +3632,7 @@ String STR_KEY_BITMAP_PATH Text [ portuguese ] = "cones" ; Text [ portuguese_brazilian ] = "Symbole" ; Text[ chinese_simplified ] = "图标"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Symbole"; Text[ japanese ] = "シンボル"; Text[ chinese_traditional ] = "圖示"; @@ -3640,8 +3640,8 @@ String STR_KEY_BITMAP_PATH Text[ dutch ] = "Pictogrammen"; Text[ chinese_simplified ] = "图标"; Text[ greek ] = ""; - Text[ korean ] = "기호"; - Text[ language_user1 ] = "BLG 18.01.00 : Ds la liste des chemin \"Outils - Options - Chemins\""; + Text[ korean ] = "이이콘"; + Text[ language_user1 ] = "BLG ; BLG 18.01.00 : Ds la liste des chemin \"Outils - Options - Chemins\""; Text[ turkish ] = "Simgeler"; Text[ catalan ] = "Icones"; Text[ finnish ] = "Kuvakkeet"; @@ -3750,12 +3750,12 @@ String STR_KEY_TEMPLATE_PATH Text [ italian ] = "Modelli" ; Text [ portuguese_brazilian ] = "Modelos de documento" ; Text [ portuguese ] = "Modelos de documentos" ; - Text [ finnish ] = "Mallipohjat" ; + Text [ finnish ] = "Mallit" ; Text [ danish ] = "Dokumentskabeloner" ; Text [ french ] = "Modles de document" ; Text [ swedish ] = "Dokumentmallar" ; Text [ dutch ] = "Sjablonen" ; - Text [ spanish ] = "Plantillas de documento" ; + Text [ spanish ] = "Plantillas" ; Text [ english_us ] = "Templates" ; Text[ chinese_simplified ] = "文档样式"; Text[ russian ] = ""; @@ -3766,7 +3766,7 @@ String STR_KEY_TEMPLATE_PATH Text[ dutch ] = "Sjablonen"; Text[ chinese_simplified ] = "文档样式"; Text[ greek ] = " "; - Text[ korean ] = "문서 서식"; + Text[ korean ] = "서식 파일"; Text[ turkish ] = "Belge ablonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Plantilles"; @@ -3782,7 +3782,7 @@ String STR_KEY_GLOSSARY_PATH Text[ greek ] = ""; Text[ dutch ] = "AutoTekst"; Text[ french ] = "AutoTexte"; - Text[ spanish ] = "AutoTexto"; + Text[ spanish ] = "Texto automtico"; Text[ italian ] = "Testo automatico"; Text[ danish ] = "AutoTekst"; Text[ swedish ] = "AutoText"; @@ -3842,7 +3842,7 @@ String STR_KEY_HELP_DIR Text [ portuguese ] = "Ficheiros de ajuda" ; Text [ portuguese_brazilian ] = "Hilfedateien" ; Text[ chinese_simplified ] = "帮助文件"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Pliki Pomocy"; Text[ japanese ] = "ヘルプファイル"; Text[ chinese_traditional ] = "說明檔案"; @@ -3901,7 +3901,7 @@ String STR_KEY_STORAGE_DIR Text [ french ] = "Mmoire pour messages" ; Text [ dutch ] = "Geheugen voor berichten" ; Text[ chinese_simplified ] = "电子邮件/新闻储存体"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Pami wiadomoci"; Text[ japanese ] = "メッセージ用メモリ"; Text[ chinese_traditional ] = "電子郵件/新聞儲存體"; @@ -3927,7 +3927,7 @@ String STR_KEY_TEMP_PATH Text[ dutch ] = "Tijdelijke bestanden"; Text[ french ] = "Fichiers temporaires"; Text[ spanish ] = "Archivos temporales"; - Text[ finnish ] = "Temporary base directory"; + Text[ finnish ] = "Vliaikaiset tiedostot"; Text[ italian ] = "File temporanei"; Text[ danish ] = "Midlertidige filer"; Text[ swedish ] = "Temporra filer"; @@ -3948,8 +3948,8 @@ String STR_KEY_PLUGINS_PATH Text [ English ] = "Plugins directory" ; Text[ english_us ] = "Plug-ins"; Text[ portuguese ] = "Directrio de plug-ins"; - Text[ russian ] = " Plugins"; - Text[ dutch ] = "Plugins directory"; + Text[ russian ] = " "; + Text[ dutch ] = "Plugins-directory"; Text[ french ] = "Rpertoire de Plug-ins"; Text[ spanish ] = "Directorio de Plug-ins"; Text[ italian ] = "Cartella plugin"; @@ -3961,7 +3961,7 @@ String STR_KEY_PLUGINS_PATH Text[ chinese_simplified ] = "Plug-In 目录"; Text[ chinese_traditional ] = "Plugins 目錄"; Text[ arabic ] = " Plug-Ins"; - Text[ dutch ] = "Plugins directory"; + Text[ dutch ] = "Plugins-directory"; Text[ chinese_simplified ] = "Plug-In 目录"; Text[ greek ] = " (Plug-Ins)"; Text[ korean ] = "플러그인 디렉토리"; @@ -3978,11 +3978,11 @@ String STR_KEY_FAVORITES_DIR Text[ english_us ] = "Folder Bookmarks"; Text[ portuguese ] = "Pastas correntes"; Text[ greek ] = " "; - Text[ dutch ] = "Bookmarks voor mappen"; + Text[ dutch ] = "Bladwijzers voor mappen"; Text[ french ] = "Rpertoires courants"; Text[ spanish ] = "Marcadores de carpetas"; Text[ swedish ] = "Mappbokmrken"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ italian ] = "Bookmark della cartella"; Text[ danish ] = "Mappe-bogmrker"; Text[ polish ] = "Zakadki folderu"; @@ -4035,13 +4035,13 @@ String STR_KEY_ADDINS_PATH Text[ french ] = "Add-ins"; Text[ spanish ] = "AddIns"; Text[ swedish ] = "Add-ins"; - Text[ russian ] = "AddIns"; + Text[ russian ] = " "; Text[ italian ] = "AddIn"; Text[ danish ] = "Add-Ins"; Text[ polish ] = "Dodatki add-in"; Text[ portuguese_brazilian ] = "AddIns"; Text[ japanese ] = "アドイン"; - Text[ korean ] = "애드인"; + Text[ korean ] = "Add-ins"; Text[ chinese_simplified ] = "AddIns"; Text[ chinese_traditional ] = "AddIns"; Text[ arabic ] = "Add-Ins"; @@ -4067,7 +4067,7 @@ String STR_KEY_USERCONFIG_PATH Text[ polish ] = "Konfiguracje uytkownika"; Text[ portuguese_brazilian ] = "User Settings"; Text[ japanese ] = "ユーザー設定"; - Text[ korean ] = "사용자 구성"; + Text[ korean ] = "사용자 설정"; Text[ chinese_simplified ] = "使用者配置"; Text[ chinese_traditional ] = "使用者配置"; Text[ arabic ] = " "; @@ -4085,7 +4085,7 @@ String STR_KEY_USERDICTIONARY_DIR Text[ portuguese ] = "Dicionrios personalizados"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Gebruikerswoordenboek"; + Text[ dutch ] = "Gebruikerswoordenboeken"; Text[ french ] = "Dictionnaires de l'utilisateur"; Text[ spanish ] = "Diccionarios de usuario"; Text[ italian ] = "Dizionari utente"; @@ -4094,7 +4094,7 @@ String STR_KEY_USERDICTIONARY_DIR Text[ polish ] = "Sowniki uytkownika"; Text[ portuguese_brazilian ] = "User Dictionaries"; Text[ japanese ] = "ユーザー辞書"; - Text[ korean ] = "사용자 사전"; + Text[ korean ] = "사용자 정의 사전"; Text[ chinese_simplified ] = "使用者字典"; Text[ chinese_traditional ] = "自訂字典"; Text[ arabic ] = " "; @@ -4113,14 +4113,14 @@ String STR_KEY_AUTOCORRECT_DIR Text[ greek ] = ""; Text[ dutch ] = "AutoCorrectie"; Text[ french ] = "AutoCorrection"; - Text[ spanish ] = "AutoCorreccin"; + Text[ spanish ] = "Correccin automtica"; Text[ italian ] = "Correzione automatica"; Text[ danish ] = "AutoKorrektur"; Text[ swedish ] = "AutoKorrigering"; Text[ polish ] = "Autokorekta"; Text[ portuguese_brazilian ] = "AutoCorrect"; Text[ japanese ] = "オートコレクト"; - Text[ korean ] = "자동 고침"; + Text[ korean ] = "자동 수정 "; Text[ chinese_simplified ] = "自动更正"; Text[ chinese_traditional ] = "自動校正"; Text[ arabic ] = " "; @@ -4147,7 +4147,7 @@ String STR_KEY_LINGUISTIC_DIR Text[ polish ] = "Pisownia"; Text[ portuguese_brazilian ] = "Linguistic"; Text[ japanese ] = "文章校正"; - Text[ korean ] = "언어"; + Text[ korean ] = "맞춤법 교정"; Text[ chinese_simplified ] = "语言规则"; Text[ chinese_traditional ] = "語言規則"; Text[ arabic ] = ""; @@ -4166,9 +4166,9 @@ String STR_QUICKSTART_EXIT Text[ portuguese ] = "Terminar incio rpido"; Text[ russian ] = " "; Text[ greek ] = "Exit %PRODUCTNAME QuickStart"; - Text[ dutch ] = "QuickStart beindigen"; + Text[ dutch ] = "SnelStarter beindigen"; Text[ french ] = "Quitter le dmarrage rapide"; - Text[ spanish ] = "Terminar Inicio rpido"; + Text[ spanish ] = "Finalizar el inicio rpido"; Text[ finnish ] = "Lopeta pikakynnistys"; Text[ italian ] = "Termina QuickStart"; Text[ danish ] = "Afslut Hurtig start"; @@ -4190,12 +4190,12 @@ String STR_QUICKSTART_TIP Text [ English ] = "%PRODUCTNAME %PRODUCTVERSION Quickstarter" ; Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION Quickstarter"; Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION Incio rpido"; - Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION "; + Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION"; Text[ greek ] = "%PRODUCTNAME QuickStart active"; - Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION QuickStart "; + Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION SnelStarter"; Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION Dmarrage rapide"; Text[ spanish ] = "Inicio rpido de %PRODUCTNAME %PRODUCTVERSION "; - Text[ finnish ] = "Ohjelman %PRODUCTNAME %PRODUCTVERSION pikakynnistys"; + Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION -pikakynnistys"; Text[ italian ] = "QuickStart %PRODUCTNAME %PRODUCTVERSION"; Text[ danish ] = "Hurtig start til %PRODUCTNAME %PRODUCTVERSION"; Text[ swedish ] = "Snabbstart %PRODUCTNAME %PRODUCTVERSION"; @@ -4214,23 +4214,23 @@ String STR_QUICKSTART_FILEOPEN { Text = "Dokument ffnen" ; Text [ English ] = "Open File" ; - Text[ english_us ] = "Open File"; + Text[ english_us ] = "Open Document"; Text[ portuguese ] = "Abrir ficheiro..."; Text[ russian ] = " ..."; Text[ greek ] = "File open..."; Text[ dutch ] = "Bestand openen..."; - Text[ french ] = "Ouvrir un fichier..."; - Text[ spanish ] = "Abrir archivo..."; - Text[ finnish ] = "~Tiedoston avaus"; - Text[ italian ] = "Apri file..."; + Text[ french ] = "Ouvrir un document"; + Text[ spanish ] = "Abrir documento"; + Text[ finnish ] = "Avaa tiedosto..."; + Text[ italian ] = "Apri documento"; Text[ danish ] = "bn fil..."; - Text[ swedish ] = "ppna fil..."; + Text[ swedish ] = "ppna dokument"; Text[ polish ] = "Otwrz plik..."; Text[ portuguese_brazilian ] = "File open..."; Text[ japanese ] = "ファイルを開く..."; - Text[ korean ] = "파일 열기..."; - Text[ chinese_simplified ] = "打开文件..."; - Text[ chinese_traditional ] = "開啟檔案..."; + Text[ korean ] = "문서 열기"; + Text[ chinese_simplified ] = "打开文档"; + Text[ chinese_traditional ] = "開啟文件"; Text[ turkish ] = "File open..."; Text[ arabic ] = "File open..."; Text[ catalan ] = "Obre el fitxer..."; @@ -4245,18 +4245,18 @@ String STR_QUICKSTART_FROMTEMPLATE Text[ russian ] = " ..."; Text[ greek ] = "From template..."; Text[ dutch ] = "Uit sjabloon..."; - Text[ french ] = " partir d'un modle..."; - Text[ spanish ] = "A partir de una plantilla..."; - Text[ finnish ] = "Mallipohjasta"; - Text[ italian ] = "Dal modello..."; + Text[ french ] = " partir d'un modle"; + Text[ spanish ] = "De plantilla"; + Text[ finnish ] = "Mallista..."; + Text[ italian ] = "Da modello"; Text[ danish ] = "Fra skabelon..."; - Text[ swedish ] = "Frn mall..."; + Text[ swedish ] = "Frn mall"; Text[ polish ] = "Na podstawie szablonu..."; Text[ portuguese_brazilian ] = "From template..."; Text[ japanese ] = "テンプレートから..."; - Text[ korean ] = "템플릿에서..."; - Text[ chinese_simplified ] = "采用样式..."; - Text[ chinese_traditional ] = "採用樣式..."; + Text[ korean ] = "서식 파일로부터"; + Text[ chinese_simplified ] = "采用样式"; + Text[ chinese_traditional ] = "採用樣式"; Text[ turkish ] = "From template..."; Text[ arabic ] = "From template..."; Text[ catalan ] = "De la plantilla..."; @@ -4273,7 +4273,7 @@ String STR_QUICKSTART_PRELAUNCH Text[ dutch ] = "%PRODUCTNAME bij systeemstart laden"; Text[ french ] = "Charger %PRODUCTNAME au dmarrage du systme"; Text[ spanish ] = "Cargar %PRODUCTNAME al iniciar el sistema"; - Text[ finnish ] = "Esikynnist ohjelma %PRODUCTNAME jrjestelmn kynnistyksen aikana"; + Text[ finnish ] = "Lataa %PRODUCTNAME jrjestelmn kynnistyksen yhteydess"; Text[ italian ] = "Apri %PRODUCTNAME all'avvio del sistema"; Text[ danish ] = "Indls %PRODUCTNAME ved systemstart"; Text[ swedish ] = "Ladda %PRODUCTNAME vid systemstart"; @@ -4301,7 +4301,7 @@ String STR_QUICKSTART_LNKNAME Text[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION"; Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION"; Text[ italian ] = "%PRODUCTNAME %PRODUCTVERSION"; - Text[ danish ] = "%PRODUCTNAME 6.0"; + Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION"; Text[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION"; Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION"; Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION"; @@ -4336,7 +4336,7 @@ WarningBox RID_SECURITY_WARNING_HYPERLINK Message[ polish ] = "This hyperlink is going to open \"%s\". Do you want to proceed?"; Message[ portuguese_brazilian ] = "This hyperlink is going to open \"%s\". Do you want to proceed?"; Message[ japanese ] = "このハイパーリンクを \"%s\" で開きます。続行しますか。"; - Message[ korean ] = "이 하이퍼링크를 통해 \"%s\"이(가) 열립니다. 계속 진행하시겠습니까?"; + Message[ korean ] = "이 하이퍼링크를 통해 \"%s\"이(가) 연결됩니다. 계속 진행하시겠습니까?"; Message[ chinese_simplified ] = "这个超链接将会打开 \"%s\" 。要继续吗？"; Message[ chinese_traditional ] = "這個超連結將會開啟 \"%s\" 。您要繼續嗎？"; Message[ turkish ] = "This hyperlink is going to open \"%s\". Do you want to proceed?"; @@ -4371,3 +4371,63 @@ String RID_SECURITY_WARNING_TITLE Text[ catalan ] = "Security Warning"; Text[ thai ] = "Security Warning"; }; + +ErrorBox RID_INVALID_URL_MSG +{ + Buttons = WB_OK ; + Message = "Der URL ist ungltig." ; + Message [ english ] = "The URL is not valid." ; + Message [ english_us ] = "The URL is not valid." ; + Message[ portuguese ] = "The URL is not valid."; + Message[ russian ] = "The URL is not valid."; + Message[ spanish ] = "URL no vlido."; + Message[ italian ] = "URL non valido."; + Message[ swedish ] = "URL:en r ogiltig."; + Message[ polish ] = "The URL is not valid."; + Message[ portuguese_brazilian ] = "The URL is not valid."; + Message[ japanese ] = "無効な URL です。"; + Message[ korean ] = "이 URL은 유효하지 않습니다."; + Message[ turkish ] = "The URL is not valid."; + Message[ thai ] = "The URL is not valid."; + Message[ greek ] = "The URL is not valid."; + Message[ dutch ] = "The URL is not valid."; + Message[ french ] = "URL non valide"; + Message[ finnish ] = "The URL is not valid."; + Message[ danish ] = "The URL is not valid."; + Message[ chinese_simplified ] = "这个 URL 无效。"; + Message[ chinese_traditional ] = "URL 無效。"; + Message[ arabic ] = "The URL is not valid."; + Message[ catalan ] = "The URL is not valid."; +}; + +String RID_INVALID_URL_TITLE +{ + Text = "%PRODUCTNAME %PRODUCTVERSION" ; + Text [ENGLISH] = "%PRODUCTNAME %PRODUCTVERSION" ; + Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION" ; + Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ russian ] = "%PRODUCTNAME 6.0"; + Text[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ italian ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ japanese ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ korean ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ turkish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ thai ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ greek ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION "; + Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ arabic ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text[ catalan ] = "Hint"; +}; + + + + + diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 3b3839a0860f..19f790ff88bb 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appbas.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: mba $ $Date: 2002-05-27 13:50:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -532,12 +532,12 @@ sal_uInt16 SfxApplication::SaveBasicManager() const INetURLObject aAppBasicObj( aBasicPath.GetToken(1) ); aAppBasicObj.insertName( Application::GetAppName() ); aAppBasicObj.setExtension( DEFINE_CONST_UNICODE( "sbl" ) ); - String aAppBasicPath( aAppBasicObj.GetMainURL() ); + String aAppBasicPath( aAppBasicObj.GetMainURL( INetURLObject::NO_DECODE ) ); SvStorageRef aStor = new SvStorage( aAppBasicPath ); if ( aStor->GetError() == 0 ) { String aBaseURL = INetURLObject::GetBaseURL(); - INetURLObject::SetBaseURL( aAppBasicObj.GetMainURL() ); + INetURLObject::SetBaseURL( aAppBasicObj.GetMainURL( INetURLObject::NO_DECODE ) ); pImp->pBasicMgr->Store( *aStor ); INetURLObject::SetBaseURL( aBaseURL ); } @@ -858,15 +858,6 @@ void SfxApplication::LeaveBasicCall() void SfxApplication::EventExec_Impl( SfxRequest &rReq, SfxObjectShell *pObjSh ) { - // SID nur einmal holen - sal_uInt16 nSID = rReq.GetSlot(); - - SFX_REQUEST_ARG(rReq, pItem, SfxStringItem, nSID, sal_False); - if ( pItem ) - { - String aArg( pItem->GetValue() ); - GetEventConfig()->ConfigureEvent( nSID, aArg, pObjSh ); - } } //------------------------------------------------------------------------- @@ -878,16 +869,6 @@ void SfxApplication::EventState_Impl SfxObjectShell* pObjSh ) { - // Config auslesen - SfxMacroConfig *pMC = GetMacroConfig(); - SfxEventConfiguration *pEC = GetEventConfig(); - const SvxMacro* pMacro = pEC->GetMacroForEventId( nSID, pObjSh ); - - // "Library.Modul.Method" zusammensetzen - String aRet; - if ( pMacro ) - aRet = pMacro->GetMacName(); - rSet.Put( SfxStringItem( nSID, aRet ) ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index bb508448497b..abc035289933 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: os $ $Date: 2002-05-27 08:45:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,7 +176,6 @@ #include "cfgmgr.hxx" #include "docinf.hxx" #include "appdata.hxx" -#include "picklist.hxx" #include "workwin.hxx" #include <misccfg.hxx> #include <macrconf.hxx> @@ -320,68 +319,104 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = TRUE; break; case SID_ATTR_BACKUP : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ), - aSaveOptions.IsBackup()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_BACKUP)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ),aSaveOptions.IsBackup()))) + bRet = FALSE; + } break; case SID_ATTR_PRETTYPRINTING: - if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting() ) ) ) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting()))) + bRet = FALSE; + } break; case SID_ATTR_AUTOSAVE : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), - aSaveOptions.IsAutoSave()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave()))) + bRet = FALSE; + } break; case SID_ATTR_AUTOSAVEPROMPT : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), - aSaveOptions.IsAutoSavePrompt()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVEPROMPT)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt()))) + bRet = FALSE; + } break; case SID_ATTR_AUTOSAVEMINUTE : - if(rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), - (UINT16)aSaveOptions.GetAutoSaveTime()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)) + if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (UINT16)aSaveOptions.GetAutoSaveTime()))) + bRet = FALSE; + } break; case SID_ATTR_DOCINFO : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), - aSaveOptions.IsDocInfoSave()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave()))) + bRet = FALSE; + } break; case SID_OPT_SAVEGRAPHICSCOMPRESSED : { - SfxDocumentInfo *pDocInf = SfxObjectShell::Current() ? &SfxObjectShell::Current()->GetDocInfo() : 0; - BOOL bComprGraph = pDocInf ? pDocInf->IsSaveGraphicsCompressed() : - aSaveOptions.GetSaveGraphicsMode() == SvtSaveOptions::SaveGraphicsCompressed; - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_OPT_SAVEGRAPHICSCOMPRESSED ), - bComprGraph ) ) ) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEGRAPHICS)) + { + SfxDocumentInfo *pDocInf = SfxObjectShell::Current() ? &SfxObjectShell::Current()->GetDocInfo() : 0; + BOOL bComprGraph = pDocInf ? pDocInf->IsSaveGraphicsCompressed() : aSaveOptions.GetSaveGraphicsMode() == SvtSaveOptions::SaveGraphicsCompressed; + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_OPT_SAVEGRAPHICSCOMPRESSED ),bComprGraph ))) + bRet = FALSE; + } + } break; } case SID_OPT_SAVEORIGINALGRAPHICS : { - SfxDocumentInfo *pDocInf = SfxObjectShell::Current() ? &SfxObjectShell::Current()->GetDocInfo() : 0; - BOOL bOrigGraph = pDocInf ? pDocInf->IsSaveOriginalGraphics() : - aSaveOptions.GetSaveGraphicsMode() == SvtSaveOptions::SaveGraphicsOriginal; - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_OPT_SAVEORIGINALGRAPHICS ), - bOrigGraph ) ) ) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEGRAPHICS)) + { + SfxDocumentInfo *pDocInf = SfxObjectShell::Current() ? &SfxObjectShell::Current()->GetDocInfo() : 0; + BOOL bOrigGraph = pDocInf ? pDocInf->IsSaveOriginalGraphics() : aSaveOptions.GetSaveGraphicsMode() == SvtSaveOptions::SaveGraphicsOriginal; + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_OPT_SAVEORIGINALGRAPHICS ), bOrigGraph ))) + bRet = FALSE; + } + } break; } case SID_ATTR_WORKINGSET : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), - aSaveOptions.IsSaveWorkingSet()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEWORKINGSET)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet()))) + bRet = FALSE; + } break; case SID_ATTR_SAVEDOCWINS : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCWINS ), - aSaveOptions.IsSaveDocWins()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEDOCWINS)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCWINS ), aSaveOptions.IsSaveDocWins()))) + bRet = FALSE; + } break; case SID_ATTR_SAVEDOCVIEW : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), - aSaveOptions.IsSaveDocView()))) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEDOCVIEW)) + if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), aSaveOptions.IsSaveDocView()))) + bRet = FALSE; + } break; case SID_ATTR_METRIC : // if(rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_METRIC ), @@ -429,66 +464,92 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = TRUE; break; case SID_SAVEREL_INET : - if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), - aSaveOptions.IsSaveRelINet() ) ) ) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELINET)) + if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() ))) + bRet = FALSE; + } break; case SID_SAVEREL_FSYS : - if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), - aSaveOptions.IsSaveRelFSys() ) ) ) + { bRet = TRUE; + if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)) + if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), aSaveOptions.IsSaveRelFSys() ))) + bRet = FALSE; + } break; case SID_BASIC_ENABLED : - if ( rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), aSecurityOptions.GetBasicMode()))) + { bRet = TRUE; + if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_BASICMODE)) + { + if ( !rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), aSecurityOptions.GetBasicMode()))) + bRet = FALSE; + } + } break; case SID_INET_EXE_PLUGIN : - if ( rSet.Put( SfxBoolItem( SID_INET_EXE_PLUGIN, aSecurityOptions.IsExecutePlugins() ) ) ) + { bRet = TRUE; + if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_EXECUTEPLUGINS)) + { + if ( !rSet.Put( SfxBoolItem( SID_INET_EXE_PLUGIN, aSecurityOptions.IsExecutePlugins() ) ) ) + bRet = FALSE; + } + } + break; case SID_MACRO_WARNING : - if ( rSet.Put( SfxBoolItem( SID_MACRO_WARNING, aSecurityOptions.IsWarningEnabled() ) ) ) - bRet = TRUE; - case SID_MACRO_CONFIRMATION : - if ( rSet.Put( SfxBoolItem( SID_MACRO_CONFIRMATION, aSecurityOptions.IsConfirmationEnabled() ) ) ) - bRet = TRUE; - case SID_SECURE_URL : - { - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs(); - List aList; - sal_uInt32 nCount = seqURLs.getLength(); - sal_uInt32 nURL; - for( nURL=0; nURL<nCount; ++nURL ) { - aList.Insert( new String( seqURLs[nURL] ), LIST_APPEND ); + bRet = TRUE; + if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_WARNING)) + { + if ( !rSet.Put( SfxBoolItem( SID_MACRO_WARNING, aSecurityOptions.IsWarningEnabled() ) ) ) + bRet = FALSE; + } } - if( rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), - &aList ) ) ) + break; + case SID_MACRO_CONFIRMATION : { bRet = TRUE; + if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_CONFIRMATION)) + { + if ( !rSet.Put( SfxBoolItem( SID_MACRO_CONFIRMATION, aSecurityOptions.IsConfirmationEnabled() ) ) ) + bRet = FALSE; + } } - for( nURL=0; nURL<nCount; ++nURL ) + break; + case SID_SECURE_URL : { - delete (String*)aList.GetObject(nURL); + bRet = TRUE; + if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) + { + ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs(); + List aList; + sal_uInt32 nCount = seqURLs.getLength(); + sal_uInt32 nURL; + for( nURL=0; nURL<nCount; ++nURL ) + { + aList.Insert( new String( seqURLs[nURL] ), LIST_APPEND ); + } + if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), + &aList ) ) ) + { + bRet = FALSE; + } + for( nURL=0; nURL<nCount; ++nURL ) + { + delete (String*)aList.GetObject(nURL); + } + aList.Clear(); + } } - aList.Clear(); break; - } case SID_ENABLE_METAFILEPRINT : #ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI DBG_ASSERT(sal_False, "SfxApplication::GetOptions()\nSoffice.ini key \"Common\\MetafilePrint\" is obsolete! .. How I can support SID_ENABLE_METAFILEPRINT any longer?\n"); #endif break; - - case SID_INET_DNS_SERVER : - if ( !IsPlugin() && rSet.Put( SfxStringItem( rPool.GetWhich(SID_INET_DNS_SERVER), - aInetOptions.GetDnsIpAddress() ) ) ) - bRet = TRUE; - break; - case SID_INET_DNS_AUTO : - if ( !IsPlugin() && rSet.Put( SfxBoolItem( rPool.GetWhich( SID_INET_DNS_AUTO ), - !aInetOptions.GetDnsIpAddress().getLength() ) ) ) - bRet = TRUE; - break; case SID_INET_PROXY_TYPE : { if ( IsPlugin() ) @@ -577,16 +638,6 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) aInetOptions.GetProxyFtpPort() ))) bRet = TRUE; break; - case SID_INET_SOCKS_PROXY_NAME : - if ( !IsPlugin() && rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_SOCKS_PROXY_NAME ), - aInetOptions.GetProxySocksName() ))) - bRet = TRUE; - break; - case SID_INET_SOCKS_PROXY_PORT : - if ( !IsPlugin() && rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_SOCKS_PROXY_PORT ), - aInetOptions.GetProxySocksPort() ))) - bRet = TRUE; - break; case SID_INET_SECURITY_PROXY_NAME : case SID_INET_SECURITY_PROXY_PORT : #ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI @@ -661,7 +712,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) //-------------------------------------------------------------------- BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const { - return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL(), *pReferer ); + return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ), *pReferer ); } //-------------------------------------------------------------------- @@ -1001,7 +1052,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) bResetSession = TRUE; bProxiesModified = TRUE; } - if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_SOCKS_PROXY_NAME ), TRUE, &pItem ) ) +/* if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_SOCKS_PROXY_NAME ), TRUE, &pItem ) ) { DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" ); aInetOptions.SetProxySocksName( ((const SfxStringItem *)pItem)->GetValue() ); @@ -1034,7 +1085,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) aInetOptions.SetDnsIpAddress( aDNS ); } bResetSession = TRUE; - } + }*/ if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, TRUE, &pItem)) { DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected"); @@ -1085,7 +1136,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) ::vos::ORef< ::inet::INetConfig > xINetConfig; if ( aWrapper.getINetConfig( xINetConfig ) ) { - xINetConfig->setDomainNameServer( aInetOptions.GetDnsIpAddress() ); + //xINetConfig->setDomainNameServer( aInetOptions.GetDnsIpAddress() ); if ( bProxiesModified ) { @@ -1105,9 +1156,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) aInetOptions.GetProxyFtpName(), (sal_uInt16)aInetOptions.GetProxyFtpPort()); - aProxyCfg.setSocksProxy ( +/* aProxyCfg.setSocksProxy ( aInetOptions.GetProxySocksName(), - (sal_uInt16)aInetOptions.GetProxySocksPort()); + (sal_uInt16)aInetOptions.GetProxySocksPort());*/ xINetConfig->setProxyConfig (aProxyCfg); } @@ -1298,7 +1349,7 @@ IMPL_LINK( SfxApplication, AutoSaveHdl_Impl, Timer*, pTimer ) { SvtSaveOptions aSaveOptions; FASTBOOL bAutoSave = aSaveOptions.IsAutoSave() && - !bDispatcherLocked && !Application::IsInModalMode() && + !bDispatcherLocked && !Application::IsUICaptured() && Application::GetLastInputInterval() > 300; if ( bAutoSave ) { @@ -1343,12 +1394,13 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave) pDoc = SfxObjectShell::GetNext(*pDoc) ) { if( SFX_CREATE_MODE_STANDARD == pDoc->GetCreateMode() && - SfxViewFrame::GetFirst(pDoc) ) + SfxViewFrame::GetFirst(pDoc) && + !pDoc->IsInModalMode() && + !pDoc->HasModalViews() ) { if ( pDoc->GetProgress() == 0 ) { - if (!pDoc->IsModified() || - bAutoSave && pDoc->GetModifyTime()<pImp->aAutoSaveTime) + if ( !pDoc->IsModified() ) continue; if ( bPrompt || (bAutoSave && !pDoc->HasName()) ) @@ -1361,12 +1413,12 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave) SfxRequest aReq( SID_SAVEDOC, 0, pDoc->GetPool() ); const SfxPoolItem *pPoolItem = pDoc->ExecuteSlot( aReq ); if ( !pPoolItem || !pPoolItem->ISA(SfxBoolItem) || - !( (const SfxBoolItem*) pPoolItem )->GetValue() ) - bFunc = FALSE; // kein Abbruch mehr! + !( (const SfxBoolItem*) pPoolItem )->GetValue() ) + bFunc = FALSE; } else if ( nRet == RET_CANCEL ) { - bFunc = FALSE; // kein Abbruch mehr! + bFunc = FALSE; break; } else if ( nRet == RET_NO ) @@ -1376,6 +1428,7 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave) } } pImp->aAutoSaveTime=Time(); + return bFunc; } diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 88a8f2909432..c0e14033680a 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appdata.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: mba $ $Date: 2002-03-19 17:17:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,6 +92,7 @@ #ifndef _SV_WRKWIN_HXX #include <vcl/wrkwin.hxx> #endif +#include "comphelper/processfactory.hxx" #include "viewfrm.hxx" #include "appdata.hxx" @@ -103,7 +104,6 @@ #include "dataurl.hxx" #include "arrdecl.hxx" #include "docfac.hxx" -#include "picklist.hxx" #include "docfile.hxx" #include "request.hxx" #include "referers.hxx" @@ -111,6 +111,7 @@ #include "sfxresid.hxx" #include "objshimp.hxx" #include "appuno.hxx" +#include "imestatuswindow.hxx" SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) : bServer( false ), @@ -159,7 +160,9 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) : pTemplates( 0 ), pSaveOptions( 0 ), pUndoOptions( 0 ), - pHelpOptions( 0 ) + pHelpOptions( 0 ), + m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow( + *pApp, comphelper::getProcessServiceFactory())) { StartListening( *pApp ); } diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 87d20c467a63..0d4dd3547a22 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appdde.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2001-10-11 07:45:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -525,7 +525,8 @@ BOOL SfxApplication::InitializeDde() // Config-Pfad als Topic wegen Mehrfachstart INetURLObject aOfficeLockFile( SvtPathOptions().GetUserConfigPath() ); aOfficeLockFile.insertName( DEFINE_CONST_UNICODE( "soffice.lck" ) ); - String aService( SfxDdeServiceName_Impl( aOfficeLockFile.GetMainURL() ) ); + String aService( SfxDdeServiceName_Impl( + aOfficeLockFile.GetMainURL(INetURLObject::DECODE_TO_IURI) ) ); aService.ToUpperAscii(); pAppData_Impl->pDdeService2 = new ImplDdeService( aService ); pAppData_Impl->pTriggerTopic = new SfxDdeTriggerTopic_Impl; @@ -637,12 +638,12 @@ BOOL ImplDdeService::MakeTopic( const String& rNm ) INetURLObject aWorkPath( SvtPathOptions().GetWorkPath() ); INetURLObject aFile; if ( aWorkPath.GetNewAbsURL( rNm, &aFile ) && - SfxContentHelper::IsDocument( aFile.GetMainURL() ) ) + SfxContentHelper::IsDocument( aFile.GetMainURL( INetURLObject::NO_DECODE ) ) ) { // File vorhanden // dann versuche die Datei zu laden: - SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL() ); + SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) ); SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, TRUE); // SfxBoolItem aHidden(SID_HIDDEN, TRUE); // minimiert! diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index c2e1da6502c0..87f7c2b0ed59 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appinit.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: mba $ $Date: 2002-03-19 17:17:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,7 +162,6 @@ #include "mnumgr.hxx" #include "msgpool.hxx" #include "newhdl.hxx" -#include "picklist.hxx" #include "plugobj.hxx" #include "progress.hxx" #include "sfxhelp.hxx" @@ -220,7 +219,6 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a ::vos::OGuard aGuard( Application::GetSolarMutex() ); SfxApplication* pApp = SFX_APP(); - SfxPickList_Impl::Get()->ClearMemCache(); pApp->Get_Impl()->aLateInitTimer.Stop(); pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) ); pApp->Get_Impl()->pAppDispatch->ReleaseAll(); @@ -302,7 +300,6 @@ FASTBOOL SfxApplication::Initialize_Impl() // diverse Pointer pImp->pAutoSaveTimer = new Timer; - SfxPickList_Impl::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) ); SfxPickList::GetOrCreate( SvtHistoryOptions().GetSize( ePICKLIST ) ); ///////////////////////////////////////////////////////////////// @@ -350,8 +347,7 @@ FASTBOOL SfxApplication::Initialize_Impl() SfxEventConfiguration::RegisterEvent(SFX_EVENT_ACTIVATEDOC, String(SfxResId(STR_EVENT_ACTIVATEDOC)), aEventNames.GetString( 10 ) ); SfxEventConfiguration::RegisterEvent(SFX_EVENT_DEACTIVATEDOC, String(SfxResId(STR_EVENT_DEACTIVATEDOC)), aEventNames.GetString( 11 ) ); SfxEventConfiguration::RegisterEvent(SFX_EVENT_PRINTDOC, String(SfxResId(STR_EVENT_PRINTDOC)), aEventNames.GetString( 12 ) ); - SfxEventConfiguration::RegisterEvent(SFX_EVENT_ONERROR, String(SfxResId(STR_EVENT_ONERROR)), aEventNames.GetString( 13 ) ); - SfxEventConfiguration::RegisterEvent(SFX_EVENT_NEWMESSAGE, String(SfxResId(STR_EVENT_NEWMESSAGE)), aEventNames.GetString( 14 ) ); + //SfxEventConfiguration::RegisterEvent(SFX_EVENT_MODIFYCHANGED, String(SfxResId(SFX_EVENT_MODIFYCHANGED)), aEventNames.GetString( 13 ) ); // Subklasse initialisieren bDowning = sal_False; diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 943e112b805a..39eaa5c1702c 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appmain.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-03-19 17:17:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,6 @@ #include "interno.hxx" #include "fcontnr.hxx" #include "viewsh.hxx" -#include "picklist.hxx" #include "intro.hxx" #include "msgpool.hxx" #include "cfgmgr.hxx" diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 1ed0bd524a69..6c2defaecf7b 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appmisc.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: mba $ $Date: 2002-10-11 18:06:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,7 +136,6 @@ #include "sfxresid.hxx" #include "app.hxx" -#include "picklist.hxx" #include "appdata.hxx" #include "arrdecl.hxx" #include "cfgmgr.hxx" @@ -706,6 +705,11 @@ SfxAcceleratorManager* SfxApplication::GetAcceleratorManager() const return pAcceleratorMgr; } +SfxAcceleratorManager* SfxApplication::GetGlobalAcceleratorManager() const +{ + return pAcceleratorMgr; +} + ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon() { if( pAppData_Impl->pTemplateCommon ) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 248f9769fc00..6c3552fe96ad 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: mba $ $Date: 2002-11-04 09:16:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,6 +154,9 @@ #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <svtools/pathoptions.hxx> #endif +#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX +#include <svtools/moduleoptions.hxx> +#endif #ifndef _SVTOOLS_TEMPLDLG_HXX #include <svtools/templdlg.hxx> #endif @@ -181,7 +184,6 @@ #include "objshimp.hxx" #include "openflag.hxx" #include "passwd.hxx" -#include "picklist.hxx" #include "referers.hxx" #include "request.hxx" #include "sfxresid.hxx" @@ -261,10 +263,6 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded if ( !aUrlToFind.HasError() ) { - // erst im Cache suchen - MemCache_Impl &rCache = SfxPickList_Impl::Get()->GetMemCache(); - xDoc = rCache.Find( aUrlToFind, aPostString ); - // dann bei den normal geoeffneten Docs if ( !xDoc.Is() ) { @@ -342,7 +340,7 @@ void SetTemplate_Impl( SvStorage *pStorage, String aFoundName; if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rLongName, aFoundName ) ) { - rInfo.SetTemplateFileName( aObj.GetMainURL() ); + rInfo.SetTemplateFileName( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) ); rInfo.SetTemplateName( rLongName ); // wenn schon eine Config da ist, mu\s sie aus dem Template sein @@ -595,7 +593,6 @@ SfxMedium* SfxApplication::InsertDocumentDialog String aFilter; SfxItemSet* pSet=0; ErrCode nErr = sfx2::FileOpenDialog_Impl( nFlags | SFXWB_INSERT | WB_3DLOOK, rFact, pURLList, aFilter, pSet, String(), nHelpId ); - DBG_ASSERT( pURLList, "invalid URLList" ); if( pURLList && !nErr ) { DBG_ASSERT( pURLList->Count() == 1, "invalid URLList count" ); @@ -729,42 +726,15 @@ SfxObjectShellLock SfxApplication::NewDoc_Impl( const String& rFact, const SfxIt } if( !pFactory ) - pFactory = &SfxObjectFactory::GetDefaultFactory(); - - // Objekt erzeugen - USHORT nSlotId = pFactory->GetCreateNewSlotId(); - if ( pSet ) { - SFX_ITEMSET_ARG( pSet, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE); - if ( pFrmItem && pFrmItem->GetFrame() && !pFrmItem->GetFrame()->IsTop() ) - // In SubFrames ohne Dialog laden - nSlotId = 0; - SFX_ITEMSET_ARG( pSet, pSilentItem, SfxBoolItem, SID_SILENT, FALSE); - if ( pSilentItem && pSilentItem->GetValue() ) - nSlotId = 0; + DBG_ERROR("Unknown factory!"); + pFactory = &SfxObjectFactory::GetDefaultFactory(); } - if ( nSlotId ) - { - const SfxFrameItem* pFrmItem = NULL; - if ( pSet ) - pFrmItem = (const SfxFrameItem*) SfxRequest::GetItem( pSet, SID_DOCFRAME, FALSE, TYPE(SfxFrameItem) ); - SfxBoolItem aItem( SID_NEWDOCDIRECT, TRUE ); - if ( pFrmItem && pFrmItem->GetFrame() && !pFrmItem->GetFrame()->GetCurrentDocument() ) - { - GetAppDispatcher_Impl()->Execute( nSlotId, SFX_CALLMODE_SYNCHRON, &aItem, pFrmItem, 0L ); - xDoc = pFrmItem->GetFrame()->GetCurrentDocument(); - } - else - GetAppDispatcher_Impl()->Execute( nSlotId, SFX_CALLMODE_ASYNCHRON, &aItem, pFrmItem, 0L ); - } - else - { - xDoc = pFactory->CreateObject(); - aParam = INetURLObject::decode( aParam, '%', INetURLObject::DECODE_WITH_CHARSET ); - if( xDoc.Is() ) - xDoc->DoInitNew_Impl( aParam ); - } + xDoc = pFactory->CreateObject(); + aParam = INetURLObject::decode( aParam, '%', INetURLObject::DECODE_WITH_CHARSET ); + if( xDoc.Is() ) + xDoc->DoInitNew_Impl( aParam ); if ( xDoc.Is() ) { @@ -811,6 +781,31 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) SFX_REQUEST_ARG( rReq, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, FALSE ); if( pFactoryName ) aFactory = pFactoryName->GetValue(); + else + { + SvtModuleOptions aOpt; + + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SWRITER)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_WRITER); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SCALC)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_CALC); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SDRAW)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_DRAW); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SIMPRESS)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_IMPRESS); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SMATH)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_MATH); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SWRITER)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_WRITERGLOBAL); + else + if (aOpt.IsModuleInstalled(SvtModuleOptions::E_SWRITER)) + aFactory = aOpt.GetFactoryShortName(SvtModuleOptions::E_WRITERWEB); + } SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, FALSE); if ( pFileFlagsItem ) @@ -855,12 +850,20 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) if ( xDoc.Is() ) { SFX_REQUEST_ARG(rReq, pHidden, SfxBoolItem, SID_HIDDEN, FALSE); + BOOL bHidden = FALSE; if ( pHidden ) + { xDoc->GetMedium()->GetItemSet()->Put( *pHidden, SID_HIDDEN ); + bHidden = pHidden->GetValue(); + } SFX_REQUEST_ARG(rReq, pViewId, SfxUInt16Item, SID_VIEW_ID, FALSE); + USHORT nViewId = 0; if ( pViewId ) + { xDoc->GetMedium()->GetItemSet()->Put( *pViewId, SID_VIEW_ID ); + nViewId = pViewId->GetValue(); + } xDoc->SetActivateEvent_Impl( SFX_EVENT_CREATEDOC ); // xDoc->Get_Impl()->nLoadedFlags = SFX_LOADED_ALL; @@ -869,13 +872,17 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) xDoc->GetMedium()->GetItemSet()->Put( *pInternalArgs ); BOOL bOwnsFrame = FALSE; SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE); - SfxFrame* pFrame = pFrameItem ? pFrameItem->GetFrame() : NULL; - DBG_ASSERT( pFrame, "This call we not work correctly in StarPortal !" ); + + SfxFrame* pFrame = NULL; + if (pFrameItem) + pFrame = pFrameItem->GetFrame(); + else + pFrame = (SfxFrame*)SfxTopFrame::Create(xDoc, nViewId, bHidden, pInternalArgs); if ( pFrame ) { if ( pFrame->GetCurrentDocument() == xDoc || pFrame->PrepareClose_Impl( TRUE, TRUE ) == TRUE ) { - if ( pHidden && pHidden->GetValue() ) + if (bHidden) { xDoc->RestoreNoDelete(); xDoc->OwnerLock( TRUE ); @@ -996,7 +1003,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) INetURLObject aObj( aTemplateFileName ); DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL!" ); - SfxStringItem aName( SID_FILE_NAME, aObj.GetMainURL() ); + SfxStringItem aName( SID_FILE_NAME, aObj.GetMainURL( INetURLObject::NO_DECODE ) ); SfxStringItem aTemplName( SID_TEMPLATE_NAME, aTemplateName ); SfxStringItem aTemplRegionName( SID_TEMPLATE_REGIONNAME, aTemplateRegion ); pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, eMode, &aName, &aTarget, &aReferer, &aTemplName, &aTemplRegionName, 0L ); @@ -1142,6 +1149,11 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pRefererItem ) aReferer = pRefererItem->GetValue(); + // #105259#: opening templates in UI should open the template, not use it + SFX_REQUEST_ARG( rReq, pTemplItem, SfxBoolItem, SID_TEMPLATE, FALSE); + if ( !pTemplItem ) + rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) ); + // Mark without URL cannot be handled by hyperlink code if ( bHyperlinkUsed && aFileName.Len() && aFileName.GetChar(0) != '#' ) { diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 5b71d715dee8..63c8e748d730 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appquit.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: mav $ $Date: 2002-09-30 15:14:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,6 @@ #include "viewsh.hxx" #include "dispatch.hxx" #include "printer.hxx" -#include "picklist.hxx" #include "plugobj.hxx" #include "arrdecl.hxx" #include "sfxresid.hxx" @@ -123,6 +122,7 @@ #include "dlgcont.hxx" #include "scriptcont.hxx" #include <misccfg.hxx> +#include "docfac.hxx" #ifndef PRODUCT DECLARE_LIST( SfxFrameWindowFactoryArray_Impl, SfxFrameWindowFactory* ) @@ -197,10 +197,6 @@ BOOL SfxApplication::QueryExit_Impl() pAppData_Impl->bDirectAliveCount = FALSE; } - // alle "normal" bearbeiteten Dokumente schlie\sen - MemCache_Impl &rCache = SfxPickList_Impl::Get()->GetMemCache(); - rCache.ClearObjects(); - /* SfxObjectShell *pLastDocSh = SfxObjectShell::GetFirst(); if ( bQuit ) @@ -250,9 +246,6 @@ void SfxApplication::Deinitialize() //!Wait(); StarBASIC::Stop(); - // Pickliste (nicht in StoreConfig wegen letztem Doc) - SfxPickList_Impl::Get()->SavePicklist(); - // ggf. BASIC speichern if ( pImp->pBasicMgr && pImp->pBasicMgr->IsModified() ) SaveBasicManager(); @@ -287,6 +280,7 @@ void SfxApplication::Deinitialize() // dabei sollten auch restliche Komponenten ( Beamer! ) verschwinden DELETEZ(pMenuMgr); DELETEZ(pAcceleratorMgr); + SfxObjectFactory::ClearAll_Impl(); DELETEZ( pImp->pBasicMgr ); if( pImp->pBasicLibContainer ) pImp->pBasicLibContainer->release(); @@ -298,7 +292,7 @@ void SfxApplication::Deinitialize() DBG_ASSERT( pViewFrame == 0, "active foreign ViewFrame" ); - DELETEZ(pInterfaces); + delete[] pInterfaces, pInterfaces = 0; DELETEZ(pImageMgr); // free administration managers @@ -311,7 +305,6 @@ void SfxApplication::Deinitialize() DELETEX(pAppData_Impl->pSfxFrameObjectFactoryPtr); DELETEX(pAppData_Impl->pSfxPluginObjectFactoryPtr); - SfxPickList_Impl::Delete(); delete pAppData_Impl->pLabelResMgr; #ifndef PRODUCT diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index df13d3fc67b8..a6a02e587ed0 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appserv.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: mba $ $Date: 2002-07-24 17:57:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,6 @@ #include "tabdlg.hxx" #include "arrdecl.hxx" #include "fltfnc.hxx" -//#include "picklist.hxx" #include "sfx.hrc" #include "app.hrc" #include "tbxcust.hxx" @@ -184,6 +183,7 @@ #include "module.hxx" #include "topfrm.hxx" #include "sfxpicklist.hxx" +#include "imestatuswindow.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -202,69 +202,6 @@ long QuitAgain_Impl( void* pObj, void* pArg ) return 0; } -struct ApplicationType -{ - String aPathName; - String aParams; - String aDomainName; -}; - -/* -BOOL SfxApplication::InitOfficeAppType_Impl( USHORT nAppId, ApplicationType& rType, BOOL bEmbed ) -{ - if ( nAppId < SID_START_BEGIN || nAppId > SID_START_END ) - return FALSE; - // App in Config suchen - String aAppName = String( SfxResId( nAppId ) ); -#if SUPD<613//MUSTINI - SfxIniManager* pIni = SFX_INIMANAGER(); - DBG_ASSERT( pIni, "Kein IniManager?!" ); - String aFullName; - while ( pIni && !aFullName.Len() ) - { - aFullName = pIni->ReadKey( DEFINE_CONST_UNICODE("OfficeApplications"), aAppName ); - if ( !aFullName.Len() ) - pIni = pIni->GetSubManager(); - } -#else - String aFullName; -#endif - - if ( !aFullName.Len() ) - { - // not found, but new try - INetURLObject aTryObj( Application::GetAppFileName(), INET_PROT_FILE ); - aTryObj.setBase( aAppName ); - aFullName = aTryObj.PathToFileName(); - } - - rType.aPathName = aFullName; - if ( bEmbed ) - rType.aParams = DEFINE_CONST_UNICODE( "-embedding" ); - INetURLObject aObj( aFullName, INET_PROT_FILE ); - rType.aDomainName = aObj.getBase(); - return TRUE; -} - -FASTBOOL SfxApplication::PostOfficeAppEvent( USHORT nAppId, const String& rEvent, const String& rParam ) -{ - -//(mba)/task SfxWaitCursor aWait; - - ApplicationType aType; - if( !InitOfficeAppType_Impl( nAppId, aType ) ) - return FALSE; - - // Event posten, ggf. App mit . auf Kommandozeile starten - ApplicationAddress aAppAdr; - String aAppParam( rParam.Len() ? DEFINE_CONST_UNICODE(".") : String() ); - SvFactory::IncAliveCount(); // Quit verhindern - BOOL bOk = FALSE; //! (pb) OldSV: Application::PostAppEvent( aType.aPathName, aAppAdr, rEvent, rParam, TRUE, &aAppParam ); - SvFactory::DecAliveCount(); - return bOk; -} - */ - void SfxApplication::BasicLibExec_Impl( SfxRequest &rReq, BasicManager *pMgr ) { // Zuerst den LibName holen @@ -281,7 +218,7 @@ void SfxApplication::BasicLibExec_Impl( SfxRequest &rReq, BasicManager *pMgr ) // Bei AddLibrary ist der LibName optional, er kann mit dem // FileName identisch sein INetURLObject aObj( pNameItem->GetValue(), INET_PROT_FILE ); - aFileName = aObj.GetMainURL(); + aFileName = aObj.GetMainURL( INetURLObject::NO_DECODE ); // Nach optionalem LibName suchen SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LOAD_LIBRARY, FALSE ); @@ -428,6 +365,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) FASTBOOL bDone = FALSE; switch ( rReq.GetSlot() ) { + case SID_UPDATE_CONFIG: + { + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_UPDATE_CONFIG, FALSE ); + if ( pItem ) + GetConfigManager_Impl()->ReInitialize( pItem->GetValue() ); + break; + } + case SID_LOAD_LIBRARY: case SID_UNLOAD_LIBRARY: case SID_REMOVE_LIBRARY: @@ -659,11 +604,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_HELPINDEX: + case SID_HELP_SUPPORTPAGE: { Help* pHelp = Application::GetHelp(); if ( pHelp ) { - pHelp->Start( 0, NULL ); // show start page + ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0; + pHelp->Start( nHelpId, NULL ); // show start or support page bDone = TRUE; } break; @@ -769,6 +716,23 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) abort(); } + case SID_SHOW_IME_STATUS_WINDOW: + if (pAppData_Impl->m_xImeStatusWindow->canToggle()) + { + SfxBoolItem const * pItem = static_cast< SfxBoolItem const * >( + rReq.GetArg(SID_SHOW_IME_STATUS_WINDOW, false, + TYPE(SfxBoolItem))); + bool bShow = pItem == 0 + ? !pAppData_Impl->m_xImeStatusWindow->isShowing() + : ( pItem->GetValue() == TRUE ); + pAppData_Impl->m_xImeStatusWindow->show(bShow); + if (pItem == 0) + rReq.AppendItem(SfxBoolItem(SID_SHOW_IME_STATUS_WINDOW, + bShow)); + } + bDone = true; + break; + default: break; } @@ -915,6 +879,16 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) break; } + case SID_SHOW_IME_STATUS_WINDOW: + if (pAppData_Impl->m_xImeStatusWindow->canToggle()) + rSet.Put(SfxBoolItem( + SID_SHOW_IME_STATUS_WINDOW, + pAppData_Impl->m_xImeStatusWindow-> + isShowing())); + else + rSet.DisableItem(SID_SHOW_IME_STATUS_WINDOW); + break; + default: break; } @@ -923,5 +897,3 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) ++pRanges; } } - - diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 3a07004f38ca..15b401b073e4 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: mba $ $Date: 2002-10-31 09:36:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,6 +58,9 @@ * * ************************************************************************/ +#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#pragma warning( disable : 4290 ) +#endif #include "appuno.hxx" @@ -203,7 +206,6 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; -using namespace ::rtl; #pragma hdrstop @@ -232,6 +234,8 @@ using namespace ::rtl; #include "fltoptint.hxx" #include "docfile.hxx" #include "sfxbasecontroller.hxx" +#include "brokenpackageint.hxx" +#include "eventsupplier.hxx" #define FRAMELOADER_SERVICENAME "com.sun.star.frame.FrameLoader" #define PROTOCOLHANDLER_SERVICENAME "com.sun.star.frame.ProtocolHandler" @@ -252,6 +256,7 @@ static const String sOutputStream = String::CreateFromAscii( "OutputStream" static const String sHidden = String::CreateFromAscii( "Hidden" ); static const String sPreview = String::CreateFromAscii( "Preview" ); static const String sViewOnly = String::CreateFromAscii( "ViewOnly" ); +static const String sDontEdit = String::CreateFromAscii( "DontEdit" ); static const String sSilent = String::CreateFromAscii( "Silent" ); static const String sJumpMark = String::CreateFromAscii( "JumpMark" ); static const String sFileName = String::CreateFromAscii( "FileName" ); @@ -270,6 +275,7 @@ static const String sMinimized = String::CreateFromAscii( "Minimized" ); static const String sInteractionHdl = String::CreateFromAscii( "InteractionHandler" ); static const String sWindowState = String::CreateFromAscii( "WindowState" ); static const String sUCBContent = String::CreateFromAscii( "UCBContent" ); +static const String sRepairPackage = String::CreateFromAscii( "RepairPackage" ); void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs, SfxAllItemSet& rSet, const SfxSlot* pSlot ) { @@ -677,93 +683,101 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque sal_Bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for ViewOnly" ) if (bOK) + rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) ); + } + else if ( aName == sDontEdit ) + { + sal_Bool bVal = sal_False; + sal_Bool bOK = (rProp.Value >>= bVal); + DBG_ASSERT( bOK, "invalid type for ViewOnly" ) + if (bOK) rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) ); } else if ( aName == sFileName ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for FileName" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for FileName" ) if (bOK) rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) ); } else if ( aName == sOrigURL ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for OrigURL" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for OrigURL" ) if (bOK) rSet.Put( SfxStringItem( SID_ORIGURL, sVal ) ); } else if ( aName == sSalvageURL ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for SalvageURL" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for SalvageURL" ) if (bOK) rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) ); } else if ( aName == sFrameName ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); + sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type for FrameName" ) - if (bOK) + if (bOK && sVal.getLength()) rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) ); } else if ( aName == sMediaType ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for MediaType" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for MediaType" ) if (bOK) rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) ); } else if ( aName == sWindowState ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for WindowState" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for WindowState" ) if (bOK) rSet.Put( SfxStringItem( SID_WIN_POSSIZE, sVal ) ); } else if ( aName == sTemplateName ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for TemplateName" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for TemplateName" ) if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) ); } else if ( aName == sTemplateRegionName ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for TemplateRegionName" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ) if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) ); } else if ( aName == sJumpMark ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for JumpMark" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for JumpMark" ) if (bOK) rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) ); } else if ( aName == sCharacterSet ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for CharacterSet" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ) if (bOK) rSet.Put( SfxStringItem( SID_CHARSET, sVal ) ); } else if ( aName == sFilterFlags ) { ::rtl::OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && (sVal.getLength() > 0)); - DBG_ASSERT( bOK, "invalid type for FilterFlags" ) + sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength()); + DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ) if (bOK) rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) ); } @@ -783,6 +797,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if (bOK) rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) ); } + else if ( aName == sRepairPackage ) + { + sal_Bool bVal = sal_False; + sal_Bool bOK = (rProp.Value >>= bVal); + DBG_ASSERT( bOK, "invalid type for RepairPackage" ) + if (bOK) + rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) ); + } } } @@ -931,6 +953,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nAdditional++; if ( rSet.GetItemState( SID_PREVIEW ) == SFX_ITEM_SET ) nAdditional++; + if ( rSet.GetItemState( SID_VIEWONLY ) == SFX_ITEM_SET ) + nAdditional++; if ( rSet.GetItemState( SID_EDITDOC ) == SFX_ITEM_SET ) nAdditional++; if ( rSet.GetItemState( SID_SILENT ) == SFX_ITEM_SET ) @@ -943,6 +967,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nAdditional++; if ( rSet.GetItemState( SID_UPDATEDOCMODE ) == SFX_ITEM_SET ) nAdditional++; + if ( rSet.GetItemState( SID_REPAIRPACKAGE ) == SFX_ITEM_SET ) + nAdditional++; // consider additional arguments nProps += nAdditional; @@ -1028,6 +1054,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta continue; if ( nId == SID_PREVIEW ) continue; + if ( nId == SID_VIEWONLY ) + continue; if ( nId == SID_EDITDOC ) continue; if ( nId == SID_TARGETNAME ) @@ -1052,6 +1080,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta continue; if ( nId == SID_UPDATEDOCMODE ) continue; + if ( nId == SID_REPAIRPACKAGE ) + continue; } ByteString aDbg( "Unknown item detected: "); @@ -1267,9 +1297,14 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta pValue[nProps].Name = sPreview; pValue[nProps++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } - if ( rSet.GetItemState( SID_EDITDOC, sal_False, &pItem ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( SID_VIEWONLY, sal_False, &pItem ) == SFX_ITEM_SET ) { pValue[nProps].Name = sViewOnly; + pValue[nProps++].Value <<= (sal_Bool) (( ((SfxBoolItem*)pItem)->GetValue() )); + } + if ( rSet.GetItemState( SID_EDITDOC, sal_False, &pItem ) == SFX_ITEM_SET ) + { + pValue[nProps].Name = sDontEdit; pValue[nProps++].Value <<= (sal_Bool) (!( ((SfxBoolItem*)pItem)->GetValue() )); } if ( rSet.GetItemState( SID_TARGETNAME, sal_False, &pItem ) == SFX_ITEM_SET ) @@ -1334,6 +1369,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta pValue[nProps].Name = sUpdateDocMode; pValue[nProps++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } + if ( rSet.GetItemState( SID_REPAIRPACKAGE, sal_False, &pItem ) == SFX_ITEM_SET ) + { + pValue[nProps].Name = sRepairPackage; + pValue[nProps++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); + } + } } @@ -1347,21 +1388,32 @@ SFX_IMPL_SINGLEFACTORY( SfxMacroLoader ) void SAL_CALL SfxMacroLoader::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { + Reference < XFrame > xFrame; if ( aArguments.getLength() ) - aArguments[0] >>= m_xFrame; + { + aArguments[0] >>= xFrame; + m_xFrame = xFrame; + } +} - if ( m_xFrame.is() ) +SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl() +{ + SfxObjectShell* pDocShell = NULL; + Reference < XFrame > xFrame( m_xFrame.get(), UNO_QUERY ); + if ( xFrame.is() ) { SfxFrame* pFrame=0; for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = SfxFrame::GetNext( *pFrame ) ) { - if ( pFrame->GetFrameInterface() == m_xFrame ) + if ( pFrame->GetFrameInterface() == xFrame ) break; } if ( pFrame ) pDocShell = pFrame->GetCurrentDocument(); } + + return pDocShell; } // ----------------------------------------------------------------------- @@ -1401,14 +1453,14 @@ void SAL_CALL SfxMacroLoader::dispatchWithNotification( const ::com::sun::star:: ::rtl::OUString aReferer; for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) { - if( lArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")) ) + if( lArgs[nProperty].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")) ) { lArgs[nProperty].Value >>= aReferer; break; } } - ErrCode nErr = loadMacro( aURL.Complete, pDocShell ); + ErrCode nErr = loadMacro( aURL.Complete, GetObjectShell_Impl() ); if( xListener.is() ) { // always call dispatchFinished(), because we didn't load a document but @@ -1436,14 +1488,14 @@ void SAL_CALL SfxMacroLoader::dispatch( const ::com::sun::star::util::URL& ::rtl::OUString aReferer; for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) { - if( lArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")) ) + if( lArgs[nProperty].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")) ) { lArgs[nProperty].Value >>= aReferer; break; } } - ErrCode nErr = loadMacro( aURL.Complete, pDocShell ); + ErrCode nErr = loadMacro( aURL.Complete, GetObjectShell_Impl() ); } // ----------------------------------------------------------------------- @@ -1465,17 +1517,6 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( const ::com::sun::star::uno: } // ----------------------------------------------------------------------- -SfxMacroLoader::SfxMacroLoader( com::sun::star::uno::Reference < class com::sun::star::lang::XMultiServiceFactory > const &) - : pDocShell(0) -{ -} - -// ----------------------------------------------------------------------- -SfxMacroLoader::~SfxMacroLoader() -{ -} - -// ----------------------------------------------------------------------- ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, SfxObjectShell* pSh ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -1610,6 +1651,9 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, SfxObjectShell* aCall += aQuotedArgs; aCall += ']'; + // just to let the shell be alive + SfxObjectShellRef rSh = pSh; + // execute function using its Sbx parent, pMethod->GetParent()->Execute( aCall ); nErr = SbxBase::GetError(); @@ -1617,9 +1661,9 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, SfxObjectShell* // reset "ThisComponent" to prior value pCompVar->PutObject( xOldVar ); - if ( pSh ) - // remove flag for modal mode - pSh->SetMacroMode_Impl( FALSE ); + if ( pSh && pSh->GetModel().is() ) + // remove flag for modal mode + pSh->SetMacroMode_Impl( FALSE ); } else nErr = ERRCODE_BASIC_PROC_UNDEFINED; @@ -1643,12 +1687,16 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, SfxObjectShell* } SFX_IMPL_XSERVICEINFO( SfxAppDispatchProvider, "com.sun.star.frame.DispatchProvider", "com.sun.star.comp.sfx2.AppDispatchProvider" ) \ -SFX_IMPL_ONEINSTANCEFACTORY( SfxAppDispatchProvider ); +SFX_IMPL_SINGLEFACTORY( SfxAppDispatchProvider ); void SAL_CALL SfxAppDispatchProvider::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { + Reference < XFrame > xFrame; if ( aArguments.getLength() ) - aArguments[0] >>= m_xFrame; + { + aArguments[0] >>= xFrame; + m_xFrame = xFrame; + } } Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, @@ -1679,7 +1727,79 @@ Sequence< Reference < XDispatch > > SAL_CALL SfxAppDispatchProvider::queryDispat { return Sequence< Reference < XDispatch > >(); } +#ifdef TEST_HANDLERS +#ifndef _CPPUHELPER_IMPLBASE2_HXX_ +#include <cppuhelper/implbase2.hxx> +#endif + +#include <drafts/com/sun/star/awt/XKeyHandler.hdl> +#include <drafts/com/sun/star/awt/XMouseClickHandler.hdl> + +class TestKeyHandler: public ::cppu::WeakImplHelper2 +< + drafts::com::sun::star::awt::XKeyHandler, + com::sun::star::lang::XServiceInfo +> +{ +public: + TestKeyHandler( const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& ){} + + SFX_DECL_XSERVICEINFO + virtual sal_Bool SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source) + throw (::com::sun::star::uno::RuntimeException); +}; + +class TestMouseClickHandler: public ::cppu::WeakImplHelper2 +< + drafts::com::sun::star::awt::XMouseClickHandler, + com::sun::star::lang::XServiceInfo +> +{ +public: + TestMouseClickHandler( const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& ){} + + SFX_DECL_XSERVICEINFO + virtual sal_Bool SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source) + throw (::com::sun::star::uno::RuntimeException); +}; + +sal_Bool SAL_CALL TestKeyHandler::keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException) +{ + return sal_False; +} + +sal_Bool SAL_CALL TestKeyHandler::keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException) +{ + return sal_False; +} + +void SAL_CALL TestKeyHandler::disposing( const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException) +{ +} + +sal_Bool SAL_CALL TestMouseClickHandler::mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException) +{ + return sal_False; +} +sal_Bool SAL_CALL TestMouseClickHandler::mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException) +{ + return sal_False; +} + +void SAL_CALL TestMouseClickHandler::disposing( const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException) +{ +} + +SFX_IMPL_XSERVICEINFO( TestKeyHandler, "com.sun.star.task.Job", "com.sun.star.comp.Office.KeyHandler"); +SFX_IMPL_XSERVICEINFO( TestMouseClickHandler, "com.sun.star.task.Job", "com.sun.star.comp.Office.MouseClickHandler"); +SFX_IMPL_SINGLEFACTORY( TestKeyHandler ); +SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler ); +#endif // ----------------------------------------------------------------------- extern "C" { @@ -1702,6 +1822,15 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , Reference< XRegistryKey > xNewKey; Reference< XRegistryKey > xLoaderKey; + // global app event broadcaster + aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName(); + + aTempStr = aImpl; + aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); + xNewKey = xKey->createKey( aTempStr ); + xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ); + // global app dispatcher aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aImpl += SfxAppDispatchProvider::impl_getStaticImplementationName(); @@ -1820,6 +1949,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName // !!! ATTENTION !!! // Write no ";" at end of line and dont forget "else" ! (see macro) //============================================================================= + IF_NAME_CREATECOMPONENTFACTORY( SfxGlobalEvents_Impl ) IF_NAME_CREATECOMPONENTFACTORY( SfxFrameLoader_Impl ) IF_NAME_CREATECOMPONENTFACTORY( SfxMacroLoader ) IF_NAME_CREATECOMPONENTFACTORY( SfxStandaloneDocumentInfoObject ) @@ -1830,7 +1960,10 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName IF_NAME_CREATECOMPONENTFACTORY( SfxDialogLibraryContainer ) IF_NAME_CREATECOMPONENTFACTORY( SfxApplicationScriptLibraryContainer ) IF_NAME_CREATECOMPONENTFACTORY( SfxApplicationDialogLibraryContainer ) - +#ifdef TEST_HANDLERS + IF_NAME_CREATECOMPONENTFACTORY( TestKeyHandler ) + IF_NAME_CREATECOMPONENTFACTORY( TestMouseClickHandler ) +#endif // Factory is valid - service was found. if ( xFactory.is() ) { @@ -1894,4 +2027,68 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< :: return m_lContinuations; } +//========================================================================= + +RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName ) +{ + ::rtl::OUString temp; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; + ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, + temp2, + aName ); + + m_aRequest <<= aBrokenPackageRequest; + + m_pApprove = new ContinuationApprove; + m_pDisapprove = new ContinuationDisapprove; + + m_lContinuations.realloc( 2 ); + m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove ); + m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove ); +} + +::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest() + throw( ::com::sun::star::uno::RuntimeException ) +{ + return m_aRequest; +} + +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > + SAL_CALL RequestPackageReparation::getContinuations() + throw( ::com::sun::star::uno::RuntimeException ) +{ + return m_lContinuations; +} + +//========================================================================= + +NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName ) +{ + ::rtl::OUString temp; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; + ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, + temp2, + aName ); + + m_aRequest <<= aBrokenPackageRequest; + + m_pAbort = new ContinuationAbort; + + m_lContinuations.realloc( 1 ); + m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort ); +} + +::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest() + throw( ::com::sun::star::uno::RuntimeException ) +{ + return m_aRequest; +} + +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > + SAL_CALL NotifyBrokenPackage::getContinuations() + throw( ::com::sun::star::uno::RuntimeException ) +{ + return m_lContinuations; +} + diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 6236083cda14..eccbd9174d66 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: childwin.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mba $ $Date: 2002-07-03 16:28:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,9 @@ #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> #endif +#ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ +#include <com/sun/star/util/XCloseable.hpp> +#endif #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> @@ -106,6 +109,7 @@ struct SfxChildWindow_Impl sal_Bool bHideNotDelete; sal_Bool bVisible; sal_Bool bHideAtToggle; + sal_Bool bWantsFocus; SfxModule* pContextModule; SfxWorkWindow* pWorkWin; }; @@ -132,12 +136,17 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang:: if( m_pOwner && m_pData ) { m_pData->xListener = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >(); - m_pData->xFrame = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); - // Attention: Do nothing after "Toogle" call with pOwner & pData! - // They will die insteandly ... We should forget these pointers only!!! - if( m_pData->pWorkWin ) + if ( m_pData->pWorkWin ) + { + // m_pOwner and m_pData will be killed + m_pData->xFrame = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); m_pData->pWorkWin->GetBindings().Execute( m_pOwner->GetType() ); + } + else + { + delete m_pOwner; + } m_pOwner = NULL; m_pData = NULL; @@ -180,6 +189,7 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) pImp->pFact = 0L; pImp->bHideNotDelete = sal_False; pImp->bHideAtToggle = sal_False; + pImp->bWantsFocus = sal_True; pImp->bVisible = sal_True; pImp->pContextModule = NULL; pImp->pWorkWin = NULL; @@ -188,6 +198,27 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) DBG_CTOR(SfxChildWindow,0); } +void SfxChildWindow::Destroy() +{ + if ( GetFrame().is() ) + { + pImp->pWorkWin = NULL; + try + { + ::com::sun::star::uno::Reference < ::com::sun::star::util::XCloseable > xClose( GetFrame(), ::com::sun::star::uno::UNO_QUERY ); + if ( xClose.is() ) + xClose->close( sal_True ); + else + GetFrame()->dispose(); + } + catch ( com::sun::star::uno::Exception& ) + { + } + } + else + delete this; +} + //------------------------------------------------------------------------- SfxChildWindow::~SfxChildWindow() { @@ -616,6 +647,16 @@ sal_Bool SfxChildWindow::IsHideAtToggle() const return pImp->bHideAtToggle; } +void SfxChildWindow::SetWantsFocus( BOOL bSet ) +{ + pImp->bWantsFocus = bSet; +} + +sal_Bool SfxChildWindow::WantsFocus() const +{ + return pImp->bWantsFocus; +} + sal_Bool SfxChildWinInfo::GetExtraData_Impl ( SfxChildAlignment *pAlign, @@ -737,14 +778,14 @@ Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const void SfxChildWindow::SetWorkWindow_Impl( SfxWorkWindow* pWin ) { pImp->pWorkWin = pWin; - if ( pWindow->HasChildPathFocus() ) + if ( pWin && pWindow->HasChildPathFocus() ) pImp->pWorkWin->SetActiveChild_Impl( pWindow ); } -SfxWorkWindow* SfxChildWindow::GetWorkWindow_Impl() const -{ - return pImp->pWorkWin; -} +//SfxWorkWindow* SfxChildWindow::GetWorkWindow_Impl() const +//{ +// return pImp->pWorkWin; +//} void SfxChildWindow::Activate_Impl() { diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index b94012487f47..8d79f0fa66eb 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helpinterceptor.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-10-29 12:15:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,21 +114,6 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() // ----------------------------------------------------------------------- -Reference< XController > HelpInterceptor_Impl::getController() const throw( RuntimeException ) -{ - Reference< XController > xRet; - if( m_pWindow ) - { - Reference< XFrame > xFrame = m_pWindow->getTextFrame(); - if( xFrame.is() ) - xRet = xFrame->getController(); - } - - return xRet; -} - -// ----------------------------------------------------------------------- - void HelpInterceptor_Impl::addURL( const String& rURL ) { if ( !m_pHistory ) @@ -150,7 +135,8 @@ void HelpInterceptor_Impl::addURL( const String& rURL ) } m_aCurrentURL = rURL; - m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL ), LIST_APPEND ); + Any aEmptyViewData; + m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), LIST_APPEND ); m_nCurPos = m_pHistory->Count() - 1; if ( m_xListener.is() ) @@ -168,24 +154,6 @@ void HelpInterceptor_Impl::addURL( const String& rURL ) // ----------------------------------------------------------------------- -void HelpInterceptor_Impl::LeavePage() -{ - if( m_pHistory && m_pHistory->Count() > m_nCurPos) - { - // get view position of _current_ URL - HelpHistoryEntry_Impl* pCurEntry = m_pHistory->GetObject( m_nCurPos ); - try - { - Reference< XController > xContr( getController() ); - if( xContr.is() ) - pCurEntry->aViewData = xContr->getViewData(); - } - catch( const Exception& ) {} - } -} - -// ----------------------------------------------------------------------- - void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) { m_xIntercepted = Reference< XDispatchProviderInterception>( xFrame, UNO_QUERY ); @@ -202,7 +170,8 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL ) if ( !m_pHistory ) { m_pHistory = new HelpHistoryList_Impl; - m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL ), ((ULONG)0x0) ); + Any aEmptyViewData; + m_pHistory->Insert( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ), ((ULONG)0x0) ); m_nCurPos = m_pHistory->Count() - 1; m_pWindow->UpdateToolbox(); @@ -210,15 +179,11 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL ) m_aCurrentURL = rURL; } -// ----------------------------------------------------------------------- - sal_Bool HelpInterceptor_Impl::HasHistoryPred() const { return m_pHistory && ( m_nCurPos > 0 ); } -// ----------------------------------------------------------------------- - sal_Bool HelpInterceptor_Impl::HasHistorySucc() const { return m_pHistory && ( m_nCurPos < ( m_pHistory->Count() - 1 ) ); @@ -321,7 +286,7 @@ Sequence< ::rtl::OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() { Sequence< ::rtl::OUString > aURLList( 1 ); aURLList[0] = DEFINE_CONST_UNICODE("vnd.sun.star.help://*"); - return aURLList; + return aURLList;; } // ----------------------------------------------------------------------- @@ -337,7 +302,17 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( { if ( m_pHistory ) { - LeavePage(); // save current position + if(m_pHistory->Count() > m_nCurPos) + { + Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY); + Reference<XController> xController; + if(xFrame.is()) + xController = xFrame->getController(); + if(xController.is()) + { + m_pHistory->GetObject(m_nCurPos)->aViewData = xController->getViewData(); + } + } ULONG nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos : ( !bBack && m_nCurPos < m_pHistory->Count() - 1 ) diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 2b37c22140c5..8f5c9f09893e 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -2,9 +2,9 @@ * * $RCSfile: helpinterceptor.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: os $ $Date: 2002-10-24 10:04:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,6 @@ #ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase3.hxx> #endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ -#include <com/sun/star/frame/XController.hpp> -#endif #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #endif @@ -97,17 +94,12 @@ #ifndef _LINK_HXX #include <tools/link.hxx> #endif -#ifndef _SV_TIMER_HXX -#include <vcl/timer.hxx> -#endif - struct HelpHistoryEntry_Impl { - String aURL; - ::com::sun::star::uno::Any aViewData; + String aURL; + com::sun::star::uno::Any aViewData; - HelpHistoryEntry_Impl( const String& rURL ) : aURL( rURL ) {} HelpHistoryEntry_Impl( const String& rURL, const com::sun::star::uno::Any& rViewData ) : aURL( rURL ), aViewData(rViewData) {} }; @@ -142,10 +134,8 @@ friend class HelpDispatch_Impl; String m_aCurrentURL; com::sun::star::uno::Any m_aViewData; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > - getController() const throw( ::com::sun::star::uno::RuntimeException ); void addURL( const String& rURL ); - void LeavePage(); // e.g. stores the ViewData of actual page + public: HelpInterceptor_Impl(); ~HelpInterceptor_Impl(); diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx new file mode 100644 index 000000000000..9c2673147801 --- /dev/null +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -0,0 +1,262 @@ +/************************************************************************* + * + * $RCSfile: imestatuswindow.cxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-27 11:27:39 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2002 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#include "imestatuswindow.hxx" + +#include "app.hxx" +#include "sfxsids.hrc" + +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "osl/diagnose.h" +#include "osl/mutex.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" +#include "sal/types.h" +#include "vcl/svapp.hxx" +#include "vos/mutex.hxx" + +namespace css = com::sun::star; + +using sfx2::appl::ImeStatusWindow; + +ImeStatusWindow::ImeStatusWindow( + SfxApplication & rApplication, + css::uno::Reference< css::lang::XMultiServiceFactory > const & + rServiceFactory): + m_rApplication(rApplication), + m_xServiceFactory(rServiceFactory), + m_bDisposed(false) +{} + +void ImeStatusWindow::init() +{ + if (Application::CanToggleImeStatusWindow()) + try + { + sal_Bool bShow; + if (getConfig()->getPropertyValue( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "ShowStatusWindow"))) + >>= bShow) + Application::ShowImeStatusWindow(bShow); + } + catch (css::uno::Exception &) + { + OSL_ENSURE(false, "com.sun.star.uno.Exception"); + // Degrade gracefully and use the VCL-supplied default if no + // configuration is available. + } +} + +bool ImeStatusWindow::isShowing() +{ + try + { + sal_Bool bShow; + if (getConfig()->getPropertyValue( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow"))) + >>= bShow) + return bShow; + } + catch (css::uno::Exception &) + { + OSL_ENSURE(false, "com.sun.star.uno.Exception"); + // Degrade gracefully and use the VCL-supplied default if no + // configuration is available. + } + return Application::GetShowImeStatusWindowDefault(); +} + +void ImeStatusWindow::show(bool bShow) +{ + try + { + css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig()); + xConfig->setPropertyValue( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + css::uno::makeAny(static_cast< sal_Bool >(bShow))); + css::uno::Reference< css::util::XChangesBatch > xCommit( + xConfig, css::uno::UNO_QUERY); + // Degrade gracefully by not saving the settings permanently: + if (xCommit.is()) + xCommit->commitChanges(); + // Alternatively, setting the VCL status could be done even if updating + // the configuration failed: + Application::ShowImeStatusWindow(bShow); + } + catch (css::uno::Exception &) + { + OSL_ENSURE(false, "com.sun.star.uno.Exception"); + } +} + +bool ImeStatusWindow::canToggle() const +{ + return Application::CanToggleImeStatusWindow(); +} + +ImeStatusWindow::~ImeStatusWindow() +{ + if (m_xConfig.is()) + // We should never get here, but just in case... + try + { + m_xConfig->removePropertyChangeListener( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + this); + } + catch (css::uno::Exception &) + { + OSL_ENSURE(false, "com.sun.star.uno.RuntimeException"); + } +} + +void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & rSource) + throw (css::uno::RuntimeException) +{ + osl::MutexGuard aGuard(m_aMutex); + m_xConfig = 0; + m_bDisposed = true; +} + +void SAL_CALL +ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & rEvent) + throw (css::uno::RuntimeException) +{ + vos::OGuard aGuard(Application::GetSolarMutex()); + m_rApplication.Invalidate(SID_SHOW_IME_STATUS_WINDOW); +} + +css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() +{ + css::uno::Reference< css::beans::XPropertySet > xConfig; + bool bAdd = false; + { + osl::MutexGuard aGuard(m_aMutex); + if (!m_xConfig.is()) + { + if (m_bDisposed) + throw css::lang::DisposedException(); + if (!m_xServiceFactory.is()) + throw css::uno::RuntimeException( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "null comphelper::getProcessServiceFactory")), + 0); + css::uno::Reference< css::lang::XMultiServiceFactory > xProvider( + m_xServiceFactory->createInstance( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationProvider"))), + css::uno::UNO_QUERY); + if (!xProvider.is()) + throw css::uno::RuntimeException( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "null com.sun.star.configuration." + "ConfigurationProvider")), + 0); + css::beans::PropertyValue aArg( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, + css::uno::makeAny( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "/org.openoffice.Office.Common/I18N/InputMethod"))), + css::beans::PropertyState_DIRECT_VALUE); + css::uno::Sequence< css::uno::Any > aArgs(1); + aArgs[0] <<= aArg; + m_xConfig + = css::uno::Reference< css::beans::XPropertySet >( + xProvider->createInstanceWithArguments( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationUpdateAccess")), + aArgs), + css::uno::UNO_QUERY); + if (!m_xConfig.is()) + throw css::uno::RuntimeException( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "null com.sun.star.configuration." + "ConfigurationUpdateAccess")), + 0); + bAdd = true; + } + xConfig = m_xConfig; + } + if (bAdd) + // Exceptions here could be handled individually, to support graceful + // degradation (no update notification mechanism in this case---but also + // no dispose notifications): + xConfig->addPropertyChangeListener( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")), + this); + return xConfig; +} + diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx new file mode 100644 index 000000000000..854c7eca28ea --- /dev/null +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -0,0 +1,167 @@ +/************************************************************************* + * + * $RCSfile: imestatuswindow.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-27 11:27:39 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2002 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#if !defined INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX +#define INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX + +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "cppuhelper/implbase1.hxx" +#include "osl/mutex.hxx" + +namespace com { namespace sun { namespace star { + namespace beans { class XPropertySet; } + namespace lang { class XMultiServiceFactory; } +} } } +class SfxApplication; + +namespace sfx2 { namespace appl { + +// The MS compiler needs this typedef work-around to accept the using +// declarations within ImeStatusWindow: +typedef cppu::WeakImplHelper1< com::sun::star::beans::XPropertyChangeListener > +ImeStatusWindow_Impl; + +/** Control the behavior of any (platform-dependent) IME status windows. + + The decision of whether a status window shall be displayed or not can be + stored permanently in the configuration (under key + org.openoffice.office.Common/I18N/InputMethod/ShowStatusWindow; if that + entry is nil, VCL is asked for a default). + */ +class ImeStatusWindow: private ImeStatusWindow_Impl +{ +public: + ImeStatusWindow(SfxApplication & rApplication, + com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory > const & + rServiceFactory); + + /** Set up VCL according to the configuration. + + Is it not strictly required that this method is called exactly once + (though that will be the typical use). + + Must only be called with the Solar mutex locked. + */ + void init(); + + /** Return true if the status window is toggled on. + + This is only meaningful when canToggle returns true. + + Can be called without the Solar mutex locked. + */ + bool isShowing(); + + /** Toggle the status window on or off. + + This only works if canToggle returns true (otherwise, any calls of this + method are ignored). + + Must only be called with the Solar mutex locked. + */ + void show(bool bShow); + + /** Return true if the status window can be toggled on and off externally. + + Must only be called with the Solar mutex locked. + */ + bool canToggle() const; + + // At least the Solaris "CC: Forte Developer 7 C++ 5.4 2002/03/09" compiler + // does not accept the following using-declarations for virtual functions, + // so use (deprecated) access declarations instead: + /*using*/ ImeStatusWindow_Impl::acquire; + /*using*/ ImeStatusWindow_Impl::release; + using ImeStatusWindow_Impl::operator new; + using ImeStatusWindow_Impl::operator delete; + +private: + ImeStatusWindow(ImeStatusWindow &); // not implemented + void operator =(ImeStatusWindow); // not implemented + + virtual ~ImeStatusWindow(); + + virtual void SAL_CALL + disposing(com::sun::star::lang::EventObject const & rSource) + throw (com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL + propertyChange(com::sun::star::beans::PropertyChangeEvent const & rEvent) + throw (com::sun::star::uno::RuntimeException); + + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > + getConfig(); + + SfxApplication & m_rApplication; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + m_xServiceFactory; + + osl::Mutex m_aMutex; + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > + m_xConfig; + bool m_bDisposed; +}; + +} } + +#endif // INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk index cb5e72358f6a..e480c4699874 100644 --- a/sfx2/source/appl/makefile.mk +++ b/sfx2/source/appl/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: mav $ $Date: 2002-09-30 15:14:52 $ +# last change: $Author: hr $ $Date: 2003-03-27 11:27:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -114,7 +114,6 @@ SLOFILES = \ $(SLO)$/childwin.obj \ $(SLO)$/sfxdll.obj \ $(SLO)$/module.obj \ - $(SLO)$/picklist.obj \ $(SLO)$/appsys.obj \ $(SLO)$/loadenv.obj \ $(SLO)$/dlgcont.obj \ @@ -125,7 +124,9 @@ SLOFILES = \ $(SLO)$/shutdownicon.obj \ $(SLO)$/shutdowniconw32.obj \ $(SLO)$/sfxpicklist.obj \ - $(SLO)$/helpdispatch.obj + $(SLO)$/helpdispatch.obj \ + $(SLO)$/imestatuswindow.obj \ + $(SLO)$/accelinfo.obj EXCEPTIONSFILES=\ $(SLO)$/imagemgr.obj \ @@ -133,7 +134,6 @@ EXCEPTIONSFILES=\ $(SLO)$/appmisc.obj \ $(SLO)$/frstinit.obj \ $(SLO)$/appinit.obj \ - $(SLO)$/picklist.obj \ $(SLO)$/appcfg.obj \ $(SLO)$/helpinterceptor.obj \ $(SLO)$/newhelp.obj \ diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 95710ba933b6..8ef75d7c5081 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.87 $ * - * last change: $Author: os $ $Date: 2002-10-24 09:38:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,6 +213,9 @@ #ifndef _VCL_UNOHELP_HXX #include <vcl/unohelp.hxx> #endif +#ifndef _VCL_I18NHELP_HXX +#include <vcl/i18nhelp.hxx> +#endif #include <ucbhelper/content.hxx> #include <vcl/msgbox.hxx> @@ -222,6 +225,7 @@ using namespace ::ucb; using namespace com::sun::star::ucb; +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::frame; @@ -994,6 +998,30 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const } // ----------------------------------------------------------------------- +//added by BerryJia for fixing Bug98251, 2002-12-11 +sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase() +{ + sal_Bool bRet = sal_False; + if ( sKeyword.Len() > 0 ) + { + USHORT nEntries = aIndexCB.GetEntryCount(); + String sIndexItem; + const vcl::I18nHelper& rI18nHelper = GetSettings().GetLocaleI18nHelper(); + for ( USHORT n = 0; n < nEntries; n++) + { + sIndexItem = aIndexCB.GetEntry( n ); + if (rI18nHelper.MatchString( sIndexItem, sKeyword )) + { + sKeyword = sIndexItem; + bRet = sal_True; + } + } + } + + return bRet; +} + +// ----------------------------------------------------------------------- void IndexTabPage_Impl::OpenKeyword() { @@ -1750,6 +1778,9 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG ) { // keyword found on index? sal_Bool bIndex = pIPage->HasKeyword(); + //The following two lines are added by BerryJia for fixing Bug98251, 2002-12-11 + if( !bIndex) + bIndex = pIPage->HasKeywordIgnoreCase(); // then set index or search page as current. USHORT nPageId = ( bIndex ) ? HELP_INDEX_PAGE_INDEX : HELP_INDEX_PAGE_SEARCH; if ( nPageId != aTabCtrl.GetCurPageId() ) @@ -2544,7 +2575,7 @@ void SfxHelpWindow_Impl::MakeLayout() if ( aRect.Width > 0 && aRect.Height > 0 ) { - Rectangle aScreenRect = pScreenWin->GetWindowExtentsRelative( NULL ); + Rectangle aScreenRect = pScreenWin->GetClientWindowExtentsRelative( NULL ); Point aNewPos = aScreenRect.TopLeft(); sal_Int32 nDiffWidth = nOldWidth - nWidth; aNewPos.X() += nDiffWidth; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 932c9a97c26c..a7d9b3a4612f 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.hxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: pb $ $Date: 2002-10-16 12:47:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,6 +222,7 @@ public: inline void SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; } void SetKeyword( const String& rKeyword ); sal_Bool HasKeyword() const; + sal_Bool HasKeywordIgnoreCase(); //added by BerryJia for fixing Bug98251, 2002-12-11 void OpenKeyword(); }; diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src index 855b9b28ca94..d574208f8d43 100644 --- a/sfx2/source/appl/newhelp.src +++ b/sfx2/source/appl/newhelp.src @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.src,v $ * - * $Revision: 1.78 $ + * $Revision: 1.79 $ * - * last change: $Author: kz $ $Date: 2002-09-05 11:26:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,23 +96,23 @@ Window WIN_HELP_INDEX Text [ ENGLISH ] = "Contents" ; Text[ english_us ] = "Contents"; Text[ portuguese ] = "Contedos"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Inhoud"; Text[ french ] = "Contenu"; - Text[ spanish ] = "Contenidos"; + Text[ spanish ] = "Contenido"; Text[ italian ] = "Contenuti"; Text[ danish ] = "Indhold"; Text[ swedish ] = "Innehll"; Text[ polish ] = "Zawartoci"; Text[ portuguese_brazilian ] = "Contents"; - Text[ japanese ] = "内容"; + Text[ japanese ] = "目次"; Text[ korean ] = "내용"; Text[ chinese_simplified ] = "内容"; Text[ chinese_traditional ] = "內容"; Text[ turkish ] = "Contents"; Text[ arabic ] = ""; - Text[ finnish ] = "Contents"; + Text[ finnish ] = "Sislt"; Text[ catalan ] = "Continguts"; Text[ thai ] = "เนื้อหา"; }; @@ -133,7 +133,7 @@ Window WIN_HELP_INDEX Text[ swedish ] = "Index"; Text[ polish ] = "Indeks"; Text[ portuguese_brazilian ] = "Index"; - Text[ japanese ] = "目次"; + Text[ japanese ] = "索引"; Text[ korean ] = "색인"; Text[ chinese_simplified ] = "索引"; Text[ chinese_traditional ] = "索引"; @@ -150,7 +150,7 @@ Window WIN_HELP_INDEX Text [ ENGLISH ] = "Find" ; Text[ english_us ] = "Find"; Text[ portuguese ] = "Procurar"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = ""; Text[ dutch ] = "Zoeken"; Text[ french ] = "Recherche"; @@ -183,7 +183,7 @@ Window WIN_HELP_INDEX Text[ dutch ] = "Bladwijzers"; Text[ french ] = "Signets"; Text[ spanish ] = "Marcadores"; - Text[ finnish ] = "Bookmarks"; + Text[ finnish ] = "Kirjanmerkit"; Text[ italian ] = "Segnalibro"; Text[ danish ] = "Bogmrke"; Text[ swedish ] = "Bokmrken"; @@ -232,7 +232,7 @@ TabPage TP_HELP_INDEX Text[ turkish ] = "~Suchbegriff"; Text[ arabic ] = " "; Text[ catalan ] = "~Cerca terme"; - Text[ finnish ] = "~Etsittv termi"; + Text[ finnish ] = "Etsittv ~termi"; Text[ thai ] = "~ค้นหาเงื่อนไข"; }; ComboBox CB_INDEX @@ -344,19 +344,19 @@ TabPage TP_HELP_SEARCH Text = "~Nur ganze Wrter" ; Text [ english_us ] = "~Complete words only"; Text[ portuguese ] = "~S palavras inteiras"; - Text[ russian ] = "~ "; + Text[ russian ] = "~ "; Text[ greek ] = "~Complete words only"; Text[ dutch ] = "~Alleen hele woorden"; Text[ french ] = "Uniquement les mots entiers"; Text[ spanish ] = "~Slo palabras completas"; - Text[ finnish ] = "~Complete words only"; + Text[ finnish ] = "Vain ~kokonaiset sanat"; Text[ italian ] = "~Solo parole intere"; Text[ danish ] = "~Kun hele ord"; Text[ swedish ] = "~Bara hela ord"; Text[ polish ] = "~Tylko cae sowa"; Text[ portuguese_brazilian ] = "~Complete words only"; Text[ japanese ] = "単語として(~C)"; - Text[ korean ] = "완벽한 단어만(~C)"; + Text[ korean ] = "단어 단위로(~C)"; Text[ chinese_simplified ] = "只允许单词(~C)"; Text[ chinese_traditional ] = "僅是單詞(~C)"; Text[ turkish ] = "~Complete words only"; @@ -382,7 +382,7 @@ TabPage TP_HELP_SEARCH Text[ polish ] = "Przeszukaj tylko tytuy"; Text[ portuguese_brazilian ] = "~Search headings only"; Text[ japanese ] = "タイトルのみを検索(~H)"; - Text[ korean ] = "제목에서만 찾기(~H)"; + Text[ korean ] = "제목에서만 찾아보기(~H)"; Text[ chinese_simplified ] = "仅在大标题范围内搜寻(~H)"; Text[ chinese_traditional ] = "僅在大標題範圍內搜尋(~H)"; Text[ turkish ] = "~Search headings only"; @@ -444,7 +444,7 @@ TabPage TP_HELP_BOOKMARKS Text[ dutch ] = "~Bladwijzers"; Text[ french ] = "Signets"; Text[ spanish ] = "Marcadores"; - Text[ finnish ] = "Bookmarks"; + Text[ finnish ] = "Kirjan~merkit"; Text[ italian ] = "~Segnalibro"; Text[ danish ] = "~Bogmrke"; Text[ swedish ] = "~Bokmrken"; @@ -594,7 +594,7 @@ String STR_HELP_WINDOW_TITLE Text[ greek ] = " %PRODUCTNAME"; Text[ dutch ] = "%PRODUCTNAME Help"; Text[ french ] = "Aide de %PRODUCTNAME"; - Text[ spanish ] = "%PRODUCTNAME Ayuda"; + Text[ spanish ] = "%PRODUCTNAME - Ayuda"; Text[ italian ] = "Guida %PRODUCTNAME"; Text[ danish ] = "Hjlp til %PRODUCTNAME"; Text[ swedish ] = "%PRODUCTNAME-hjlp"; @@ -607,7 +607,7 @@ String STR_HELP_WINDOW_TITLE Text[ turkish ] = "%PRODUCTNAME Help"; Text[ arabic ] = "%PRODUCTNAME "; Text[ catalan ] = "%PRODUCTNAME Ajuda"; - Text[ finnish ] = " Ohjelman %PRODUCTNAME ohje"; + Text[ finnish ] = "%PRODUCTNAME Ohje"; Text[ thai ] = "ตัวช่วยเหลือ%PRODUCTNAME "; }; String STR_HELP_BUTTON_INDEX_ON @@ -615,7 +615,7 @@ String STR_HELP_BUTTON_INDEX_ON Text = "Navigationsbereich anzeigen"; Text [ english_us ] = "Show Navigation Pane"; Text[ portuguese ] = "Mostrar rea de navegao"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Navigatiebereik weergeven"; Text[ french ] = "Afficher l'espace de navigation"; @@ -632,7 +632,7 @@ String STR_HELP_BUTTON_INDEX_ON Text[ turkish ] = "ndis"; Text[ arabic ] = ""; Text[ catalan ] = "ndex"; - Text[ finnish ] = "Hakemisto"; + Text[ finnish ] = "Nyt siirtymisruutu"; Text[ thai ] = "แสดงการนำทางบานหน้าต่าง"; }; String STR_HELP_BUTTON_INDEX_OFF @@ -640,12 +640,12 @@ String STR_HELP_BUTTON_INDEX_OFF Text = "Navigationsbereich ausschalten"; Text [ english_us ] = "Hide Navigation Pane"; Text[ portuguese ] = "Desactivar rea de navegao"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "Hide navigation area"; Text[ dutch ] = "Navigatiebereik uitschakelen"; Text[ french ] = "Masquer l'espace de navigation"; Text[ spanish ] = "Ocultar rea de navegacin"; - Text[ finnish ] = "Hide navigation area"; + Text[ finnish ] = "Piilota siirtymisruutu"; Text[ italian ] = "Nascondi area di navigazione"; Text[ danish ] = "Sl navigationsomrde fra"; Text[ swedish ] = "Dlj navigationsomrde"; @@ -667,7 +667,7 @@ String STR_HELP_BUTTON_START Text[ portuguese ] = "Pgina inicial"; Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Startpagina"; + Text[ dutch ] = "Beginpagina"; Text[ french ] = "Page de dpart"; Text[ spanish ] = "Pgina de inicio"; Text[ italian ] = "Home"; @@ -676,7 +676,7 @@ String STR_HELP_BUTTON_START Text[ polish ] = "Strona startowa"; Text[ portuguese_brazilian ] = "Start page"; Text[ japanese ] = "開始ページ"; - Text[ korean ] = "시작 페이지"; + Text[ korean ] = "첫 페이지"; Text[ chinese_simplified ] = "首页"; Text[ chinese_traditional ] = "首頁"; Text[ turkish ] = "Start page"; @@ -757,7 +757,7 @@ String STR_HELP_BUTTON_PRINT Text[ turkish ] = "Print"; Text[ arabic ] = ""; Text[ catalan ] = "Imprimeix"; - Text[ finnish ] = "Tulosta"; + Text[ finnish ] = "Tulosta..."; Text[ thai ] = "พิมพ์..."; }; String STR_HELP_BUTTON_ADDBOOKMARK @@ -767,10 +767,10 @@ String STR_HELP_BUTTON_ADDBOOKMARK Text[ portuguese ] = "Adicionar marcador..."; Text[ russian ] = " ..."; Text[ greek ] = "Add to bookmarks"; - Text[ dutch ] = "Bladwijzers toevoegen..."; + Text[ dutch ] = "Bladwijzer toevoegen..."; Text[ french ] = "Ajouter un signet..."; Text[ spanish ] = "Aadir marcador..."; - Text[ finnish ] = "Add to bookmarks"; + Text[ finnish ] = "Lis kirjanmerkkeihin..."; Text[ italian ] = "Aggiungi segnalibro..."; Text[ danish ] = "Tilfj bogmrke..."; Text[ swedish ] = "Lgg till bokmrke..."; @@ -795,7 +795,7 @@ String STR_HELP_BUTTON_SEARCHDIALOG Text[ dutch ] = "Zoeken..."; Text[ french ] = "Rechercher..."; Text[ spanish ] = "Buscar..."; - Text[ finnish ] = "Find..."; + Text[ finnish ] = "Etsi..."; Text[ italian ] = "Cerca..."; Text[ danish ] = "Sg..."; Text[ swedish ] = "Sk..."; @@ -815,8 +815,8 @@ String STR_HELP_BUTTON_SOURCEVIEW Text = "HTML-Quelltext"; Text[ english_us ] = "HTML Source"; Text[ portuguese ] = "Fonte HTML"; - Text[ russian ] = " HTML"; - Text[ dutch ] = "HTLM-brontekst"; + Text[ russian ] = " HTML-"; + Text[ dutch ] = "HTML-brontekst"; Text[ french ] = "Texte source HTML"; Text[ spanish ] = "Texto fuente HTML"; Text[ italian ] = "Testo sorgente HTML"; @@ -828,10 +828,10 @@ String STR_HELP_BUTTON_SOURCEVIEW Text[ chinese_simplified ] = "HTML 源文本"; Text[ chinese_traditional ] = "HTML 原始檔"; Text[ arabic ] = " HTML"; - Text[ dutch ] = "HTLM-brontekst"; + Text[ dutch ] = "HTML-brontekst"; Text[ chinese_simplified ] = "HTML 源文本"; Text[ greek ] = " HTML"; - Text[ korean ] = "HTML-소스 텍스트"; + Text[ korean ] = "HTML 원본"; Text[ turkish ] = "HTML kaynak kodu"; Text[ catalan ] = "Font HTML"; Text[ finnish ] = "HTML-lhde"; @@ -843,7 +843,7 @@ String STR_HELP_FIRST_MESSAGE Text = "Die Hilfe wird gestartet..."; Text[ english_us ] = "The Help is being started..."; Text[ portuguese ] = "A iniciar Ajuda..."; - Text[ russian ] = " ..."; + Text[ russian ] = " ..."; Text[ greek ] = "Help is started..."; Text[ dutch ] = "Help wordt gestart..."; Text[ french ] = "Dmarrage de l'aide..."; @@ -860,7 +860,7 @@ String STR_HELP_FIRST_MESSAGE Text[ turkish ] = "Help is started..."; Text[ arabic ] = "Help is started..."; Text[ catalan ] = "S'ha iniciat l'ajuda..."; - Text[ finnish ] = "Ohjetoiminto kynnistetn"; + Text[ finnish ] = "Ohjetoiminto kynnistetn..."; Text[ thai ] = "เริ่มตัวช่วย..."; }; String STR_HELP_FIRST_HTML @@ -969,10 +969,10 @@ ModalDialog DLG_HELP_ADDBOOKMARK TEXT[ portuguese ] = "Mudar nome ao marcador"; TEXT[ russian ] = " "; TEXT[ greek ] = "Rename bookmark"; - TEXT[ dutch ] = "Bladwijzer nieuwe naam geven"; + TEXT[ dutch ] = "Naam bladwijzer wijzigen"; TEXT[ french ] = "Renommer le signet"; TEXT[ spanish ] = "Cambiar nombre a marcador"; - TEXT[ finnish ] = "Rename bookmark"; + TEXT[ finnish ] = "Nime kirjanmerkki uudelleen"; TEXT[ italian ] = "Rinomina segnalibro"; TEXT[ danish ] = "Omdb bogmrke"; TEXT[ swedish ] = "Byt namn p bokmrke"; @@ -991,10 +991,10 @@ ModalDialog DLG_HELP_ADDBOOKMARK TEXT[ portuguese ] = "Adicionar marcador"; TEXT[ russian ] = " "; TEXT[ greek ] = "Add to Bookmarks"; - TEXT[ dutch ] = "Bladwijzers toevoegen"; + TEXT[ dutch ] = "Bladwijzer toevoegen"; TEXT[ french ] = "Ajouter un signet"; TEXT[ spanish ] = "Aadir marcador"; - TEXT[ finnish ] = "Add to Bookmarks"; + TEXT[ finnish ] = "Lis kirjanmerkkeihin"; TEXT[ italian ] = "Aggiungi segnalibro"; TEXT[ danish ] = "Tilfj bogmrke"; TEXT[ swedish ] = "Lgg till bokmrke"; @@ -1027,7 +1027,7 @@ Menu MENU_HELP_BOOKMARKS Text[ dutch ] = "Weergeven"; Text[ french ] = "Afficher"; Text[ spanish ] = "Mostrar"; - Text[ finnish ] = "New..."; + Text[ finnish ] = "Nyt"; Text[ italian ] = "Mostra"; Text[ danish ] = "Vis"; Text[ swedish ] = "Visa"; @@ -1056,10 +1056,10 @@ Menu MENU_HELP_BOOKMARKS Text[ portuguese ] = "Mudar nome..."; Text[ russian ] = "..."; Text[ greek ] = "Rename..."; - Text[ dutch ] = "Nieuwe naam geven..."; + Text[ dutch ] = "Naam wijzigen..."; Text[ french ] = "Renommer..."; Text[ spanish ] = "Cambiar nombre..."; - Text[ finnish ] = "Rename..."; + Text[ finnish ] = "Nime uudelleen..."; Text[ italian ] = "Rinomina..."; Text[ danish ] = "Omdb..."; Text[ swedish ] = "Byt namn..."; @@ -1086,8 +1086,8 @@ Menu MENU_HELP_BOOKMARKS Text[ greek ] = "Delete"; Text[ dutch ] = "Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; - Text[ finnish ] = "Delete"; + Text[ spanish ] = "Borrar"; + Text[ finnish ] = "Poista"; Text[ italian ] = "Elimina"; Text[ danish ] = "Slet"; Text[ swedish ] = "Radera"; @@ -1113,12 +1113,12 @@ InfoBox RID_INFO_NOSEARCHRESULTS MESSAGE [ English ] = "No themes found." ; MESSAGE[ english_us ] = "No topics found."; MESSAGE[ portuguese ] = "No foram encontrados temas."; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ greek ] = "No themes found."; MESSAGE[ dutch ] = "Geen onderwerpen gevonden"; MESSAGE[ french ] = "Aucun rsultat de recherche."; MESSAGE[ spanish ] = "No se han encontrado temas"; - MESSAGE[ finnish ] = "No themes found."; + MESSAGE[ finnish ] = "Aiheita ei lytynyt."; MESSAGE[ italian ] = "Nessun tema trovato"; MESSAGE[ danish ] = "Der blev ikke fundet emner."; MESSAGE[ swedish ] = "Skningen gav inget resultat."; @@ -1272,3 +1272,8 @@ Image IMG_HELP_TOOLBOX_HCL_COPY MASKCOLOR_MAGENTA }; + + + + + diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index c6e6056d4e5a..a6b6989bca67 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -2,9 +2,9 @@ * * $RCSfile: sfx.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2002-11-04 16:16:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ String STR_NONAME Text [ spanish ] = "Sin nombre" ; Text [ english_us ] = "Untitled" ; Text[ chinese_simplified ] = "未命名"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Bez nazwy"; Text[ japanese ] = "無題"; Text[ chinese_traditional ] = "未命名"; @@ -105,7 +105,7 @@ String STR_NONE Text [ spanish ] = "- Ninguno -" ; Text [ english_us ] = "- None -" ; Text[ chinese_simplified ] = "- 无 -"; - Text[ russian ] = "- -"; + Text[ russian ] = "- -"; Text[ polish ] = "- Brak -"; Text[ japanese ] = "-なし-"; Text[ chinese_traditional ] = "- 無 -"; @@ -189,13 +189,13 @@ String STR_STYLE_FILTER_USED TEXT [ spanish ] = "Estilos utilizados" ; TEXT [ english_us ] = "Applied Styles" ; TEXT[ chinese_simplified ] = "使用的样式"; - TEXT[ russian ] = " "; + TEXT[ russian ] = " "; TEXT[ polish ] = "Uywane style"; TEXT[ japanese ] = "使用したスタイル"; TEXT[ chinese_traditional ] = "使用的樣式"; TEXT[ arabic ] = " "; TEXT[ greek ] = " "; - TEXT[ korean ] = "사용된 스타일"; + TEXT[ korean ] = "적용된 스타일"; TEXT[ turkish ] = "Kullanlan biimler"; TEXT[ catalan ] = "Estils aplicats"; TEXT[ thai ] = "ลักษณะประยุกต์"; @@ -265,7 +265,7 @@ String STR_STANDARD Text [ English ] = "Standard" ; Text [ english_us ] = "Standard" ; Text[ portuguese ] = "Padro"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ greek ] = ""; Text[ dutch ] = "Standaard"; Text[ french ] = "Par dfaut"; @@ -320,10 +320,10 @@ String STR_FILTERNAME_ALL Text[ portuguese ] = "<Todos>"; Text[ russian ] = " (*.*)"; Text[ greek ] = "<>"; - Text[ dutch ] = "<Alle>"; + Text[ dutch ] = "Alle bestanden (*.*)"; Text[ french ] = "Tous les fichiers (*.*)"; Text[ spanish ] = "Todos los archivos (*.*)"; - Text[ finnish ] = "<Kaikki>"; + Text[ finnish ] = "Kaikki tiedostot (*.*)"; Text[ italian ] = "Tutti i file (*.*)"; Text[ danish ] = "Alle filer (*.*)"; Text[ swedish ] = "Alla filer (*.*)"; @@ -367,7 +367,7 @@ String STR_BYTES Text[ korean ] = "바이트"; Text[ turkish ] = "Byte"; Text[ catalan ] = "Bytes"; - Text[ finnish ] = "Tavuja"; + Text[ finnish ] = "Tavua"; Text[ thai ] = "ไบต์"; }; @@ -385,7 +385,7 @@ String STR_KB Text [ french ] = "Ko" ; Text [ dutch ] = "KB" ; Text[ chinese_simplified ] = "千字节"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "KB"; Text[ japanese ] = "キロバイト"; Text[ chinese_traditional ] = "KB"; @@ -412,7 +412,7 @@ String STR_MB Text [ french ] = "Mo" ; Text [ dutch ] = "MB" ; Text[ chinese_simplified ] = "兆字节"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "MB"; Text[ japanese ] = "MB"; Text[ chinese_traditional ] = "MB"; @@ -440,7 +440,7 @@ String STR_GB Text [ french ] = "Go" ; Text [ dutch ] = "GB" ; Text[ chinese_simplified ] = "千兆"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "GB"; Text[ japanese ] = "GB"; Text[ chinese_traditional ] = "GB"; @@ -462,11 +462,11 @@ String STR_UNDO Text [ italian ] = "Annulla " ; Text [ portuguese_brazilian ] = "Desfazer " ; Text [ portuguese ] = "Anular: " ; - Text [ finnish ] = "Peruuta: " ; + Text [ finnish ] = "Kumoa: " ; Text [ danish ] = "Fortryd: " ; Text [ french ] = "Annuler : " ; Text [ swedish ] = "ngra: " ; - Text [ dutch ] = "Ongedaan: " ; + Text [ dutch ] = "Ongedaan maken:" ; Text [ spanish ] = "Deshacer: " ; Text [ english_us ] = "Undo: " ; Text[ chinese_simplified ] = "撤消命令： "; @@ -476,7 +476,7 @@ String STR_UNDO Text[ chinese_traditional ] = "復原："; Text[ arabic ] = ": "; Text[ greek ] = ": "; - Text[ korean ] = "실행취소: "; + Text[ korean ] = "실행 취소: "; Text[ turkish ] = "Geri al: "; Text[ catalan ] = "Desfs: "; Text[ thai ] = "เลิกทำ: "; @@ -494,9 +494,9 @@ String STR_REDO Text [ italian ] = "Ripristina: " ; Text [ spanish ] = "Restaurar: " ; Text [ french ] = "Restaurer : " ; - Text [ dutch ] = "Herstellen: " ; + Text [ dutch ] = "Herstellen:" ; Text[ chinese_simplified ] = "恢复撤消命令 (~D)"; - Text[ russian ] = ": "; + Text[ russian ] = ": "; Text[ polish ] = "Przywr: "; Text[ japanese ] = "やり直し(~D):"; Text[ chinese_traditional ] = "恢復撤消指令(~D):"; @@ -519,9 +519,9 @@ String STR_REPEAT Text [ swedish ] = "Senaste ~kommando: " ; Text [ danish ] = "Sidste ~kommado: " ; Text [ italian ] = "Ultimo ~comando: " ; - Text [ spanish ] = "~ltimo comando: " ; + Text [ spanish ] = "~Repetir: " ; Text [ french ] = "~Rpter : " ; - Text [ dutch ] = "~Herhalen: " ; + Text [ dutch ] = "~Herhalen:" ; Text[ chinese_simplified ] = "上一个命令(~R)"; Text[ russian ] = ": "; Text[ polish ] = "Ostatnie polecenie: "; @@ -529,10 +529,10 @@ String STR_REPEAT Text[ chinese_traditional ] = "上一個指令(~R)"; Text[ arabic ] = " : "; Text[ greek ] = ": "; - Text[ korean ] = "마지막 명령(~R):"; + Text[ korean ] = "반복(~R):"; Text[ turkish ] = "Son ~komutu yinele: "; Text[ catalan ] = "~Repeteix: "; - Text[ finnish ] = "~Toisto: "; + Text[ finnish ] = "~Toista: "; Text[ thai ] = "~ซ้ำ: "; }; @@ -542,10 +542,10 @@ String RID_STR_NEW_TASK Text [ english ] = "New task"; Text[ english_us ] = "New task"; Text[ portuguese ] = "Nova tarefa"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ dutch ] = "Nieuwe taak"; Text[ french ] = "Nouvelle tche"; - Text[ spanish ] = "Nueva tarea"; + Text[ spanish ] = "Tarea nueva"; Text[ italian ] = "Nuovo compito"; Text[ danish ] = "Ny opgave"; Text[ swedish ] = "Ny aktivitet"; @@ -556,7 +556,7 @@ String RID_STR_NEW_TASK Text[ chinese_traditional ] = "開新檔案"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "새로운 작업"; + Text[ korean ] = "새 작업"; Text[ turkish ] = "Yeni grev"; Text[ catalan ] = "Tasca nova"; Text[ finnish ] = "Uusi tehtv"; @@ -586,7 +586,7 @@ QueryBox MSG_QUERY_LASTVERSION Message[ japanese ] = "すべての変更を解除しますか。"; Message[ chinese_traditional ] = "取消所有的變更？"; Message[ greek ] = " ;"; - Message[ korean ] = "모든 변경을 취소하겠습니까?"; + Message[ korean ] = "모든 변경 내용을 취소하시겠습니까?"; Message[ arabic ] = " ʿ"; Message[ turkish ] = "Tm deiiklikleri iptal et?"; Message[ catalan ] = "Cancel.la tots els canvis?"; @@ -606,3 +606,8 @@ QueryBox MSG_QUERY_LASTVERSION + + + + + diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 43aafb3474cc..f5783e8e1f59 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxhelp.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: as $ $Date: 2002-05-23 13:14:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,7 +219,7 @@ public: SfxHelpOptions_Impl(); ~SfxHelpOptions_Impl(); - BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds->Seek_Entry( nId, &nDummy ); } + BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; } }; static Sequence< ::rtl::OUString > GetPropertyNames() diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index c82b85fcf6ef..0e9f2e5f2c83 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxpicklist.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mav $ $Date: 2002-08-27 10:47:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -373,7 +373,6 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) aReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPick->aName )); aReq.AppendItem( SfxStringItem( SID_REFERER, DEFINE_CONST_UNICODE( SFX_REFERER_USER ) ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, DEFINE_CONST_UNICODE("_default") ) ); - aReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) ); String aFilter( pPick->aFilter ); aGuard.clear(); @@ -386,6 +385,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) } aReq.AppendItem(SfxStringItem( SID_FILTER_NAME, aFilter )); + aReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) ); SFX_APP()->ExecuteSlot( aReq ); } } @@ -431,6 +431,39 @@ void SfxPickList::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) break; } + case SFX_EVENT_OPENDOC: + { + SfxMedium *pMed = pDocSh->GetMedium(); + if( !pMed ) + return; + + // unbenannt-Docs und embedded-Docs nicht in History + if ( !pDocSh->HasName() || + SFX_CREATE_MODE_STANDARD != pDocSh->GetCreateMode() ) + return; + + // Hilfe nicht in History + if ( !pDocSh->Get_Impl()->bIsHelpObjSh ) + { + ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); + ::rtl::OUString aFilter; + + INetURLObject aURL( pMed->GetOrigURL() ); + const SfxFilter* pFilter = pMed->GetOrigFilter(); + + if ( pFilter ) + aFilter = pFilter->GetFilterName(); + + // add to svtool history options + SvtHistoryOptions().AppendItem( eHISTORY, + aURL.GetURLNoPass( INetURLObject::NO_DECODE ), + aFilter, + aTitle, + SfxStringEncode( aURL.GetPass() ) ); + } + break; + } + case SFX_EVENT_CLOSEDOC: { SfxMedium *pMed = pDocSh->GetMedium(); @@ -455,6 +488,10 @@ void SfxPickList::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if ( pPicklistItem && !pPicklistItem->GetValue() ) return; + // ignore hidden documents + if ( pDocSh->Get_Impl()->bHidden ) + return; + ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); ::rtl::OUString aFilter; diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 3ac39c3d2fa1..bacebe07a841 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shutdownicon.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: mav $ $Date: 2002-09-30 15:16:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,7 @@ #include <app.hxx> #include <vos/mutex.hxx> #include <svtools/imagemgr.hxx> +// #include <cmdlineargs.hxx> #ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> @@ -466,12 +467,15 @@ void ShutdownIcon::terminateDesktop() getInstance()->m_xDesktop->removeTerminateListener( getInstance() ); // terminate desktop only if no tasks exist - Reference < XFramesSupplier > xTasksSupplier( getInstance()->m_xDesktop, UNO_QUERY ); - if( xTasksSupplier.is() ) + Reference < XFramesSupplier > xSupplier( getInstance()->m_xDesktop, UNO_QUERY ); + if( xSupplier.is() ) { - Reference < XElementAccess > xCont( xTasksSupplier->getFrames(), UNO_QUERY ); - if( !xCont->hasElements() ) - getInstance()->m_xDesktop->terminate(); + Reference < XIndexAccess > xTasks ( xSupplier->getFrames(), UNO_QUERY ); + if( xTasks.is() ) + { + if( xTasks->getCount()<1 ) + getInstance()->m_xDesktop->terminate(); + } } } } @@ -530,30 +534,32 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : if ( aArguments.getLength() > 0 ) { - try + if ( !ShutdownIcon::pShutdownIcon ) { - sal_Bool bQuickstart = sal_False; - bQuickstart = ::cppu::any2bool( aArguments[0] ); - if( Application::IsRemoteServer() || ( !bQuickstart && !GetAutostart() ) ) - return; + try + { + sal_Bool bQuickstart = sal_False; + bQuickstart = ::cppu::any2bool( aArguments[0] ); + if( Application::IsRemoteServer() || ( !bQuickstart && !GetAutostart() ) ) + return; - m_pResMgr = SFX_APP()->GetSfxResManager(); + m_pResMgr = SFX_APP()->GetSfxResManager(); - m_xDesktop = Reference < XDesktop >( m_xServiceManager->createInstance( - DEFINE_CONST_UNICODE( "com.sun.star.frame.Desktop" )), - UNO_QUERY ); + m_xDesktop = Reference < XDesktop >( m_xServiceManager->createInstance( + DEFINE_CONST_UNICODE( "com.sun.star.frame.Desktop" )), + UNO_QUERY ); - if ( !m_xDesktop.is() ) - return; + if ( !m_xDesktop.is() ) + return; - if ( !ShutdownIcon::pShutdownIcon ) ShutdownIcon::pShutdownIcon = this; #ifdef WNT - initSystray(); + initSystray(); #endif - } - catch(const ::com::sun::star::lang::IllegalArgumentException&) - { + } + catch(const ::com::sun::star::lang::IllegalArgumentException&) + { + } } } } diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index d49cea3eecc9..043af2a66646 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shutdowniconw32.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hro $ $Date: 2002-11-29 12:57:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 69ae26e6a4ba..6ed5c4a1491d 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: workwin.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: mba $ $Date: 2002-09-11 15:43:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -472,7 +472,8 @@ void SfxWorkWindow::DeleteControllers_Impl() if (pCW->pCli) ReleaseChild_Impl(*pChild->GetWindow()); pCW->pWin = 0; - delete pChild; + pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( pChild->GetWindow() ); + pChild->Destroy(); } delete pCW->pControl; delete pCW; @@ -501,6 +502,7 @@ void SfxWorkWindow::DeleteControllers_Impl() { // Release siehe unten pTbx->StoreConfig(); + pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( &pTbx->GetToolBox() ); delete(pTbx); } } @@ -640,51 +642,63 @@ SvBorder SfxWorkWindow::Arrange_Impl() switch ( pCli->eAlign ) { case SFX_ALIGN_HIGHESTTOP: - aUpperClientArea.Top() += aSize.Height(); case SFX_ALIGN_TOP: case SFX_ALIGN_TOOLBOXTOP: case SFX_ALIGN_LOWESTTOP: + aSize.Width() = aTmp.GetWidth(); + if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) + aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); bAllowHiding = FALSE; aBorder.Top() += aSize.Height(); aPos = aTmp.TopLeft(); aTmp.Top() += aSize.Height(); - aSize.Width() = aTmp.GetWidth(); + if ( pCli->eAlign == SFX_ALIGN_HIGHESTTOP ) + aUpperClientArea.Top() += aSize.Height(); break; case SFX_ALIGN_LOWESTBOTTOM: - aUpperClientArea.Bottom() -= aSize.Height(); case SFX_ALIGN_BOTTOM: case SFX_ALIGN_TOOLBOXBOTTOM: case SFX_ALIGN_HIGHESTBOTTOM: + aSize.Width() = aTmp.GetWidth(); + if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) + aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); aBorder.Bottom() += aSize.Height(); aPos = aTmp.BottomLeft(); aPos.Y() -= (aSize.Height()-1); aTmp.Bottom() -= aSize.Height(); - aSize.Width() = aTmp.GetWidth(); + if ( pCli->eAlign == SFX_ALIGN_LOWESTBOTTOM ) + aUpperClientArea.Bottom() -= aSize.Height(); break; case SFX_ALIGN_FIRSTLEFT: - aUpperClientArea.Left() += aSize.Width(); case SFX_ALIGN_LEFT: - case SFX_ALIGN_TOOLBOXLEFT: case SFX_ALIGN_LASTLEFT: + case SFX_ALIGN_TOOLBOXLEFT: + aSize.Height() = aTmp.GetHeight(); + if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) + aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); bAllowHiding = FALSE; aBorder.Left() += aSize.Width(); aPos = aTmp.TopLeft(); aTmp.Left() += aSize.Width(); - aSize.Height() = aTmp.GetHeight(); + if ( pCli->eAlign != SFX_ALIGN_TOOLBOXLEFT ) + aUpperClientArea.Left() += aSize.Width(); break; - case SFX_ALIGN_LASTRIGHT: - aUpperClientArea.Right() -= aSize.Width(); + case SFX_ALIGN_FIRSTRIGHT: case SFX_ALIGN_RIGHT: + case SFX_ALIGN_LASTRIGHT: case SFX_ALIGN_TOOLBOXRIGHT: - case SFX_ALIGN_FIRSTRIGHT: + aSize.Height() = aTmp.GetHeight(); + if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) + aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); aBorder.Right() += aSize.Width(); aPos = aTmp.TopRight(); aPos.X() -= (aSize.Width()-1); aTmp.Right() -= aSize.Width(); - aSize.Height() = aTmp.GetHeight(); + if ( pCli->eAlign != SFX_ALIGN_TOOLBOXRIGHT ) + aUpperClientArea.Right() -= aSize.Width(); break; default: @@ -1175,6 +1189,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() FASTBOOL bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN == ( nTbxMode & SFX_VISIBILITY_FULLSCREEN ); nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN; + nTbxMode &= ~SFX_VISIBILITY_VIEWER; // wird in diesem Kontext eine ToolBox gefordert? FASTBOOL bModesMatching = nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode; @@ -1408,6 +1423,8 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus ) SfxChildWindow *pChildWin = SfxChildWindow::CreateChildWindow( pCW->nId, pWorkWin, &GetBindings(), pCW->aInfo); if (pChildWin) { + if ( bSetFocus ) + bSetFocus = pChildWin->WantsFocus(); pChildWin->SetWorkWindow_Impl( this ); #if 0 // Enable-Status richtig setzen @@ -1518,7 +1535,7 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW ) pWorkWin->GetSystemWindow()->GetTaskPaneList()->RemoveWindow( pChildWin->GetWindow() ); pCW->pWin = 0; - delete pChildWin; + pChildWin->Destroy(); GetBindings().Invalidate( nId ); } @@ -2403,7 +2420,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc { pCW->pCli->bSetFocus = bSetFocus; pCW->pCli->nVisible = CHILD_VISIBLE; - pChildWin->Show( bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + pChildWin->Show( bSetFocus && pChildWin->WantsFocus() ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } else ((SfxDockingWindow*)pChildWin->GetWindow())->Reappear_Impl(); |