diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:29:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:29:38 +0000 |
| commit | 5be98eba1fddb559194066c511b53412009c2d5d (patch) | |
| tree | 538903c2049093b623e6bd26fd2d0c0396fa43a0 /sfx2 | |
| parent | 45967111901ed4b8f9439bdf538fbbf5a6dd4a64 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sfx2')
123 files changed, 6091 insertions, 3814 deletions
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx index 9f01d757cd70..0681157106ca 100644 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/imgmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: imgmgr.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: cd $ $Date: 2002-10-28 16:15:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,9 @@ public: SfxImageManager( SfxObjectShell* pDoc ); ~SfxImageManager(); + SfxConfigManager* GetConfigManager(); + USHORT GetType() const; + Size GetImageSize() const; Color GetMaskColor() const; diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/mieclip.hxx index 9b211c2f4b7a..e332877d21bf 100644 --- a/sfx2/inc/mieclip.hxx +++ b/sfx2/inc/mieclip.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mieclip.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2001-02-02 13:41:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,42 +95,5 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// -// -/* - $Log: not supported by cvs2svn $ - Revision 1.1.1.1 2000/09/18 16:52:23 hr - initial import - - Revision 1.8 2000/09/17 16:47:07 willem.vandorp - OpenOffice header added. - - Revision 1.7 2000/09/06 14:49:36 willem.vandorp - Header and footer replaced. - - Revision 1.6 1999/12/16 19:32:37 er - #60614# add: GetData with SvData - - Revision 1.5 1999/07/23 08:34:06 hr - #65293#: misplaced comment - - Revision 1.4 1999/01/18 13:35:50 JP - Task #59398#: unnoetiges RegisterClipb... gegen IDS ausgetauscht - - - Rev 1.3 18 Jan 1999 14:35:50 JP - Task #59398#: unnoetiges RegisterClipb... gegen IDS ausgetauscht - - Rev 1.2 22 Jun 1998 21:20:36 JP - SvDataObject gegen SorDataObject ausgetauscht - - Rev 1.1 23 Feb 1998 17:05:14 TJ - include - - Rev 1.0 18 Feb 1998 17:28:26 OK - NEW: MSE40HTMLClipFormatObj - -*/ - #endif //_MIECLIP_HXX diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 61f80de0a0d3..a666131b4337 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -38,8 +38,6 @@ touch: ..\%__SRC%\misc\sfx2.hid %_DEST%\bin%_EXT%\sfx2.hid ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv ..\%__SRC%\inc\macropg.hxx %_DEST%\inc%_EXT%\macropg.hxx -..\%__SRC%\bin\odk?????.dll %_DEST%\odk\bin%_EXT%\odk?????.dll -..\%__SRC%\bin\cli?????.dll %_DEST%\odk\bin%_EXT%\cli?????.dll hedabu: ..\inc\accmgr.hxx %_DEST%\inc%_EXT%\sfx2\accmgr.hxx hedabu: ..\inc\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx @@ -147,6 +145,7 @@ hedabu: ..\inc\xmlmetai.hxx %_DEST%\inc%_EXT%\sfx2\xmlmetai.hxx hedabu: ..\inc\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc hedabu: ..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx hedabu: ..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx +hedabu: ..\inc\accelinfo.hxx %_DEST%\inc%_EXT%\sfx2\accelinfo.hxx ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 589e7cf04ffe..01973c00e71c 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -5,8 +5,8 @@ #* Description shell SfxApplication #* #* Creation date MI 01/31/1995 -#* last change $Author: cd $ $Date: 2002-10-11 14:43:52 $ -#* $Revision: 1.9 $ +#* last change $Author: hr $ $Date: 2003-03-27 11:27:31 $ +#* $Revision: 1.10 $ #* #* Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. #* @@ -323,9 +323,28 @@ interface Application : Module ] //--------------------------------------------------------------------- - SID_ADDONS + + SID_UPDATE_CONFIG + [ + ExecMethod = MiscExec_Impl ; + ] + + SID_ADDONS + [ + ] + + SID_SHOW_IME_STATUS_WINDOW [ + ExecMethod = MiscExec_Impl ; + StateMethod = MiscState_Impl ; + ] + + //--------------------------------------------------------------------- + SID_HELP_SUPPORTPAGE + [ + ExecMethod = MiscExec_Impl ; ] + } //========================================================================= diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi index f6c6531b0cf5..8227e8e44503 100644 --- a/sfx2/sdi/docslots.sdi +++ b/sfx2/sdi/docslots.sdi @@ -2,7 +2,7 @@ shell SfxObjectShell (C) 1994-1995 StarDivision GmbH, Hamburg, Germany - $Author: as $ $Date: 2002-09-13 06:40:54 $ $Revision: 1.8 $ + $Author: hr $ $Date: 2003-03-27 11:27:31 $ $Revision: 1.9 $ $Logfile: T:/sfx2/sdi/docslots.sdv $ $Workfile: DOCSLOTS.SDI $ =========================================================================*/ @@ -91,73 +91,6 @@ interface Document : Object ExecMethod = ExecView_Impl ; StateMethod = StateView_Impl ; ] - //--------------------------------------------------------------------- - SID_ON_CREATEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_OPENDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_PREPARECLOSEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_CLOSEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_SAVEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_SAVEASDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - - SID_ON_SAVEDOCDONE // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - - //--------------------------------------------------------------------- - SID_ON_SAVEASDOCDONE // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_ACTIVATEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_DEACTIVATEDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] - //--------------------------------------------------------------------- - SID_ON_PRINTDOC // ole(no) api(final/play) - [ - ExecMethod = ExecProps_Impl ; - StateMethod = StateProps_Impl ; - ] } interface OfficeDocument : Document diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 7b5704f17e21..474f0c5f4efb 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5494,357 +5494,6 @@ SfxStringItem OldPALK SID_OLD_PALK ] //-------------------------------------------------------------------------- -SfxStringItem OnActivate SID_ON_ACTIVATEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnClose SID_ON_CLOSEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnCreate SID_ON_CREATEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnDeactivate SID_ON_DEACTIVATEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnOpen SID_ON_OPENDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnPrepareClose SID_ON_PREPARECLOSEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnPrint SID_ON_PRINTDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnQuit SID_ON_CLOSEAPP - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnSave SID_ON_SAVEDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnSaveAs SID_ON_SAVEASDOC - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnSaveAsDone SID_ON_SAVEASDOCDONE - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnSaveDone SID_ON_SAVEDOCDONE - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- -SfxStringItem OnStart SID_ON_STARTAPP - -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = ; -] - -//-------------------------------------------------------------------------- SfxObjectItem Open SID_OPENDOC (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER) [ @@ -8893,3 +8542,79 @@ SfxVoidItem Addons SID_ADDONS ToolBoxConfig = FALSE, GroupId = GID_APPLICATION; ] + +SfxBoolItem ShowImeStatusWindow SID_SHOW_IME_STATUS_WINDOW +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_VIEW; +] + +//-------------------------------------------------------------------------- +SfxVoidItem UpdateConfiguration SID_UPDATE_CONFIG +(SfxStringItem StreamName SID_UPDATE_CONFIG ) +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_EXPLORER; +] + +//-------------------------------------------------------------------------- +SfxVoidItem HelpSupport SID_HELP_SUPPORTPAGE +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_APPLICATION; +] + 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(); diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src index dd644a8ffccf..2dfc14b97a27 100644 --- a/sfx2/source/bastyp/bastyp.src +++ b/sfx2/source/bastyp/bastyp.src @@ -2,9 +2,9 @@ * * $RCSfile: bastyp.src,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: kz $ $Date: 2001-08-13 20:22:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ String ERR_INET_NAME_RESOLVE { Text = "Der Rechnername konnte nicht aufgelst werden\n" ; Text [ ENGLISH ] = "Could not resolve hostname" ; - Text [ dutch ] = "De naam van de computer kon niet worden herleid\n" ; + Text [ dutch ] = "De naam van de computer kan niet worden herleid\n" ; Text [ english_us ] = "The computer name could not be resolved\n" ; Text [ italian ] = "Non stato possibile risolvere il nome dell'host\n" ; Text [ spanish ] = "El nombre del ordenador no se pudo resolver.\n" ; @@ -78,22 +78,23 @@ String ERR_INET_NAME_RESOLVE Text [ portuguese ] = "Impossvel resolver o nome do computador.\n" ; Text [ portuguese_brazilian ] = "Der Rechnername konnte nicht aufgel?t werden\n" ; Text[ chinese_simplified ] = "无法找到主机地址\n"; - Text[ russian ] = " \n"; + Text[ russian ] = " \n"; Text[ polish ] = "Nazwy komputera nie mona byo przetworzy\n"; - Text[ japanese ] = "ﾎｽﾄ名は見つかりませんでした\n"; + Text[ japanese ] = "ホスト名は見つかりませんでした\n"; Text[ chinese_traditional ] = "無法找到主機地址。\n"; Text[ arabic ] = " \n"; Text[ greek ] = " $(ARG1)"; Text[ korean ] = "컴퓨터 이름을 확인하지 못했습니다 \n"; Text[ turkish ] = "Bilgisayarn ad zlemedi\n"; - Text[ catalan ] = "El nombre del ordenador no se pudo resolver.\n"; - Text[ finnish ] = "Tietokoneen nime ei voitu selvitt \n"; + Text[ catalan ] = "No s'ha pogut resoldre el nom de l'ordinador\n"; + Text[ finnish ] = "Tietokoneen nime ei voitu selvitt\n"; + Text[ thai ] = "ไม่สามารถแก้ชื่อคอมพิวเตอร์ได้\n"; }; String ERR_INET_CONNECT { Text = "Die Internetverbindung konnte nicht hergestellt werden" ; Text [ ENGLISH ] = "The Internetconnection could not be established" ; - Text [ dutch ] = "De Internet-verbinding kon niet worden tot stand gebracht worden" ; + Text [ dutch ] = "De internetverbinding kan niet tot stand worden gebracht" ; Text [ english_us ] = "Internet connection could not be established" ; Text [ italian ] = "Non stato possibile ripristinare il collegamento Internet" ; Text [ spanish ] = "No se pudo crear la conexin Internet" ; @@ -103,22 +104,23 @@ String ERR_INET_CONNECT Text [ portuguese_brazilian ] = "Die Internetverbindung konnte nicht hergestellt werden" ; Text [ portuguese ] = "Impossvel estabelecer a ligao com a Internet." ; Text[ chinese_simplified ] = "无法和国际互联网建立连接"; - Text[ russian ] = " "; + Text[ russian ] = " -."; Text[ polish ] = "Nie mona byo uzyska poczenia z sieci Internetu"; - Text[ japanese ] = "ｲﾝﾀｰﾈｯﾄの接続ができていません。"; + Text[ japanese ] = "インターネットの接続ができていません。"; Text[ chinese_traditional ] = "無法和 Internet 建立連結。"; Text[ arabic ] = " "; Text[ greek ] = " Internet"; - Text[ korean ] = "인터넷 접속을 구축하지 못했습니다."; + Text[ korean ] = "인터넷 접속을 설정하지 못했습니다."; Text[ turkish ] = "Internet balants gerekletirilemedi."; - Text[ catalan ] = "No se pudo crear la conexin Internet"; - Text[ finnish ] = "Internet-yhteyden muodostaminen ei onnistunut"; + Text[ catalan ] = "No s'ha pogut crear la connexi a Internet"; + Text[ finnish ] = "Internet-yhteyden muodostaminen ei onnistunut."; + Text[ thai ] = "ไม่สามารถสร้างการเชื่อมต่ออินเตอร์เน็ตได้"; }; String ERR_INET_READ { Text = "Daten konnten nicht ber das Internet gelesen werden.\nServerfehlermeldung: $(ARG1)" ; Text [ ENGLISH ] = "Error reading from the internet\n.Server error message: $(ARG1)" ; - Text [ dutch ] = "De gegevens konden niet via Internet worden gelezen.\nFoutmelding server: $(ARG1)" ; + Text [ dutch ] = "De gegevens kunnen niet via het internet worden gelezen.\nFoutmelding server: $(ARG1)" ; Text [ english_us ] = "Error reading data from the internet\n.Server error message: $(ARG1)" ; Text [ italian ] = "Non stato possibile leggere i dati tramite Internet.\nErrore di server: $(ARG1)" ; Text [ spanish ] = "Los datos no se pudieron leer a travs de Internet.\nMensaje de error del servidor: $(ARG1)" ; @@ -128,22 +130,23 @@ String ERR_INET_READ Text [ portuguese ] = "Foi impossvel ler os dados via Internet.\nMensagem de erro do servidor: $(ARG1)" ; Text [ portuguese_brazilian ] = "Daten konnten nicht ?er das Internet gelesen werden.\nServerfehlermeldung: $(ARG1)" ; Text[ chinese_simplified ] = "无法通过国际互联网读取数据。\n服务器报告错误：$(ARG1)"; - Text[ russian ] = " .\n : $(ARG1)"; + Text[ russian ] = " .\n : $(ARG1)"; Text[ polish ] = "Danych nie mona odczyta przez Internet. \nKomunikat o bdzie serwera: $(ARG1)"; - Text[ japanese ] = "ﾃﾞｰﾀはｲﾝﾀｰﾈｯﾄからは読み取れませんでした\n。ｻｰﾊﾞｰ ｴﾗｰ ﾒｯｾｰｼﾞ: $(ARG1)"; + Text[ japanese ] = "データはインターネットからは読み取れませんでした\n。サーバー エラー メッセージ: $(ARG1)"; Text[ chinese_traditional ] = "無法透過 Internet 讀取資料。\n伺服器報告錯誤：$(ARG1)"; Text[ arabic ] = " .\n : $(ARG1)"; Text[ greek ] = " Internet.\n : $(ARG1)"; - Text[ korean ] = "인터넷을 통한 데이터 읽기 오류\n.서버 오류 메시지: $(ARG1)"; + Text[ korean ] = "인터넷을 통한 데이터 읽기 오류\n.서버 오류 메시지: $(ARG1)"; Text[ turkish ] = "Internet zerinden veri okunurken hata olutu.\nSunucu hata iletisi: $(ARG1)"; - Text[ catalan ] = "Los datos no se pudieron leer a travs de Internet.\nMensaje de error del servidor: $(ARG1)"; + Text[ catalan ] = "Les dades no s'han pogut llegir a travs d'Internet.\nMissatge d'error del servidor: $(ARG1)"; Text[ finnish ] = "On ilmennyt virhe luettaessa tietoja Internetist.\nPalvelimen virhesanoma: $(ARG1)"; + Text[ thai ] = "การอ่านข้อมูลผิดพลาดจากอินเตอร์เน็ต\n.ข้อความผิดพลาดของเซิร์ฟเวอร์: $(ARG1)"; }; String ERR_INET_WRITE { Text = "Daten konnten nicht ins Internet bertragen werden.\nServerfehlermeldung: $(ARG1)" ; Text [ ENGLISH ] = "Error writing to the internet.Server error message: $(ARG1)" ; - Text [ dutch ] = "De gegevens konden niet naar Internet worden getransfereerd.\nFoutmelding server: $(ARG1)" ; + Text [ dutch ] = "De gegevens kunnen niet naar het internet worden verzonden.\nFoutmelding server: $(ARG1)" ; Text [ english_us ] = "Error transferring data to the internet.\nServer error message: $(ARG1)" ; Text [ italian ] = "Non stato possibile trasmettere i dati in Internet.\nErrore di server: $(ARG1)" ; Text [ spanish ] = "Los datos no se pudieron transferir a Internet.\nMensaje de error del servidor: $(ARG1)" ; @@ -153,22 +156,23 @@ String ERR_INET_WRITE Text [ portuguese ] = "Foi impossvel transmitir dados para a Internet.\nMensagem de erro do servidor: $(ARG1)" ; Text [ portuguese_brazilian ] = "Daten konnten nicht ins Internet ?ertragen werden.\nServerfehlermeldung: $(ARG1)" ; Text[ chinese_simplified ] = "无法向国际互联网传递数据。\n服务器报告错误：$(ARG1)"; - Text[ russian ] = " .\n : $(ARG1)"; + Text[ russian ] = " .\n : $(ARG1)"; Text[ polish ] = "Danych nie mona przesa przez Internet.\nKomunikat o bdzie z serwera: $(ARG1)"; - Text[ japanese ] = "ﾃﾞｰﾀはｲﾝﾀｰﾈｯﾄに転送できませんでした\n。ｻｰﾊﾞｰ ｴﾗｰ ﾒｯｾｰｼﾞ: $(ARG1)"; + Text[ japanese ] = "データはインターネットに転送できませんでした\n。サーバー エラー メッセージ: $(ARG1)"; Text[ chinese_traditional ] = "無法向 Internet 傳遞資料。\n伺服器報告錯誤：$(ARG1)"; Text[ arabic ] = " .\n : $(ARG1)"; Text[ greek ] = " Internet.\n : $(ARG1)"; Text[ korean ] = "인터넷에서 데이터 전송 오류.\n서버 오류 메시지: $(ARG1)"; Text[ turkish ] = "Veriler Internet zerinden aktarlamad.\nSunucu hata iletisi: $(ARG1)"; - Text[ catalan ] = "Los datos no se pudieron transferir a Internet.\nMensaje de error del servidor: $(ARG1)"; + Text[ catalan ] = "Les dades no s'han pogut transmetre a Internet.\nMissatge d'error del servidor: $(ARG1)"; Text[ finnish ] = "On ilmennyt virhe siirrettess tietoja Internetiin.\nPalvelimen virhesanoma: $(ARG1)"; + Text[ thai ] = "การถ่ายโอนข้อมูลไปยังอินเตอร์เน็ตผิดพลาด\nข้อความผิดพลาดของเซิร์ฟเวอร์: $(ARG1)"; }; String ERR_INET_GENERAL { Text = "Ein allgemeiner Fehler im Internetbereich trat auf" ; Text [ ENGLISH ] = "Gereral Internet Error" ; - Text [ dutch ] = "Algemene fout in Internet" ; + Text [ dutch ] = "Algemene fout op het internet" ; Text [ english_us ] = "General Internet Error" ; Text [ italian ] = "Si verificato un errore generale nell'area Internet" ; Text [ spanish ] = "Error general en Internet" ; @@ -178,16 +182,17 @@ String ERR_INET_GENERAL Text [ portuguese ] = "Surgiu um erro geral na rea da Internet." ; Text [ portuguese_brazilian ] = "Ein allgemeiner Fehler im Internetbereich trat auf" ; Text[ chinese_simplified ] = "在国际互联网内发生一个一般错误。"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wystpi oglny bd w sieci Internetu"; - Text[ japanese ] = "ｲﾝﾀｰﾈｯﾄ領域の一般的なｴﾗｰの発生"; + Text[ japanese ] = "インターネット領域の一般的なエラーの発生"; Text[ chinese_traditional ] = "在 Internet 連結範圍內發生一個一般錯誤。"; Text[ arabic ] = " "; Text[ greek ] = " Internet"; Text[ korean ] = "인터넷에서 일반적인 오류 발생"; Text[ turkish ] = "Genel Internet hatas"; - Text[ catalan ] = "Error general en Internet"; + Text[ catalan ] = "Error general d'Internet"; Text[ finnish ] = "Yleinen Internet-virhe"; + Text[ thai ] = "ข้อผิดพลาดของอินเตอร์เน็ตทั่วไป"; }; String ERR_WRONG_URL { @@ -203,16 +208,17 @@ String ERR_WRONG_URL Text [ portuguese ] = "Erro no URL\n" ; Text [ portuguese_brazilian ] = "Fehlerhafter URL\n" ; Text[ chinese_simplified ] = "URL地址不完整\n"; - Text[ russian ] = " URL\n"; + Text[ russian ] = " URL\n"; Text[ polish ] = "Bd w URL\n"; - Text[ japanese ] = "URLにｴﾗｰあり\n"; + Text[ japanese ] = "URLにエラーあり\n"; Text[ chinese_traditional ] = "URL 位址不完整\n"; Text[ arabic ] = "URL \n"; Text[ greek ] = " URL\n"; Text[ korean ] = "URL 오류\n"; Text[ turkish ] = "Hatal URL\n"; - Text[ catalan ] = "URL errnea\n"; + Text[ catalan ] = "URL incorrecta\n"; Text[ finnish ] = "Virheellinen URL-osoite\n"; + Text[ thai ] = "ข้อผิดพลาด URL\n"; }; String ERR_ACTIVEDOWNLOADS { @@ -223,20 +229,21 @@ String ERR_ACTIVEDOWNLOADS Text[ portuguese ] = "Existem ainda alguns downloads em curso.\nCancelar?\n"; Text[ danish ] = "Der er fortsat aktive overfrsler.\nEr du sikker p, at du vil annullere?\n"; Text[ french ] = "Vous avez des tlchargements en cours.\nVoulez-vous vraiment annuler ?\n"; - Text[ swedish ] = "Det finns fortfarande aktiva nedladdningar.\nVill Du verkligen avbryta?\n"; - Text[ dutch ] = "Er zijn nog downloads actief.\nWilt u de applicatie werkelijk stoppen?\n"; + Text[ swedish ] = "Det finns fortfarande aktiva nedladdningar.\nVill du verkligen avbryta?\n"; + Text[ dutch ] = "Er zijn nog downloads actief.\nWilt u de toepassing werkelijk annuleren?\n"; Text[ spanish ] = "Todava existen descargas activas.\nDesea realmente cancelar?\n"; Text[ chinese_simplified ] = "还正在下载文件。\n您真要中断吗？\n"; Text[ russian ] = " .\n ?\n"; Text[ polish ] = "Trwa jeszcze pobieranie.\nCzy je przerwa?\n"; - Text[ japanese ] = "まだﾀﾞｳﾝﾛｰﾄﾞ中です。\n中止してもよろしいですか?\n"; + Text[ japanese ] = "まだダウンロード中です。\n中止してもよろしいですか?\n"; Text[ chinese_traditional ] = "還正在下載檔案。\n真要中斷？\n"; Text[ arabic ] = " .\n \n"; Text[ greek ] = " .\n ;\n"; - Text[ korean ] = "다운로드가 진행 중입니다.\n그래도 취소하시겠습니까?\n"; + Text[ korean ] = "다운로드가 진행 중입니다.\n취소하시겠습니까?\n"; Text[ turkish ] = "u an devam eden veri indirme ileri var.\nGerekten kmak istiyor musunuz?\n"; - Text[ catalan ] = "Todava existen descargas activas.\nDesea realmente cancelar?\n"; + Text[ catalan ] = "Encara hi ha descrreges actives.\nRealment voleu cancel.lar?\n"; Text[ finnish ] = "Noutoja on yh kynniss.\nHaluatko varmasti lopettaa?\n"; + Text[ thai ] = "ยังมีการดาวน์โหลดอยู่\nคุณแน่ใจหรือไม่ที่จะเลิก?\n"; }; String ERR_QUEUEDDOWNLOADS { @@ -245,23 +252,24 @@ String ERR_QUEUEDDOWNLOADS Text [ english_us ] = "There are still downloads to be performed.\nDo you really want to quit?\n" ; Text [ portuguese ] = "Ainda existem downloads em fila de espera.\\Deseja realmente cancelar?\n" ; Text [ portuguese_brazilian ] = "Es stehen noch Downloads in der Warteschlange.\nWollen Sie wirklich beenden?\n" ; - Text [ swedish ] = "Det finns fortfarande nedladdningar i k.\nVill Du nd avsluta?\n" ; + Text [ swedish ] = "Det finns fortfarande nedladdningar i k.\nVill du nd avsluta?\n" ; Text [ danish ] = "Der er fortsat overfrsler i k.\nEr du sikker p, at du vil afslutte?\n" ; Text [ italian ] = "Ci sono ancora dei download in corso.\nVolete davvero terminare?\n" ; Text [ spanish ] = "Todava hay documentos para descargar.\nDesea realmente cancelar?\n" ; Text [ french ] = "Il y a des tlchargements dans la file d'attente.\ntes-vous sr de vouloir quitter ?\n" ; Text [ dutch ] = "Er staan nog downloads op de wachtlijst.\nWilt u werkelijk beindigen?\n" ; Text[ chinese_simplified ] = "还有下载命令等候处理。\n您真要结束吗？\n"; - Text[ russian ] = " .\n ?\n"; + Text[ russian ] = " .\n ?\n"; Text[ polish ] = "Nie zakoczono jeszcze pobierania.\nCzy na pewno zakoczy?\n"; - Text[ japanese ] = "ﾀﾞｳﾝﾛｰﾄﾞはまだ待機中です。\n終了してもよろしいですか?\n"; + Text[ japanese ] = "ダウンロードはまだ待機中です。\n終了してもよろしいですか?\n"; Text[ chinese_traditional ] = "還正在下載檔案。\n真要結束？\n"; Text[ arabic ] = " .\n \n"; Text[ greek ] = " .\n ;\n"; - Text[ korean ] = "다운로드가 대기 중입니다.\n그래도 종료하시겠습니까?\n"; + Text[ korean ] = "다운로드가 대기 중입니다.\n그래도 종료하겠습니까?\n"; Text[ turkish ] = "Bekleme srasnda veri indirme ileri var.\nGerekten kmak istiyor musunuz?\n"; - Text[ catalan ] = "Todava hay documentos para descargar.\nDesea realmente cancelar?\n"; + Text[ catalan ] = "Encara hi ha documents per descarregar.\nRealment voleu cancel.lar?\n"; Text[ finnish ] = "Noutoja on viel suorittamatta.\nHaluatko varmasti lopettaa?\n"; + Text[ thai ] = "ยังมีการดาวน์โหลดอยู่\nคุณต้องการเลิกหรือไม่?\n"; }; String ERR_FILEISLOCAL { @@ -270,23 +278,24 @@ String ERR_FILEISLOCAL Text [ english_us ] = "The file already exists on your computer.\nDo you want to copy it anyway?" ; Text [ portuguese ] = "O ficheiro j se encontra no seu computador.\nMesmo assim copiar?" ; Text [ portuguese_brazilian ] = "Die Datei liegt bereits lokal auf Ihrem Rechner.\nSoll sie trotzdem kopiert werden?" ; - Text [ swedish ] = "Filen finns redan lokalt p Din dator.\nSkall den nd kopieras?" ; + Text [ swedish ] = "Filen finns redan lokalt p din dator.\nSkall den nd kopieras?" ; Text [ danish ] = "Filen findes allerede lokalt p din computer.\nSkal den kopieres alligevel?" ; Text [ italian ] = "Il file si trova gi sul computer dell'utente.\nVolete copiarlo lo stesso?" ; Text [ spanish ] = "El archivo ya est guardado localmente en su ordenador.\nDesea copiarlo de todas maneras?" ; Text [ french ] = "Ce fichier existe dj sur votre disque dur.\nSouhaitez-vous tout de mme la copier?" ; Text [ dutch ] = "Het bestand bevindt zich reeds op uw computer.\nWilt u het toch kopiren?" ; Text[ chinese_simplified ] = "这个文件已经存盘在您的计算机上。\n您还是要复制它吗？"; - Text[ russian ] = " .\n ?"; + Text[ russian ] = " .\n, ?"; Text[ polish ] = "Plik jest ju ulokowany w twoim komputerze.\nCzy ma on pomimo tego zosta skopiowany?"; - Text[ japanese ] = "このﾌｧｲﾙはすでにｺﾝﾋﾟｭｰﾀｰ上にあります。\nそれでもｺﾋﾟｰしますか？"; + Text[ japanese ] = "このファイルはすでにコンピューター上にあります。\nそれでもコピーしますか？"; Text[ chinese_traditional ] = "這個檔案已經儲存在磁碟上。\n還是要複製它？"; Text[ arabic ] = " .\n ߿"; Text[ greek ] = " .\n ' ;"; - Text[ korean ] = "파일은 이미 사용자의 컴퓨터에 지역적으로 존재합니다.\n그래도 복사하시겠습니까?"; + Text[ korean ] = "파일은 이미 사용자의 컴퓨터에 지역적으로 존재합니다.\n그래도 복사하겠습니까?"; Text[ turkish ] = "Dosya bilgisayarnzda zaten mevcut.\nYine de kopyalansn m?"; - Text[ catalan ] = "El archivo ya est guardado localmente en su ordenador.\nDesea copiarlo de todas maneras?"; + Text[ catalan ] = "El fitxer ja existeix en el vostre ordinador.\nVoleu copiar-lo igualment?"; Text[ finnish ] = "Tiedosto on jo tietokoneella.\nHaluatko kopioida tiedoston?"; + Text[ thai ] = "มีแฟ้มอยู่ในคอมพิวเตอร์คุณแล้ว\nคุณต้องการคัดลอกหรือไม่?"; }; String ERR_FILENAMECHECK83 { @@ -300,18 +309,19 @@ String ERR_FILENAMECHECK83 Text [ italian ] = "Il nome del file digitato non valido.\nTenete presente che il nome del file pu avere una lunghezza massima di 8 caratteri\ne l'estensione del file di 3." ; Text [ spanish ] = "El nombre del archivo especificado no es vlido.\\Tenga en cuenta que el nombre debe tener un mximo de 8 caracteres\ny la terminacin 3." ; Text [ french ] = "Le nom de fichier indiqu est incorrect.\nIl peut comporter au maximum 8 caractres\net l'extension de fichier au maximum 3 caractres." ; - Text [ dutch ] = "De aangegeven bestandsnaam is ongeldig.\nWij wijzen u erop dat de bestandsnaam maximaal 8 tekens\nen de extensie maximaal 3 tekens lang mag zijn." ; + Text [ dutch ] = "De opgegeven bestandsnaam is ongeldig.\nWij wijzen u erop dat de bestandsnaam maximaal 8 tekens\nen de extensie maximaal 3 tekens lang mag zijn." ; Text[ chinese_simplified ] = "给定的文件名称无效。\n请注意：文件名不得超过8个字符。\n文件的扩展名不得超过 3 个字符。"; - Text[ russian ] = " .\n, , 8 \n, 3 ."; + Text[ russian ] = " .\n 8 \n, - 3 ."; Text[ polish ] = "Podana nazwa pliku jest nieprawidowa.\nNaley uwzgldni, e nazwa pliku moe zawiera maksym. 8 znakw\n,a rozszerzenie pliku maksym. 3 znaki."; - Text[ japanese ] = "指定したﾌｧｲﾙ名が無効です。\nﾌｧｲﾙ名は最高8文字まで、\nﾌｧｲﾙ拡張子は最高3文字までと制限があります。注意してください。"; + Text[ japanese ] = "指定したファイル名が無効です。\nファイル名は最高8文字まで、\nファイル拡張子は最高3文字までと制限があります。注意してください。"; Text[ chinese_traditional ] = "輸入的檔案名無效。\n請您留意檔案名不得超過8個字元。\n副檔名不得超過 3 個字元。"; Text[ arabic ] = " .\n \n ."; Text[ greek ] = " .\n 8 \n ? "; - Text[ korean ] = "지정된 파일 이름이 유효하지 않습니다.\n파일의 이름이 8문자를 초과할 수 없다는 점과\n확장자가 3문자를 초과 할수 없다는 점을 유의하십시오."; + Text[ korean ] = "지정된 파일 이름이 잘못되었습니다.\n파일의 이름이 8문자를 초과할 수 없다는 점과\n확장자가 3문자를 초과 할 수 없다는 점을 유의하십시오."; Text[ turkish ] = "Girilen dosya ad geerli deil.\nDosya ad en fazla 8 ve dosyan\\uzants en fazla 3 karakter uzunluunda olabilir."; - Text[ catalan ] = "El nombre del archivo especificado no es vlido.\\Tenga en cuenta que el nombre debe tener un mximo de 8 caracteres\ny la terminacin 3."; - Text[ finnish ] = "Annettu tiedostonimi on virheellinen.\nTiedostonimi voi olla korkeintaan kahdeksan merkin pituinen\nja tunniste voi olla enintn kolmen merkin pituinen."; + Text[ catalan ] = "El nom del fitxer especificat no s vlid.\nTingueu en compte que el nom ha de tenir un mxim de 8 carcters\ni l'extensi 3."; + Text[ finnish ] = "Annettu tiedoston nimi on virheellinen.\nTiedoston nimi voi olla korkeintaan kahdeksan merkin pituinen\nja tunniste voi olla enintn kolmen merkin pituinen."; + Text[ thai ] = "ใส่ชื่อแฟ้มไม่ถูกต้อง\nกรุณาหมายเหตุว่าชื่อแฟ้มมีไม่เกิน 8 ตัวอักขระ \n และส่วนขยายแฟ้มมี 3 ตัวอักขระเท่านั้น"; }; String ERR_INSUFFICIENTDISKSPACE { @@ -322,20 +332,21 @@ String ERR_INSUFFICIENTDISKSPACE Text[ portuguese ] = "O ficheiro %1 excede o espao disponvel no disco.\nContinuar?\n"; Text[ danish ] = "Filen %1 overskrider den tilgngelige diskplads.\nVil du fortstte alligevel?\n"; Text[ french ] = "La taille du fichier %1 dpasse l'espace libre sur votre disque dur.\nSouhaitez-vous poursuivre ?\n"; - Text[ swedish ] = "Filen %1 blir strre n det tillgngliga diskutrymmet.\nVill Du nd fortstta?\n"; - Text[ dutch ] = "Bestand %1 wordt groter dan de beschikbare schuifruimte.\nWilt u doorgaan ?\n"; + Text[ swedish ] = "Filen %1 blir strre n det tillgngliga diskutrymmet.\nVill du nd fortstta?\n"; + Text[ dutch ] = "Bestand %1 wordt groter dan de beschikbare schuifruimte.\nWilt u doorgaan?\n"; Text[ spanish ] = "El tamao del archivo %1 exceder al del disponible en el disco.\nDesea continuar?\n"; Text[ chinese_simplified ] = "文件 %1 所需空间大于现有的可用空间。\n您要继续吗？\n"; - Text[ russian ] = " %1 , .\n ?\n"; + Text[ russian ] = " %1 , .\n, ?\n"; Text[ polish ] = "Plik %1 przewysza ilo miejsca na dysku.\nKontynuowa ?\n"; - Text[ japanese ] = "ﾌｧｲﾙ %1は空きﾃﾞｽｸ容量領域を越えています｡\n続行しますか?\n"; + Text[ japanese ] = "ファイル %1は空きデスク容量領域を越えています｡\n続行しますか?\n"; Text[ chinese_traditional ] = "檔案 %1 所需空間大於現存的可用空間。\n要繼續﹖\n"; Text[ arabic ] = " %1 .\n ɿ\n"; Text[ greek ] = " %1 .\n ;\n"; - Text[ korean ] = "파일 %1이(가) 사용 가능한 디스크 공간보다 큽니다.\n계속하시겠습니까?\n"; + Text[ korean ] = "파일 %1이(가) 사용 가능한 디스크 공간보다 큽니다.\n계속 진행하시겠습니까?\n"; Text[ turkish ] = "%1 dosyas mevcut disk alann ayor.\nDevam etmek istiyor musunuz ?\n"; - Text[ catalan ] = "El tamao del archivo %1 exceder al del disponible en el disco.\nDesea continuar?\n"; + Text[ catalan ] = "La mida del fitxer %1 s ms gran que l'espi disponible al disc.\nVoleu continuar?\n"; Text[ finnish ] = "Tiedoston %1 koko on suurempi kuin kytettviss oleva levytila.\nHaluatko jatkaa?\n"; + Text[ thai ] = "แฟ้ม %1 มีขนาดเกินเนื้อที่ว่างดิสก์\nคุณต้องการทำต่อหรือไม่?\n"; }; //= Texte "downloadcontroller" ================================================================= String STR_DOWNLOAD_SOURCE @@ -354,14 +365,15 @@ String STR_DOWNLOAD_SOURCE Text [ chinese_simplified ] = "源"; Text [ russian ] = ""; Text [ polish ] = "rdo"; - Text [ japanese ] = "ｿｰｽ"; + Text [ japanese ] = "ソース"; Text [ chinese_traditional ] = "資料源"; Text [ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "소스"; + Text[ korean ] = "원본"; Text[ turkish ] = "Kaynak"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Font"; Text[ finnish ] = "Lhde"; + Text[ thai ] = "แหล่งที่มา"; }; String STR_DOWNLOAD_DESTINATION { @@ -377,16 +389,17 @@ String STR_DOWNLOAD_DESTINATION Text [ portuguese ] = "Destino" ; Text [ portuguese_brazilian ] = "Ziel" ; Text [ chinese_simplified ] = "目标"; - Text [ russian ] = ""; + Text [ russian ] = ""; Text [ polish ] = "Cel"; - Text [ japanese ] = "ﾀｰｹﾞｯﾄ"; + Text [ japanese ] = "ターゲット"; Text [ chinese_traditional ] = "目標"; Text [ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "타겟"; + Text[ korean ] = "대상"; Text[ turkish ] = "Hedef"; - Text[ catalan ] = "Destino"; + Text[ catalan ] = "Dest"; Text[ finnish ] = "Kohde"; + Text[ thai ] = "จุดหมาย"; }; String STR_DOWNLOAD_STATE { @@ -404,14 +417,15 @@ String STR_DOWNLOAD_STATE Text [ chinese_simplified ] = "状态"; Text [ russian ] = ""; Text [ polish ] = "Stan"; - Text [ japanese ] = "ｽﾃｰﾀｽ"; + Text [ japanese ] = "ステータス"; Text [ chinese_traditional ] = "狀態"; Text [ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "상태"; Text[ turkish ] = "Durum"; - Text[ catalan ] = "Estado"; + Text[ catalan ] = "Estat"; Text[ finnish ] = "Tila"; + Text[ thai ] = "สถานะ"; }; String STR_DOWNLOAD_REMAININGTIME { @@ -427,7 +441,7 @@ String STR_DOWNLOAD_REMAININGTIME Text [ portuguese ] = "Tempo restante" ; Text [ portuguese_brazilian ] = "Restzeit" ; Text [ chinese_simplified ] = "剩余时间"; - Text [ russian ] = " "; + Text [ russian ] = " "; Text [ polish ] = "Pozostay czas"; Text [ japanese ] = "残り時間"; Text [ chinese_traditional ] = "剩餘時間"; @@ -435,8 +449,9 @@ String STR_DOWNLOAD_REMAININGTIME Text[ greek ] = " "; Text[ korean ] = "남은 시간"; Text[ turkish ] = "Kalan sre"; - Text[ catalan ] = "Tiempo restante"; + Text[ catalan ] = "Temps restant"; Text[ finnish ] = "Aikaa jljell"; + Text[ thai ] = "เวลาที่เหลืออยู่"; }; String STR_DOWNLOAD_STATEFORMAT { @@ -462,6 +477,7 @@ String STR_DOWNLOAD_STATEFORMAT Text[ turkish ] = "$(READ) Toplam $(TOTAL) [ $(TIME) ]"; Text[ catalan ] = "$(READ) de $(TOTAL) [ $(TIME) ]"; Text[ finnish ] = "$(READ)/$(TOTAL) [ $(TIME) ]"; + Text[ thai ] = "$(READ) of $(TOTAL) [ $(TIME) ]"; }; Resource RID_DLSTATUS2 @@ -480,7 +496,7 @@ Resource RID_DLSTATUS2 Text [ portuguese_brazilian ] = "Verbindung zu: $(HOST). Warten auf Antwort..." ; Text [ portuguese ] = "Ligao com: $(HOST). Esperando resposta ..." ; Text[ chinese_simplified ] = "连接：$(HOST)。正在等候回应..."; - Text[ russian ] = " : $(HOST). ..."; + Text[ russian ] = " : $(HOST). ..."; Text[ polish ] = "Poczenie z: $(HOST). Czekanie na odpowied..."; Text[ japanese ] = "接続先:$(HOST)。応答を待っています..."; Text[ chinese_traditional ] = "連線到：$(HOST)。正在等候答復..."; @@ -491,8 +507,9 @@ Resource RID_DLSTATUS2 Text[ korean ] = "다음에 연결: $(HOST). 응답을 기다립니다..."; Text[ turkish ] = "Balanlan: $(HOST). Yant bekleniyor..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Conexin con: $(HOST). Esperando respuesta..."; + Text[ catalan ] = "Connectant amb: $(HOST). Esperant resposta..."; Text[ finnish ] = "Yhdistetn kohteeseen: $(HOST). Odotetaan vastausta..."; + Text[ thai ] = "เชื่อมต่อ: $(HOST). กำลังรอการตอบสนอง..."; }; String SVBINDSTATUS_CONNECTING { @@ -504,11 +521,11 @@ Resource RID_DLSTATUS2 Text [ spanish ] = "Abriendo: $(TARGET) en $(HOST)" ; Text [ french ] = "Ouverture de $(TARGET) sur $(HOST)" ; Text [ swedish ] = "$(TARGET) ppnas p $(HOST)" ; - Text [ danish ] = "bner: $(TARGET) p $(HOST)" ; + Text [ danish ] = "Flgende bnes: $(TARGET) p $(HOST)" ; Text [ portuguese ] = "Abrir: $(TARGET) em $(HOST)" ; Text [ portuguese_brazilian ] = "Ge?fnet wird: $(TARGET) auf $(HOST)" ; Text[ chinese_simplified ] = "打开： $(HOST)上的$(TARGET)"; - Text[ russian ] = ": $(TARGET) $(HOST)"; + Text[ russian ] = " $(TARGET) $(HOST)"; Text[ polish ] = "Otwarte zostanie: $(TARGET) na $(HOST)"; Text[ japanese ] = "開く: $(HOST) 上の $(TARGET)"; Text[ chinese_traditional ] = "開啟：$(HOST)上的$(TARGET)"; @@ -519,8 +536,9 @@ Resource RID_DLSTATUS2 Text[ korean ] = "열기: $(HOST)에서 $(TARGET)"; Text[ turkish ] = "Alan: $(HOST) zerinde bulunan $(TARGET)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Abriendo: $(TARGET) en $(HOST)"; + Text[ catalan ] = "Obrint $(TARGET) a $(HOST)"; Text[ finnish ] = "Avataan $(TARGET) koneelta $(HOST)"; + Text[ thai ] = "กำลังเปิด $(TARGET) บน $(HOST)"; }; String SVBINDSTATUS_DOWNLOADINGDATA { @@ -532,11 +550,11 @@ Resource RID_DLSTATUS2 Text [ french ] = "Transfert de $(TARGET) Lu : $(BYTE)" ; Text [ dutch ] = "Geladen wordt: $(TARGET) Gelezen: $(BYTE)" ; Text [ swedish ] = "verfrs: $(TARGET) Lst: $(BYTE)" ; - Text [ danish ] = "Overfrer: $(TARGET) Indlst: $(BYTE)" ; + Text [ danish ] = "Flgende overfres: $(TARGET) Lst: $(BYTE)" ; Text [ portuguese_brazilian ] = "?bertragen wird: $(TARGET) Gelesen: $(BYTE)" ; Text [ portuguese ] = "Transferir: $(TARGET) Lidos: $(BYTE)" ; Text[ chinese_simplified ] = "传递：$(TARGET)已经阅读：$(BYTE)"; - Text[ russian ] = ": $(TARGET) : $(BYTE)"; + Text[ russian ] = ": $(TARGET) : $(BYTE)"; Text[ polish ] = "Przetransmitowane zostanie: $(TARGET) Przeczytano: $(BYTE)"; Text[ japanese ] = "転送:$(TARGET) 読み取り:$(BYTE)"; Text[ chinese_traditional ] = "傳遞：$(TARGET)已經閱讀：$(BYTE)"; @@ -547,8 +565,9 @@ Resource RID_DLSTATUS2 Text[ korean ] = "전송: $(TARGET) 판독: $(BYTE)"; Text[ turkish ] = "Aktarlan: $(TARGET) Okunan: $(BYTE)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Transfiriendo: $(TARGET) Ledo: $(BYTE)"; + Text[ catalan ] = "Transferint: $(TARGET) Llegit: $(BYTE)"; Text[ finnish ] = "Siirretn: $(TARGET) Luettu: $(BYTE)"; + Text[ thai ] = "กำลังถ่ายโอน: $(TARGET) อ่าน: $(BYTE)"; }; String SVBINDSTATUS_ENDDOWNLOADDATA { @@ -559,12 +578,12 @@ Resource RID_DLSTATUS2 Text [ spanish ] = "Desconectado" ; Text [ french ] = "Dconnect" ; Text [ dutch ] = "Verbinding verbroken" ; - Text [ swedish ] = "Fbindelse r bruten" ; + Text [ swedish ] = "Frbindelse r bruten" ; Text [ danish ] = "Forbindelse afbrudt" ; Text [ portuguese_brazilian ] = "Verbindung abgebaut" ; Text [ portuguese ] = "Ligao cancelada" ; Text[ chinese_simplified ] = "已经结束连接"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poczenie rozczone"; Text[ japanese ] = "接続が切断されました。"; Text[ chinese_traditional ] = "已經結束連線"; @@ -575,8 +594,9 @@ Resource RID_DLSTATUS2 Text[ korean ] = "연결 해제"; Text[ turkish ] = "Balant kesildi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desconectado"; + Text[ catalan ] = "Desconnectat"; Text[ finnish ] = "Istunto lopetettu"; + Text[ thai ] = "ไม่เชื่อมต่อ"; }; }; @@ -593,3 +613,11 @@ String STR_HTML_GENERATOR + + + + + + + + diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 96eee23ccf0a..ab4ede205458 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltfnc.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: er $ $Date: 2002-11-15 13:01:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,7 +275,6 @@ using namespace ::vos; #include "frame.hxx" #include "dispatch.hxx" #include "urlframe.hxx" -#include "picklist.hxx" #include "topfrm.hxx" #include "plugwin.hxx" #include "helper.hxx" @@ -380,7 +379,7 @@ const SfxFilter* SfxFilterContainer::GetFilter4Protocol( */ { const INetURLObject& rObj = rMed.GetURLObject(); - String aName = rMed.GetURLObject().GetMainURL(); + String aName = rMed.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); // Hier noch pruefen, ob das Doc im Browser dargestellt werden soll SFX_ITEMSET_ARG( rMed.GetItemSet(), pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src index a736f7afc4ef..c8a3ddccab9e 100644 --- a/sfx2/source/bastyp/fltfnc.src +++ b/sfx2/source/bastyp/fltfnc.src @@ -2,9 +2,9 @@ * * $RCSfile: fltfnc.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-07-19 20:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,25 +68,26 @@ String STR_FILTER_CHANNELON_OFFLINE Text = "Dieses Abonnement soll gem Einstellung im Offline Modus gelesen werden.\n\nDas %PRODUCTNAME befindet sich aber im Online Modus. Mchten Sie %PRODUCTNAME jetzt in den Offline Modus umschalten?" ; Text [ english_us ] = "This subscription is set to be read in the offline mode.\n\n%PRODUCTNAME is presently in the online mode. Switch to offline mode now?" ; Text [ portuguese_brazilian ] = "Dieses Abonnement soll gem?? Einstellung im Offline Modus gelesen werden.\n\nDas %PRODUCTNAME befindet sich aber im Online Modus. M?hten Sie %PRODUCTNAME jetzt in den Offline Modus umschalten?" ; - Text [ swedish ] = "Denna prenumeration skall enligt instllningarna lsas i offlinelget.\n\nMen %PRODUCTNAME r i onlinelge. Vill Du vxla till offlinelget nu?" ; + Text [ swedish ] = "Den hr prenumerationen skall enligt instllningarna lsas i offlinelget.\n\nMen %PRODUCTNAME r i onlinelge. Vill du vxla till offlinelget nu?" ; Text [ danish ] = "Dette abonnement skal iflge indstillingerne lses i offlinetilstand.\n\nDit %PRODUCTNAME befinder sig for tiden i onlinetilstand. Vil du skifte til offlinetilstand nu?" ; Text [ italian ] = "Questa sottoscrizione deve essere letta nel modo offline conformemente all'impostazione. \n\n%PRODUCTNAME attualmente si trova nel modo online. Volete passare al modo offline?" ; - Text [ spanish ] = "Esta suscripcin se debe poder leer en modo desconectado (Offline).\n\n%PRODUCTNAME se encuentra sin embargo en modo en lnea. Desea cambiar %PRODUCTNAME al modo desconectado?" ; + Text [ spanish ] = "Esta suscripcin est pensada para ser leda en el modo 'fuera de lnea'.\n\nSin embargo %PRODUCTNAME se encuentra en el modo 'en lnea'. Desea desconectar ahora %PRODUCTNAME?" ; Text [ french ] = "Cet abonnement ne peut tre lu que hors connexion.\n\n%PRODUCTNAME est cependant en ligne. Souhaitez-vous dconnecter %PRODUCTNAME maintenant?" ; - Text [ dutch ] = "Dit abonnement moet in offline modus worden gelezen.\n\n%PRODUCTNAME bevindt zich echter in de online-modus. Wilt u omschakelen naar offline-modus?" ; + Text [ dutch ] = "Dit abonnement moet in offlinemodus worden gelezen.\n\n%PRODUCTNAME bevindt zich echter in de onlinemodus. Wilt u omschakelen naar offlinemodus?" ; Text [ portuguese ] = "Esta subscrio foi definida para ser lida em offline.\n\nDe momento o %PRODUCTNAME encontra-se no modo online. Deseja passar ao modo offline? " ; - Text[ chinese_simplified ] = "ʹѻʽĶĵݡ\n\n%PRODUCTNAME ڴ״̬Ҫ %PRODUCTNAME תѻģʽ"; - Text[ russian ] = " , , Offline.\n\n%PRODUCTNAME Online. %PRODUCTNAME Offline?"; + Text[ chinese_simplified ] = "使用脱机方式阅读订阅的内容。\n\n%PRODUCTNAME 现在处于联机状态。您要让 %PRODUCTNAME 转到脱机模式？"; + Text[ russian ] = " .\n\n%PRODUCTNAME . %PRODUCTNAME ?"; Text[ polish ] = "Wedug ustawie ta subskrypcja ma zosta odczytana w trybie offline.\n\n %PRODUCTNAME znajduje si w trybie online. Czy przeczy na tryb offline?"; - Text[ japanese ] = "̍wǂ͵ײ Ӱނł̐ݒɏ]ēǂݎ܂B\n\n%PRODUCTNAME ݵײ ӰނɂȂĂ܂B%PRODUCTNAME ײ Ӱނɐ芷܂?"; - Text[ chinese_traditional ] = "ӳ]wϥΪ̨ϥu\\ŪҦC\n\n%PRODUCTNAME {bBuWACzn %PRODUCTNAME suҦH"; + Text[ japanese ] = "この購読はオフラインモード設定にもとづいて読み取られます。\n\n%PRODUCTNAME は現在オンラインモードになっています。%PRODUCTNAME をオフラインモードに切り換えますか。"; + Text[ chinese_traditional ] = "按照設定使用者使用離線閱讀模式。\n\n%PRODUCTNAME 現在處於線上狀態。您要讓 %PRODUCTNAME 轉到連線模式？"; Text[ arabic ] = " ߡ ʡ .\n\n%PRODUCTNAME . %PRODUCTNAME "; Text[ greek ] = " , , ' '.\n\n %PRODUCTNAME "; - Text[ korean ] = " 忡 о մϴ.\n\n%PRODUCTNAME () ¶ 忡 ֽϴ. ȯϽðڽϱ?"; + Text[ korean ] = "가입은 설정에 따라 오프라인 모드에서 읽어야 합니다.\n\n%PRODUCTNAME은(는) 현재 온라인 모드에 있습니다. 지금 오프라인 모드로 전환하겠습니까?"; Text[ turkish ] = "Bu yelik, evrimd kipte okunmak zere ayarlanmtr.\n\n%PRODUCTNAME u an evrimii kipinde. %PRODUCTNAME, evrimd kipe gesin mi?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Esta suscripcin se debe poder leer en modo desconectado (Offline).\n\n%PRODUCTNAME se encuentra sin embargo en modo en lnea. Desea cambiar %PRODUCTNAME al modo desconectado?"; + Text[ catalan ] = "Aquesta subscripci s'ha de poder llegir en mode desconnectat (Offline).\n\n%PRODUCTNAME es troba en mode en lnia. Voleu canviar el %PRODUCTNAME al mode desconnectat?"; Text[ finnish ] = "Tilaus on mritetty luettavaksi offline-tilassa.\n\n%PRODUCTNAME on kytettviss vain online-tilassa. Siirrytnk offline-tilaan?"; + Text[ thai ] = "กำหนดการอ่านการสมัครสมาชิกนี้ในโหมดไม่เชื่อมตรง\n\n%PRODUCTNAME อยู่ในโหมดเชื่อมตรงขณะนี้ สลับไปที่โหมดไม่เชื่อมตรงขณะนี้หรือไม่?"; }; String STR_FILTER_EXTERNAL { @@ -101,18 +102,19 @@ String STR_FILTER_EXTERNAL Text [ spanish ] = "Otra aplicacin" ; Text [ french ] = "Autres applications" ; Text [ dutch ] = "Andere toepassing" ; - Text[ chinese_simplified ] = "Ӧó"; + Text[ chinese_simplified ] = "其他的应用程序"; Text[ russian ] = " "; Text[ polish ] = "Inna aplikacja"; - Text[ japanese ] = "ق̱ع"; - Text[ chinese_traditional ] = "䥦ε{"; + Text[ japanese ] = "ほかのアプリケーション"; + Text[ chinese_traditional ] = "其它的應用程序"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "Ÿ α"; + Text[ korean ] = "기타 응용 프로그램"; Text[ turkish ] = "Dier uygulama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Otra aplicacin"; + Text[ catalan ] = "Una altra aplicaci"; Text[ finnish ] = "Muu sovellus"; + Text[ thai ] = "โปรแกรมประยุกต์อื่น"; }; String STR_FILTER_COMPONENT @@ -121,24 +123,25 @@ String STR_FILTER_COMPONENT Text [ english ] = "StarOffice Component" ; Text [ english_us ] = "%PRODUCTNAME Component" ; Text[ portuguese ] = "Componentes %PRODUCTNAME"; - Text[ russian ] = "%PRODUCTNAME - "; + Text[ russian ] = " %PRODUCTNAME"; Text[ greek ] = "%PRODUCTNAME - "; Text[ dutch ] = "%PRODUCTNAME component"; Text[ french ] = "Composants de %PRODUCTNAME"; - Text[ spanish ] = "%PRODUCTNAME Componentes"; + Text[ spanish ] = "%PRODUCTNAME - Componentes"; Text[ italian ] = "Componenti %PRODUCTNAME"; Text[ danish ] = "%PRODUCTNAME komponent"; Text[ swedish ] = "%PRODUCTNAME-komponent"; Text[ polish ] = "Skadnik %PRODUCTNAME "; Text[ portuguese_brazilian ] = "%PRODUCTNAME Component"; - Text[ japanese ] = "%PRODUCTNAME ߰"; - Text[ korean ] = "%PRODUCTNAME "; - Text[ chinese_simplified ] = "%PRODUCTNAME "; - Text[ chinese_traditional ] = "%PRODUCTNAME "; + Text[ japanese ] = "%PRODUCTNAME コンポーネント"; + Text[ korean ] = "%PRODUCTNAME 구성요소"; + Text[ chinese_simplified ] = "%PRODUCTNAME 组件"; + Text[ chinese_traditional ] = "%PRODUCTNAME 元件"; Text[ arabic ] = " %PRODUCTNAME"; Text[ turkish ] = "%PRODUCTNAME bileeni"; - Text[ catalan ] = "%PRODUCTNAME Componentes"; - Text[ finnish ] = "Tuotteen %PRODUCTNAME osa"; + Text[ catalan ] = "%PRODUCTNAME Components"; + Text[ finnish ] = "%PRODUCTNAMEn osa"; + Text[ thai ] = "ส่วนประกอบโปรแกรม%PRODUCTNAME "; }; String STR_FILTER_NOT_INSTALLED @@ -147,25 +150,26 @@ String STR_FILTER_NOT_INSTALLED Text [ English ] = " The selected filter $(FILTER) has not been installed.\nWould you like to do this now ?"; Text[ english_us ] = "The selected filter $(FILTER) has not been installed.\nWould you like to do this now ?"; Text[ portuguese ] = "O filtro seleccionado $(FILTER) no est instalado.\nInstalar agora?"; - Text[ russian ] = " $(FILTER) .\n ?"; - Text[ dutch ] = "De gekozen filter $(FILTER) is niet genstalleerd.\nWilt u dat nu doen ?"; + Text[ russian ] = " $(FILTER) .\n ?"; + Text[ dutch ] = "De gekozen filter $(FILTER) is niet genstalleerd.\nWilt u dat nu doen?"; Text[ french ] = "Le filtre $(FILTER) que vous avez slectionn n'est pas install\nSouhaitez-vous l'installer ?"; Text[ spanish ] = "El filtro seleccionado $(FILTER) no ha sido instalado.\nDesea instalarlo?"; Text[ italian ] = "Il filtro selezionato $(FILTER) non stato instalalto.\nVolete installarlo adesso?"; Text[ danish ] = "Det udvalgte filter $(FILTER) er ikke installeret.\nVil du installere det nu?"; - Text[ swedish ] = "Det utvalda filtret $(FILTER) r inte installerat.\nVill Du gra det nu?"; + Text[ swedish ] = "Det utvalda filtret $(FILTER) r inte installerat.\nVill du gra det nu?"; Text[ polish ] = "Wybrany filtr $(FILTER) nie jest zainstalowany.\nCzy to teraz zrobi ?"; Text[ portuguese_brazilian ] = "The selected filter $(FILTER) has not been installed.\nWould you like to do this now ?"; - Text[ japanese ] = "Iꂽ̨$(FILTER)ͲݽİقĂ܂B\nݽİقꂽł?"; - Text[ chinese_simplified ] = "ѡĹ $(FILTER)ûбװá\nҪװ"; - Text[ chinese_traditional ] = "zܪLo $(FILTER)٨Sw˦nC\n{bnwˡH"; + Text[ japanese ] = "選択されたフィルタ$(FILTER)はインストールされていません。\nこれをインストールされたいですか?"; + Text[ chinese_simplified ] = "您选择的转换器 $(FILTER)还没有被安装好。\n现在要安装？"; + Text[ chinese_traditional ] = "您選擇的轉換器 $(FILTER)還沒有安裝好。\n現在要安裝？"; Text[ arabic ] = " $(FILTER) .\n "; Text[ greek ] = " $(FILTER) .\n ;"; - Text[ korean ] = "õ $(FILTER)() ġǾ ʽϴ.\n ġ Ͻðڽϱ ?"; + Text[ korean ] = "선택된 필터 $(FILTER)은(는) 설치되어 있지 않습니다.\n지금 설치하겠습니까 ?"; Text[ turkish ] = "Seilen $(FILTER) filtresi kurulu deil.\nimdi kurmak ister misiniz ?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El filtro seleccionado $(FILTER) no ha sido instalado.\nDesea instalarlo?"; + Text[ catalan ] = "El filtre seleccionat $(FILTER) no ha estat instal.lat\nVoleu instal.lar-lo?"; Text[ finnish ] = "Valittua suodatinta $(FILTER) ei ole asennettu.\nHaluatko asentaa suodattimen nyt?"; + Text[ thai ] = "ยังไม่ได้ติดตั้งตัวกรองที่เลือก $(FILTER) \nคุณต้องการติดตั้งขณะนี้หรือไม่?"; }; String STR_FILTER_CONSULT_SERVICE @@ -174,25 +178,26 @@ String STR_FILTER_CONSULT_SERVICE Text [ English ] = "The selected filter $(FILTER) is not included in your edition.\nOrdering informations can be found on our website."; Text[ english_us ] = "The selected filter $(FILTER) is not included in your edition.\nYou can find information about orders on our homepage."; Text[ portuguese ] = "O filtro seleccionado $(FILTER) no est includo na sua verso.\nEncontrar as informaes necessrias para uma possvel encomenda na nossa pgina principal."; - Text[ russian ] = " $(FILTER) .\n ."; + Text[ russian ] = " $(FILTER) .\n ."; Text[ dutch ] = "De geselecteerde filter $(FILTER) komt in uw versie niet voor.\nVoor informatie over bestelmogelijkheden zie onze homepage."; Text[ french ] = "Le filtre $(FILTER) que vous avez slectionn n'est pas inclus dans votre version.\nVous trouverez les renseignements ncessaires une ventuelle commande sur notre page d'accueil."; Text[ spanish ] = "El filtro seleccionado $(FILTER) no est incluido en su edicin.\nEn nuestra pgina de Internet encontrar las informaciones para poder pedirlos."; Text[ italian ] = "Il filtro selezionato $(FILTER) non incluso nella vostra versione.\nTroverete informazioni su eventuali ordini sulla nostra home page."; Text[ danish ] = "De udvalgte filter $(FILTER) er ikke indeholdt i din version.\nDu kan finde informationer omkring ordremuligheder p vores hjemmeside."; - Text[ swedish ] = "Det utvalda filtret $(FILTER) r inte inkluderat i Din version.\nDu hittar information om bestllningsmjligheter p vr hemsida."; + Text[ swedish ] = "Det utvalda filtret $(FILTER) finns inte med i din version.\nDu hittar information om bestllningsmjligheter p vr hemsida."; Text[ polish ] = "Wybrany filtr $(FILTER) nie jest zawarty w twoim edytorze. \nInformacje dotyczce zamwienia znajdziesz na naszej stronie macierzystej."; Text[ portuguese_brazilian ] = "The selected filter $(FILTER) is not included in your version.\nPlease contact our sales department."; - Text[ japanese ] = "Iꂽ̨$(FILTER)հް̎gpłɊ܂܂Ă܂B\n\\ȏ͂킪Ђΰ߰Ŏɓ܂B"; - Text[ chinese_simplified ] = "汾ûṩѡĹ $(FILTER)\nǹ˾ҳṩϢ"; - Text[ chinese_traditional ] = "oӪ٨SѱzҿܪLo $(FILTER)C\nаѾ\\ڭ̪Ѫwʳn骺TC"; + Text[ japanese ] = "選択されたフィルタ$(FILTER)はユーザーの使用版に含まれてません。\n注文可能な情報はわが社のホームペーシで手に入れられます。"; + Text[ chinese_simplified ] = "这个版本还没有提供您所选择的转换器 $(FILTER)。\n您参阅我们公司的网页提供定购软件的信息。"; + Text[ chinese_traditional ] = "這個版本還沒有提供您選擇的轉換器 $(FILTER)。\n請參閱我們的網頁提供的定購軟體的資訊。"; Text[ arabic ] = " $(FILTER) .\n ."; Text[ greek ] = " $(FILTER) .\n ."; - Text[ korean ] = " $(FILTER)() ʽϴ.\nֹ û Ȩ ʽÿ."; + Text[ korean ] = "선택한 필터$(FILTER)은(는) 이 버전에 들어 있지 않습니다.\n주문 신청 방법에 대한 정보를 얻으려면 저희 홈페이지를 보십시오."; Text[ turkish ] = "Seilen $(FILTER) filtresi srmnzde bulunmuyor.\nSipari etmek iin gereken bilgileri web sitemizde bulabilirsiniz."; Text[ language_user1 ] = " "; - Text[ catalan ] = "El filtro seleccionado $(FILTER) no est incluido en su edicin.\nEn nuestra pgina de Internet encontrar las informaciones para poder pedirlos."; + Text[ catalan ] = "El filtre seleccionat $(FILTER) no est incls en aquesta edici.\nEn la nostra pgina d'Internet trobareu la informaci per poder demanar-los."; Text[ finnish ] = "Valittu suodatin $(FILTER) ei sislly laitokseen.\nTilausohjeet ovat kotisivullamme."; + Text[ thai ] = "ตัวกรองที่เลือก $(FILTER) ไม่อยู่ในฉบับของคุณ\nคุณสามารถหาข้อมูลเกี่ยวกับคำสั่งบนโฮมเพจของเรา"; }; @@ -200,3 +205,17 @@ String STR_FILTER_CONSULT_SERVICE + + + + + + + + + + + + + + diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 8b240182d3ca..6b3c7142d61e 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmhtmlw.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mib $ $Date: 2001-07-03 07:47:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -521,8 +521,9 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( if( pSh ) aURL = CreateDataURL( pSh, pFSet, pTopFrame ); } - if( !aURL.Len() ) aURL = bFlatten ? pFrame->GetActualURL().GetMainURL() : - pFrame->GetURL().GetMainURL(); + if( !aURL.Len() ) aURL = bFlatten ? + pFrame->GetActualURL().GetMainURL( INetURLObject::DECODE_TO_IURI ) : + pFrame->GetURL().GetMainURL( INetURLObject::DECODE_TO_IURI ); if( aURL.Len() ) { if( !bFlatten ) aURL = INetURLObject::AbsToRel( aURL ); diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 370ed48110c3..cfa960abb3f3 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hro $ $Date: 2001-09-26 10:14:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -171,13 +171,13 @@ sal_Bool SfxContentHelper::Transfer_Impl( const String& rSource, const String& r try { - Content aDestPath( aDestObj.GetMainURL(), Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); + Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); OUString aTransferName = OUString::createFromAscii( "transfer" ); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, makeAny( - ::com::sun::star::ucb::TransferInfo( bMoveData, aSourceObj.GetMainURL(), aName, nNameClash ) ) ); + ::com::sun::star::ucb::TransferInfo( bMoveData, aSourceObj.GetMainURL( INetURLObject::NO_DECODE ), aName, nNameClash ) ) ); } else { @@ -818,7 +818,7 @@ sal_Bool SfxContentHelper::MakeFolder( const String& rFolder ) sal_Bool bRet = sal_False; try { - Content aCnt( aURL.GetMainURL(), aCmdEnv ); + Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ); Content aNewFolder; OUString aType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.staroffice.fsys-folder" ) ); bRet = aCnt.insertNewContent( aType, aNames, aValues, aNewFolder ); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 9b1f5f449e6d..ce5bbdda57dd 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -2,9 +2,9 @@ * * $RCSfile: progress.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: obo $ $Date: 2002-11-26 16:43:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -198,8 +198,8 @@ struct SfxProgress_Impl : public SfxCancellable #define aTypeLibInfo aProgressTypeLibImpl //======================================================================== - -static inline ULONG Get10ThSec() +#if (_MSC_VER < 1300) +inline ULONG Get10ThSec() { #if defined (MSC) && defined (WIN) ULONG n10Ticks = 10 * (ULONG)GetTickCount(); @@ -209,7 +209,9 @@ static inline ULONG Get10ThSec() return n10Ticks / CLOCKS_PER_SEC; } - +#else +extern ULONG Get10ThSec(); +#endif // ----------------------------------------------------------------------- void SfxProgress_Impl::Enable_Impl( BOOL bEnable ) diff --git a/sfx2/source/config/config.src b/sfx2/source/config/config.src index 12310f0d550f..56bcb0d684d7 100644 --- a/sfx2/source/config/config.src +++ b/sfx2/source/config/config.src @@ -2,9 +2,9 @@ * * $RCSfile: config.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2002-09-05 17:04:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ String STR_EVENTCONFIG Text [ portuguese ] = "Atribuir eventos" ; Text [ portuguese_brazilian ] = "Ereigniszuordnung" ; Text[ chinese_simplified ] = "指定事件"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Przyporzdkowanie wydarze"; Text[ japanese ] = "イベントの指定"; Text[ chinese_traditional ] = "設定動作"; @@ -86,8 +86,9 @@ String STR_EVENTCONFIG Text[ korean ] = "이벤트 지정"; Text[ turkish ] = "Olay ata"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Asignar acontecimientos"; + Text[ catalan ] = "Assigna els esdeveniments"; Text[ finnish ] = "Liit tapahtumat"; + Text[ thai ] = "กำหนดเหตุการณ์"; }; String STR_FILTERNAME_CFG { @@ -103,7 +104,7 @@ String STR_FILTERNAME_CFG Text [ portuguese ] = "Configurao" ; Text [ portuguese_brazilian ] = "Konfiguration" ; Text[ chinese_simplified ] = "配置"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Konfiguracja"; Text[ japanese ] = "設定"; Text[ chinese_traditional ] = "配置"; @@ -111,11 +112,12 @@ String STR_FILTERNAME_CFG Text[ dutch ] = "Configuratie"; Text[ chinese_simplified ] = "配置"; Text[ greek ] = ""; - Text[ korean ] = "구성"; + Text[ korean ] = "설정"; Text[ turkish ] = "Konfigrasyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configuracin"; + Text[ catalan ] = "Configuraci"; Text[ finnish ] = "Kokoonpano"; + Text[ thai ] = "โครงแบบ"; }; QueryBox DLG_MACROQUERY @@ -145,7 +147,7 @@ QueryBox DLG_MACROQUERY Title[ turkish ] = "Makroyu altr"; Title[ language_user1 ] = " "; Title[ catalan ] = "Ejecutar macro"; - Title[ finnish ] = "Suorita makro"; + Title[ finnish ] = "Run Macro"; Message = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; Message [English] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; @@ -178,6 +180,7 @@ QueryBox DLG_MACROQUERY Text[ language_user1 ] = " "; Text[ catalan ] = "Ejecutar"; Text[ finnish ] = "Suorita"; + Text[ thai ] = "Run"; }; String BTN_CANCEL { @@ -206,6 +209,7 @@ QueryBox DLG_MACROQUERY Text[ language_user1 ] = " "; Text[ catalan ] = "No ejecutar"; Text[ finnish ] = "l suorita"; + Text[ thai ] = "Do Not Run"; }; String FT_CANCEL { @@ -213,12 +217,12 @@ QueryBox DLG_MACROQUERY Text [english] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; Text [english_us] = "According to the security settings, this macro should not be run. Do you want to run it anyway?"; Text[ portuguese ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; - Text[ russian ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; + Text[ russian ] = " . , ?"; Text[ greek ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; - Text[ dutch ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; + Text[ dutch ] = "Volgens de beveiligingsopties mag deze macro niet worden uitgevoerd. Wilt u de macro toch uitvoeren?"; Text[ french ] = "Les paramtres de scurit n'autorisent normalement pas l'excution de cette macro. Excuter quand mme ?"; Text[ spanish ] = "Por razones de seguridad no se debera ejecutar esta macro. Desea ejecutarla a pesar de ello?"; - Text[ finnish ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; + Text[ finnish ] = "Suojausasetusten mukaan tt makroa ei tulisi suorittaa. Suoritetaanko se siit huolimatta?"; Text[ italian ] = "In base alle impostazioni di sicurezza questa macro non dev'essere eseguita. Volete eseguirla comunque?"; Text[ danish ] = "Iflge sikkerhedsindstillingerne skal denne makro ikke udfres. Vil du alligevel udfre den?"; Text[ swedish ] = "Enligt skerhetsinstllningarna ska det hr makrot inte kras. Vill du kra det i alla fall?"; @@ -231,6 +235,7 @@ QueryBox DLG_MACROQUERY Text[ turkish ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; Text[ arabic ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; Text[ catalan ] = "Nach den Sicherheitseinstellungen soll dieses Makro nicht ausgefhrt werden. Mchten Sie es trotzdem ausfhren?"; + Text[ thai ] = "According to the security settings, this macro should not be run. Do you want to run it anyway?"; }; String FT_OK { @@ -238,12 +243,12 @@ QueryBox DLG_MACROQUERY Text [english] = "Mchten Sie dieses Makro ausfhren?"; Text [english_us] = "Do you want to run the macro?"; Text[ portuguese ] = "Mchten Sie dieses Makro ausfhren?"; - Text[ russian ] = "Mchten Sie dieses Makro ausfhren?"; + Text[ russian ] = " ?"; Text[ greek ] = "Mchten Sie dieses Makro ausfhren?"; - Text[ dutch ] = "Mchten Sie dieses Makro ausfhren?"; + Text[ dutch ] = "Wilt u deze macro uitvoeren?"; Text[ french ] = "Excuter cette macro ?"; Text[ spanish ] = "Desea ejecutar esta macro?"; - Text[ finnish ] = "Mchten Sie dieses Makro ausfhren?"; + Text[ finnish ] = "Haluatko suorittaa makron?"; Text[ italian ] = "Volete eseguire questa macro?"; Text[ danish ] = "Vil du udfre denne makro?"; Text[ swedish ] = "Vill du kra det hr makrot?"; @@ -256,19 +261,20 @@ QueryBox DLG_MACROQUERY Text[ turkish ] = "Mchten Sie dieses Makro ausfhren?"; Text[ arabic ] = "Mchten Sie dieses Makro ausfhren?"; Text[ catalan ] = "Mchten Sie dieses Makro ausfhren?"; + Text[ thai ] = "Do you want to run the macro?"; }; Message[ portuguese ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; - Message[ russian ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; + Message[ russian ] = " , $(MACRO). $(TEXT)"; Message[ greek ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; - Message[ dutch ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; + Message[ dutch ] = "Er is een gebeurtenis aangeroepen waarvoor de macro $(MACRO) is geconfigureerd. $(TEXT)"; Message[ french ] = "Le dclenchement d'un vnement a eu lieu en rapport avec la macro $(MACRO). $(TEXT)"; Message[ spanish ] = "Se ha producido el evento para el cual se configur la macro $(MACRO). $(TEXT)"; - Message[ finnish ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; + Message[ finnish ] = "Kynnistyi tapahtuma, johon makro $(MACRO) kuuluu. $(TEXT)"; Message[ italian ] = "Si verificato l'evento per cui stata configurata la macro $(MACRO). $(TEXT)"; Message[ danish ] = "Der er aktiveret en begivenhed, hvortil makroen $(MACRO) er konfigureret. $(TEXT)"; Message[ swedish ] = "En hndelse utlstes fr vilken makrot $(MACRO) har konfigurerats. $(TEXT)"; Message[ polish ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; - Message[ portuguese_brazilian ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; + Message[ portuguese_brazilian ] = "Um evento foi iniciado no qual a macro $(MACRO) pertence. $(TEXT)"; Message[ japanese ] = "マクロ $(MACRO) で設定されているイベントが作動しました。$(TEXT)"; Message[ korean ] = "매크로 $(MACRO)가 구성되어 있는 이벤트가 작동되었습니다. $(TEXT)"; Message[ chinese_simplified ] = "已经引发这个宏 $(MACRO) 设定好的事件。$(TEXT)"; @@ -276,6 +282,8 @@ QueryBox DLG_MACROQUERY Message[ turkish ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; Message[ arabic ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; Message[ catalan ] = "Es wurde ein Ereignis ausgelst, auf das das Makro $(MACRO) konfiguriert ist. $(TEXT)"; + Message[ thai ] = "An event was triggered to which the macro $(MACRO) belongs. $(TEXT)"; + Title[ thai ] = "Run Macro"; }; @@ -283,3 +291,8 @@ QueryBox DLG_MACROQUERY + + + + + diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 9a2e6050ef02..9c8a00aeac0e 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: evntconf.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-06-19 17:13:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,7 @@ #include <com/sun/star/uno/Any.hxx> #include <framework/eventsconfiguration.hxx> +#include <comphelper/processfactory.hxx> #include "evntconf.hxx" @@ -277,10 +278,14 @@ SfxEventConfiguration::SfxEventConfiguration() pEventArr->Insert(pEvent, 0); } -SfxEventConfigItem_Impl* SfxEventConfiguration::GetAppEventConfig() +SfxEventConfigItem_Impl* SfxEventConfiguration::GetAppEventConfig_Impl() { if ( !pAppEventConfig ) + { pAppEventConfig = new SfxEventConfigItem_Impl( SFX_ITEMTYPE_APPEVENTCONFIG, this ); + pAppEventConfig->Initialize(); + } + return pAppEventConfig; } @@ -354,59 +359,6 @@ USHORT SfxEventConfiguration::GetEventId(const String& rName) const return SFX_NO_EVENT; } -void SfxEventConfiguration::ConfigureEvent( USHORT nId, const String& rMacro, SfxObjectShell *pObjSh ) -{ - String aLibrary, aModule, aFunction; - if ( STRING_NOTFOUND == rMacro.Search( '(' ) ) - { - // interne Syntax: Library.Module.Function - aFunction = rMacro.GetToken( 2, '.' ); - aModule = rMacro.GetToken( 1, '.' ); - aLibrary = rMacro.GetToken( 0, '.' ); - } - else - { - // UI-Syntax: Function(Library.Module) - aFunction = rMacro.GetToken( 0, '(' ); - String aModLib( rMacro.GetToken( 1, '(' ) ); - aLibrary = aModLib.GetToken( 0, '.' ); - aModule = aModLib.GetToken( 1, '.' ).GetToken( 0, ')' ); - } - - //Ist ein DocBasic-Macro oder nicht ? - BOOL bDocBasic = FALSE; - if ( pObjSh ) - { - BasicManager *pMgr = pObjSh->GetBasicManager(); - StarBASIC* pLib = pMgr->GetLib( aLibrary ); - if ( pLib ) - { - SbModule* pMod = - pLib->FindModule( aModule ); - if ( pMod && pMod->GetMethods()->Find( aFunction, SbxCLASS_METHOD ) ) - bDocBasic = TRUE; - } - } - - // Event konfigurieren - String aCode( aLibrary ); - if ( aCode.Len() ) - { - aCode += '.'; - aCode += aModule; - aCode += '.'; - aCode += aFunction; - } - - String aBasic; - if( bDocBasic ) - aBasic = pObjSh->GetTitle(); - else - aBasic = SFX_APP()->GetName(); - SvxMacro aMacro( aCode, aBasic, STARBASIC ); - ConfigureEvent( nId, aMacro, pObjSh ); -} - void SfxEventConfiguration::ConfigureEvent( USHORT nId, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { if ( bIgnoreConfigure ) @@ -417,14 +369,15 @@ void SfxEventConfiguration::ConfigureEvent( USHORT nId, const SvxMacro& rMacro, pMacro = new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(), rMacro.GetScriptType() ); if ( pDoc ) { - pDocEventConfig = pDoc->GetEventConfig_Impl( TRUE ); - pDocEventConfig->ConfigureEvent( nId, pMacro ); + //pDocEventConfig = pDoc->GetEventConfig_Impl( TRUE ); + //pDocEventConfig->ConfigureEvent( nId, pMacro ); PropagateEvent_Impl( pDoc, nId, pMacro ); } else { // globale Bindung - GetAppEventConfig()->ConfigureEvent( nId, pMacro ); + //GetAppEventConfig_Impl()->ConfigureEvent( nId, pMacro ); + PropagateEvent_Impl( NULL, nId, pMacro ); } } @@ -439,7 +392,7 @@ void SfxEventConfiguration::ExecuteEvent( if ( pDoc && pDoc->GetEventConfig_Impl() && pDoc->GetEventConfig_Impl()->aMacroTable.Seek( nId ) ) return; - const SvxMacro* pMacro = GetAppEventConfig()->aMacroTable.Seek( nId ); + const SvxMacro* pMacro = GetAppEventConfig_Impl()->aMacroTable.Seek( nId ); if ( pMacro ) { if ( bSynchron ) @@ -462,7 +415,7 @@ const SvxMacro* SfxEventConfiguration::GetMacroForEventId if ( pDocEventConfig ) pMacro = pDocEventConfig->aMacroTable.Seek( nId ); if ( !pMacro ) - pMacro = GetAppEventConfig()->aMacroTable.Seek( nId ); + pMacro = GetAppEventConfig_Impl()->aMacroTable.Seek( nId ); return pMacro; } @@ -479,7 +432,7 @@ const SfxMacroInfo* SfxEventConfiguration::GetMacroInfo if ( pDocEventConfig ) pMacro = pDocEventConfig->aMacroTable.Seek( nId ); if ( !pMacro ) - pMacro = const_cast< SfxEventConfiguration* >(this)->GetAppEventConfig()->aMacroTable.Seek( nId ); + pMacro = const_cast< SfxEventConfiguration* >(this)->GetAppEventConfig_Impl()->aMacroTable.Seek( nId ); return SFX_APP()->GetMacroConfig()->GetMacroInfo_Impl( pMacro ); } @@ -493,8 +446,9 @@ SfxEventConfigItem_Impl::SfxEventConfigItem_Impl( USHORT nConfigId, , aMacroTable( 2, 2 ) , pEvConfig( pCfg ) , pObjShell( pObjSh ) + , bInitialized( FALSE ) { - Initialize(); + bInitialized = TRUE; } /* @@ -516,6 +470,7 @@ int SfxEventConfigItem_Impl::Load(SvStream& rStream) if ( nFileVersion < nCompatVersion || nFileVersion > nVersion ) return SfxConfigItem::WARNING_VERSION; + SvxMacroTableDtor aLocalMacroTable; if ( nFileVersion <= nOldVersion ) { if ( nFileVersion > nCompatVersion ) @@ -528,7 +483,6 @@ int SfxEventConfigItem_Impl::Load(SvStream& rStream) else bWarning = bAlwaysWarning = FALSE; - aMacroTable.DelDtor(); USHORT nCount, nEventCount = pEvConfig->GetEventCount(); rStream >> nCount; @@ -545,7 +499,7 @@ int SfxEventConfigItem_Impl::Load(SvStream& rStream) if ( nEventId == nId ) { SvxMacro *pMacro = new SvxMacro( aInfo.GetQualifiedName(), aInfo.GetBasicName(), STARBASIC ); - aMacroTable.Insert( nEventId, pMacro ); + aLocalMacroTable.Insert( nEventId, pMacro ); break; } } @@ -557,11 +511,11 @@ int SfxEventConfigItem_Impl::Load(SvStream& rStream) rStream >> nWarn; bWarning = ( nWarn & 0x01 ) != 0; bAlwaysWarning = ( nWarn & 0x02 ) != 0; - aMacroTable.Read( rStream ); + aLocalMacroTable.Read( rStream ); } if ( pObjShell && pEvConfig ) - pEvConfig->PropagateEvents_Impl( pObjShell, *pEvConfig->GetDocEventTable( pObjShell ) ); + pEvConfig->PropagateEvents_Impl( pObjShell, aLocalMacroTable ); return SfxConfigItem::ERR_OK; } @@ -577,10 +531,12 @@ BOOL SfxEventConfigItem_Impl::LoadXML( SvStream& rInStream ) SvxMacro* pMacro = SfxEvents_Impl::ConvertToMacro( aCfg.aEventsProperties[i], NULL ); USHORT nID = (USHORT) SfxEventConfiguration::GetEventId_Impl( aCfg.aEventNames[i] ); if ( nID && pMacro ) - ConfigureEvent( nID, pMacro ); + pEvConfig->PropagateEvent_Impl( pObjShell, nID, pMacro ); else DBG_ERROR("Suspicious event binding!"); } + + return TRUE; } return FALSE; @@ -616,7 +572,20 @@ BOOL SfxEventConfigItem_Impl::StoreXML( SvStream& rOutStream ) for ( i=0; i<nNamesCount; i++ ) pNames[i] = aEventNames.GetString( (USHORT) i); + REFERENCE< XEVENTSSUPPLIER > xSupplier; + if ( pObjShell ) + { + xSupplier = REFERENCE< XEVENTSSUPPLIER >( pObjShell->GetModel(), UNO_QUERY ); + } + else + { + xSupplier = REFERENCE< XEVENTSSUPPLIER > + ( ::comphelper::getProcessServiceFactory()->createInstance( + rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY ); + } + // fill in the bindings + REFERENCE< XNAMEREPLACE > xEvents = xSupplier->getEvents(); SvxMacroTableDtor& rTable = aMacroTable; long nCount = (long) rTable.Count(); for ( i=0; i<nCount; i++ ) @@ -631,8 +600,9 @@ BOOL SfxEventConfigItem_Impl::StoreXML( SvStream& rOutStream ) if ( aSequence[n] == aEventName ) { // create properties from macro - SvxMacro* pMacro = rTable.GetObject( i ); - aData[n] = pEvConfig->CreateEventData_Impl( pMacro ); + //SvxMacro* pMacro = rTable.GetObject( i ); + //aData[n] = pEvConfig->CreateEventData_Impl( pMacro ); + aData[n] = xEvents->getByName( aEventName ); break; } } @@ -664,6 +634,7 @@ void SfxEventConfigItem_Impl::UseDefault() aMacroTable.DelDtor(); SetDefault( TRUE ); + pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable ); } int SfxEventConfigItem_Impl::Load( SotStorage& rStorage ) @@ -672,7 +643,18 @@ int SfxEventConfigItem_Impl::Load( SotStorage& rStorage ) if ( xStream->GetError() ) return SfxConfigItem::ERR_READ; else - return LoadXML( *xStream ); + { + if ( bInitialized ) + { + aMacroTable.DelDtor(); + pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable ); + } + + if ( LoadXML( *xStream ) ) + return SfxConfigItem::ERR_OK; + else + return SfxConfigItem::ERR_READ; + } } BOOL SfxEventConfigItem_Impl::Store( SotStorage& rStorage ) @@ -717,7 +699,7 @@ void SfxEventConfiguration::AddEvents( SfxMacroTabPage* pPage ) const SvxMacroTableDtor* SfxEventConfiguration::GetAppEventTable() { - return &GetAppEventConfig()->aMacroTable; + return &GetAppEventConfig_Impl()->aMacroTable; } SvxMacroTableDtor* SfxEventConfiguration::GetDocEventTable( SfxObjectShell*pDoc ) @@ -730,8 +712,9 @@ SvxMacroTableDtor* SfxEventConfiguration::GetDocEventTable( SfxObjectShell*pDoc void SfxEventConfiguration::SetAppEventTable( const SvxMacroTableDtor& rTable ) { - GetAppEventConfig()->aMacroTable = rTable; - pAppEventConfig->SetDefault(FALSE); + //GetAppEventConfig_Impl()->aMacroTable = rTable; + //pAppEventConfig->SetDefault(FALSE); + PropagateEvents_Impl( NULL, rTable ); } void SfxEventConfiguration::SetDocEventTable( SfxObjectShell *pDoc, @@ -740,8 +723,8 @@ void SfxEventConfiguration::SetDocEventTable( SfxObjectShell *pDoc, if ( pDoc ) { pDocEventConfig = pDoc->GetEventConfig_Impl( TRUE ); - pDocEventConfig->aMacroTable = rTable; - pDocEventConfig->SetDefault(FALSE); + //pDocEventConfig->aMacroTable = rTable; + //pDocEventConfig->SetDefault(FALSE); pDoc->SetModified(TRUE); PropagateEvents_Impl( pDoc, rTable ); } @@ -753,7 +736,17 @@ void SfxEventConfiguration::SetDocEventTable( SfxObjectShell *pDoc, void SfxEventConfiguration::PropagateEvents_Impl( SfxObjectShell *pDoc, const SvxMacroTableDtor& rTable ) { - REFERENCE< XEVENTSSUPPLIER > xSupplier( pDoc->GetModel(), UNO_QUERY ); + REFERENCE< XEVENTSSUPPLIER > xSupplier; + if ( pDoc ) + { + xSupplier = REFERENCE< XEVENTSSUPPLIER >( pDoc->GetModel(), UNO_QUERY ); + } + else + { + xSupplier = REFERENCE< XEVENTSSUPPLIER > + ( ::comphelper::getProcessServiceFactory()->createInstance( + rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY ); + } if ( xSupplier.is() ) { @@ -823,7 +816,17 @@ void SfxEventConfiguration::PropagateEvent_Impl( SfxObjectShell *pDoc, USHORT nId, const SvxMacro* pMacro ) { - REFERENCE< XEVENTSSUPPLIER > xSupplier( pDoc->GetModel(), UNO_QUERY ); + REFERENCE< XEVENTSSUPPLIER > xSupplier; + if ( pDoc ) + { + xSupplier = REFERENCE< XEVENTSSUPPLIER >( pDoc->GetModel(), UNO_QUERY ); + } + else + { + xSupplier = REFERENCE< XEVENTSSUPPLIER > + ( ::comphelper::getProcessServiceFactory()->createInstance( + rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY ); + } if ( xSupplier.is() ) { @@ -890,6 +893,37 @@ ANY SfxEventConfiguration::CreateEventData_Impl( const SvxMacro *pMacro ) aEventData <<= aProperties; } + else if ( pMacro->GetScriptType() == EXTENDED_STYPE ) + { + SEQUENCE < PROPERTYVALUE > aProperties(2); + PROPERTYVALUE *pValues = aProperties.getArray(); + + OUSTRING aLib = pMacro->GetLibName(); + OUSTRING aMacro = pMacro->GetMacName(); + + pValues[ 0 ].Name = OUSTRING::createFromAscii( PROP_EVENT_TYPE ); + pValues[ 0 ].Value <<= aLib; + + pValues[ 1 ].Name = OUSTRING::createFromAscii( PROP_SCRIPT ); + pValues[ 1 ].Value <<= aMacro; + + aEventData <<= aProperties; + } + else if ( pMacro->GetScriptType() == JAVASCRIPT ) + { + SEQUENCE < PROPERTYVALUE > aProperties(2); + PROPERTYVALUE *pValues = aProperties.getArray(); + + OUSTRING aMacro = pMacro->GetMacName(); + + pValues[ 0 ].Name = OUSTRING::createFromAscii( PROP_EVENT_TYPE ); + pValues[ 0 ].Value <<= ::rtl::OUString::createFromAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT); + + pValues[ 1 ].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME ); + pValues[ 1 ].Value <<= aMacro; + + aEventData <<= aProperties; + } else { DBG_ERRORFILE( "CreateEventData_Impl(): ScriptType not supported!"); @@ -1084,7 +1118,7 @@ BOOL SfxEventConfiguration::Import( SvStream& rInStream, SvStream* pOutStream, S else if ( pOutStream ) { SfxEventConfiguration aConfig; - if ( aConfig.GetAppEventConfig()->Load( rInStream ) == SfxConfigItem::ERR_OK ) + if ( aConfig.GetAppEventConfig_Impl()->Load( rInStream ) == SfxConfigItem::ERR_OK ) return aConfig.pAppEventConfig->StoreXML( *pOutStream ); return FALSE; } @@ -1097,7 +1131,6 @@ BOOL SfxEventConfiguration::Export( SvStream* pInStream, SvStream& rOutStream, S { if ( pDoc ) { - // load events, they are automatically propagated to the document DBG_ASSERT( !pInStream, "DocEventConfig can't be converted!" ); SfxEventConfigItem_Impl* pCfg = pDoc->GetEventConfig_Impl(); if ( pCfg ) @@ -1108,7 +1141,7 @@ BOOL SfxEventConfiguration::Export( SvStream* pInStream, SvStream& rOutStream, S else if ( pInStream ) { SfxEventConfiguration aConfig; - if ( aConfig.GetAppEventConfig()->LoadXML( *pInStream ) ) + if ( aConfig.GetAppEventConfig_Impl()->LoadXML( *pInStream ) ) return aConfig.pAppEventConfig->Store( rOutStream ); return FALSE; } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index aea3724138ec..bcda9b45e311 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -2,8 +2,8 @@ * * $RCSfile: bindings.cxx,v $ * - * $Revision: 1.22 $ - * last change: $Author: mba $ $Date: 2002-09-18 16:09:13 $ + * $Revision: 1.23 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1989,8 +1989,7 @@ void SfxBindings::UpdateControllers_Impl eState = SfxControllerItem::GetItemState( pEnumItem ); // "uber alle Slaves-Slots iterieren - for ( const SfxSlot *pSlave = pFirstSlave; pSlave; - pSlave = pSlave->GetNextSlot() ) + for ( const SfxSlot *pSlave = pFirstSlave; pSlave; pSlave = pSlave->GetNextSlot() ) { DBG_ASSERT(pSlave, "Falsche SlaveSlot-Verkettung!"); DBG_ASSERT(SFX_KIND_ENUM == pSlave->GetKind(),"non enum slaves aren't allowed"); @@ -2014,11 +2013,7 @@ void SfxBindings::UpdateControllers_Impl continue; } - if ( SFX_ITEM_DISABLED == eState -#ifdef OV_hat_das_SvxChooseControlItem_angepasst - || USHRT_MAX == pEnumItem->GetPosByValue(pEnumCache->GetValue()) -#endif - ) + if ( SFX_ITEM_DISABLED == eState || !pEnumItem->IsEnabled( pSlave->GetSlotId()) ) { // disabled pEnumCache->SetState(SFX_ITEM_DISABLED, 0); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 876b00639055..126834d79f6a 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dispatch.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: mba $ $Date: 2002-10-08 16:04:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,6 +129,7 @@ #include "topfrm.hxx" #include "sfxuno.hxx" #include "cfgmgr.hxx" +#include "docfile.hxx" //================================================================== DBG_NAME(SfxDispatcherFlush); @@ -289,15 +290,18 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest xFrame, com::sun::star::uno::UNO_QUERY); - com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString::createFromAscii("DispatchRecorderSupplier")); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; - aProp >>= xSupplier; - if(xSupplier.is()) - xRecorder = xSupplier->getDispatchRecorder(); - - if ( bRecord && xRecorder.is() && !rSlot.IsMode(SFX_SLOT_NORECORD) ) - rReq.Record_Impl( rShell, rSlot, xRecorder, GetFrame() ); + if ( xSet.is() ) + { + com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString::createFromAscii("DispatchRecorderSupplier")); + com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; + com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + aProp >>= xSupplier; + if(xSupplier.is()) + xRecorder = xSupplier->getDispatchRecorder(); + + if ( bRecord && xRecorder.is() && !rSlot.IsMode(SFX_SLOT_NORECORD) ) + rReq.Record_Impl( rShell, rSlot, xRecorder, GetFrame() ); + } } // ggf. die Bindings locken (MI: warum?) @@ -1917,6 +1921,17 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, if ( nFeature && !pShell->HasUIFeature( nFeature ) ) continue; + // check for toolboxes that are exclusively for a viewer + if ( pImp->pFrame) + { + BOOL bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER ); + SfxObjectShell* pSh = pImp->pFrame->GetObjectShell(); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + BOOL bIsViewer = pItem && pItem->GetValue(); + if ( bIsViewer != bViewerTbx ) + continue; + } + // Auf jeden Fall eintragen, auch wenn unsichtbar. Dann kann // WorkWindow anbieten, wieder anzuschalten sal_Bool bVisible = pIFace->IsObjectBarVisible(nNo); @@ -2940,6 +2955,17 @@ void SfxDispatcher::ShowObjectBar(sal_uInt16 nId, SfxShell *pShell) const if ( nFeature && !pShell->HasUIFeature( nFeature ) ) return; + // check for toolboxes that are exclusively for a viewer + if ( pImp->pFrame) + { + BOOL bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER ); + SfxObjectShell* pSh = pImp->pFrame->GetObjectShell(); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + BOOL bIsViewer = pItem && pItem->GetValue(); + if ( bIsViewer != bViewerTbx ) + return; + } + sal_Bool bVisible = pIFace->IsObjectBarVisible(nNo); if ( !bVisible ) // Alle Sichtbarkeitsflags ausschalten @@ -3109,7 +3135,7 @@ sal_Bool SfxDispatcher::IsReadOnlyShell_Impl( sal_uInt16 nShell ) const if ( nShell < nShellCount ) { SfxShell* pShell = pImp->aStack.Top( nShell ); - if( pShell->ISA( SfxModule ) || pShell->ISA( SfxApplication ) ) + if( pShell->ISA( SfxModule ) || pShell->ISA( SfxApplication ) || pShell->ISA( SfxViewFrame ) ) return sal_False; else return pImp->bReadOnly; @@ -3321,6 +3347,17 @@ sal_uInt16 SfxDispatcher::GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType if ( nFeature && !pShell->HasUIFeature( nFeature ) ) continue; + // check for toolboxes that are exclusively for a viewer + if ( pImp->pFrame) + { + BOOL bViewerTbx = SFX_VISIBILITY_VIEWER == ( nP & SFX_VISIBILITY_VIEWER ); + SfxObjectShell* pSh = pImp->pFrame->GetObjectShell(); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + BOOL bIsViewer = pItem && pItem->GetValue(); + if ( bIsViewer != bViewerTbx ) + continue; + } + // Kommt sie nach der aktuellen ? if ( bFound ) { diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index ce8015361e26..aeacd56f5605 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: macrconf.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-06-27 08:01:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -242,6 +242,9 @@ SfxMacroInfo::SfxMacroInfo( const String& rURL ) : aLibName = aTmp.GetToken( 0, '.' ); aModuleName = aTmp.GetToken( 1, '.' ); aMethodName = aTmp.GetToken( 2, '.' ); + + // Remove arguments to be compatible + aMethodName.SearchAndReplaceAscii( "()", String(), std::max( aMethodName.Len()-2, 0 )); } } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 7078c3506bd1..df49b0a67a23 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shell.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mba $ $Date: 2002-09-06 12:44:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1430,16 +1430,19 @@ const SvVerbList* SfxShell::GetVerbs() const void SfxShell::VerbExec(SfxRequest& rReq) { USHORT nId = rReq.GetSlot(); - SfxViewShell *pViewShell = SfxViewShell::Current(); - const SvVerbList* pList = pViewShell->GetVerbs(); - - for (USHORT n=0; n<pList->Count(); n++) + SfxViewShell *pViewShell = GetViewShell(); + if ( pViewShell ) { - if (nId == SID_VERB_START + n) + const SvVerbList* pList = pViewShell->GetVerbs(); + + for (USHORT n=0; n<pList->Count(); n++) { - pViewShell->DoVerb((*pList)[n].GetId()); - rReq.Done(); - return; + if (nId == SID_VERB_START + n) + { + pViewShell->DoVerb((*pList)[n].GetId()); + rReq.Done(); + return; + } } } } diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index c66112c6876f..13a5ffdbf40b 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statcach.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: mba $ $Date: 2002-10-24 13:57:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,11 @@ * ************************************************************************/ +#ifdef SOLARIS +// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 +#include <ctime> +#endif + #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #ifndef _COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ @@ -149,7 +154,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: pCache->Invalidate( sal_False ); if ( !aStatus.IsEnabled ) pCache->SetState_Impl( SFX_ITEM_DISABLED, NULL ); - else + else if (aStatus.State.hasValue()) { sal_uInt16 nId = pCache->GetId(); SfxItemState eState = SFX_ITEM_AVAILABLE; @@ -197,6 +202,12 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: pCache->SetState_Impl( eState, pItem ); delete pItem; } + else + { + // DONTCARE status + SfxVoidItem aVoid(0); + pCache->SetState_Impl( SFX_ITEM_UNKNOWN, &aVoid ); + } } } diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 490f9343ac0c..81b8b18ba04a 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -2,9 +2,9 @@ * * $RCSfile: about.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: pb $ $Date: 2002-08-29 06:02:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,7 +143,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS SfxModalDialog ( pParent, rId ), aOKButton ( this, ResId( ABOUT_BTN_OK ) ), - aAppLogo ( ResId( ABOUT_BMP_LOGO ) ), aVersionText ( this, ResId( ABOUT_FTXT_VERSION ) ), aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT ) ), aDeveloperAry ( ResId( ABOUT_STR_DEVELOPER_ARY ) ), @@ -167,6 +166,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS aStrm >> aBmp; aAppLogo = Image( aBmp ); } + else + { + aAppLogo = Image( Bitmap( ResId( RID_DEFAULT_ABOUT_BMP_LOGO, rId.GetResMgr() ) ) ); + } // Transparenter Font Font aFont = GetFont(); diff --git a/sfx2/source/dialog/acccfg.cxx b/sfx2/source/dialog/acccfg.cxx index d4e93c83688d..495f4a5deaf6 100644 --- a/sfx2/source/dialog/acccfg.cxx +++ b/sfx2/source/dialog/acccfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccfg.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: cd $ $Date: 2002-09-24 08:38:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,7 @@ #ifndef _HELP_HXX //autogen #include <vcl/help.hxx> #endif +#include <vcl/svapp.hxx> #include <so3/svstor.hxx> @@ -89,6 +90,7 @@ //static const char __FAR_DATA pUnknownStr[] = "???"; static USHORT __FAR_DATA aCodeArr[] = { + KEY_F1 , KEY_F2 , KEY_F3 , KEY_F4 , @@ -128,6 +130,7 @@ static USHORT __FAR_DATA aCodeArr[] = KEY_MENU , KEY_HELP , + KEY_F1 | KEY_SHIFT, KEY_F2 | KEY_SHIFT, KEY_F3 | KEY_SHIFT, KEY_F4 | KEY_SHIFT, @@ -192,6 +195,7 @@ static USHORT __FAR_DATA aCodeArr[] = KEY_Y | KEY_MOD1 , KEY_Z | KEY_MOD1 , + KEY_F1 | KEY_MOD1 , KEY_F2 | KEY_MOD1 , KEY_F3 | KEY_MOD1 , KEY_F4 | KEY_MOD1 , @@ -260,6 +264,7 @@ static USHORT __FAR_DATA aCodeArr[] = KEY_Y | KEY_SHIFT | KEY_MOD1, KEY_Z | KEY_SHIFT | KEY_MOD1, + KEY_F1 | KEY_SHIFT | KEY_MOD1, KEY_F2 | KEY_SHIFT | KEY_MOD1, KEY_F3 | KEY_SHIFT | KEY_MOD1, KEY_F4 | KEY_SHIFT | KEY_MOD1, @@ -301,6 +306,44 @@ static long nAccCfgTabs[] = #pragma warning (disable:4355) #endif + +class SfxAccCfgLBoxString_Impl : public SvLBoxString +{ +public: + SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rTxt ) : + SvLBoxString( pEntry, nFlags, rTxt ) {} + virtual ~SfxAccCfgLBoxString_Impl(); + + virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry ); +}; + +SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl() +{ +} + +// ----------------------------------------------------------------------- + +void SfxAccCfgLBoxString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) +{ + Font aOldFont( rDev.GetFont() ); + Font aFont( aOldFont ); + DBG_ASSERT( pEntry && pEntry->GetUserData(), "Entry or UserData invalid" ); + + rDev.SetFont( aFont ); + + BOOL bCanBeConfigured = ((SfxMenuConfigEntry*)pEntry->GetUserData())->IsConfigurable(); + if ( !bCanBeConfigured ) + rDev.DrawCtrlText( rPos, GetText(), 0, STRING_LEN, TEXT_DRAW_DISABLE ); + else + rDev.DrawText( rPos, GetText() ); + rDev.SetFont( aOldFont ); +} + +void SfxAccCfgTabListBox_Impl::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2 ) +{ + SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2 ); +} + /* SfxAcceleratorConfigListBox::KeyInput() ******************************************* Springt den Eintrag an, der der gedrueckten Tastenkombination entspricht. @@ -308,7 +351,6 @@ Ausgenommen davon sind die fuer die Dialogsteuerung ueblichen Tastenkombinationen. ****************************************************************************/ - void SfxAccCfgTabListBox_Impl::KeyInput( const KeyEvent &rKEvt ) { KeyCode aCode1 = rKEvt.GetKeyCode(); @@ -423,6 +465,18 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window *pParent, const SfxIt aGroupLBox.SetFunctionListBox( &aFunctionBox ); } +void SfxAcceleratorConfigPage::CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ) +{ + // Initialize text columns with own class to enable custom painting + // This is needed as we have to paint disabled entries by ourself. No support for that in the + // original SvTabListBox! + SfxAccCfgLBoxString_Impl* pStrItem = new SfxAccCfgLBoxString_Impl( pEntry, 0, aCol1 ); + pEntry->ReplaceItem( pStrItem, 1 ); + + pStrItem = new SfxAccCfgLBoxString_Impl( pEntry, 0, aCol2 ); + pEntry->ReplaceItem( pStrItem, 2 ); +} + void SfxAcceleratorConfigPage::Init( SfxAcceleratorManager* pAccMgr ) { // Insert all editable accelerators into list box. It is possible @@ -463,6 +517,37 @@ void SfxAcceleratorConfigPage::Init( SfxAcceleratorManager* pAccMgr ) SfxMenuConfigEntry *pEntry = (SfxMenuConfigEntry*) aEntriesBox.GetEntry( 0, nPos )->GetUserData(); pEntry->SetId( nId ); aConfigAccelArr[ nPos ] = nId; + + SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry( NULL, nPos ); + CreateCustomItems( pLBEntry, aEntriesBox.GetEntryText( pLBEntry, 0 ), aText ); + } + } + + // Map the VCL hardcoded key codes and mark them as not changeable + ULONG nCount = Application::GetReservedKeyCodeCount(); + for ( ULONG n = 0; n < nCount; n++ ) + { + const KeyCode* pKeyCode = Application::GetReservedKeyCode( n ); + USHORT nPos = KeyCodeToPos_Config( *pKeyCode ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + { + USHORT nCol = aEntriesBox.TabCount() - 1; + String aText = Application::GetReservedKeyCodeDescription( n ); + if( aText.Len() ) + { + aText.Insert( (sal_Unicode)'[', 0 ); + aText.Append( ']' ); + aEntriesBox.SetEntryText( aText, nPos, nCol ); + } + + // Hardcoded function mapped so no ID possible and mark entry as not changeable + SfxMenuConfigEntry *pEntry = (SfxMenuConfigEntry*) aEntriesBox.GetEntry( 0, nPos )->GetUserData(); + pEntry->SetConfigurable( FALSE ); + pEntry->SetId( 0 ); + aConfigAccelArr[ nPos ] = 0; + + SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry( NULL, nPos ); + CreateCustomItems( pLBEntry, aEntriesBox.GetEntryText( pLBEntry, 0 ), aText ); } } } @@ -535,7 +620,11 @@ void SfxAcceleratorConfigPage::Apply( SfxAcceleratorManager* pAccMgr, BOOL bIsDe } for (i=0; i<aListOfIds.Count(); i++) - SFX_APP()->GetMacroConfig()->ReleaseSlotId(aListOfIds[i]); + { + // Check if macro is still present to prevent an assertion if the macro was removed by the user before! + if ( SFX_APP()->GetMacroConfig()->GetMacroInfo( aListOfIds[i] )) + SFX_APP()->GetMacroConfig()->ReleaseSlotId(aListOfIds[i]); + } pAccMgr->SetDefault(FALSE); } @@ -773,8 +862,23 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) { // Eintrag ausgewaehlt: Buttons enablen/disablen USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); - aChangeButton.Enable( aConfigAccelArr[ nPos ] != aFunctionBox.GetCurId() ); - aRemoveButton.Enable( aConfigAccelArr[ nPos ] > 0 ); + if ( aConfigAccelArr[ nPos ] == 0 ) + { + // Entry without mapped function. + // Can be hardcoded keyboard shortcut or non-mapped keyboard shortcut + USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); + SfxMenuConfigEntry *pEntry = (SfxMenuConfigEntry*) aEntriesBox.GetEntry( 0, nPos )->GetUserData(); + if ( pEntry->IsConfigurable() ) + aChangeButton.Enable( TRUE ); + else + aChangeButton.Enable( FALSE ); + aRemoveButton.Enable( FALSE ); + } + else + { + aChangeButton.Enable( aConfigAccelArr[ nPos ] != aFunctionBox.GetCurId() ); + aRemoveButton.Enable( aConfigAccelArr[ nPos ] > 0 ); + } } else if ( pListBox == &aGroupLBox ) { @@ -789,8 +893,23 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) // Zuerst "uberpr"ufen, ob durch den Wechsel der Selektion der Zustand des ChangeButtons wechselt USHORT nEntryPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() ); USHORT nId = aFunctionBox.GetCurId(); - aChangeButton.Enable( aConfigAccelArr[ nEntryPos ] != nId ); - aRemoveButton.Enable( aConfigAccelArr[ nEntryPos ] > 0 ); + + if ( aConfigAccelArr[ nEntryPos ] == 0 ) + { + // Entry without mapped function. + // Can be hardcoded keyboard shortcut or non-mapped keyboard shortcut + SfxMenuConfigEntry *pEntry = (SfxMenuConfigEntry*) aEntriesBox.GetEntry( 0, nEntryPos )->GetUserData(); + if ( pEntry->IsConfigurable() ) + aChangeButton.Enable( aConfigAccelArr[ nEntryPos ] != nId ); + else + aChangeButton.Enable( FALSE ); + aRemoveButton.Enable( FALSE ); + } + else + { + aChangeButton.Enable( aConfigAccelArr[ nEntryPos ] != nId ); + aRemoveButton.Enable( aConfigAccelArr[ nEntryPos ] > 0 ); + } aKeyBox.Clear(); aKeyArr.Clear(); diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx index 6396746908d8..803d5f4f9767 100644 --- a/sfx2/source/dialog/cfg.cxx +++ b/sfx2/source/dialog/cfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cfg.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2002-11-20 11:41:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,6 +138,7 @@ SfxMenuConfigEntry::SfxMenuConfigEntry( USHORT nInitId, const String& rInitStr, , bPopUp(bPopup) , aHelpText(rHelpText) , aStr(rInitStr) + , bConfigure( TRUE ) { if ( SfxMacroConfig::IsMacroSlot( nId ) ) { @@ -541,8 +542,10 @@ void SfxConfigGroupListBox_Impl::Init( SvStringsDtor *pArr, SfxSlotPool* pPool ) } } - SfxObjectShell *pDoc = SfxObjectShell::GetFirst(); - while ( pDoc ) + //SfxObjectShell *pDoc = SfxObjectShell::GetFirst(); + SfxObjectShell *pDoc = SfxObjectShell::GetWorkingDocument(); + //while ( pDoc ) + if ( pDoc ) { BOOL bInsert = TRUE; if ( pArr ) @@ -576,7 +579,7 @@ void SfxConfigGroupListBox_Impl::Init( SvStringsDtor *pArr, SfxSlotPool* pPool ) } } - pDoc = SfxObjectShell::GetNext(*pDoc); + //pDoc = SfxObjectShell::GetNext(*pDoc); } pSfxApp->LeaveBasicCall(); diff --git a/sfx2/source/dialog/cfg.src b/sfx2/source/dialog/cfg.src index 1581eb4358d8..2554e3039e46 100644 --- a/sfx2/source/dialog/cfg.src +++ b/sfx2/source/dialog/cfg.src @@ -2,9 +2,9 @@ * * $RCSfile: cfg.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cd $ $Date: 2002-05-16 12:48:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,14 +86,14 @@ Text[ korean ] = "저장(~S)..."; \ Text[ turkish ] = "~Kaydet..."; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Guardar..."; \ - Text[ finnish ] = "~Tallenna"; \ + Text[ catalan ] = "~Desa..."; \ + Text[ finnish ] = "~Tallenna..."; \ Text[ thai ] = "~บันทึก..."; #define PUSHBUTTON_TEXT_RESET \ Text = "Zur~cksetzen" ; \ Text [ ENGLISH ] = "R~eset" ; \ - Text [ dutch ] = "~Terugzetten" ; \ + Text [ dutch ] = "Hers~tellen" ; \ Text [ english_us ] = "R~eset" ; \ Text [ italian ] = "Ripris~tina" ; \ Text [ spanish ] = "Restablecer" ; \ @@ -105,14 +105,14 @@ Text[ chinese_simplified ] = "重设(~E)"; \ Text[ russian ] = ""; \ Text[ polish ] = "Zresetuj"; \ - Text[ japanese ] = "元に戻す(~E)"; \ + Text[ japanese ] = "リセット(~E)"; \ Text[ chinese_traditional ] = "重設(~E)"; \ Text[ arabic ] = " "; \ Text[ greek ] = "~"; \ Text[ korean ] = "원래대로(~E)"; \ Text[ turkish ] = "Baa al"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Restablecer"; \ + Text[ catalan ] = "R~einicialitza"; \ Text[ finnish ] = "P~alauta"; \ Text[ thai ] = "ตั้~งค่าใหม่"; @@ -139,8 +139,8 @@ Text[ korean ] = "로드(~L)..."; \ Text[ turkish ] = "Ykle..."; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Cargar..."; \ - Text[ finnish ] = "~Lataa"; \ + Text[ catalan ] = "~Carrega..."; \ + Text[ finnish ] = "L~ataa..."; \ Text[ thai ] = "โ~หลด..."; #define PUSHBUTTON_TEXT_REMOVE \ @@ -156,7 +156,7 @@ Text [ french ] = "~Supprimer" ; \ Text [ swedish ] = "~Radera" ; \ Text [ dutch ] = "~Wissen" ; \ - Text [ spanish ] = "~Eliminar" ; \ + Text [ spanish ] = "~Borrar" ; \ Text [ english_us ] = "~Delete" ; \ Text[ chinese_simplified ] = "删除(~D)"; \ Text[ russian ] = ""; \ @@ -168,7 +168,7 @@ Text[ korean ] = "삭제(~D)"; \ Text[ turkish ] = "Sil"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Eliminar"; \ + Text[ catalan ] = "~Suprimeix"; \ Text[ thai ] = "~ลบ"; #define PUSHBUTTON_TEXT_CHANGE \ @@ -179,7 +179,7 @@ Text [ italian ] = "~Cambia" ; \ Text [ portuguese_brazilian ] = "~Mudar" ; \ Text [ portuguese ] = "~Modificar" ; \ - Text [ finnish ] = "~Muokkaa" ; \ + Text [ finnish ] = "~Muuta" ; \ Text [ danish ] = "Modificer" ; \ Text [ french ] = "~Modifier" ; \ Text [ swedish ] = "~ndra" ; \ @@ -196,7 +196,7 @@ Text[ korean ] = "변경(~M)"; \ Text[ turkish ] = "Deitir"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Modificar"; \ + Text[ catalan ] = "~Modifica"; \ Text[ thai ] = "~ดัดแปลงแก้ไข"; #define PUSHBUTTON_TEXT_NEW \ @@ -214,7 +214,7 @@ Text [ spanish ] = "~Nuevo" ; \ Text [ english_us ] = "~New" ; \ Text[ chinese_simplified ] = "新建(~N)"; \ - Text[ russian ] = "~"; \ + Text[ russian ] = "~ "; \ Text[ polish ] = "Nowy"; \ Text[ japanese ] = "新規作成(~N)"; \ Text[ chinese_traditional ] = "開啟新檔(~N)"; \ @@ -223,7 +223,7 @@ Text[ korean ] = "새로 만들기(~N)"; \ Text[ turkish ] = "~Yeni"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Nuevo"; \ + Text[ catalan ] = "~Nou"; \ Text[ thai ] = "ใ~หม่"; #define FIXEDTEXT_TEXT_GROUP \ @@ -238,7 +238,7 @@ Text [ french ] = "~Catgorie" ; \ Text [ swedish ] = "~Kategori" ; \ Text [ dutch ] = "~Bereik" ; \ - Text [ spanish ] = "~rea" ; \ + Text [ spanish ] = "~Categora" ; \ Text [ english_us ] = "~Category" ; \ Text[ chinese_simplified ] = "范围(~C)"; \ Text[ russian ] = ""; \ @@ -250,7 +250,7 @@ Text[ korean ] = "영역(~C)"; \ Text[ turkish ] = "Ka~tegori"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~rea"; \ + Text[ catalan ] = "~Categoria"; \ Text[ thai ] = "~ประเภท"; #define FIXEDTEXT_TEXT_FUNCTION \ @@ -260,7 +260,7 @@ Text [ italian ] = "~Funzione" ; \ Text [ portuguese_brazilian ] = "~Fun??o" ; \ Text [ portuguese ] = "~Funo" ; \ - Text [ finnish ] = "Funktio" ; \ + Text [ finnish ] = "Toiminto" ; \ Text [ danish ] = "Funktion" ; \ Text [ french ] = "~Fonction" ; \ Text [ swedish ] = "~Funktion" ; \ @@ -277,7 +277,7 @@ Text[ korean ] = "기능"; \ Text[ turkish ] = "lev"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "~Funcin"; \ + Text[ catalan ] = "~Funci"; \ Text[ thai ] = "ฟังก์ชั่น"; #define GROUPBOX_TEXT_FUNCTIONS \ @@ -301,10 +301,10 @@ Text[ chinese_traditional ] = "功能"; \ Text[ arabic ] = ""; \ Text[ greek ] = ""; \ - Text[ korean ] = "기능들"; \ + Text[ korean ] = "기능 모음"; \ Text[ turkish ] = "Fonksiyon"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "Funciones"; \ + Text[ catalan ] = "Funcions"; \ Text[ thai ] = "ฟังก์ชั่น"; // TP_CONFIG_MENU -------------------------------------------------------- @@ -321,14 +321,14 @@ TabPage TP_CONFIG_MENU Text [ ENGLISH ] = "Menu entries" ; Text[ english_us ] = "Menu entries"; Text[ portuguese ] = "Entradas de menu"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "Menu entries"; - Text[ dutch ] = "Menu-items"; + Text[ dutch ] = "Menuopties"; Text[ french ] = "Entres de menu"; Text[ spanish ] = "Entradas de men"; Text[ finnish ] = "Valikon merkinnt"; Text[ italian ] = "Voci del menu"; - Text[ danish ] = "Menu entries"; + Text[ danish ] = "Menupunkter"; Text[ swedish ] = "Menyposter"; Text[ polish ] = "Wpisy menu"; Text[ portuguese_brazilian ] = "Menu entries"; @@ -338,7 +338,7 @@ TabPage TP_CONFIG_MENU Text[ chinese_traditional ] = "功能表項目"; Text[ turkish ] = "Menu entries"; Text[ arabic ] = "Menu entries"; - Text[ catalan ] = "Menu entries"; + Text[ catalan ] = "Entrades del men"; Text[ thai ] = "รายการเมนู"; }; PushButton BTN_MN_NEW @@ -364,7 +364,7 @@ TabPage TP_CONFIG_MENU Text [ portuguese_brazilian ] = "Neues ~Men?" ; Text [ portuguese ] = "Novo ~menu" ; Text[ chinese_simplified ] = "新菜单(~U)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nowe menu"; Text[ japanese ] = "新しいメニュー(~U)"; Text[ chinese_traditional ] = "新功能表(~U)"; @@ -373,8 +373,8 @@ TabPage TP_CONFIG_MENU Text[ korean ] = "새 메뉴(~U)"; Text[ turkish ] = "Yeni mn"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nue~vo men"; - Text[ finnish ] = "Uusi va~likko"; + Text[ catalan ] = "N~ou men"; + Text[ finnish ] = "Uusi ~valikko"; Text[ thai ] = "เม~นูใหม่"; }; PushButton BTN_MN_CHANGE @@ -461,10 +461,10 @@ TabPage TP_CONFIG_MENU Text[ chinese_traditional ] = "功能"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "기능들"; + Text[ korean ] = "기능 모음"; Text[ turkish ] = "levler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones"; + Text[ catalan ] = "Funcions"; Text[ finnish ] = "Toiminnot"; Text[ thai ] = "ฟังก์ชั่น"; }; @@ -481,7 +481,7 @@ TabPage TP_CONFIG_MENU Text [ swedish ] = "~Kategori" ; Text [ danish ] = "Omrde" ; Text [ italian ] = "Area" ; - Text [ spanish ] = "~rea" ; + Text [ spanish ] = "~Categora" ; Text [ french ] = "~Catgorie" ; Text [ dutch ] = "~Bereik" ; Text [ portuguese ] = "~Categoria" ; @@ -495,7 +495,7 @@ TabPage TP_CONFIG_MENU Text[ korean ] = "영역(~A)"; Text[ turkish ] = "Ka~tegori"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~rea"; + Text[ catalan ] = "C~ategoria"; Text[ finnish ] = "L~uokka"; Text[ thai ] = "ป~ระเภท"; }; @@ -572,17 +572,17 @@ TabPage TP_CONFIG_ACCEL Text[ spanish ] = "Combinacin de teclas"; Text[ finnish ] = "Pikanppimet"; Text[ italian ] = "Combinazione tasti"; - Text[ danish ] = "Keyboard shortcuts"; + Text[ danish ] = "Genvejstaster"; Text[ swedish ] = "Tangentkombinationer"; Text[ polish ] = "Skrty klawiaturowe"; Text[ portuguese_brazilian ] = "Keyboard shortcuts"; Text[ japanese ] = "ショートカットキー"; - Text[ korean ] = "키보드 바로가기 키"; + Text[ korean ] = "키보드 단축키"; Text[ chinese_simplified ] = "组合键"; Text[ chinese_traditional ] = "組合鍵"; Text[ turkish ] = "Keyboard shortcuts"; Text[ arabic ] = "Keyboard shortcuts"; - Text[ catalan ] = "Keyboard shortcuts"; + Text[ catalan ] = "Dreceres de teclat"; Text[ thai ] = "ปุ่มทางลัด"; }; Control BOX_ACC_ENTRIES @@ -643,7 +643,7 @@ TabPage TP_CONFIG_ACCEL Text [ portuguese_brazilian ] = "~Teclas" ; Text [ portuguese ] = "~Teclas" ; Text [ finnish ] = "~Nppimet" ; - Text [ danish ] = "Taster" ; + Text [ danish ] = "T~aster" ; Text [ french ] = "~Clavier" ; Text [ swedish ] = "~Tangenter" ; Text [ dutch ] = "T~oetsen" ; @@ -660,7 +660,7 @@ TabPage TP_CONFIG_ACCEL Text[ korean ] = "키(~K)"; Text[ turkish ] = "T~ular"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Teclas"; + Text[ catalan ] = "~Tecles"; Text[ thai ] = "~ปุ่ม"; }; ListBox BOX_ACC_KEY @@ -712,11 +712,11 @@ TabPage TP_CONFIG_STATBAR Text [ italian ] = "Barra di stato " ; Text [ portuguese_brazilian ] = "Barra de Status " ; Text [ portuguese ] = "Barra de estado " ; - Text [ finnish ] = "Tilarivi" ; + Text [ finnish ] = "Tilarivi " ; Text [ danish ] = "Statuslinje " ; Text [ french ] = "Barre d'tat " ; Text [ swedish ] = "Statuslist " ; - Text [ dutch ] = "Statusbalk " ; + Text [ dutch ] = "Statusbalk" ; Text [ spanish ] = "Barra de estado " ; Text [ english_us ] = "Status bar " ; Text[ chinese_simplified ] = "状态栏 "; @@ -729,7 +729,7 @@ TabPage TP_CONFIG_STATBAR Text[ korean ] = "상태 표시줄 "; Text[ turkish ] = "Durum ubuu "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de estado "; + Text[ catalan ] = "Barra d'estat "; Text[ thai ] = "แถบแสดงสถานะ "; }; Control BOX_STATBAR_ENTRIES @@ -786,7 +786,7 @@ TabDialog DLG_CONFIG Text [ danish ] = "Tilpas" ; Text [ french ] = "Adaptation" ; Text [ swedish ] = "Anpassa" ; - Text [ dutch ] = "Configureren" ; + Text [ dutch ] = "Aanpassen" ; Text [ spanish ] = "Configurar" ; Text [ english_us ] = "Configuration" ; Moveable = TRUE ; @@ -854,7 +854,7 @@ TabDialog DLG_CONFIG Text[ korean ] = "키보드"; Text[ turkish ] = "Klavye"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Teclado"; + Text[ catalan ] = "Teclat"; Text[ thai ] = "แป้นพิมพ์"; }; PageItem @@ -884,7 +884,7 @@ TabDialog DLG_CONFIG Text[ korean ] = "상태 표시줄"; Text[ turkish ] = "Durum ubuu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de estado"; + Text[ catalan ] = "Barra d'estat"; Text[ thai ] = "แถบแสดงสถานะ"; }; PageItem @@ -905,18 +905,18 @@ TabDialog DLG_CONFIG Text [ english_us ] = "Toolbars" ; PageResID = 303 ; Text[ chinese_simplified ] = "图标栏"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Paski symboli"; Text[ japanese ] = "ツールバー"; Text[ chinese_traditional ] = "圖示列"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "도구모음"; + Text[ korean ] = "도구 모음"; Text[ turkish ] = "Ara ubuklar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barras de smbolos"; + Text[ catalan ] = "Barres d'eines"; Text[ thai ] = "แถบเครื่องมือ"; - }; + }; PageItem { Identifier = TP_CONFIG_EVENT ; @@ -944,22 +944,22 @@ TabDialog DLG_CONFIG Text[ korean ] = "이벤트"; Text[ turkish ] = "lemler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Acontecimientos"; + Text[ catalan ] = "Esdeveniments"; Text[ thai ] = "เหตุการณ์"; }; }; }; Text[ chinese_simplified ] = "调整"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Konfiguracja"; Text[ japanese ] = "設定"; Text[ chinese_traditional ] = "調整"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "구성"; + Text[ korean ] = "설정"; Text[ turkish ] = "zelletir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configurar"; + Text[ catalan ] = "Configura"; Text[ thai ] = "โครงแบบ"; }; // Strings --------------------------------------------------------------- @@ -985,10 +985,10 @@ String STR_NEW Text[ chinese_traditional ] = "開啟新檔"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "새로"; + Text[ korean ] = "새로 만들기"; Text[ turkish ] = "Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo"; + Text[ catalan ] = "Nou"; Text[ thai ] = "ใหม่"; }; String STR_OPEN @@ -1018,7 +1018,7 @@ String STR_OPEN Text[ korean ] = "열기"; Text[ turkish ] = "A"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Abrir"; + Text[ catalan ] = "Obre"; Text[ thai ] = "เปิด"; }; String STR_SAVE @@ -1046,7 +1046,7 @@ String STR_SAVE Text[ korean ] = "저장"; Text[ turkish ] = "Kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar"; + Text[ catalan ] = "Desa"; Text[ thai ] = "บันทึก"; }; String STR_SAVEAS @@ -1074,7 +1074,7 @@ String STR_SAVEAS Text[ korean ] = "다른 이름으로 저장"; Text[ turkish ] = "Farkl kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar como"; + Text[ catalan ] = "Anomena i desa"; Text[ thai ] = "บันทึกเป็น"; }; String STR_PRINT @@ -1102,7 +1102,7 @@ String STR_PRINT Text[ korean ] = "인쇄"; Text[ turkish ] = "Yazdr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imprimir"; + Text[ catalan ] = "Imprimeix"; Text[ thai ] = "พิมพ์"; }; String STR_QUIT @@ -1130,7 +1130,7 @@ String STR_QUIT Text[ korean ] = "종료"; Text[ turkish ] = "Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Terminar"; + Text[ catalan ] = "Surt"; Text[ thai ] = "ออก"; }; String STR_CUT @@ -1158,7 +1158,7 @@ String STR_CUT Text[ korean ] = "잘라내기"; Text[ turkish ] = "Kes"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cortar"; + Text[ catalan ] = "Retalla"; Text[ thai ] = "ตัด"; }; String STR_COPY @@ -1186,7 +1186,7 @@ String STR_COPY Text[ korean ] = "복사"; Text[ turkish ] = "Kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar"; + Text[ catalan ] = "Copia"; Text[ thai ] = "คัดลอก"; }; String STR_PASTE @@ -1206,17 +1206,17 @@ String STR_PASTE Text [ dutch ] = "Invoegen" ; Text [ spanish ] = "Pegar" ; Text [ english_us ] = "Paste" ; - Text[ chinese_simplified ] = "插入"; + Text[ chinese_simplified ] = "粘贴"; Text[ russian ] = ""; Text[ polish ] = "Wklej"; Text[ japanese ] = "貼り付け"; - Text[ chinese_traditional ] = "插入"; + Text[ chinese_traditional ] = "貼上"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "붙여넣기"; Text[ turkish ] = "Yaptr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pegar"; + Text[ catalan ] = "Enganxa"; Text[ thai ] = "วาง"; }; String STR_DELETE @@ -1234,7 +1234,7 @@ String STR_DELETE Text [ french ] = "Supprimer" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "删除"; Text[ russian ] = ""; @@ -1246,7 +1246,7 @@ String STR_DELETE Text[ korean ] = "삭제"; Text[ turkish ] = "Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar"; + Text[ catalan ] = "Suprimeix"; Text[ thai ] = "ลบ"; }; String STR_FIND @@ -1271,10 +1271,10 @@ String STR_FIND Text[ chinese_traditional ] = "搜尋"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "찾기"; + Text[ korean ] = "검색"; Text[ turkish ] = "Ara"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Buscar"; + Text[ catalan ] = "Cerca"; Text[ thai ] = "ค้นหา"; }; String STR_FINDBACKWARD @@ -1304,7 +1304,7 @@ String STR_FINDBACKWARD Text[ korean ] = "뒤로 찾기"; Text[ turkish ] = "Geriye doru ara"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Buscar hacia atrs"; + Text[ catalan ] = "Cerca cap enrere"; Text[ thai ] = "ค้นหาย้อนกลับ"; }; String STR_PROPERTIES @@ -1329,10 +1329,10 @@ String STR_PROPERTIES Text[ chinese_traditional ] = "屬性"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "등록정보"; + Text[ korean ] = "등록 정보"; Text[ turkish ] = "zellikler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ thai ] = "คุณสมบัติ"; }; String STR_FRONT @@ -1351,7 +1351,7 @@ String STR_FRONT Text [ spanish ] = "Hacia delante" ; Text [ english_us ] = "To front" ; Text[ chinese_simplified ] = "向前"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Do przodu"; Text[ japanese ] = "前へ"; Text[ chinese_traditional ] = "向前"; @@ -1360,7 +1360,7 @@ String STR_FRONT Text[ korean ] = "앞으로"; Text[ turkish ] = "leri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Primer plano"; + Text[ catalan ] = "Al davant"; Text[ thai ] = "ไปยังด้านหน้า"; }; // MessageBoxes ---------------------------------------------------------- @@ -1384,16 +1384,16 @@ QueryBox QBX_MNUCFG_UNDEFINED_FUNCTIONS Message [ spanish ] = "Todava hay funciones no definidas (???).\n\nDesea de todas formas aceptar esta configuracin?" ; Message [ english_us ] = "There are still undefined functions (???).\n\nDo you want to accept the configuration anyway?" ; Message[ chinese_simplified ] = "还存在未定义的功能。\n\n您还是要接受这个配置吗？"; - Message[ russian ] = " , (???).\n\n ?"; + Message[ russian ] = " , (???).\n\n , ?"; Message[ polish ] = "Istniej jeszcze nie zdefiniowane funkcje (???).\n\nCzy akceptujesz mimo to t konfiguracj?"; Message[ japanese ] = "まだ定義されていない機能があります(???)｡\n\nこの設定を適応してもいいですか？"; Message[ chinese_traditional ] = "還存在未定義的功能。\n\n還是要接受這個配置？"; Message[ arabic ] = " (???).\n\n ߿"; Message[ greek ] = " (???).\n\n ;"; - Message[ korean ] = "정의되지 않은 기능들이 아직 있습니다. (???).\n\n그래도 이 구성을 적용하겠습니까?"; + Message[ korean ] = "정의되지 않은 기능이 아직 있습니다(???).\n\n그래도 이 설정을 적용하시겠습니까?"; Message[ turkish ] = "Hala tanmlanmam ilevler mevcut (???).\n\nBu konfigrasyonu yine de kabul etmek istiyor musunuz?"; Message[ language_user1 ] = " "; - Message[ catalan ] = "Todava hay funciones no definidas (???).\n\nDesea de todas formas aceptar esta configuracin?"; + Message[ catalan ] = "Encara hi ha funcions no definides (???).\n\nVoleu acceptar aquesta configuraci de totes maneres?"; Message[ thai ] = "มีฟังก์ชั่นที่ยังไม่ได้กำหนด (???).\n\nคุณต้องการยอมรับโครงแบบหรือไม่?"; }; QueryBox QBX_MNUCFG_POPUP_FUNCTIONS @@ -1412,20 +1412,20 @@ QueryBox QBX_MNUCFG_POPUP_FUNCTIONS Message [ danish ] = "Der findes stadig elementer med funktioner, som kun kan tildeles popups.\n\nVil du overtage denne konfiguration alligevel?" ; Message [ french ] = "Certaines entres sont encore associes des fonctions rserves des menus droulants\n\nPoursuivre malgr tout ?" ; Message [ swedish ] = "Det finns fortfarande poster med funktioner som bara kan tilldelas popups.\n\nVill du nd anvnda den hr konfigurationen?" ; - Message [ dutch ] = "Er zijn nog items met functies die alleen aan popups kunnen worden toegewezen.\n\nWilt u deze configuratie toch overnemen?" ; + Message [ dutch ] = "Er zijn nog items met functies die alleen aan popup's kunnen worden toegewezen.\n\nWilt u deze configuratie toch overnemen?" ; Message [ spanish ] = "Todava hay entradas con funciones que solo pueden ser asignadas a emergentes.\n\nDesea continuar de todos modos?" ; Message [ english_us ] = "There are still entries with functions that can only be assigned to pop-ups.\n\nContinue anyway?" ; Message[ chinese_simplified ] = "还存在一些只能让给弹出式菜单执行的条目。\n您还是要接受这个配置吗？"; - Message[ russian ] = " , .\n\n ?"; + Message[ russian ] = " , .\n\n , ?"; Message[ polish ] = "Istniej jeszcze wpisy, ktre mog zosta przypisane tylko oknom typu popup. n\nCzy chcesz mimo to zastosowa t konfiguracj?"; Message[ japanese ] = "まだポップアップのみに割り当てられる機能の項目があります。\n\nこの設定を適用してもいいですか?"; Message[ chinese_traditional ] = "還存在一些只能讓給快顯功能表執行的項目。\n您還是要接受這個配置？"; Message[ arabic ] = " .\n\n ߿"; Message[ greek ] = " .\n\n "; - Message[ korean ] = "팝업에만 해당될 수 있는 기능을 가진 항목들이 아직 있습니다.\n\n그래도 이 구성을 적용하겠습니까?"; + Message[ korean ] = "팝업에만 지정할 수 있는 기능을 가진 항목이 아직 있습니다.\n\n그래도 이 구성을 적용하시겠습니까?"; Message[ turkish ] = "Yalnzca alan mnlere atanabilen ilevleri olan giriler mevcut.\n\nBu konfigrasyon ile devam etmek istiyor musunuz?"; Message[ language_user1 ] = " "; - Message[ catalan ] = "Todava hay entradas con funciones que solo pueden ser asignadas a emergentes.\n\nDesea continuar de todos modos?"; + Message[ catalan ] = "Encara hi ha entrades amb funcions que noms poden ser assignades a emergents.\n\nVoleu continuar de totes maneres?"; Message[ thai ] = "มีรายการฟังก์ชั่นที่ยังคงสามารถกำหนดไปยังตัวผุดขึ้น\n\nทำต่อหรือไม่?"; }; InfoBox IBX_MNUCFG_ALREADY_INCLUDED @@ -1444,7 +1444,7 @@ InfoBox IBX_MNUCFG_ALREADY_INCLUDED Message [ spanish ] = "La funcin ya est incluida en este emergente." ; Message [ english_us ] = "Function is already included in this popup." ; Message[ chinese_simplified ] = "这个弹出式菜单已经包含了这个功能。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Ta funkcja jest ju zawarta w menu podrcznym."; Message[ japanese ] = "機能はすでにこのポップアップに含まれています。"; Message[ chinese_traditional ] = "這個快速功能表已經包含了這個功能。"; @@ -1453,7 +1453,7 @@ InfoBox IBX_MNUCFG_ALREADY_INCLUDED Message[ korean ] = "기능이 이미 이 팝업에 포함되어 있습니다."; Message[ turkish ] = "lev zaten bu alan mnde mevcut."; Message[ language_user1 ] = " "; - Message[ catalan ] = "La funcin ya est incluida en este emergente."; + Message[ catalan ] = "La funci ja est inclosa en aquest emergent."; Message[ thai ] = "รวมฟังก์ชั่นในการผุดขึ้นนี้แล้ว"; }; String STR_LOADMENUCONFIG @@ -1478,10 +1478,10 @@ String STR_LOADMENUCONFIG Text[ chinese_traditional ] = "載入功能表配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "메뉴 구성 로드"; + Text[ korean ] = "메뉴 설정을 로드"; Text[ turkish ] = "Mn konfigrasyonunu ykle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cargar configuracin del men"; + Text[ catalan ] = "Carrega la configuraci del men"; Text[ finnish ] = "Lataa valikkomritys"; Text[ thai ] = "โหลดโครงแบบเมนู"; }; @@ -1505,9 +1505,9 @@ String STR_SAVEMENUCONFIG Text[ chinese_traditional ] = "儲存菜單配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "메뉴구성 저장"; + Text[ korean ] = "메뉴 설정 저장"; Text[ turkish ] = "Mn konfigrasyonunu kaydet"; - Text[ catalan ] = "Guardar configuracin del men"; + Text[ catalan ] = "Desa la configuraci del men"; Text[ finnish ] = "Tallenna valikkomritys"; Text[ thai ] = "บันทึกโครงแบบเมนู"; }; @@ -1515,7 +1515,7 @@ String STR_LOADACCELCONFIG { Text = "Tastaturkonfiguration laden" ; Text [ ENGLISH ] = "Load Keyboard Configuration" ; - Text [ dutch ] = "Tastatuurconfiguratie laden" ; + Text [ dutch ] = "Toetsenbordconfiguratie laden" ; Text [ english_us ] = "Load Keyboard Configuration" ; Text [ italian ] = "Carica configurazione tastiera" ; Text [ spanish ] = "Cargar configuracin del teclado" ; @@ -1531,10 +1531,10 @@ String STR_LOADACCELCONFIG Text[ chinese_traditional ] = "載入鍵盤配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "키보드 구성 로드"; + Text[ korean ] = "키보드 설정 로드"; Text[ turkish ] = "Klavye konfigrasyonunu ykle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cargar configuracin del teclado"; + Text[ catalan ] = "Carrega la configuraci del teclat"; Text[ finnish ] = "Lataa nppimistmritys"; Text[ thai ] = "โหลดโครงแบบแป้นพิมพ์"; }; @@ -1558,9 +1558,9 @@ String STR_SAVEACCELCONFIG Text[ chinese_traditional ] = "儲存鍵盤配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "키보드구성 저장"; + Text[ korean ] = "키보드 설정 저장"; Text[ turkish ] = "Klavye konfigrasyonunu kaydet"; - Text[ catalan ] = "Guardar configuracin del teclado"; + Text[ catalan ] = "Desa la configuraci del teclat"; Text[ finnish ] = "Tallenna nppimistmritys"; Text[ thai ] = "บันทึกโครงแบบแป้นพิมพ์"; }; @@ -1568,7 +1568,7 @@ String STR_LOADSTATBARCONFIG { Text = "Statusleistenkonfiguration laden" ; Text [ ENGLISH ] = "Load Statusbar Configuration" ; - Text [ dutch ] = "Statusballk-configuratie laden" ; + Text [ dutch ] = "Statusbalkconfiguratie laden" ; Text [ english_us ] = "Load Status Bar Configuration" ; Text [ italian ] = "Carica configurazione barra di stato" ; Text [ spanish ] = "Cargar configuracin de la barra de estado" ; @@ -1584,10 +1584,10 @@ String STR_LOADSTATBARCONFIG Text[ chinese_traditional ] = "載入狀態列配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "상태 표시줄 구성 로드"; + Text[ korean ] = "상태 표시줄 설정 로드"; Text[ turkish ] = "Durum ubuu konfigrasyonunu ykle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cargar configuracin de la barra de estado"; + Text[ catalan ] = "Carrega la configuraci de la barra d'estat"; Text[ finnish ] = "Lataa tilarivimritys"; Text[ thai ] = "โหลดโครงแบบแถบแสดงสถานะ"; }; @@ -1611,10 +1611,10 @@ String STR_SAVESTATBARCONFIG Text[ chinese_traditional ] = "儲存狀態欄配置"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "상태 표시줄 구성 저장"; + Text[ korean ] = "상태 표시줄 설정 저장"; Text[ turkish ] = "Durum ubuu konfigrasyonunu kaydet"; - Text[ catalan ] = "Guardar configuracin de la barra de estado"; - Text[ finnish ] = "Tallenna tilarivin kokoonpanomritykset"; + Text[ catalan ] = "Desa la configuraci de la barra d'estat"; + Text[ finnish ] = "Tallenna tilarivin mritykset"; Text[ thai ] = "บันทึกโครงแบบแสดงสถานะ"; }; String STR_MENU @@ -1644,7 +1644,6 @@ String STR_MENU Text[ finnish ] = "Valikko"; Text[ thai ] = "เมนู"; }; - String STR_TOOLBAR_SEPARATOR { Text = "Trenner" ; @@ -1654,22 +1653,22 @@ String STR_TOOLBAR_SEPARATOR Text[ russian ] = "Separator"; Text[ greek ] = "Separator"; Text[ dutch ] = "Separator"; - Text[ french ] = "Separator"; - Text[ spanish ] = "Separator"; + Text[ french ] = "Sparateur"; + Text[ spanish ] = "Separador"; Text[ finnish ] = "Separator"; - Text[ italian ] = "Separator"; + Text[ italian ] = "Separatore"; Text[ danish ] = "Separator"; - Text[ swedish ] = "Separator"; + Text[ swedish ] = "Avgrnsare"; Text[ polish ] = "Separator"; Text[ portuguese_brazilian ] = "Separator"; - Text[ japanese ] = "Separator"; - Text[ korean ] = "Separator"; - Text[ chinese_simplified ] = "Separator"; - Text[ chinese_traditional ] = "Separator"; + Text[ japanese ] = "区切り記号"; + Text[ korean ] = "구분 기호"; + Text[ chinese_simplified ] = "分隔符"; + Text[ chinese_traditional ] = "分隔符"; Text[ turkish ] = "Separator"; Text[ arabic ] = "Separator"; Text[ catalan ] = "Separator"; - Text[ thai ] = "Separator"; + Text[ thai ] = "ตัวแยก"; }; String STR_TOOLBAR_SPACE @@ -1681,18 +1680,18 @@ String STR_TOOLBAR_SPACE Text[ russian ] = "Invisible separator"; Text[ greek ] = "Invisible separator"; Text[ dutch ] = "Invisible separator"; - Text[ french ] = "Invisible separator"; - Text[ spanish ] = "Invisible separator"; + Text[ french ] = "Sparateur invisible"; + Text[ spanish ] = "Separador invisible"; Text[ finnish ] = "Invisible separator"; - Text[ italian ] = "Invisible separator"; + Text[ italian ] = "Separatore invisibile"; Text[ danish ] = "Invisible separator"; - Text[ swedish ] = "Invisible separator"; + Text[ swedish ] = "Osynlig avgrnsare"; Text[ polish ] = "Invisible separator"; Text[ portuguese_brazilian ] = "Invisible separator"; - Text[ japanese ] = "Invisible separator"; - Text[ korean ] = "Invisible separator"; - Text[ chinese_simplified ] = "Invisible separator"; - Text[ chinese_traditional ] = "Invisible separator"; + Text[ japanese ] = "隠し区切り記号"; + Text[ korean ] = "숨겨진 구분 기호"; + Text[ chinese_simplified ] = "隐藏的分隔符"; + Text[ chinese_traditional ] = "隱藏的分隔符"; Text[ turkish ] = "Invisible separator"; Text[ arabic ] = "Invisible separator"; Text[ catalan ] = "Invisible separator"; @@ -1703,29 +1702,28 @@ String STR_FUNCTION_ALREADY_IN_TOOLBOX { Text = "Die gewnschte Funktion ist bereits in der aktuellen Symbolleiste vorhanden." ; Text [ ENGLISH ] = "The selected function is already in the current toolbox." ; - Text[ english_us ] = "The selected function is already in the current toolbox."; + Text[ english_us ] = "The selected function is already on the current toolbar."; Text[ portuguese ] = "The selected function is already in the current toolbox."; Text[ russian ] = "The selected function is already in the current toolbox."; Text[ greek ] = "The selected function is already in the current toolbox."; Text[ dutch ] = "The selected function is already in the current toolbox."; - Text[ french ] = "The selected function is already in the current toolbox."; - Text[ spanish ] = "The selected function is already in the current toolbox."; + Text[ french ] = "La fonction slectionne existe dj dans la barre d'outils active."; + Text[ spanish ] = "La funcin seleccionada ya se encuentra disponible en la barra de smbolos actual. "; Text[ finnish ] = "The selected function is already in the current toolbox."; - Text[ italian ] = "The selected function is already in the current toolbox."; + Text[ italian ] = "La funzione selezionata gi presente nella barra dei simboli."; Text[ danish ] = "The selected function is already in the current toolbox."; - Text[ swedish ] = "The selected function is already in the current toolbox."; + Text[ swedish ] = "Den nskade funktionen finns redan p den aktuella symbollisten."; Text[ polish ] = "The selected function is already in the current toolbox."; Text[ portuguese_brazilian ] = "The selected function is already in the current toolbox."; - Text[ japanese ] = "The selected function is already in the current toolbox."; - Text[ korean ] = "The selected function is already in the current toolbox."; - Text[ chinese_simplified ] = "The selected function is already in the current toolbox."; - Text[ chinese_traditional ] = "The selected function is already in the current toolbox."; + Text[ japanese ] = "選択した機能はすでに現在のツールバーにあります。"; + Text[ korean ] = "선택하신 기능은 이미 현재 보시는 도구 상자 안에 있습니다."; + Text[ chinese_simplified ] = "你需要的功能已经在当前的图表栏之中。"; + Text[ chinese_traditional ] = "您需要的功能已經在當前的圖示列之中。"; Text[ turkish ] = "The selected function is already in the current toolbox."; Text[ arabic ] = "The selected function is already in the current toolbox."; Text[ catalan ] = "The selected function is already in the current toolbox."; Text[ thai ] = "The selected function is already in the current toolbox."; }; - // ********************************************************************** EOF @@ -1742,3 +1740,7 @@ String STR_FUNCTION_ALREADY_IN_TOOLBOX + + + + diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index c8992a85415b..4e6f88768904 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -2,9 +2,9 @@ * * $RCSfile: dialog.src,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2002-11-04 16:20:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,7 @@ String STR_RESET TEXT [ italian ] = "Ri~pristina" ; TEXT [ portuguese_brazilian ] = "~Redefinir" ; TEXT [ portuguese ] = "~Repor" ; - TEXT [ finnish ] = "~Palauta" ; + TEXT [ finnish ] = "P~alauta" ; TEXT [ danish ] = "Tilbage" ; TEXT [ french ] = "Rinitialisation" ; TEXT [ swedish ] = "terst~ll" ; @@ -105,9 +105,9 @@ String STR_RESET TEXT [ spanish ] = "~Restablecer" ; TEXT [ english_us ] = "~Reset" ; TEXT[ chinese_simplified ] = "返回(~R)"; - TEXT[ russian ] = "~"; + TEXT[ russian ] = "~"; TEXT[ polish ] = "Zresetuj"; - TEXT[ japanese ] = "元に戻す(~R)"; + TEXT[ japanese ] = "リセット(~R)"; TEXT[ chinese_traditional ] = "返回(~R)"; TEXT[ arabic ] = " "; TEXT[ greek ] = ""; @@ -183,7 +183,7 @@ String STR_BASEFMT Text [ french ] = "Format de ~base" ; Text [ swedish ] = "Grundformat" ; Text [ dutch ] = "~Basisopmaak" ; - Text [ spanish ] = "Formato ~base" ; + Text [ spanish ] = "Formato de ~base" ; Text [ english_us ] = "Base format" ; Text[ chinese_simplified ] = "基本格式"; Text[ russian ] = " "; @@ -192,7 +192,7 @@ String STR_BASEFMT Text[ chinese_traditional ] = "基本格式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "기본서식"; + Text[ korean ] = "기본 서식"; Text[ turkish ] = "Temel format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format de la base"; @@ -221,7 +221,7 @@ CheckBox CB_USE_PASSWD Text[ chinese_traditional ] = "密碼(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "패스워드(~P)"; + Text[ korean ] = "암호(~P)"; Text[ turkish ] = "~ifre"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Contrasenya"; @@ -236,11 +236,11 @@ CheckBox CB_READ_ONLY Text [ italian ] = "~Sola lettura" ; Text [ portuguese_brazilian ] = "~S?leitura" ; Text [ portuguese ] = "~S leitura" ; - Text [ finnish ] = "~Vain luku" ; + Text [ finnish ] = "Vain ~luku" ; Text [ danish ] = "Skrivebeskyttet" ; Text [ french ] = "En ~lecture seule" ; Text [ swedish ] = "Ba~ra lsning" ; - Text [ dutch ] = "~Alleen lezen" ; + Text [ dutch ] = "~Alleen-lezen" ; Text [ spanish ] = "~Slo lectura" ; Text [ english_us ] = "~Read-only" ; Text[ chinese_simplified ] = "只读(~R)"; @@ -265,13 +265,13 @@ PushButton CB_FILE Text [ italian ] = "File system" ; Text [ spanish ] = "Sistema de ~archivos" ; Text [ french ] = "Systme ~de fichiers" ; - Text [ dutch ] = "~Bestandsysteem" ; + Text [ dutch ] = "~Bestandssysteem" ; Text [ swedish ] = "Fils~ystem" ; Text [ danish ] = "Filsystem" ; Text [ portuguese ] = "~Sistema de ficheiro" ; Text [ portuguese_brazilian ] = "~Dateisystem" ; Text[ chinese_simplified ] = "文件系统(~F)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "System plikw"; Text[ japanese ] = "ファイルシステム(~F)"; Text[ chinese_traditional ] = "檔案系統(~F)"; @@ -309,7 +309,7 @@ PushButton CB_URL Text[ turkish ] = "Internet"; Text[ language_user1 ] = " "; Text[ catalan ] = "Int~ernet"; - Text[ finnish ] = "Int~ernet"; + Text[ finnish ] = "In~ternet"; Text[ thai ] = "อินเต~อร์เน็ต"; }; PushButton BTN_MANAGER @@ -378,7 +378,7 @@ String STR_PATH_NOT_FOUND1 Text [ italian ] = "La cartella" ; Text [ portuguese_brazilian ] = "O diret?io" ; Text [ portuguese ] = "O directrio '" ; - Text [ finnish ] = "Hakemistoa " ; + Text [ finnish ] = "Hakemistoa" ; Text [ danish ] = "Biblioteket '" ; Text [ french ] = "Le rpertoire '" ; Text [ swedish ] = "Mappen '" ; @@ -406,7 +406,7 @@ String STR_PATH_NOT_FOUND2 Text [ italian ] = "' non esiste." ; Text [ portuguese_brazilian ] = "' n?o existe." ; Text [ portuguese ] = "' no existe." ; - Text [ finnish ] = " ei ole" ; + Text [ finnish ] = "ei ole olemassa." ; Text [ danish ] = "' eksisterer ikke." ; Text [ french ] = "' n'existe pas." ; Text [ swedish ] = "' finns inte." ; @@ -420,7 +420,7 @@ String STR_PATH_NOT_FOUND2 Text[ chinese_traditional ] = ">不存在。"; Text[ arabic ] = "' ."; Text[ greek ] = "' ."; - Text[ korean ] = "' 없습니다."; + Text[ korean ] = "' 이(가) 없습니다."; Text[ turkish ] = "' mevcut deil."; Text[ language_user1 ] = " "; Text[ catalan ] = "' no existeix."; @@ -440,7 +440,7 @@ InfoBox MSG_ERROR_PASSWD MESSAGE [ danish ] = "Ugyldig adgangskode" ; MESSAGE [ french ] = "Mot de passe incorrect." ; MESSAGE [ swedish ] = "Felaktigt lsenord." ; - MESSAGE [ dutch ] = "Wachtwoord niet juist" ; + MESSAGE [ dutch ] = "Wachtwoord niet juist." ; MESSAGE [ spanish ] = "Contrasea errnea" ; MESSAGE [ english_us ] = "Invalid password" ; MESSAGE[ chinese_simplified ] = "错误的密码。"; @@ -450,7 +450,7 @@ InfoBox MSG_ERROR_PASSWD MESSAGE[ chinese_traditional ] = "密碼無效。"; MESSAGE[ arabic ] = " ."; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "유효하지 않은 암호"; + MESSAGE[ korean ] = "암호가 잘못되었습니다."; MESSAGE[ turkish ] = "Yanl ifre"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Contrasenya incorrecta."; @@ -500,7 +500,7 @@ String STR_TABPAGE_MANAGESTYLES Text [ spanish ] = "Administrar" ; Text [ english_us ] = "Organizer" ; Text[ chinese_simplified ] = "管理"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Zarzdzaj"; Text[ japanese ] = "管理"; Text[ chinese_traditional ] = "管理"; @@ -530,7 +530,7 @@ InfoBox MSG_TABPAGE_INVALIDNAME Message [ spanish ] = "Este nombre ya es usado para una plantilla." ; Message [ english_us ] = "This name is already in use." ; Message[ chinese_simplified ] = "一个样式已经使用这个名称。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Ta nazwa zostaa ju uyta dla stylu."; Message[ japanese ] = "この名前はすでに、あるスタイルに使われています。"; Message[ chinese_traditional ] = "有一個樣式已經使用這個名稱。"; @@ -554,19 +554,19 @@ InfoBox MSG_TABPAGE_INVALIDSTYLE Message [ portuguese ] = "Este modelo no existe." ; Message [ finnish ] = "Tt tyyli ei ole olemassa." ; Message [ danish ] = "Denne typografi eksisterer ikke." ; - Message [ french ] = "Style inexistant." ; + Message [ french ] = "Style inexistant" ; Message [ swedish ] = "Den hr mallen finns inte." ; Message [ dutch ] = "Dit opmaakprofiel bestaat niet." ; Message [ spanish ] = "Este estilo no existe." ; Message [ english_us ] = "This Style does not exist." ; Message[ chinese_simplified ] = "这个样式不存在。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Szablon nie istnieje."; Message[ japanese ] = "このスタイルは存在していません。"; Message[ chinese_traditional ] = "這個樣式不存在。"; Message[ arabic ] = " ."; Message[ greek ] = " ."; - Message[ korean ] = "이 템플릿은 없습니다."; + Message[ korean ] = "이 스타일은 없습니다."; Message[ turkish ] = "Bu ablon mevcut deil."; Message[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; Message[ catalan ] = "Aquest estil no existeix."; @@ -582,21 +582,21 @@ InfoBox MSG_TABPAGE_INVALIDPARENT Message [ italian ] = "Impossibile usare lo stile come principale;\ncauserebbe una connessione circolare." ; Message [ portuguese_brazilian ] = "O estilo n?o pode ser usado como superior;\nisto provocaria uma conex o circular." ; Message [ portuguese ] = "Este modelo no pode ser usado como modelo-base,\numa vez que provocaria uma referncia recursiva." ; - Message [ finnish ] = "Mallipohjaa ei voi tallentaa perusmallipohjana.\nTst seuraisi rekursiivinen viite." ; + Message [ finnish ] = "Mallia ei voi tallentaa perusmallina.\nTst seuraisi rekursiivinen viite." ; Message [ danish ] = "Denne skabelon kan ikke bruges som basisskabelon, \nda dette ville forrsage en rekursion." ; Message [ french ] = "Ce style ne peut pas tre utilis comme style de base\ncar il entranerait une rfrence rcursive." ; Message [ swedish ] = "Denna mall kan inte anvndas som basmall, d\nen rekursion skulle uppst." ; Message [ dutch ] = "Deze sjabloon kan niet als basissjabloon worden gebruikt;\nhierdoor zou een kringverbinding ontstaan." ; - Message [ spanish ] = "Esta plantilla no se puede utilizar como plantilla base,\nya que podra provocar una referencia recursiva." ; - Message [ english_us ] = "Template cannot be used as a base template;\nrecursive reference would result." ; + Message [ spanish ] = "Este estilo no se puede utilizar como estilo de base,\nya que podra provocar una referencia recursiva." ; + Message [ english_us ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ; Message[ chinese_simplified ] = "这个样式无法被当作样式文件，\n否则会引起递归引用。"; - Message[ russian ] = " ,\n.. ."; + Message[ russian ] = " ,\n ."; Message[ polish ] = "Tego szablonu nie moesz uy jako szablonu podstawowego,\nponiewa moga by powsta rekurencja."; Message[ japanese ] = "このスタイルはベース スタイルとして使用できません｡\nエラーが発生します。"; Message[ chinese_traditional ] = "這個樣式無法被當作樣式文件﹐\n否則會引起遞歸引用。"; Message[ arabic ] = " \n ()."; Message[ greek ] = " ;\n ."; - Message[ korean ] = "이 템플릿은 기본 템플릿으로 사용할 수 없습니다.\n재귀 호출이 발생할 수도 있기 때문입니다."; + Message[ korean ] = "이 스타일은 기본 스타일로 사용할 수 없습니다.\n재귀 호출이 발생할 수 있기 때문입니다."; Message[ turkish ] = "Bu ablon (zyineleme nedeniyle)\n temel ablon olarak kullanlamaz."; Message[ language_user1 ] = " "; Message[ catalan ] = "Aquesta plantilla no es pot utilitzar com a plantilla base,\nja que podria provocar una referncia recursiva."; @@ -615,16 +615,16 @@ InfoBox MSG_POOL_STYLE_NAME MESSAGE [ french ] = "Ce nom a dj attribu un style par dfaut.\nVeuillez en choisir un autre." ; MESSAGE [ swedish ] = "Namnet anvnds redan fr en standardmall.\nVlj ett annat namn." ; MESSAGE [ dutch ] = "Naam wordt al voor een standaardopmaakprofiel gebruikt.\nKies een andere naam." ; - MESSAGE [ spanish ] = "El nombre ya est usado por un estilo predeterminado.\nElija otro nombre por favor." ; + MESSAGE [ spanish ] = "El nombre ya existe como estilo predeterminado.\nElija otro nombre." ; MESSAGE [ english_us ] = "Name already exists as a default Style.\nPlease choose another name." ; MESSAGE[ chinese_simplified ] = "这个名称是一个标准样式的名称。\n请使用其他一个名称。"; - MESSAGE[ russian ] = " .\n, , ."; + MESSAGE[ russian ] = " .\n ."; MESSAGE[ polish ] = "Ta nazwa jest ju nazw stylu domylnego .\nProsz wybierz inn nazw."; MESSAGE[ japanese ] = "この名前はすでに標準スタイル名で使われています。\n別の名前を選択してください。"; MESSAGE[ chinese_traditional ] = "這個名稱是一個標準樣式的名稱。\n請您採用其他一個名稱。"; MESSAGE[ arabic ] = " .\n ."; MESSAGE[ greek ] = " .\n ."; - MESSAGE[ korean ] = "이 이름은 기본 템플릿의 이름입니다.\n다른 이름을 선택하십시오."; + MESSAGE[ korean ] = "이 이름은 이미 기본 스타일의 이름으로 지정되어 있습니다.\n다른 이름을 선택하십시오."; MESSAGE[ turkish ] = "Bu ad bir standart ablon ad olarak kullanlyor.\nBaka bir ad sein."; MESSAGE[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; MESSAGE[ catalan ] = "El nom ja existeix com a estil per defecte.\nTrieu un altre nom."; @@ -654,7 +654,7 @@ QueryBox MSG_OVERWRITE_STYLE Message[ chinese_traditional ] = "樣式已經存在。您要覆寫它﹖"; Message[ arabic ] = " . "; Message[ greek ] = " . ;"; - Message[ korean ] = "템플릿이 이미 존재합니다. 덮어쓰겠습니까?"; + Message[ korean ] = "이 스타일은 이미 있습니다. 겹쳐쓰시겠습니까?"; Message[ turkish ] = "ablon mevcut durumda. zerine yazlsn m?"; Message[ language_user1 ] = " "; Message[ catalan ] = "L'estil ja exiteix. Voleu sobreescriure'l?"; @@ -670,7 +670,7 @@ String STR_DELETE_STYLE Text [ swedish ] = "Vill du verkligen radera mallen $1?" ; Text [ danish ] = "Er du sikker p, at du vil slette typografi $1?" ; Text [ italian ] = "Eliminare veramente il modello $1 ?" ; - Text [ spanish ] = "Desea realmente eliminar el estilo $1?" ; + Text [ spanish ] = "Desea realmente borrar el estilo $1?" ; Text [ french ] = "Voulez-vous vraiment supprimer le modle $1 ?" ; Text [ dutch ] = "Wilt u het opmaakprofiel $1 werkelijk wissen?" ; Text[ chinese_simplified ] = "您真的要删除样式 $1 ？"; @@ -680,7 +680,7 @@ String STR_DELETE_STYLE Text[ chinese_traditional ] = "您真的要刪除樣式 $1 ﹖"; Text[ arabic ] = " $1"; Text[ greek ] = " $1?"; - Text[ korean ] = "템플릿 $1을(를) 정말 삭제하겠습니까?"; + Text[ korean ] = "스타일 $1을(를) 삭제하시겠습니까?"; Text[ turkish ] = "$1 ablonlarn gerekten silmek istiyor musunuz?"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; Text[ catalan ] = "Voleu suprimir realment l'estil $1?"; @@ -691,17 +691,17 @@ String STR_DELETE_STYLE_USED { Text = "Sie lschen eine benutzte Vorlage!\n" ; Text [ English ] = "You are deleting a used style!\n" ; - Text [ dutch ] = "U wist een gebruikt opmaakprofiel!\n" ; + Text [ dutch ] = "U wilt een gebruikt opmaakprofiel wissen!\n" ; Text [ english_us ] = "You are deleting an applied Style!\n" ; Text [ italian ] = "Si sta cancellando un modello in uso!\n" ; - Text [ spanish ] = "Usted est borrando un estilo que ha sido aplicado!\n" ; + Text [ spanish ] = "Est borrando un estilo en uso!\n" ; Text [ french ] = "Vous supprimez un style utilis !\n" ; Text [ swedish ] = "Du raderar en anvnd formatmall!\n" ; Text [ danish ] = "Du sletter en anvendt typografi!\n" ; Text [ portuguese ] = "Est a eliminar um estilo usado!\n" ; Text [ portuguese_brazilian ] = "Sie l?chen eine benutzte Vorlage!\n" ; Text[ chinese_simplified ] = "您要删除的是一个使用的样式！\n"; - Text[ russian ] = " !\n"; + Text[ russian ] = " !\n"; Text[ polish ] = "Usuwasz zastosowany styl!\n"; Text[ japanese ] = "使用したスタイルを削除しようとしています。\n"; Text[ chinese_traditional ] = "您要刪除的是一個使用的樣式﹗\n"; @@ -711,7 +711,7 @@ String STR_DELETE_STYLE_USED Text[ turkish ] = "Kullanlan bir ablonu siliyorsunuz!\n"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; Text[ catalan ] = "Esteu suprimint un estil ja aplicat!\n"; - Text[ finnish ] = "Olet poistamassa kytss olevaa tyyli!\n"; + Text[ finnish ] = "Olet poistamassa kytss olevaa tyyli.\n"; Text[ thai ] = "คุณกำลังลบลักษณะประยุกต์!\n"; }; Image BMP_COLLAPSED @@ -757,7 +757,7 @@ Menu MN_CONTEXT_TEMPLDLG Text [ italian ] = "Nuovo..." ; Text [ portuguese_brazilian ] = "Novo..." ; Text [ portuguese ] = "Novo..." ; - Text [ finnish ] = "Uusi" ; + Text [ finnish ] = "Uusi..." ; Text [ danish ] = "Ny..." ; Text [ french ] = "Nouveau..." ; Text [ swedish ] = "Nytt..." ; @@ -787,7 +787,7 @@ Menu MN_CONTEXT_TEMPLDLG Text [ italian ] = "Modifica..." ; Text [ portuguese_brazilian ] = "Editar..." ; Text [ portuguese ] = "Modificar..." ; - Text [ finnish ] = "Muokkaa..." ; + Text [ finnish ] = "Muuta..." ; Text [ danish ] = "Modificer..." ; Text [ french ] = "Modifier..." ; Text [ swedish ] = "ndra..." ; @@ -822,7 +822,7 @@ Menu MN_CONTEXT_TEMPLDLG Text [ french ] = "Supprimer..." ; Text [ swedish ] = "Radera..." ; Text [ dutch ] = "Wissen..." ; - Text [ spanish ] = "Eliminar..." ; + Text [ spanish ] = "Borrar..." ; Text [ english_us ] = "Delete..." ; HelpId = HID_STYLIST_DELETE ; Text[ chinese_simplified ] = "删除..."; @@ -852,7 +852,7 @@ String STR_BASICMACROS TEXT [ danish ] = "BASIC-makroer" ; TEXT [ french ] = "Macros BASIC" ; TEXT [ swedish ] = "BASIC-makron" ; - TEXT [ dutch ] = "BASIC- macros" ; + TEXT [ dutch ] = "BASIC-macro's" ; TEXT [ spanish ] = "Macros BASIC" ; TEXT [ english_us ] = "BASIC Macros" ; TEXT[ chinese_simplified ] = "BASIC-宏"; @@ -878,7 +878,7 @@ InfoBox MSG_LAYOUT_NOT_LOADING MESSAGE [ italian ] = "Il documento viene caricato senza layout" ; MESSAGE [ portuguese_brazilian ] = "Carregando Documentos sem Layout." ; MESSAGE [ portuguese ] = "A carregar documento sem configurao." ; - MESSAGE [ finnish ] = "Ladataan asettelun sisltv asiakirjaa." ; + MESSAGE [ finnish ] = "Ladataan asiakirjaa, jossa ei ole asettelua." ; MESSAGE [ danish ] = "Indlser dokument uden layout." ; MESSAGE [ french ] = "Chargement d'un document sans mise en page." ; MESSAGE [ swedish ] = "Dokument laddas utan layout." ; @@ -886,13 +886,13 @@ InfoBox MSG_LAYOUT_NOT_LOADING MESSAGE [ spanish ] = "Cargando el documento sin diseo." ; MESSAGE [ english_us ] = "Loading document without layout." ; MESSAGE[ chinese_simplified ] = "不带版式地装入文件。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "adowanie dokumentu bez ukadu."; MESSAGE[ japanese ] = "ドキュメントはレイアウトなしで読み込まれます。"; MESSAGE[ chinese_traditional ] = "載入文件，不附帶版式。"; MESSAGE[ arabic ] = " ."; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "문서를 레이아웃 없이 로드하고 있습니다."; + MESSAGE[ korean ] = "문서를 레이아웃없이 로드하고 있습니다."; MESSAGE[ turkish ] = "Belge sayfa dzeni olmadan ykleniyor."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Carregant un document sense format."; @@ -918,7 +918,7 @@ ErrorBox MSG_ERR_CANT_EDIT_OLD_FORMAT { Message = "Die Dokument-Info von Dokumenten in diesem\nDateiformat kann nicht bearbeitet werden." ; Message [ ENGLISH ] = "Can't edit document-info of documents\nof this file format." ; - Message [ dutch ] = "De documentinformatie van documenten in dit\nbestandformaat kan niet worden bewerkt." ; + Message [ dutch ] = "De documentinformatie van documenten in deze\nbestandsindeling kan niet worden bewerkt." ; Message [ english_us ] = "Cannot edit document info for documents\n in this file format." ; Message [ italian ] = "La modifica dell'informazione sul documento per\nun documento nel formato dato non possibile." ; Message [ spanish ] = "La informacin de documentos no se puede editar en este\nformato de archivo." ; @@ -928,7 +928,7 @@ ErrorBox MSG_ERR_CANT_EDIT_OLD_FORMAT Message [ portuguese ] = "Impossvel editar a informao sobre documentos\n neste formato de ficheiro." ; Message [ portuguese_brazilian ] = "Die Dokument-Info von Dokumenten in diesem\nDateiformat kann nicht bearbeitet werden." ; Message[ chinese_simplified ] = "无法编辑这个文件格式的文档信息。"; - Message[ russian ] = " \n ."; + Message[ russian ] = " \n ."; Message[ polish ] = "Informacje o dokumencie dla dokumentw nie mog \nby edytowane w tym formacie pliku."; Message[ japanese ] = "このファイル書式のドキュメントのドキュメント情報は\n編集できません。"; Message[ chinese_traditional ] = "無法編輯這個文件格式的文件資訊。"; @@ -950,13 +950,13 @@ ErrorBox MSG_ERR_CANT_EDIT_OPEN_DOCS Message [ italian ] = "L'informazione sul documento relativa a documenti\nin fase di modifica non modificabile con la gestione manager." ; Message [ spanish ] = "La informacin acerca de los documentos que se estn editando\nno puede ser editada por el administrador de documentos." ; Message [ french ] = "Impossible de modifier les proprits du document actuel \npar le gestionnaire de document." ; - Message [ dutch ] = "De documentinformatie van de in bewerking zijnde\ndocumenten kan niet door de documentmanager worden bewerkt." ; + Message [ dutch ] = "De documentinformatie van de in bewerking zijnde\ndocumenten kan niet via documentbeheer worden bewerkt." ; Message [ swedish ] = "Dokumentinformation frn dokument som redigeras\nfr nrvarande kan inte redigeras av dokumenthanteraren." ; Message [ danish ] = "Dokumentinformationen til dokumenter som aktuelt redigeres\nkan ikke redigeres af dokumentmanageren." ; Message [ portuguese_brazilian ] = "Die Dokument-Info von in Bearbeitung befindlichen\nDokumenten kann nicht vom Dokumentmanager bearbeitet werden." ; Message [ portuguese ] = "A Informao sobre Documentos dos documentos que\n esto a ser editados no poder ser modificada pelo gestor de documentos." ; Message[ chinese_simplified ] = "文档已经处于编辑状态，\n文档管理器无法处理这些文档。"; - Message[ russian ] = " \n , \n"; + Message[ russian ] = " , \n"; Message[ polish ] = "Informacja o dokumencie dla edytowanych dokumentw\nnie moe by edytowana przez menedera dokumentw."; Message[ japanese ] = "編集中のドキュメントのドキュメント情報は\nドキュメントマネージャーからでは編集できません。"; Message[ chinese_traditional ] = "文件已經處於編輯狀態﹐\n文件管理器無法處理這些文件。"; @@ -1042,7 +1042,7 @@ Menu RID_AUTOHIDE Text [ french ] = "Masquer" ; Text [ dutch ] = "Verbergen" ; Text[ chinese_simplified ] = "隐入"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Ukryj"; Text[ japanese ] = "隠す"; Text[ chinese_traditional ] = "隱入"; @@ -1071,13 +1071,13 @@ String RID_AUTOHIDE Text [ french ] = "Ne pas masquer" ; Text [ dutch ] = "Niet verbergen" ; Text[ chinese_simplified ] = "不隐入"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie ukrywaj"; Text[ japanese ] = "非表示にしない"; Text[ chinese_traditional ] = "不隱入"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "표시"; + Text[ korean ] = "숨기지 않기"; Text[ turkish ] = "Gizleme"; Text[ language_user1 ] = " "; Text[ catalan ] = "No amaguis"; @@ -1108,7 +1108,7 @@ String SID_NAVIGATOR Text[ turkish ] = "Navigatr"; Text[ language_user1 ] = " "; Text[ catalan ] = "Navegador"; - Text[ finnish ] = "Navigaattori"; + Text[ finnish ] = "Etsin"; Text[ thai ] = "ตัวนำ"; }; String STR_BASICNAME @@ -1124,7 +1124,7 @@ ErrorBox MSG_ERROR_WRONG_CONFIRM MESSAGE [ English ] = "Wrong confirmation of the password" ; MESSAGE[ english_us ] = "Faulty password confirmation"; MESSAGE[ portuguese ] = "Confirmao errada da senha"; - MESSAGE[ russian ] = " "; + MESSAGE[ russian ] = " "; MESSAGE[ greek ] = " "; MESSAGE[ dutch ] = "Foutieve bevestiging van wachtwoord"; MESSAGE[ french ] = "Confirmation du mot de passe errone !"; @@ -1135,7 +1135,7 @@ ErrorBox MSG_ERROR_WRONG_CONFIRM MESSAGE[ polish ] = "Nieprawidowe potwierdzenie hasa"; MESSAGE[ portuguese_brazilian ] = "Wrong confirmation of the password"; MESSAGE[ japanese ] = "パスワードの確認ができていません"; - MESSAGE[ korean ] = "패스워드 확인이 잘못되었습니다."; + MESSAGE[ korean ] = "암호 확인이 잘못되었습니다."; MESSAGE[ chinese_simplified ] = "确认密码时出错"; MESSAGE[ chinese_traditional ] = "驗証密碼無效"; MESSAGE[ arabic ] = " "; @@ -1147,3 +1147,8 @@ ErrorBox MSG_ERROR_WRONG_CONFIRM }; // ******************************************************************* EOF + + + + + diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 3b68e034c29c..7af795e8f49a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dinfdlg.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2002-11-20 11:41:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src index b4e643a19d52..e3fe201a1939 100644 --- a/sfx2/source/dialog/dinfdlg.src +++ b/sfx2/source/dialog/dinfdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: dinfdlg.src,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2002-11-04 16:23:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ TabPage TP_DOCINFODESC Text [ italian ] = "~Titolo" ; Text [ portuguese_brazilian ] = "~T?tulo" ; Text [ portuguese ] = "~Ttulo" ; - Text [ finnish ] = "~Otsikko" ; + Text [ finnish ] = "O~tsikko" ; Text [ danish ] = "Titel" ; Text [ french ] = "Titre" ; Text [ swedish ] = "~Rubrik" ; @@ -123,12 +123,12 @@ TabPage TP_DOCINFODESC Text [ italian ] = "Oggetto" ; Text [ portuguese_brazilian ] = "~Assunto" ; Text [ portuguese ] = "~Assunto" ; - Text [ finnish ] = "~Aihe" ; + Text [ finnish ] = "A~ihe" ; Text [ danish ] = "Emne" ; Text [ french ] = "~Sujet" ; Text [ swedish ] = "T~ema" ; Text [ dutch ] = "~Onderwerp" ; - Text [ spanish ] = "Tema" ; + Text [ spanish ] = "~Asunto" ; Text [ english_us ] = "~Subject" ; Text[ chinese_simplified ] = "主题(~S)"; Text[ russian ] = ""; @@ -162,7 +162,7 @@ TabPage TP_DOCINFODESC Text [ italian ] = "~Parole chiave" ; Text [ portuguese_brazilian ] = "~Palavras-chave" ; Text [ portuguese ] = "~Palavras-chave" ; - Text [ finnish ] = "~Avainsanat" ; + Text [ finnish ] = "A~vainsanat" ; Text [ danish ] = "Ngleord" ; Text [ french ] = "~Mots-cls" ; Text [ swedish ] = "~Nyckelord" ; @@ -195,7 +195,7 @@ TabPage TP_DOCINFODESC Pos = MAP_APPFONT ( 6 , 52 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Left = TRUE ; - Text = "~Beschreibung" ; + Text = "~Kommentar" ; Text [ ENGLISH ] = "~Description" ; Text [ norwegian ] = "~Description" ; Text [ italian ] = "~Descrizione" ; @@ -207,14 +207,14 @@ TabPage TP_DOCINFODESC Text [ swedish ] = "~Beskrivning" ; Text [ dutch ] = "~Beschrijving" ; Text [ spanish ] = "~Descripcin" ; - Text [ english_us ] = "~Comment" ; + Text [ english_us ] = "~Comments" ; Text[ chinese_simplified ] = "说明(~C)"; Text[ russian ] = ""; Text[ polish ] = "Opis"; Text[ japanese ] = "コメント(~C)"; Text[ chinese_traditional ] = "描述(~C)"; Text[ greek ] = ""; - Text[ korean ] = "설명(~C)"; + Text[ korean ] = "메모(~C)"; Text[ arabic ] = ""; Text[ turkish ] = "~Tanm"; Text[ language_user1 ] = " "; @@ -252,13 +252,13 @@ TabPage TP_DOCINFODOC }; FixedLine FL_FILE_1 { - Pos = MAP_APPFONT ( 6 , 35 ) ; + Pos = MAP_APPFONT ( 6 , 31 ) ; Size = MAP_APPFONT ( 248 , 1 ) ; }; FixedText FT_FILE_TYP { - Pos = MAP_APPFONT ( 6 , 39 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 37 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Typ:" ; Text [ ENGLISH ] = "Type:" ; Text [ english_us ] = "Type:" ; @@ -281,17 +281,17 @@ TabPage TP_DOCINFODOC Text[ turkish ] = "Tip:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tipus"; - Text[ finnish ] = "Tyyppi"; + Text[ finnish ] = "Tyyppi:"; Text[ thai ] = "ชนิด:"; }; FixedText FT_FILE_SHOW_TYP { - Pos = MAP_APPFONT ( 54 , 39 ) ; + Pos = MAP_APPFONT ( 78 , 37 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; }; CheckBox CB_FILE_READONLY { - Pos = MAP_APPFONT ( 163 , 39 ) ; + Pos = MAP_APPFONT ( 163 , 37 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text = "~Schreibgeschtzt" ; Text [ ENGLISH ] = "~Readonly" ; @@ -302,7 +302,7 @@ TabPage TP_DOCINFODOC Text [ italian ] = "~Sola lettura" ; Text [ spanish ] = "~Solo lectura" ; Text [ french ] = "~En lecture seule" ; - Text [ dutch ] = "~Schrijfbeveiligd" ; + Text [ dutch ] = "~Alleen-lezen" ; Text [ portuguese ] = "~S leitura" ; Text[ chinese_simplified ] = "防改写(~R)"; Text[ russian ] = "~ "; @@ -310,18 +310,18 @@ TabPage TP_DOCINFODOC Text[ japanese ] = "読み取り専用(~R)"; Text[ chinese_traditional ] = "唯讀(~R)"; Text[ greek ] = " "; - Text[ korean ] = "쓰기 보호(~R)"; + Text[ korean ] = "읽기 전용(~R)"; Text[ arabic ] = " "; Text[ turkish ] = "S~alt okunur"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Noms lectura"; - Text[ finnish ] = "~Vain luku"; + Text[ finnish ] = "Vain ~luku"; Text[ thai ] = "~อ่านอย่างเดียว"; }; FixedText FT_FILE { - Pos = MAP_APPFONT ( 6 , 51 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 49 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Ort:" ; Text [ ENGLISH ] = "Location:" ; Text [ english_us ] = "Location:" ; @@ -349,13 +349,13 @@ TabPage TP_DOCINFODOC }; FixedText FT_FILE_VAL { - Pos = MAP_APPFONT ( 54 , 51 ) ; + Pos = MAP_APPFONT ( 78 , 49 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; }; FixedText FT_FILE_SIZE { - Pos = MAP_APPFONT ( 6 , 63 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 61 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Gre:" ; Text [ ENGLISH ] = "Size:" ; Text [ english_us ] = "Size:" ; @@ -383,18 +383,18 @@ TabPage TP_DOCINFODOC }; FixedText FT_FILE_SHOW_SIZE { - Pos = MAP_APPFONT ( 54 , 63 ) ; - Size = MAP_APPFONT ( 200 , 10 ) ; + Pos = MAP_APPFONT ( 78 , 61 ) ; + Size = MAP_APPFONT ( 170 , 10 ) ; }; FixedLine FL_FILE_2 { - Pos = MAP_APPFONT ( 6 , 86 ) ; + Pos = MAP_APPFONT ( 6 , 74 ) ; Size = MAP_APPFONT ( 248 , 1 ) ; }; FixedText FT_CREATE { - Pos = MAP_APPFONT ( 6 , 90 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 80 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Erstellt am:" ; Text [ ENGLISH ] = "Created:" ; Text [ english_us ] = "Created:" ; @@ -422,48 +422,13 @@ TabPage TP_DOCINFODOC }; FixedText FT_CREATE_VAL { - Pos = MAP_APPFONT ( 54 , 90 ) ; + Pos = MAP_APPFONT ( 78 , 80 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; }; - FixedText FT_TIMELOG - { - Pos = MAP_APPFONT ( 179 , 90 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; - Text = "Bearbeitet:" ; - Text [ ENGLISH ] = "Edit time:" ; - Text [ norwegian ] = "Edit time:" ; - Text [ italian ] = "Modificato:" ; - Text [ portuguese_brazilian ] = "Edit time:" ; - Text [ portuguese ] = "Editado:" ; - Text [ french ] = "Dure d'ouverture :" ; - Text [ dutch ] = "Bewerkt:" ; - Text [ spanish ] = "Abierto desde :" ; - Text [ danish ] = "Redigeret:" ; - Text [ swedish ] = "Redigeringstid:" ; - Text [ finnish ] = "Muokattu:" ; - Text [ english_us ] = "Edited:" ; - Text[ chinese_simplified ] = "已经编辑："; - Text[ russian ] = ":"; - Text[ polish ] = "Opracowano:"; - Text[ japanese ] = "編集時間:"; - Text[ chinese_traditional ] = "已經編輯："; - Text[ greek ] = ":"; - Text[ korean ] = "편집:"; - Text[ arabic ] = ":"; - Text[ turkish ] = "Dzenleme:"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Editat el:"; - Text[ thai ] = "แก้ไข:"; - }; - FixedText FT_TIMELOG_VAL - { - Pos = MAP_APPFONT ( 232 , 90 ) ; - Size = MAP_APPFONT ( 26 , 10 ) ; - }; FixedText FT_CHANGE { - Pos = MAP_APPFONT ( 6 , 102 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 92 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Gendert am:" ; Text [ ENGLISH ] = "Changed:" ; Text [ english_us ] = "Modified:" ; @@ -481,7 +446,7 @@ TabPage TP_DOCINFODOC Text[ japanese ] = "変更日時:"; Text[ chinese_traditional ] = "變更的日期："; Text[ greek ] = " :"; - Text[ korean ] = "변경일자:"; + Text[ korean ] = "변경일:"; Text[ arabic ] = " :"; Text[ turkish ] = "Deitirme tarihi:"; Text[ language_user1 ] = " "; @@ -491,80 +456,115 @@ TabPage TP_DOCINFODOC }; FixedText FT_CHANGE_VAL { - Pos = MAP_APPFONT ( 54 , 102 ) ; + Pos = MAP_APPFONT ( 78 , 92 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; }; - FixedText FT_DOCNO - { - Pos = MAP_APPFONT ( 179 , 102 ) ; - Size = MAP_APPFONT ( 51 , 10 ) ; - Text = "Version:" ; - Text [ ENGLISH ] = "Version:" ; - Text [ english_us ] = "Version:" ; - Text [ portuguese_brazilian ] = "N?mero do documento:" ; - Text [ swedish ] = "Version:" ; - Text [ danish ] = "Version:" ; - Text [ italian ] = "Versione:" ; - Text [ spanish ] = "Versin:" ; - Text [ french ] = "Version :" ; - Text [ dutch ] = "Versie:" ; - Text [ portuguese ] = "Verso:" ; - Text[ chinese_simplified ] = "版本："; - Text[ russian ] = ":"; - Text[ polish ] = "Wersja:"; - Text[ japanese ] = "バージョン:"; - Text[ chinese_traditional ] = "版本："; - Text[ greek ] = ":"; - Text[ korean ] = "버전:"; - Text[ arabic ] = ":"; - Text[ turkish ] = "Srm:"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Versi:"; - Text[ finnish ] = "Versio:"; - Text[ thai ] = "เวอร์ชั่น:"; - }; - FixedText FT_DOCNO_VAL - { - Pos = MAP_APPFONT ( 232 , 102 ) ; - Size = MAP_APPFONT ( 26 , 10 ) ; - }; FixedText FT_PRINT { - Pos = MAP_APPFONT ( 6 , 114 ) ; - Size = MAP_APPFONT ( 45 , 10 ) ; - Text = "Gedruckt am:" ; + Pos = MAP_APPFONT ( 6 , 104 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + Text = "Letzter Druck:" ; Text [ ENGLISH ] = "Last printed:" ; - Text [ english_us ] = "Printed:" ; - Text [ italian ] = "Stampato il:" ; - Text [ spanish ] = "Impreso el:" ; - Text [ french ] = "Imprim le :" ; + Text [ english_us ] = "Last printed:" ; + Text [ italian ] = "Ultima stampa:" ; + Text [ spanish ] = "ltima impresin:" ; + Text [ french ] = "Dernire impression :" ; Text [ dutch ] = "Afgedrukt op:" ; - Text [ swedish ] = "Utskrivet den:" ; + Text [ swedish ] = "Senaste utskrift:" ; Text [ danish ] = "Udskrevet den:" ; Text [ portuguese_brazilian ] = "Gedruckt am:" ; Text [ portuguese ] = "Impresso em:" ; - Text[ chinese_simplified ] = "打印日期："; + Text[ chinese_simplified ] = "上次打印的日期："; Text[ russian ] = ":"; Text[ polish ] = "Wydrukowany:"; Text[ japanese ] = "印刷日時:"; - Text[ chinese_traditional ] = "列印日期："; + Text[ chinese_traditional ] = "上一次列印："; Text[ greek ] = " :"; - Text[ korean ] = "인쇄일자:"; + Text[ korean ] = "최근 인쇄일:"; Text[ arabic ] = " :"; Text[ turkish ] = "Yazdrma tarihi:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imprs el:"; - Text[ finnish ] = "Tulostettu"; + Text[ finnish ] = "Tulostettu:"; Text[ thai ] = "พิมพ์:"; }; FixedText FT_PRINT_VAL { - Pos = MAP_APPFONT ( 54 , 114 ) ; + Pos = MAP_APPFONT ( 78 , 104 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; }; + FixedText FT_TIMELOG + { + Pos = MAP_APPFONT ( 6 , 116 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + Text = "Bearbeitungszeit:" ; + Text [ ENGLISH ] = "Editing time:" ; + Text [ norwegian ] = "Editing time:" ; + Text [ italian ] = "Durata revisioni:" ; + Text [ portuguese_brazilian ] = "Edit time:" ; + Text [ portuguese ] = "Editado:" ; + Text [ french ] = "Dure d'dition :" ; + Text [ dutch ] = "Bewerkt:" ; + Text [ spanish ] = "Tiempo de edicin:" ; + Text [ danish ] = "Redigeret:" ; + Text [ swedish ] = "Redigeringstid:" ; + Text [ finnish ] = "Muokattu:" ; + Text [ english_us ] = "Editing time:" ; + Text[ chinese_simplified ] = "编辑时间："; + Text[ russian ] = ":"; + Text[ polish ] = "Opracowano:"; + Text[ japanese ] = "編集時間:"; + Text[ chinese_traditional ] = "編輯時間："; + Text[ greek ] = ":"; + Text[ korean ] = "편집 시간:"; + Text[ arabic ] = ":"; + Text[ turkish ] = "Dzenleme:"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Editat el:"; + Text[ thai ] = "แก้ไข:"; + }; + FixedText FT_TIMELOG_VAL + { + Pos = MAP_APPFONT ( 78 , 116 ) ; + Size = MAP_APPFONT ( 30 , 10 ) ; + }; + FixedText FT_DOCNO + { + Pos = MAP_APPFONT ( 6 , 128 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + Text = "Dokumentnummer:" ; + Text [ ENGLISH ] = "Document number:" ; + Text [ english_us ] = "Document number:" ; + Text [ portuguese_brazilian ] = "N?mero do documento:" ; + Text [ swedish ] = "Dokumentnummer:" ; + Text [ danish ] = "Version:" ; + Text [ italian ] = "Numero revisioni:" ; + Text [ spanish ] = "Revisin n:" ; + Text [ french ] = "Rvision n :" ; + Text [ dutch ] = "Versie:" ; + Text [ portuguese ] = "Verso:" ; + Text[ chinese_simplified ] = "文档号码："; + Text[ russian ] = ":"; + Text[ polish ] = "Wersja:"; + Text[ japanese ] = "バージョン:"; + Text[ chinese_traditional ] = "文件號碼："; + Text[ greek ] = ":"; + Text[ korean ] = "버전:"; + Text[ arabic ] = ":"; + Text[ turkish ] = "Srm:"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Versi:"; + Text[ finnish ] = "Versio:"; + Text[ thai ] = "เวอร์ชั่น:"; + }; + FixedText FT_DOCNO_VAL + { + Pos = MAP_APPFONT ( 78 , 128 ) ; + Size = MAP_APPFONT ( 30 , 10 ) ; + }; PushButton BTN_DELETE { - Pos = MAP_APPFONT ( 204 , 122 ) ; + Pos = MAP_APPFONT ( 204 , 140 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; Text = "~Lschen"; @@ -575,7 +575,7 @@ TabPage TP_DOCINFODOC Text[ greek ] = ""; Text[ dutch ] = "~Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "~Eliminar"; + Text[ spanish ] = "~Borrar"; Text[ italian ] = "~Elimina"; Text[ danish ] = "Slet"; Text[ swedish ] = "~Radera"; @@ -593,12 +593,12 @@ TabPage TP_DOCINFODOC }; CheckBox CB_USE_USERDATA { - Pos = MAP_APPFONT ( 6 , 126 ) ; + Pos = MAP_APPFONT ( 6 , 144 ) ; Size = MAP_APPFONT ( 192 , 10 ) ; Hide = TRUE; Text = "~Benutzerdaten verwenden" ; Text[English] = "~Using user data"; - Text[french] = "~Utiliser les donnes d'identit"; + Text[french] = "~Utiliser les donnes d'utilisateur"; Text [ italian ] = "Usa i dati utente" ; Text [ dutch ] = "~Gebruikersgegevens toepassen" ; Text [ spanish ] = "Utilizar los ~datos del usuario" ; @@ -613,22 +613,22 @@ TabPage TP_DOCINFODOC Text[ japanese ] = "ユーザー データを使用する(~A)"; Text[ chinese_traditional ] = "採用使用者資料(~A)"; Text[ greek ] = " ~ "; - Text[ korean ] = "사용자 데이터 이용(~A)"; + Text[ korean ] = "사용자 정보 사용(~A)"; Text[ arabic ] = " "; Text[ turkish ] = "~Kullanc verilerini kullan"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Aplica les dades de l'usuari"; - Text[ finnish ] = "~Kyt kyttjtietoja"; + Text[ finnish ] = "Kyt ~kyttjtietoja"; Text[ thai ] = "ใ~ช้ข้อมูลผู้ใช้"; }; FixedLine FL_FILE_3 { - Pos = MAP_APPFONT ( 5 , 148 ) ; + Pos = MAP_APPFONT ( 5 , 160 ) ; Size = MAP_APPFONT ( 248 , 1 ) ; }; FixedText FT_TEMPL { - Pos = MAP_APPFONT ( 5 , 152 ) ; + Pos = MAP_APPFONT ( 5 , 164 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text = "Vorlage:" ; Text [ ENGLISH ] = "Template:" ; @@ -636,7 +636,7 @@ TabPage TP_DOCINFODOC Text [ italian ] = "Modello:" ; Text [ portuguese_brazilian ] = "Modelo:" ; Text [ portuguese ] = "Modelo:" ; - Text [ finnish ] = "Mallipohja:" ; + Text [ finnish ] = "Malli:" ; Text [ danish ] = "Skabelon:" ; Text [ french ] = "Modle :" ; Text [ swedish ] = "Mall:" ; @@ -650,7 +650,7 @@ TabPage TP_DOCINFODOC Text[ chinese_traditional ] = "樣式："; Text[ language_user1 ] = " "; Text[ greek ] = ":"; - Text[ korean ] = "템플릿:"; + Text[ korean ] = "서식 파일:"; Text[ arabic ] = ":"; Text[ turkish ] = "ablon:"; Text[ catalan ] = "Plantilla:"; @@ -658,8 +658,8 @@ TabPage TP_DOCINFODOC }; FixedText FT_TEMPL_VAL { - Pos = MAP_APPFONT ( 54 , 152 ) ; - Size = MAP_APPFONT ( 200 , 10 ) ; + Pos = MAP_APPFONT ( 78 , 164 ) ; + Size = MAP_APPFONT ( 180 , 10 ) ; }; String STR_UNKNOWNSIZE { @@ -680,7 +680,7 @@ TabPage TP_DOCINFODOC Text[ japanese ] = "不明"; Text[ chinese_traditional ] = "不明的"; Text[ greek ] = ""; - Text[ korean ] = "알려져 있지 않음"; + Text[ korean ] = "알 수 없음"; Text[ arabic ] = " "; Text[ turkish ] = "bilinmiyor"; Text[ language_user1 ] = " "; @@ -759,7 +759,7 @@ TabPage TP_DOCINFOUSER Text [ italian ] = "Campi info..." ; Text [ portuguese_brazilian ] = "Camos de Info..." ; Text [ portuguese ] = "~Campos de informao" ; - Text [ finnish ] = "~Tietokentt" ; + Text [ finnish ] = "~Tietokentt..." ; Text [ danish ] = "Infofelter..." ; Text [ french ] = "~Champs d'information..." ; Text [ swedish ] = "~Infoflt..." ; @@ -808,7 +808,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "Uppdatera inte automatiskt"; Text[ polish ] = "Do not refresh automatically"; Text[ japanese ] = "自動更新しない"; - Text[ korean ] = "자동으로 새로 고침 안함"; + Text[ korean ] = "자동으로 새로 고침 하지 않음"; Text[ chinese_simplified ] = "不自动更新"; Text[ chinese_traditional ] = "不自動更新"; Text[ turkish ] = "Do not refresh automatically"; @@ -835,7 +835,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "Uppdatera det hr dokumentet"; Text[ polish ] = "Refresh this document"; Text[ japanese ] = "このドキュメントを更新する"; - Text[ korean ] = "문서 새로 고침"; + Text[ korean ] = "이 문서를 새로 고침"; Text[ chinese_simplified ] = "更新这个文档"; Text[ chinese_traditional ] = "更新這個文件"; Text[ turkish ] = "Refresh this document"; @@ -860,7 +860,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "var"; Text[ polish ] = "every"; Text[ japanese ] = "すべて"; - Text[ korean ] = "모두"; + Text[ korean ] = "설정 시간"; Text[ chinese_simplified ] = "每"; Text[ chinese_traditional ] = "毎"; Text[ turkish ] = "every"; @@ -898,10 +898,10 @@ TabPage TP_DOCINFORELOAD Text[ finnish ] = "seconds"; Text[ italian ] = "secondi"; Text[ danish ] = "seconds"; - Text[ swedish ] = "sekunder"; + Text[ swedish ] = "sekund"; Text[ polish ] = "seconds"; Text[ japanese ] = "秒毎"; - Text[ korean ] = "초"; + Text[ korean ] = "초 마다"; Text[ chinese_simplified ] = "秒"; Text[ chinese_traditional ] = "秒"; Text[ turkish ] = "seconds"; @@ -931,7 +931,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "Vidarebefordra frn det hr dokumentet"; Text[ polish ] = "Redirect from this document"; Text[ japanese ] = "このドキュメントから転送する"; - Text[ korean ] = "이 문서로부터 다시 전달"; + Text[ korean ] = "이 문서로부터 다시 전송"; Text[ chinese_simplified ] = "从这个文档转送"; Text[ chinese_traditional ] = "從這個文件轉送"; Text[ turkish ] = "Redirect from this document"; @@ -948,7 +948,7 @@ TabPage TP_DOCINFORELOAD Text[ russian ] = "after"; Text[ greek ] = "after"; Text[ dutch ] = "after"; - Text[ french ] = "aAprs"; + Text[ french ] = "aprs"; Text[ spanish ] = "tras"; Text[ finnish ] = "after"; Text[ italian ] = "dopo"; @@ -956,7 +956,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "efter"; Text[ polish ] = "after"; Text[ japanese ] = "更新する時間"; - Text[ korean ] = "시간 설정"; + Text[ korean ] = "설정 시간"; Text[ chinese_simplified ] = "经过"; Text[ chinese_traditional ] = "經過"; Text[ turkish ] = "after"; @@ -994,7 +994,7 @@ TabPage TP_DOCINFORELOAD Text[ swedish ] = "sekund"; Text[ polish ] = "seconds"; Text[ japanese ] = "秒毎"; - Text[ korean ] = "초"; + Text[ korean ] = "초 후"; Text[ chinese_simplified ] = "秒"; Text[ chinese_traditional ] = "秒"; Text[ turkish ] = "seconds"; @@ -1023,7 +1023,7 @@ TabPage TP_DOCINFORELOAD Text[ polish ] = "URL"; Text[ portuguese_brazilian ] = "~URL"; Text[ japanese ] = "URL へ"; - Text[ korean ] = "URL로"; + Text[ korean ] = "전송 URL"; Text[ chinese_simplified ] = "送至 URL"; Text[ chinese_traditional ] = "送至 URL"; Text[ turkish ] = "~URL"; @@ -1054,14 +1054,14 @@ TabPage TP_DOCINFORELOAD Text[ greek ] = "to frame"; Text[ dutch ] = "to frame"; Text[ french ] = "au cadre"; - Text[ spanish ] = "al frame"; + Text[ spanish ] = "al marco"; Text[ finnish ] = "to frame"; Text[ italian ] = "al frame"; Text[ danish ] = "to frame"; Text[ swedish ] = "till ram"; Text[ polish ] = "to frame"; Text[ japanese ] = "フレームへ"; - Text[ korean ] = "프레임에"; + Text[ korean ] = "프레임 대상"; Text[ chinese_simplified ] = "送至框对象"; Text[ chinese_traditional ] = "送至訊框"; Text[ turkish ] = "to frame"; @@ -1087,10 +1087,10 @@ TabPage TP_DOCINFORELOAD Text[ finnish ] = "If you select the option \"%PLACEHOLDER%\", you must enter a URL."; Text[ italian ] = "Se selezionate l'opzione \"%PLACEHOLDER%\" dovete indicare un URL."; Text[ danish ] = "If you select the option \"%PLACEHOLDER%\", you must enter a URL."; - Text[ swedish ] = "Om du vljer alternativet \"%PLACEHOLDER%\" mster du ange en URL."; + Text[ swedish ] = "Om du vljer alternativet \"%PLACEHOLDER%\" mste du ange en URL."; Text[ polish ] = "If you select the option \"%PLACEHOLDER%\", you must enter a URL."; Text[ japanese ] = "オプション \"%PLACEHOLDER%\" を選択するときは、URL を指定してください。"; - Text[ korean ] = "\"%PLACEHOLDER%\" 옵션을 선택할 경우 URL을 입력해야만 합니다."; + Text[ korean ] = "[%PLACEHOLDER%] 옵션을 선택할 경우 URL을 입력해야만 합니다."; Text[ chinese_simplified ] = "如果选择选项 \"%PLACEHOLDER%\"，您就必须输入一个 URL 地址。"; Text[ chinese_traditional ] = "如果您選擇選項 \"%PLACEHOLDER%\" ，就必須輸入一個 URL 地址。"; Text[ turkish ] = "If you select the option \"%PLACEHOLDER%\", you must enter a URL."; @@ -1112,7 +1112,7 @@ TabDialog SID_DOCINFO Text [ italian ] = "Propriet di " ; Text [ spanish ] = "Propiedades de " ; Text [ french ] = "Proprits de " ; - Text [ dutch ] = "Eigenschappen van " ; + Text [ dutch ] = "Eigenschappen van" ; Text [ swedish ] = "Egenskaper fr " ; Text [ danish ] = "Egenskaber af " ; Text [ portuguese_brazilian ] = "Eigenschaften von " ; @@ -1123,12 +1123,12 @@ TabDialog SID_DOCINFO Text[ japanese ] = "プロパティ "; Text[ chinese_traditional ] = "屬性： "; Text[ greek ] = " "; - Text[ korean ] = "등록정보 "; + Text[ korean ] = "등록 정보 "; Text[ arabic ] = " "; Text[ turkish ] = "zellikler "; Text[ language_user1 ] = " "; Text[ catalan ] = "Propietats de "; - Text[ finnish ] = "Ominaisuudet:"; + Text[ finnish ] = "Ominaisuudet: "; TabControl 1 { SVLook = TRUE ; @@ -1149,7 +1149,7 @@ TabDialog SID_DOCINFO Text [ portuguese_brazilian ] = "Allgemein" ; Text [ portuguese ] = "Geral" ; Text[ chinese_simplified ] = "常规"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Oglne"; Text[ japanese ] = "全般"; Text[ chinese_traditional ] = "一般"; @@ -1159,7 +1159,7 @@ TabDialog SID_DOCINFO Text[ turkish ] = "Genel"; Text[ language_user1 ] = " "; Text[ catalan ] = "General"; - Text[ finnish ] = "Yleist"; + Text[ finnish ] = "Yleiset"; Text[ thai ] = "ทั่วไป"; }; PageItem @@ -1182,7 +1182,7 @@ TabDialog SID_DOCINFO Text[ japanese ] = "概要"; Text[ chinese_traditional ] = "描述"; Text[ greek ] = ""; - Text[ korean ] = "설명"; + Text[ korean ] = "내용"; Text[ arabic ] = ""; Text[ turkish ] = "Tanm"; Text[ language_user1 ] = " "; @@ -1212,7 +1212,7 @@ TabDialog SID_DOCINFO Text[ japanese ] = "ユーザー"; Text[ chinese_traditional ] = "使用者"; Text[ greek ] = ""; - Text[ korean ] = "사용자"; + Text[ korean ] = "사용자 정의"; Text[ arabic ] = ""; Text[ turkish ] = "Kullanc"; Text[ language_user1 ] = " "; @@ -1251,3 +1251,8 @@ TabDialog SID_DOCINFO }; Text[ thai ] = "คุณสมบัติของ "; }; + + + + + diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src index 4c560966f4a1..80c048969e0b 100644 --- a/sfx2/source/dialog/dinfedt.src +++ b/sfx2/source/dialog/dinfedt.src @@ -2,9 +2,9 @@ * * $RCSfile: dinfedt.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:22:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,17 +82,17 @@ ModalDialog DLG_DOCINFO_EDT Text [ dutch ] = "Labels bewerken" ; Text [ spanish ] = "Editar nombres de informaciones" ; Text [ english_us ] = "Edit Field Names" ; - Text[ chinese_simplified ] = "༭"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "编辑标题"; + Text[ russian ] = " "; Text[ polish ] = "Edytuj nazwy informacji"; - Text[ japanese ] = "ҏW"; - Text[ chinese_traditional ] = "sD"; + Text[ japanese ] = "情報名を編集"; + Text[ chinese_traditional ] = "編輯標題"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "̸ "; + Text[ korean ] = "정보 이름 편집"; Text[ turkish ] = "Etiketleri dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar nombres informaciones"; + Text[ catalan ] = "Edita els noms dels camps"; Moveable = TRUE ; FixedLine FL_INFO { @@ -105,23 +105,24 @@ ModalDialog DLG_DOCINFO_EDT Text [ portuguese_brazilian ] = "Nomes" ; Text [ portuguese ] = "Nomes" ; Text [ finnish ] = "Nimet" ; - Text [ danish ] = "Navne" ; + Text [ danish ] = "Navn" ; Text [ french ] = "Noms" ; Text [ swedish ] = "Namn" ; Text [ dutch ] = "Namen" ; Text [ spanish ] = "Nombres" ; Text [ english_us ] = "Names" ; - Text[ chinese_simplified ] = ""; + Text[ chinese_simplified ] = "名称"; Text[ russian ] = ""; Text[ polish ] = "Nazwy"; - Text[ japanese ] = "O"; - Text[ chinese_traditional ] = "W"; + Text[ japanese ] = "名前"; + Text[ chinese_traditional ] = "名稱"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸"; + Text[ korean ] = "이름"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombres"; + Text[ catalan ] = "Noms"; + Text[ thai ] = "ชื่อ"; }; Edit ED_INFO1 { @@ -166,6 +167,7 @@ ModalDialog DLG_DOCINFO_EDT Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; + Text[ thai ] = "แก้ไขชื่อเขตข้อมูล"; }; @@ -173,3 +175,14 @@ ModalDialog DLG_DOCINFO_EDT + + + + + + + + + + + diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 64ba83f386f5..833c94c07017 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dockwin.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: iha $ $Date: 2002-10-01 08:41:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -523,7 +523,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) pImp->bEndDocked = FALSE; } - SetAlignment(pImp->GetDockAlignment()); + SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() ); pWorkWin->ConfigChild_Impl( eIdent, SFX_ALIGNDOCKINGWINDOW, pMgr->GetType() ); } @@ -1157,11 +1157,11 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& } BOOL bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment(); - if ( !bChanged ) + if ( !bChanged && !IsFloatingMode() ) { // window only sightly moved, no change of any property rRect.SetSize( pImp->aSplitSize ); - rRect.SetPos( aPos ); + rRect.SetPos( aDockingRect.TopLeft() ); return eDockAlign; } @@ -1581,7 +1581,7 @@ void SfxDockingWindow::StateChanged( StateChangedType nStateChange ) void SfxDockingWindow::Move() { - if ( IsReallyVisible() ) + if ( IsReallyVisible() && IsFloatingMode() ) { SfxChildIdentifier eIdent = SFX_CHILDWIN_DOCKINGWINDOW; if ( pImp->bSplitable ) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 903c9f99ea37..aaf61e29195e 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.99 $ + * $Revision: 1.100 $ * - * last change: $Author: obo $ $Date: 2002-11-20 11:41:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,10 +103,10 @@ #endif #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILTERGROUPMANAGER_HPP_ #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> +#endif #ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HDL_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> #endif -#endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif @@ -237,6 +237,20 @@ using namespace ::cppu; //----------------------------------------------------------------------------- +const short FILEOPEN_SIMPLE = TemplateDescription::FILEOPEN_SIMPLE; +const short FILESAVE_SIMPLE = TemplateDescription::FILESAVE_SIMPLE; +const short FILESAVE_AUTOEXTENSION_PASSWORD = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; +const short FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS; +const short FILESAVE_AUTOEXTENSION_SELECTION = TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION; +const short FILESAVE_AUTOEXTENSION_TEMPLATE = TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE; +const short FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE = TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE; +const short FILEOPEN_PLAY = TemplateDescription::FILEOPEN_PLAY; +const short FILEOPEN_READONLY_VERSION = TemplateDescription::FILEOPEN_READONLY_VERSION; +const short FILEOPEN_LINK_PREVIEW = TemplateDescription::FILEOPEN_LINK_PREVIEW; +const short FILESAVE_AUTOEXTENSION = TemplateDescription::FILESAVE_AUTOEXTENSION; + +//----------------------------------------------------------------------------- + #define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save")) #define IMPGRF_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Graph")) #define USERITEM_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserItem" )) @@ -637,7 +651,10 @@ void FileDialogHelper_Impl::updateSelectionBox() updateExtendedControl( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, - pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ); + ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) ); + + Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( mbSelection ) ); } // ------------------------------------------------------------------------ @@ -1012,6 +1029,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( FileDialogHelper* pParent, const s mbExport = SFXWB_EXPORT == ( nFlags & SFXWB_EXPORT ); mbIsSaveDlg = sal_False; mbPwdCheckBoxState = sal_False; + mbSelection = sal_False; + mbSelectionEnabled = sal_True; // default settings m_nDontFlags = SFX_FILTER_INTERNAL | SFX_FILTER_NOTINFILEDLG; @@ -1261,6 +1280,9 @@ void FileDialogHelper_Impl::preExecute() setDefaultValues( ); updatePreviewState( sal_False ); + implInitializeFileName( ); + // #106079# / 2002-12-09 / fs@openoffice.org + // allow for dialog implementations which need to be executed before they return valid values for // current filter and such mnPostUserEventId = Application::PostUserEvent( LINK( this, FileDialogHelper_Impl, InitControls ) ); @@ -1274,11 +1296,52 @@ void FileDialogHelper_Impl::postExecute( sal_Int16 _nResult ) } // ------------------------------------------------------------------------ +void FileDialogHelper_Impl::implInitializeFileName( ) +{ + if ( maFileName.getLength() ) + { + INetURLObject aObj( maPath ); + aObj.Append( maFileName ); + + // in case we're operating as save dialog, and "auto extension" is checked, + // cut the extension from the name + // #106079# / 2002-12-09 / fs@openoffice.org + if ( mbIsSaveDlg && mbHasAutoExt ) + { + try + { + sal_Bool bAutoExtChecked = sal_False; + + Reference < XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); + if ( xControlAccess.is() + && ( xControlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0 ) + >>= bAutoExtChecked + ) + ) + { + if ( bAutoExtChecked ) + { // cut the extension + aObj.removeExtension( ); + mxFileDlg->setDefaultName( aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ) ); + } + } + } + catch( const Exception& e ) + { + e; // make compiler happy + DBG_ERROR( "FileDialogHelper_Impl::implInitializeFileName: could not ask for the auto-extension current-value!" ); + } + } + } +} + +// ------------------------------------------------------------------------ sal_Int16 FileDialogHelper_Impl::implDoExecute() { preExecute(); sal_Int16 nRet = ExecutableDialogResults::CANCEL; + if ( mbSystemPicker ) { PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg ); @@ -1327,6 +1390,12 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, mbPwdCheckBoxState = ( pPassItem != NULL ); } + SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE ); + if ( pSelectItem ) + mbSelection = pSelectItem->GetValue(); + else + mbSelectionEnabled = sal_False; + // the password will be set in case user decide so rpSet->ClearItem( SID_PASSWORD ); } @@ -1521,53 +1590,46 @@ void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setPath( const OUString& rPath ) +void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) { - // We check wether the path points to a dirctory or not - // - // We set the display directory only, when it is on a local / remote(?) - // filesystem - - if ( ! rPath.getLength() ) + if ( ! _rPath.getLength() ) + // nothing to do return; - /* if (! utl::LocalFileHelper::IsLocalFile( rPath ) ) - { - return; - }*/ - - OUString aName; - OUString aPath; - INetURLObject aObj( rPath ); - - // if the given path isn't a folder, we cut off the last part - // and take it as filename and the rest of the path should be - // the folder + if ( !::utl::UCBContentHelper::IsFolder( _rPath ) ) + // only valid folders accepted here + return; - if ( ! utl::UCBContentHelper::IsFolder( rPath ) ) + maPath = _rPath; + if ( mxFileDlg.is() ) { - aName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); - aObj.removeSegment(); + try + { + mxFileDlg->setDisplayDirectory( maPath ); + } + catch( const IllegalArgumentException& e ) + { + e; // make compiler happy + DBG_ERROR( "FileDialogHelper_Impl::displayFolder: caught an exception!" ); + } } +} - aPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); - - if ( ! utl::UCBContentHelper::IsFolder( aPath ) ) - return; - else - maPath = aPath; - - // set the path +// ------------------------------------------------------------------------ +void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile ) +{ + maFileName = _rFile; if ( mxFileDlg.is() ) { try { - if ( maPath.getLength() ) - mxFileDlg->setDisplayDirectory( maPath ); - if ( aName.getLength() ) - mxFileDlg->setDefaultName( aName ); + mxFileDlg->setDefaultName( maFileName ); + } + catch( const IllegalArgumentException& e ) + { + e; // make compiler happy + DBG_ERROR( "FileDialogHelper_Impl::setFileName: caught an exception!" ); } - catch( IllegalArgumentException ){} } } @@ -1919,7 +1981,7 @@ void FileDialogHelper_Impl::loadConfig() xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, aValue ); if ( !maPath.getLength() ) - setPath( getInitPath( aUserData, 2 ) ); + displayFolder( getInitPath( aUserData, 2 ) ); if ( ! maCurFilter.getLength() ) { @@ -1935,7 +1997,7 @@ void FileDialogHelper_Impl::loadConfig() } if ( !maPath.getLength() ) - setPath( SvtPathOptions().GetGraphicPath() ); + displayFolder( SvtPathOptions().GetGraphicPath() ); } else { @@ -1954,7 +2016,7 @@ void FileDialogHelper_Impl::loadConfig() aUserData = DEFINE_CONST_UNICODE( STD_CONFIG_STR ); if ( ! maPath.getLength() ) - setPath( getInitPath( aUserData, 1 ) ); + displayFolder( getInitPath( aUserData, 1 ) ); if ( mbHasAutoExt ) { @@ -1968,7 +2030,7 @@ void FileDialogHelper_Impl::loadConfig() } if ( !maPath.getLength() ) - setPath( SvtPathOptions().GetWorkPath() ); + displayFolder( SvtPathOptions().GetWorkPath() ); } } @@ -2231,9 +2293,29 @@ ErrCode FileDialogHelper::GetGraphic( Graphic& rGraphic ) const } // ------------------------------------------------------------------------ -void FileDialogHelper::SetDisplayDirectory( const String& rPath ) +void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) { - mpImp->setPath( rPath ); + if ( !_rPath.Len() ) + return; + + // if the given path isn't a folder, we cut off the last part + // and take it as filename and the rest of the path should be + // the folder + + ::rtl::OUString sPath; + ::rtl::OUString sFileName; + + INetURLObject aObj( _rPath ); + if ( !::utl::UCBContentHelper::IsFolder( _rPath ) ) + { + sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); + aObj.removeSegment(); + } + + sPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); + + mpImp->displayFolder( sPath ); + mpImp->setFileName( sFileName ); } // ------------------------------------------------------------------------ diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src index 37b81849072a..5fcab190ec9e 100644 --- a/sfx2/source/dialog/filedlghelper.src +++ b/sfx2/source/dialog/filedlghelper.src @@ -2,9 +2,9 @@ * * $RCSfile: filedlghelper.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: mav $ $Date: 2002-04-30 13:10:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ String STR_SFX_FILEDLG_ACTUALVERSION Text[ english_us ] = "Current version"; Text[ portuguese ] = "Verso actual"; Text[ russian ] = " "; - Text[ dutch ] = "Actuele versie"; + Text[ dutch ] = "Huidige versie"; Text[ french ] = "Version actuelle"; Text[ spanish ] = "Versin actual"; Text[ italian ] = "Versione attuale"; @@ -83,21 +83,42 @@ String STR_SFX_FILEDLG_ACTUALVERSION Text[ swedish ] = "Aktuell version"; Text[ polish ] = "Wersja bieca"; Text[ portuguese_brazilian ] = "Actual version"; - Text[ japanese ] = "ŐVްޮ"; - Text[ chinese_simplified ] = "ǰİ汾"; - Text[ chinese_traditional ] = "e"; + Text[ japanese ] = "最新のバージョン"; + Text[ chinese_simplified ] = "当前的版本"; + Text[ chinese_traditional ] = "目前的版本"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ֽ "; + Text[ korean ] = "현재 버전"; Text[ turkish ] = "Yrrlkteki srm"; - Text[ catalan ] = "Current version"; + Text[ catalan ] = "Versi actual"; Text[ finnish ] = "Nykyinen versio"; + Text[ thai ] = "เวอร์ชั่นปัจจุบัน"; }; String STR_SFX_EXPLORERFILE_EXPORT { Text = "Exportieren" ; Text[ English ] = "Export" ; + Text[ swedish ] = "Exportera"; + Text[ korean ] = "내보내기"; + Text[ chinese_traditional ] = "匯出"; + Text[ english_us ] = "Export"; + Text[ portuguese ] = "Export"; + Text[ russian ] = "Export"; + Text[ greek ] = "Export"; + Text[ dutch ] = "Export"; + Text[ french ] = "Exporter"; + Text[ spanish ] = "Exportar"; + Text[ finnish ] = "Export"; + Text[ italian ] = "Esporta"; + Text[ danish ] = "Export"; + Text[ polish ] = "Export"; + Text[ japanese ] = "エクスポート"; + Text[ chinese_simplified ] = "输出"; + Text[ turkish ] = "Export"; + Text[ arabic ] = "Export"; + Text[ catalan ] = "Exporta"; + Text[ thai ] = "ส่งออก"; }; String STR_SFX_EXPLORERFILE_INSERT @@ -108,22 +129,23 @@ String STR_SFX_EXPLORERFILE_INSERT Text[ english_us ] = "Insert" ; Text[ portuguese_brazilian ] = "Einf?en" ; Text[ swedish ] = "Infoga" ; - Text[ danish ] = "Indst" ; + Text[ danish ] = "St ind" ; Text[ italian ] = "Inserisci" ; Text[ spanish ] = "Insertar" ; Text[ french ] = "Insrer" ; Text[ dutch ] = "Invoegen" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "插入"; + Text[ russian ] = " "; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "}"; - Text[ chinese_traditional ] = "KW"; + Text[ japanese ] = "挿入"; + Text[ chinese_traditional ] = "貼上"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = ""; + Text[ korean ] = "삽입"; Text[ turkish ] = "Ekle"; - Text[ catalan ] = "Insert"; + Text[ catalan ] = "Insereix"; Text[ finnish ] = "Lis"; + Text[ thai ] = "แทรก"; }; String STR_SFX_EXPLORERFILE_BUTTONINSERT @@ -134,22 +156,23 @@ String STR_SFX_EXPLORERFILE_BUTTONINSERT Text[ english_us ] = "~Insert" ; Text[ portuguese_brazilian ] = "~Einf?en" ; Text[ swedish ] = "~Infoga" ; - Text[ danish ] = "~Indst" ; - Text[ italian ] = "~Inserici" ; + Text[ danish ] = "St i~nd" ; + Text[ italian ] = "Inserisci" ; Text[ spanish ] = "~Insertar" ; - Text[ french ] = "~Insrer" ; + Text[ french ] = "Insrer" ; Text[ dutch ] = "~Invoegen" ; - Text[ chinese_simplified ] = "ճ(~I)"; + Text[ chinese_simplified ] = "插入(~I)"; Text[ russian ] = ""; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "}(~I)"; - Text[ chinese_traditional ] = "KW(~I)"; + Text[ japanese ] = "挿入(~I)"; + Text[ chinese_traditional ] = "貼上(~I)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~I)"; + Text[ korean ] = "삽입(~I)"; Text[ turkish ] = "Ekle"; - Text[ catalan ] = "~Insert"; + Text[ catalan ] = "~Insereix"; Text[ finnish ] = "~Lis"; + Text[ thai ] = "แ~ทรก"; }; String STR_SFX_IMPORT_ALL @@ -160,24 +183,25 @@ String STR_SFX_IMPORT_ALL Text[ italian ] = "<Tutti i formati>" ; Text[ portuguese_brazilian ] = "<Todos os formatos>" ; Text[ portuguese ] = "<Todos os formatos>" ; - Text[ finnish ] = "<All formats>" ; + Text[ finnish ] = "<Kaikki muodot>" ; Text[ danish ] = "<Alle formater>" ; Text[ french ] = "<Tous les formats>" ; Text[ swedish ] = "<Alla format>" ; - Text[ dutch ] = "<Alle formaten>" ; + Text[ dutch ] = "<Alle indelingen>" ; Text[ spanish ] = "<Todos los formatos>" ; Text[ english_us ] = "<All formats>" ; - Text[ chinese_simplified ] = "<еĸʽ>"; + Text[ chinese_simplified ] = "<所有的格式>"; Text[ russian ] = "< >"; Text[ polish ] = "<Wszystkie formaty>"; - Text[ japanese ] = "<ׂĂ̏>"; - Text[ chinese_traditional ] = "<Ҧ榡>"; + Text[ japanese ] = "<すべての書式>"; + Text[ chinese_traditional ] = "<所有的格式>"; Text[ arabic ] = "< >"; Text[ greek ] = "< >"; - Text[ korean ] = "<ü >"; + Text[ korean ] = "<모든 서식>"; Text[ turkish ] = "<Tm formatlar>"; Text[ language_user1 ] = " "; - Text[ catalan ] = "<All formats>"; + Text[ catalan ] = "<Tots els formats>"; + Text[ thai ] = "<รูปแบบทั้งหมด>"; }; String STR_CB_AUTO_EXTENSION @@ -187,23 +211,24 @@ String STR_CB_AUTO_EXTENSION Text[ english_us ] = "~Automatic file name extension" ; Text[ portuguese_brazilian ] = "automatische Dateinamens~erweiterung" ; Text[ swedish ] = "~Automatiskt filnamnstillgg" ; - Text[ danish ] = "automatisk filtypenavn" ; + Text[ danish ] = "automatisk filtype~navn" ; Text[ italian ] = "~Estensione automatica del nome del file" ; - Text[ spanish ] = "~Ampliacin automtica del nombre de archivo" ; + Text[ spanish ] = "~Extensin autom. del nombre de archivo" ; Text[ french ] = "Extension automatique du nom de fichier" ; Text[ dutch ] = "automatische bestandsnaam~extensie" ; Text[ portuguese ] = "E~xtenso automtica do nome de ficheiro" ; - Text[ chinese_simplified ] = "Զĵչ(~A)"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "自动加上文档扩展名(~A)"; + Text[ russian ] = " "; Text[ polish ] = "Automatyczne rozszerzenie nazwy pliku"; - Text[ japanese ] = "I̧ٖ̊gq(~A)"; - Text[ chinese_traditional ] = "۰ʥ[WɦW(~A)"; + Text[ japanese ] = "ファイル名に拡張子を付ける(~A)"; + Text[ chinese_traditional ] = "自動加上副檔名(~A)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ڵ ̸ Ȯ(~A)"; + Text[ korean ] = "자동 파일 이름 확장자(~A)"; Text[ turkish ] = "Otomatik dosya ad uzants"; - Text[ finnish ] = "~Automaattinen tiedostotunniste"; - Text[ catalan ] = "~Ampliacin automtica del nombre de archivo"; + Text[ finnish ] = "Automaattinen tiedoston ~tunniste"; + Text[ catalan ] = "~Posa automticament l'extensi "; + Text[ thai ] = "ส่วนขยายชื่อแฟ้ม~อัตโนมัติ"; }; String STR_CB_SELECTION @@ -216,21 +241,22 @@ String STR_CB_SELECTION Text[ french ] = "Slection" ; Text[ dutch ] = "~Selectie" ; Text[ swedish ] = "Mark~ering" ; - Text[ danish ] = "Markering" ; + Text[ danish ] = "M~arkering" ; Text[ portuguese ] = "S~eleco" ; Text[ portuguese_brazilian ] = "S~elektion" ; - Text[ chinese_simplified ] = "ѡ(~S)"; + Text[ chinese_simplified ] = "选中(~S)"; Text[ russian ] = ""; Text[ polish ] = "Selekcja"; - Text[ japanese ] = "I͈(~S)"; - Text[ chinese_traditional ] = "(~S)"; + Text[ japanese ] = "選択範囲(~S)"; + Text[ chinese_traditional ] = "選取(~S)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~S)"; + Text[ korean ] = "선택(~S)"; Text[ turkish ] = "Seim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Seleccin"; - Text[ finnish ] = "~Valinta"; + Text[ catalan ] = "~Selecci"; + Text[ finnish ] = "Vie vain v~alinta"; + Text[ thai ] = "เ~ลือก"; }; String STR_CB_INSERT_AS_LINK @@ -241,24 +267,25 @@ String STR_CB_INSERT_AS_LINK Text[ italian ] = "~Collega" ; Text[ portuguese_brazilian ] = "~Liga??o" ; Text[ portuguese ] = "~Ligar" ; - Text[ finnish ] = "~Linkit" ; - Text[ danish ] = "Kd" ; + Text[ finnish ] = "~Linkki" ; + Text[ danish ] = "~Kd" ; Text[ french ] = "Lien" ; Text[ swedish ] = "L~nka" ; Text[ dutch ] = "~Koppelen" ; Text[ spanish ] = "~Vincular" ; Text[ english_us ] = "~Link" ; - Text[ chinese_simplified ] = "(~L)"; + Text[ chinese_simplified ] = "链接(~L)"; Text[ russian ] = ""; Text[ polish ] = "Pocz"; - Text[ japanese ] = "ݸ(~L)"; - Text[ chinese_traditional ] = "|(~L)"; + Text[ japanese ] = "リンク(~L)"; + Text[ chinese_traditional ] = "捷徑(~L)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~L)"; + Text[ korean ] = "연결(~L)"; Text[ turkish ] = "~Balant olutur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Link"; + Text[ catalan ] = "~Enlla"; + Text[ thai ] = "เ~ชื่อมโยง"; }; String STR_CB_SHOW_PREVIEW @@ -270,23 +297,24 @@ String STR_CB_SHOW_PREVIEW Text[ portuguese_brazilian ] = "Ex~aminar" ; Text[ portuguese ] = "~Visualizar" ; Text[ finnish ] = "Esi~katselu" ; - Text[ danish ] = "Eksempel" ; + Text[ danish ] = "E~ksempel" ; Text[ french ] = "Aperu" ; Text[ swedish ] = "~Frhandsvisning" ; Text[ dutch ] = "~Voorbeeld" ; Text[ spanish ] = "~Previsualizacin" ; Text[ english_us ] = "Pr~eview" ; - Text[ chinese_simplified ] = "Ԥ(~E)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "预览(~E)"; + Text[ russian ] = " "; Text[ polish ] = "Podgld"; - Text[ japanese ] = "ޭ(~E)"; - Text[ chinese_traditional ] = "w(~E)"; + Text[ japanese ] = "プレビュー(~E)"; + Text[ chinese_traditional ] = "預覽(~E)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "̸ (~E)"; + Text[ korean ] = "미리보기(~E)"; Text[ turkish ] = "~nizleme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pr~eview"; + Text[ catalan ] = "Pr~evisualitza"; + Text[ thai ] = "แสด~งตัวอย่าง"; }; String STR_CB_READONLY @@ -296,23 +324,24 @@ String STR_CB_READONLY Text[ english_us ] = "~Read-only" ; Text[ portuguese_brazilian ] = "Nur lesen" ; Text[ swedish ] = "~Bara lsning" ; - Text[ danish ] = "Skrivebeskyttet" ; + Text[ danish ] = "K~un lse" ; Text[ italian ] = "Sola lettura" ; Text[ spanish ] = "Slo ~lectura" ; Text[ french ] = "En lecture seule" ; - Text[ dutch ] = "~Alleen lezen" ; + Text[ dutch ] = "~Alleen-lezen" ; Text[ portuguese ] = "S ~leitura" ; - Text[ chinese_simplified ] = "ֻ(~R)"; + Text[ chinese_simplified ] = "只读(~R)"; Text[ russian ] = " "; Text[ polish ] = "Tylko do odczytu"; - Text[ japanese ] = "ǂݎp(~R)"; - Text[ chinese_traditional ] = "Ū(~R)"; + Text[ japanese ] = "読み取り専用(~R)"; + Text[ chinese_traditional ] = "唯讀(~R)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "б (~R)"; + Text[ korean ] = "읽기 전용(~R)"; Text[ turkish ] = "Salt okunur"; - Text[ finnish ] = "~Vain luku"; - Text[ catalan ] = "Solo ~lectura"; + Text[ finnish ] = "Vain ~luku"; + Text[ catalan ] = "Noms ~lectura"; + Text[ thai ] = "~อ่านอย่างเดียว"; }; String STR_CB_PASSWORD @@ -322,23 +351,24 @@ String STR_CB_PASSWORD Text[ english_us ] = "Save with ~password" ; Text[ portuguese_brazilian ] = "guardar con senha" ; Text[ swedish ] = "S~para med lsenord" ; - Text[ danish ] = "gem med adgangskode" ; + Text[ danish ] = "Gem med ~adgangskode" ; Text[ italian ] = "Sal~va con password" ; Text[ spanish ] = "Guardar con c~ontrasea" ; Text[ french ] = "Enregistrer avec mot de passe" ; Text[ dutch ] = "met ~wachtwoord opslaan" ; Text[ portuguese ] = "Guardar com ~senha" ; - Text[ chinese_simplified ] = "ʹ(~P)"; + Text[ chinese_simplified ] = "使用密码存盘(~P)"; Text[ russian ] = " "; Text[ polish ] = "Zapisz z ~hasem"; - Text[ japanese ] = "߽ܰނgĕۑ(~P)"; - Text[ chinese_traditional ] = "ϥαKXxs(~P)"; + Text[ japanese ] = "パスワード付きで保存する(~P)"; + Text[ chinese_traditional ] = "使用密碼儲存(~P)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "н (~P)"; + Text[ korean ] = "암호를 사용하여 저장(~P)"; Text[ turkish ] = "ifreyle kaydet"; - Text[ finnish ] = "~Tallenna salasanan kanssa"; - Text[ catalan ] = "Guardar con c~ontrasea"; + Text[ finnish ] = "Tallenna ~mys salasana"; + Text[ catalan ] = "Desa amb c~ontrasenya"; + Text[ thai ] = "บันทึกด้วย~รหัสผ่าน"; }; String STR_CB_FILTER_OPTIONS @@ -352,19 +382,20 @@ String STR_CB_FILTER_OPTIONS Text[ french ] = "diter les paramtres de filtre"; Text[ spanish ] = "Editar ~configuracin de filtros"; Text[ italian ] = "~Modifica impostazioni filtro"; - Text[ danish ] = "Rediger filterindstillinger"; + Text[ danish ] = "~Rediger filterindstillinger"; Text[ swedish ] = "~Redigera filterinstllningar"; Text[ polish ] = "Edytuj ustawienia filtra"; Text[ portuguese_brazilian ] = "~Customize Filtersettings"; - Text[ japanese ] = "̨ݒ̕ҏW(~F)"; - Text[ chinese_simplified ] = "༭ɸѡ趨(~F)"; - Text[ chinese_traditional ] = "sz]w(~F)"; + Text[ japanese ] = "フィルタ設定を編集する(~F)"; + Text[ chinese_simplified ] = "编辑筛选设定(~F)"; + Text[ chinese_traditional ] = "編輯篩選設定(~F)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "ͼ (~F)"; + Text[ korean ] = "필터 설정 편집(~F)"; Text[ turkish ] = "Filtre ayarlarn dzenle"; - Text[ finnish ] = "Muokkaa suodattimen asetuksia"; - Text[ catalan ] = "Editar ~configuracin de filtros"; + Text[ finnish ] = "Muokkaa ~suodatusasetuksia"; + Text[ catalan ] = "Edita la ~configuraci de filtres"; + Text[ thai ] = "แก้ไขการกำหนด~ตัวกรอง"; }; String STR_PB_PLAY @@ -377,20 +408,21 @@ String STR_PB_PLAY Text[ french ] = "Reproduire" ; Text[ dutch ] = "Af~spelen" ; Text[ swedish ] = "~Spela upp" ; - Text[ danish ] = "Afspil" ; + Text[ danish ] = "Af~spil" ; Text[ portuguese ] = "~Tocar" ; Text[ portuguese_brazilian ] = "Ab~spielen" ; - Text[ chinese_simplified ] = "ӳ(~P)"; - Text[ russian ] = ""; + Text[ chinese_simplified ] = "放映(~P)"; + Text[ russian ] = ""; Text[ polish ] = "Odtwrz"; - Text[ japanese ] = "Đ(~P)"; + Text[ japanese ] = "再生(~P)"; Text[ greek ] = "~"; - Text[ korean ] = "(~P)"; - Text[ chinese_traditional ] = "M(~P)"; + Text[ korean ] = "재생(~P)"; + Text[ chinese_traditional ] = "放映(~P)"; Text[ arabic ] = ""; Text[ turkish ] = "altr"; - Text[ catalan ] = "~Reproducir"; + Text[ catalan ] = "~Reprodueix"; Text[ finnish ] = "~Toista"; + Text[ thai ] = "เ~ล่น"; }; String STR_PB_STOP @@ -403,20 +435,21 @@ String STR_PB_STOP Text[ french ] = "Arrter" ; Text[ dutch ] = "~Stoppen" ; Text[ swedish ] = "St~opp" ; - Text[ danish ] = "Stop" ; + Text[ danish ] = "S~top" ; Text[ portuguese ] = "~Parar" ; Text[ portuguese_brazilian ] = "A~nhalten" ; - Text[ chinese_simplified ] = "ͣ(~P)"; + Text[ chinese_simplified ] = "暂停(~P)"; Text[ russian ] = ""; Text[ polish ] = "Zatrzymaj"; - Text[ japanese ] = "ꎞ~(~P)"; + Text[ japanese ] = "一時停止(~P)"; Text[ greek ] = ""; - Text[ korean ] = "(~P)"; - Text[ chinese_traditional ] = "Ȱ(~P)"; + Text[ korean ] = "중지(~P)"; + Text[ chinese_traditional ] = "暫停(~P)"; Text[ arabic ] = ""; Text[ turkish ] = "Durdur"; - Text[ catalan ] = "~Detener"; + Text[ catalan ] = "~Atura"; Text[ finnish ] = "Sei~s"; + Text[ thai ] = "หยุ~ด"; }; String STR_PB_OPEN @@ -427,22 +460,23 @@ String STR_PB_OPEN Text[ english_us ] = "~Open" ; Text[ portuguese_brazilian ] = "~Abrir" ; Text[ swedish ] = "~ppna" ; - Text[ danish ] = "bn" ; + Text[ danish ] = "~bn" ; Text[ italian ] = "~Apri" ; Text[ spanish ] = "~Abrir" ; Text[ french ] = "Ouvrir" ; Text[ dutch ] = "~Openen" ; - Text[ chinese_simplified ] = "(~O)"; + Text[ chinese_simplified ] = "打开(~O)"; Text[ russian ] = "~"; Text[ polish ] = "Otwrz"; - Text[ japanese ] = "J(~O)"; - Text[ chinese_traditional ] = "}(~O)"; + Text[ japanese ] = "開く(~O)"; + Text[ chinese_traditional ] = "開啟舊檔(~O)"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "(~O)"; + Text[ korean ] = "열기(~O)"; Text[ turkish ] = "A"; Text[ finnish ] = "~Avaa"; - Text[ catalan ] = "~Abrir"; + Text[ catalan ] = "~Obre"; + Text[ thai ] = "เ~ปิด"; }; String STR_PB_SAVE @@ -453,22 +487,23 @@ String STR_PB_SAVE Text[ english_us ] = "~Save" ; Text[ portuguese_brazilian ] = "~Speichern" ; Text[ swedish ] = "~Spara" ; - Text[ danish ] = "Gem" ; + Text[ danish ] = "~Gem" ; Text[ italian ] = "~Salva" ; Text[ spanish ] = "~Guardar" ; Text[ french ] = "Enregistrer" ; Text[ dutch ] = "~Opslaan" ; - Text[ chinese_simplified ] = "(~S)"; + Text[ chinese_simplified ] = "存盘(~S)"; Text[ russian ] = ""; Text[ polish ] = "Zapisz"; - Text[ japanese ] = "ۑ(~S)"; - Text[ chinese_traditional ] = "xsɮ(~S)"; + Text[ japanese ] = "保存(~S)"; + Text[ chinese_traditional ] = "儲存檔案(~S)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~S)"; + Text[ korean ] = "저장(~S)"; Text[ turkish ] = "Kaydet"; Text[ finnish ] = "~Tallenna"; - Text[ catalan ] = "~Guardar"; + Text[ catalan ] = "~Desa"; + Text[ thai ] = "~บันทึก"; }; String STR_LB_IMAGE_TEMPLATE @@ -482,19 +517,20 @@ String STR_LB_IMAGE_TEMPLATE Text[ dutch ] = "Stijl:"; Text[ french ] = "Style :"; Text[ spanish ] = "Estilo:"; - Text[ finnish ] = "Style:"; + Text[ finnish ] = "Tyyli:"; Text[ italian ] = "Stile:"; - Text[ danish ] = "Style:"; + Text[ danish ] = "Typografi:"; Text[ swedish ] = "Stil:"; Text[ polish ] = "Styl:"; Text[ portuguese_brazilian ] = "Style:"; - Text[ japanese ] = ":"; - Text[ korean ] = "Style:"; - Text[ chinese_simplified ] = ""; - Text[ chinese_traditional ] = "G"; + Text[ japanese ] = "種類:"; + Text[ korean ] = "스타일:"; + Text[ chinese_simplified ] = "风格："; + Text[ chinese_traditional ] = "風格："; Text[ turkish ] = "Style:"; Text[ arabic ] = "Style:"; - Text[ catalan ] = "Style:"; + Text[ catalan ] = "Estil:"; + Text[ thai ] = "ลักษณะ:"; }; String STR_LB_TEMPLATES @@ -505,23 +541,24 @@ String STR_LB_TEMPLATES Text[ italian ] = "~Modelli:" ; Text[ portuguese_brazilian ] = "~Modelos:" ; Text[ portuguese ] = "~Modelos:" ; - Text[ finnish ] = "~Mallipohjat:" ; - Text[ danish ] = "Skabeloner:" ; + Text[ finnish ] = "~Mallit:" ; + Text[ danish ] = "~Skabeloner:" ; Text[ french ] = "Modles :" ; Text[ swedish ] = "~Mallar:" ; Text[ dutch ] = "S~jablonen:" ; Text[ spanish ] = "P~lantillas:" ; Text[ english_us ] = "~Templates:" ; - Text[ chinese_simplified ] = "ʽ(~T)"; + Text[ chinese_simplified ] = "样式(~T)："; Text[ russian ] = ":"; Text[ polish ] = "Szablony:"; - Text[ japanese ] = "ڰ(~T)"; - Text[ chinese_traditional ] = "˦(~T)G"; + Text[ japanese ] = "テンプレート(~T)"; + Text[ chinese_traditional ] = "樣式(~T)："; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "(~T)"; + Text[ korean ] = "서식 파일(~T)"; Text[ turkish ] = "~ablon:"; - Text[ catalan ] = "P~lantillas:"; + Text[ catalan ] = "P~lantilles:"; + Text[ thai ] = "แ~ม่แบบ:"; }; String STR_LB_VERSION @@ -535,19 +572,20 @@ String STR_LB_VERSION Text[ french ] = "Version :"; Text[ spanish ] = "~Versin:"; Text[ italian ] = "Versione:"; - Text[ danish ] = "Version:"; + Text[ danish ] = "~Version:"; Text[ swedish ] = "~Version:"; Text[ polish ] = "Wersja:"; Text[ portuguese_brazilian ] = "~Version:"; - Text[ japanese ] = "ްޮ(~V):"; - Text[ chinese_simplified ] = "汾(~V)"; - Text[ chinese_traditional ] = "(~V)G"; + Text[ japanese ] = "バージョン(~V):"; + Text[ chinese_simplified ] = "版本(~V)："; + Text[ chinese_traditional ] = "版本(~V)："; Text[ arabic ] = ":"; Text[ greek ] = ":"; - Text[ korean ] = "(~V):"; + Text[ korean ] = "버전(~V):"; Text[ turkish ] = "Srm:"; Text[ finnish ] = "~Versio:"; - Text[ catalan ] = "~Versin:"; + Text[ catalan ] = "~Versi:"; + Text[ thai ] = "เ~วอร์ชั่น:"; }; //******************************************************************** EOF @@ -557,3 +595,17 @@ String STR_LB_VERSION + + + + + + + + + + + + + + diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 506e817c1db7..f79991b81b59 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filedlgimpl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: gt $ $Date: 2002-10-31 13:51:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,6 +117,7 @@ namespace sfx2 FileDialogHelper* mpParent; ::rtl::OUString maPath; + ::rtl::OUString maFileName; ::rtl::OUString maCurFilter; ::rtl::OUString maSelectFilter; ::rtl::OUString maButtonLabel; @@ -150,6 +151,8 @@ namespace sfx2 sal_Bool mbInsert : 1; sal_Bool mbSystemPicker : 1; sal_Bool mbPwdCheckBoxState : 1; + sal_Bool mbSelection : 1; + sal_Bool mbSelectionEnabled : 1; private: void addFilters( sal_uInt32 nFlags, @@ -194,6 +197,8 @@ namespace sfx2 void SaveLastUsedFilter( const ::rtl::OUString& _rContextIdentifier ); void SaveLastUsedFilter( void ); + void implInitializeFileName( ); + DECL_LINK( TimeOutHdl_Impl, Timer* ); DECL_LINK( HandleEvent, FileDialogHelper* ); DECL_LINK( InitControls, void* ); @@ -227,9 +232,17 @@ namespace sfx2 String& rFilter ); ErrCode execute(); - void setPath( const ::rtl::OUString& rPath ); +// void setPath( const ::rtl::OUString& rPath ); void setFilter( const ::rtl::OUString& rFilter ); + /** sets the directory which should be browsed + + <p>If the given path does not point to a valid (existent and accessible) folder, the request + is silently dropped</p> + */ + void displayFolder( const ::rtl::OUString& rPath ); + void setFileName( const ::rtl::OUString& _rFile ); + ::rtl::OUString getPath() const; ::rtl::OUString getFilter() const; void getRealFilter( String& _rFilter ) const; diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 43390a409977..fe88f06cc828 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filtergrouping.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: pb $ $Date: 2002-10-22 09:58:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:27:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1029,11 +1029,14 @@ namespace sfx2 sal_Int32 nPDFIndex = -1; sal_Int32 nHTMLIndex = -1; + sal_Int32 nFlashIndex = -1; sal_Int32 nCount = 0; String sPDFExtension = String::CreateFromAscii( "*.pdf" ); String sHTMLExtension = String::CreateFromAscii( "*.htm*" ); + String sFlashExtension = String::CreateFromAscii( "*.swf" ); WildCard aHTMLWildcardMatcher( sHTMLExtension, ';' ); WildCard aPDFWildcardMatcher( sPDFExtension, ';' ); + WildCard aFlashWildcardMatcher( sFlashExtension, ';' ); ::rtl::OUString sUIName; ::rtl::OUString sExtensions; std::vector< ExportFilter > aImportantFilterGroup; @@ -1064,6 +1067,19 @@ namespace sfx2 nPDFIndex = 0; nCount++; } + else if ( nFlashIndex == -1 && aFlashWildcardMatcher.Matches( aExt )) + { + std::vector< ExportFilter >::iterator aIter = aImportantFilterGroup.begin(); + if ( nHTMLIndex != -1 ) + aIter++; + + if ( nPDFIndex != -1 ) + aIter++; + + aImportantFilterGroup.insert( aIter, aExportFilter ); + nFlashIndex = 0; + nCount++; + } else aFilterGroup.push_back( aExportFilter ); } @@ -1240,22 +1256,4 @@ namespace sfx2 } // namespace sfx2 //........................................................................ -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.15 2002/10/01 12:03:39 pb - * fix: #103741# append methods need FileDialogHelper_Impl - * - * Revision 1.14 2002/08/29 13:42:35 cd - * #102385# Use correct way to create filter groups for export - * - * Revision 1.13 2002/08/26 07:57:16 cd - * #101559# Display export filters in new order - * - * Revision 1.12 2002/08/20 09:22:52 pb - * fix: #92788# show extensions of filter - * - * - * Revision 1.0 01.10.01 10:28:28 fs - ************************************************************************/ diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index 41a892166454..07fe71c01ab1 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filtergrouping.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pb $ $Date: 2002-10-01 12:03:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,19 +123,4 @@ namespace sfx2 #endif // SFX2_FILTERGROUPING_HXX -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.3 2002/08/26 07:58:28 cd - * #101559# Display export filters in new order - * - * Revision 1.2 2002/08/20 09:22:52 pb - * fix: #92788# show extensions of filter - * - * Revision 1.1 2001/10/01 16:32:37 fs - * initial checkin - helpers for grouping and classifying filters in the file open dialog - * - * - * Revision 1.0 01.10.01 10:28:28 fs - ************************************************************************/ diff --git a/sfx2/source/dialog/macropg.src b/sfx2/source/dialog/macropg.src index e999363bdb6d..da1356c1884a 100644 --- a/sfx2/source/dialog/macropg.src +++ b/sfx2/source/dialog/macropg.src @@ -2,9 +2,9 @@ * * $RCSfile: macropg.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2002-11-04 16:32:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -221,7 +221,7 @@ TabPage RID_SFX_TP_MACROASSIGN Text[ chinese_traditional ] = "指定(~A)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "적용(~A)"; + Text[ korean ] = "지정(~A)"; Text[ turkish ] = "A~ta"; Text[ catalan ] = "~Assigna"; Text[ finnish ] = "~Mrit"; @@ -237,7 +237,7 @@ TabPage RID_SFX_TP_MACROASSIGN TabStop = TRUE ; Text [ english_us ] = "~Remove" ; Text [ italian ] = "Elimina" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ french ] = "~liminer" ; Text [ dutch ] = "~Opheffen" ; Text [ swedish ] = "~Upphv" ; @@ -245,13 +245,13 @@ TabPage RID_SFX_TP_MACROASSIGN Text [ portuguese_brazilian ] = "~Aufheben" ; Text [ portuguese ] = "~Limpar" ; Text[ chinese_simplified ] = "取消(~R)"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Usu"; Text[ japanese ] = "解除(~R)"; Text[ chinese_traditional ] = "取消(~R)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "해제(~R)"; + Text[ korean ] = "제거(~R)"; Text[ turkish ] = "~Kaldr"; Text[ catalan ] = "~Suprimeix"; Text[ finnish ] = "~Poista"; @@ -270,7 +270,7 @@ TabPage RID_SFX_TP_MACROASSIGN { Text = "Makros" ; Text [ ENGLISH ] = "Macros" ; - Text [ dutch ] = "Macros" ; + Text [ dutch ] = "Macro's" ; Text [ english_us ] = "Macros" ; Text [ italian ] = "Macro" ; Text [ spanish ] = "Macros" ; @@ -296,7 +296,7 @@ TabPage RID_SFX_TP_MACROASSIGN Text[ greek ] = " "; Text[ polish ] = "Przypisz makro"; Text[ japanese ] = "マクロの割り当て"; - Text[ korean ] = "매크로 지정"; + Text[ korean ] = "매크로 할당"; Text[ chinese_simplified ] = "指定宏"; Text[ chinese_traditional ] = "指定巨集"; Text[ turkish ] = "Makro ata"; @@ -354,3 +354,8 @@ TabPage RID_SFX_TP_MACROASSIGN Text[ korean ] = "Assign Macro"; }; + + + + + diff --git a/sfx2/source/dialog/mailwindow.src b/sfx2/source/dialog/mailwindow.src index 1f841b658ba9..2a3958276959 100644 --- a/sfx2/source/dialog/mailwindow.src +++ b/sfx2/source/dialog/mailwindow.src @@ -2,9 +2,9 @@ * * $RCSfile: mailwindow.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: gt $ $Date: 2002-09-02 07:51:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ Window RID_MAIL_WINDOW Text[ portuguese ] = "E~nviar"; Text[ russian ] = ""; Text[ greek ] = "~"; - Text[ dutch ] = "~Zenden"; + Text[ dutch ] = "Ver~zenden"; Text[ french ] = "Envo~yer"; Text[ spanish ] = "Enviar"; Text[ italian ] = "In~via"; @@ -170,7 +170,7 @@ Window RID_MAIL_WINDOW { < "" ; 1 ; > ; < "" ; 2 ; > ; - < " " ; 3 ; > ; + < " " ; 3 ; > ; }; StringList [ greek ] = { @@ -270,7 +270,7 @@ Window RID_MAIL_WINDOW }; StringList [ finnish ] = { - < "Kohde" ; 1 ; > ; + < "Vastaanottaja" ; 1 ; > ; < "Kopioi" ; 2 ; > ; < "Piilokopio" ; 3 ; > ; }; @@ -350,7 +350,7 @@ Window RID_MAIL_WINDOW Text[ polish ] = "Od:"; Text[ portuguese_brazilian ] = "From:"; Text[ japanese ] = "差出人:"; - Text[ korean ] = "부터:"; + Text[ korean ] = "보낸 사람:"; Text[ chinese_simplified ] = "发件人："; Text[ chinese_traditional ] = "寄件者："; Text[ turkish ] = "From:"; @@ -534,7 +534,7 @@ Window RID_MAIL_WINDOW { < "매우 높음" ; 1 ; > ; < "높음" ; 2 ; > ; - < "보통" ; 3 ; > ; + < "표준" ; 3 ; > ; < "낮음" ; 4 ; > ; < "매우 낮음" ; 5 ; > ; }; @@ -583,8 +583,8 @@ Window RID_MAIL_WINDOW < "Kiireellinen" ; 1 ; > ; < "Trke" ; 2 ; > ; < "Normaali" ; 3 ; > ; - < "Matala" ; 4 ; > ; - < "Matalin" ; 5 ; > ; + < "Pieni" ; 4 ; > ; + < "Pienin" ; 5 ; > ; }; StringList [ thai ] = { @@ -619,20 +619,20 @@ InfoBox MSG_ERROR_SEND_MAIL MESSAGE [ italian ] = "Errore durante l'invio del messaggio. I possibili errori sono: conto dell'utente errato oppure setup errato.\nVerificate le impostazioni di %PRODUCTNAME oppure il programma di eMail." ; MESSAGE [ portuguese_brazilian ] = "Erro ao enviar correio." ; MESSAGE [ portuguese ] = "Erro ao enviar correio." ; - MESSAGE [ finnish ] = "Virhe shkpostia lhetettess." ; + MESSAGE [ finnish ] = "Virhe viesti lhetettess. Syit voivat olla puuttuva kyttjtili tai virheelliset asetukset.\nTarkista %PRODUCTNAMEn tai shkpostiohjelmasi asetukset." ; MESSAGE [ danish ] = "Fejl ved afsendelse af meddelelsen. Mulige fejl er en manglende brugerkonto eller en forkert opstning.\nKontroller indstillingerne i %PRODUCTNAME eller i dit e-mail-program." ; MESSAGE [ french ] = "Erreur lors de l'envoi du message. Erreurs possibles : compte d'utilisateur manquant ou Setup erron.\nVrifiez les paramtres de %PRODUCTNAME ou ceux du logiciel de messagerie." ; MESSAGE [ swedish ] = "Fel vid sndning av meddelande. Mjliga fel r att ett anvndarkonto saknas eller en felaktig installation.\nKontrollera instllningarna i %PRODUCTNAME eller i ditt e-postprogram." ; - MESSAGE [ dutch ] = "Fout bij het verzenden van het bericht. Mogelijke fouten zijn een ontbrekend gebruikersaccount of een defecte Setup.\nControleer de insteliingen van %PRODUCTNAME of die van uw e-mail-programma." ; + MESSAGE [ dutch ] = "Fout bij verzenden van bericht. Het is mogelijk dat de gebruikersaccount ontbreekt of dat de installatie fouten bevat.\nControleer de instellingen van %PRODUCTNAME of van het e-mailprogramma." ; MESSAGE [ spanish ] = "Error al enviar el mensaje. La razn puede ser una cuenta de usuario o una instalacin defectuosa.\nCompruebe la configuracin de %PRODUCTNAME o la de su programa de correo electrnico." ; MESSAGE [ english_us ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生一个错误。可能缺少一个用户帐号或者安装程序有误。\n请检查 %PRODUCTNAME 的设定或者电子邮件程序的设定。"; - MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; + MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; MESSAGE[ polish ] = "Bd w przesyaniu wiadomoci: brak konta uytkownika lub nieprawidowa instalacja.\nNaley sprawdzi ustawienia programu %PRODUCTNAME lub programu poczty elektronicznej."; MESSAGE[ japanese ] = "メッセージ送信時のエラー。エラーの原因としては、ユーザーアカウントがないか、あるいはセットアップが正しくないかが考えられます。\n%PRODUCTNAME、またはお使いの E-mail プログラムの設定を確認してください。"; MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。可能缺少一個使用者賬號或程式安裝有問題。\n請檢查 %PRODUCTNAME 的設定和電子郵件程式的設定。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "메시지를 보낼 때 오류 발생. 아마도 사용자 계정이 없거나 잘못 설치되어 오류가 발생했을 것입니다.\n %PRODUCTNAME 설정이나 E-Mail 프로그램 설정을 확인하십시오"; + MESSAGE[ korean ] = "메시지를 보내는 중 오류가 발생했습니다. 아마도 사용자 계정이 없거나 잘못 설치되어 오류가 발생했을 것입니다.\n%PRODUCTNAME 설정이나 전자 메일 프로그램 설정을 확인하십시오."; MESSAGE[ arabic ] = " "; MESSAGE[ turkish ] = "Posta gnderirken hata olutu."; MESSAGE[ language_user1 ] = " "; @@ -641,3 +641,8 @@ InfoBox MSG_ERROR_SEND_MAIL }; // ------------------------------------------------------------------- EOF + + + + + diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src index 732cbe70f0f8..5b9dc69f61c9 100644 --- a/sfx2/source/dialog/mgetempl.src +++ b/sfx2/source/dialog/mgetempl.src @@ -2,9 +2,9 @@ * * $RCSfile: mgetempl.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-09-10 14:14:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,18 +117,18 @@ TabPage TP_MANAGE_STYLES Text [ swedish ] = "~Autom. uppdatering" ; Text [ danish ] = "Opdater automatisk" ; Text [ italian ] = "Aggiorna automaticamente" ; - Text [ spanish ] = "~Actualizar automticamente" ; + Text [ spanish ] = "~Actualizacin automtica" ; Text [ french ] = "Actualisation ~automatique" ; - Text [ dutch ] = "~Autom. actualiseren" ; + Text [ dutch ] = "~Autom. bijwerken" ; Text [ portuguese ] = "Actualizar ~automaticamente" ; Text[ chinese_simplified ] = "自动更新(~A)"; - Text[ russian ] = ". "; + Text[ russian ] = ""; Text[ polish ] = "~Aktualizuj automatycznie"; Text[ japanese ] = "自動的に更新(~A)"; Text[ chinese_traditional ] = "自動更新(~A)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "자동 새로고침(~A)"; + Text[ korean ] = "자동으로 새로 고침(~A)"; Text[ turkish ] = "~Otomatik gncelleme"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Actualitza automticament"; @@ -146,10 +146,10 @@ TabPage TP_MANAGE_STYLES Text [ portuguese_brazilian ] = "~Pr?imo" ; Text [ portuguese ] = "~Estilo seguinte" ; Text [ finnish ] = "Seu~raava tyyli" ; - Text [ danish ] = "Nste typografi" ; + Text [ danish ] = "N~ste typografi" ; Text [ french ] = "~Style de suite" ; Text [ swedish ] = "Nsta ~formatmall" ; - Text [ dutch ] = "~Volgend profiel" ; + Text [ dutch ] = "V~olgend profiel" ; Text [ spanish ] = "~Estilo siguiente" ; Text [ english_us ] = "Ne~xt Style" ; Text[ chinese_simplified ] = "下一个样式(~X)"; @@ -159,7 +159,7 @@ TabPage TP_MANAGE_STYLES Text[ chinese_traditional ] = "下一個樣式(~X)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "다음 템플릿(~X)"; + Text[ korean ] = "다음 스타일(~X)"; Text[ turkish ] = "Sonraki biim"; Text[ language_user1 ] = "\"Vorlagen\" Styles are always capitalized no matter where they show up. EM15.5.00"; Text[ catalan ] = "~Estil segent"; @@ -185,7 +185,7 @@ TabPage TP_MANAGE_STYLES Text [ italian ] = "~Basato su" ; Text [ portuguese_brazilian ] = "~Baseado em" ; Text [ portuguese ] = "~Baseado em" ; - Text [ finnish ] = "~Perusta" ; + Text [ finnish ] = "Perusta" ; Text [ danish ] = "Kdet med" ; Text [ french ] = "~Li " ; Text [ swedish ] = "~Lnkad med" ; @@ -228,7 +228,7 @@ TabPage TP_MANAGE_STYLES Text [ french ] = "~Catgorie" ; Text [ swedish ] = "~Kategori" ; Text [ dutch ] = "~Bereik" ; - Text [ spanish ] = "~rea" ; + Text [ spanish ] = "~Categora" ; Text [ english_us ] = "~Category" ; Text[ chinese_simplified ] = "分类(~C)"; Text[ russian ] = ""; @@ -299,3 +299,15 @@ TabPage TP_MANAGE_STYLES + + + + + + + + + + + + diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src index 91a8414cad75..120abf434d7e 100644 --- a/sfx2/source/dialog/newstyle.src +++ b/sfx2/source/dialog/newstyle.src @@ -2,9 +2,9 @@ * * $RCSfile: newstyle.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:23:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,17 +82,17 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE Text [ dutch ] = "Opmaakprofiel maken" ; Text [ spanish ] = "Crear estilo" ; Text [ english_us ] = "Create Style" ; - Text[ chinese_simplified ] = "ʽ"; - Text[ russian ] = " "; + Text[ chinese_simplified ] = "生成样式"; + Text[ russian ] = " "; Text[ polish ] = "Utwrz styl"; - Text[ japanese ] = "ق̍쐬"; - Text[ chinese_traditional ] = "s@˦"; + Text[ japanese ] = "スタイルの作成"; + Text[ chinese_traditional ] = "製作樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ۼ"; + Text[ korean ] = "스타일 만들기"; Text[ turkish ] = "Biim olutur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Crear estilo"; + Text[ catalan ] = "Crea un estil"; Moveable = TRUE ; FixedLine FL_COL { @@ -111,17 +111,18 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE Text [ dutch ] = "Naam opmaakprofiel" ; Text [ spanish ] = "Nombre del estilo" ; Text [ english_us ] = "Style name" ; - Text[ chinese_simplified ] = "ʽ"; + Text[ chinese_simplified ] = "样式名称"; Text[ russian ] = " "; Text[ polish ] = "Nazwa stylu"; - Text[ japanese ] = "ٖ"; - Text[ chinese_traditional ] = "˦W"; + Text[ japanese ] = "スタイル名"; + Text[ chinese_traditional ] = "樣式名稱"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = " ̸"; + Text[ korean ] = "스타일 이름"; Text[ turkish ] = "Biim ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre del estilo"; + Text[ catalan ] = "Nom de l'estil"; + Text[ thai ] = "ชื่อลักษณะ"; }; ComboBox LB_COL { @@ -160,21 +161,34 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE Message [ dutch ] = "Dit opmaakprofiel bestaat reeds. Overschrijven?" ; Message [ spanish ] = "El estilo ya existe. Desea sobrescribirlo?" ; Message [ english_us ] = "Style already exists. Overwrite?" ; - Message[ chinese_simplified ] = "ʽѾڡҪд"; + Message[ chinese_simplified ] = "样式已经存在。要改写？"; Message[ russian ] = " . ?"; Message[ polish ] = "Styl ju istnieje. Zastpi innym?"; - Message[ japanese ] = "ق͂łɂ܂B㏑܂B"; - Message[ chinese_traditional ] = "˦wgsbCnмgH"; + Message[ japanese ] = "スタイルはすでにあります。上書きしますか。"; + Message[ chinese_traditional ] = "樣式已經存在。要覆寫？"; Message[ arabic ] = " . "; Message[ greek ] = " . ;"; - Message[ korean ] = " ̹ ֽϴ. ðڽϱ?"; + Message[ korean ] = "이 스타일은 이미 있습니다. 겹쳐쓰시겠습니까?"; Message[ turkish ] = "Biim mevcut durumda. zerine yazlsn m?"; Message[ language_user1 ] = " "; - Message[ catalan ] = "El estilo ya existe. Desea sobrescribirlo?"; + Message[ catalan ] = "L'estil ja existeix. Voleu sobreescriure'l?"; + Message[ thai ] = "ลักษณะมีอยู่แล้ว เขียนทับหรือไม่?"; }; + Text[ thai ] = "สร้างลักษณะ"; }; + + + + + + + + + + + diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index c384383b2074..a25a794b7362 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: partwnd.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2002-09-30 17:05:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,16 +219,19 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() // frame reference in our own DisposingListener. // But don't do it, if xFrame already exist. Then dispose() must come from inside ... // and we need a valid pMgr for further operations ... - SfxPartDockWnd_Impl* pWin = (SfxPartDockWnd_Impl*) pWindow; - if( pWin != NULL && !xFrame.is() ) - pWin->ReleaseChildWindow_Impl(); + SfxPartDockWnd_Impl* pWin = (SfxPartDockWnd_Impl*) pWindow; +// if( pWin != NULL && !xFrame.is() ) +// pWin->ReleaseChildWindow_Impl(); +/* // Release frame and window. // If frame reference is valid here ... start dieing from inside by calling dispose(). SetFrame( NULL ); pWindow = NULL; +*/ if ( pWin && xFrame == pWin->GetBindings().GetActiveFrame() ) - pWin->GetBindings().SetActiveFrame( GetFrame() ); + pWin->GetBindings().SetActiveFrame( NULL ); +/* if( xFrame.is() ) { try @@ -248,6 +251,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() { } } + */ } sal_Bool SfxPartChildWnd_Impl::QueryClose() diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src index 60176f7b637e..90e79ceb3541 100644 --- a/sfx2/source/dialog/passwd.src +++ b/sfx2/source/dialog/passwd.src @@ -2,9 +2,9 @@ * * $RCSfile: passwd.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:40:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,13 +85,13 @@ ModalDialog DLG_PASSWD Text [ spanish ] = "Introduzca la contrasea" ; Text [ english_us ] = "Enter Password" ; Text[ chinese_simplified ] = "输入密码"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wprowad haso"; - Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞの入力"; + Text[ japanese ] = "パスワードの入力"; Text[ chinese_traditional ] = "輸入密碼"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "코드 워드 입력"; + Text[ korean ] = "암호 입력"; Moveable = TRUE ; FixedText FT_PASSWD_USER { @@ -111,15 +111,16 @@ ModalDialog DLG_PASSWD Text[ swedish ] = "Anvndare"; Text[ polish ] = "Uytkownik"; Text[ portuguese_brazilian ] = "User"; - Text[ japanese ] = "ﾕｰｻﾞｰ(~U)"; + Text[ japanese ] = "ユーザー(~U)"; Text[ korean ] = "사용자(~U)"; Text[ chinese_simplified ] = "使用名(~U)"; Text[ chinese_traditional ] = "使用者(~U)"; Text[ arabic ] = ""; Text[ turkish ] = "~Kullanc"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuar~io"; - Text[ finnish ] = "~K?ytt?j?"; + Text[ catalan ] = "~Usuari"; + Text[ finnish ] = "~Kyttj"; + Text[ thai ] = "~ผู้ใช้"; }; Edit ED_PASSWD_USER { @@ -141,19 +142,20 @@ ModalDialog DLG_PASSWD Text[ french ] = "~Mot de passe"; Text[ spanish ] = "~Contrasea"; Text[ italian ] = "~Password"; - Text[ danish ] = "Adgangskode"; + Text[ danish ] = "~Adgangskode"; Text[ swedish ] = "~Lsenord"; Text[ polish ] = "Haso"; Text[ portuguese_brazilian ] = "Password"; - Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞ(~P)"; - Text[ korean ] = "코드 워드(~P)"; + Text[ japanese ] = "パスワード(~P)"; + Text[ korean ] = "암호(~P)"; Text[ chinese_simplified ] = "密码(~P)"; Text[ chinese_traditional ] = "密碼(~P)"; Text[ arabic ] = " "; Text[ turkish ] = "~ifre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Contrasea"; + Text[ catalan ] = "C~ontrasenya"; Text[ finnish ] = "~Salasana"; + Text[ thai ] = "~รหัสผ่าน"; }; Edit ED_PASSWD_PASSWORD { @@ -174,20 +176,21 @@ ModalDialog DLG_PASSWD Text[ greek ] = ""; Text[ dutch ] = "~Bevestigen"; Text[ french ] = "~Confirmation"; - Text[ spanish ] = "~Confirmar"; + Text[ spanish ] = "Confirmar"; Text[ italian ] = "Conferma"; Text[ danish ] = "Bekrft"; Text[ swedish ] = "Bekrfta"; Text[ polish ] = "Potwierd"; Text[ portuguese_brazilian ] = "Confirm"; Text[ japanese ] = "確認(~C)"; - Text[ korean ] = "확인(~C)"; + Text[ korean ] = "암호 확인(~C)"; Text[ chinese_simplified ] = "确认(~C)"; Text[ chinese_traditional ] = "確認(~C)"; Text[ arabic ] = ""; Text[ turkish ] = "~Onayla"; - Text[ catalan ] = "~Confirmar"; + Text[ catalan ] = "~Confirma"; Text[ finnish ] = "~Vahvista"; + Text[ thai ] = "~ยืนยัน"; }; Edit ED_PASSWD_CONFIRM { @@ -216,14 +219,15 @@ ModalDialog DLG_PASSWD Text[ chinese_simplified ] = "密码"; Text[ russian ] = ""; Text[ polish ] = "Haso"; - Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞ"; + Text[ japanese ] = "パスワード"; Text[ chinese_traditional ] = "密碼"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "패스워드"; + Text[ korean ] = "암호"; Text[ turkish ] = "ifre"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contrasea"; + Text[ thai ] = "รหัสผ่าน"; }; OKButton BTN_PASSWD_OK { @@ -252,7 +256,7 @@ ModalDialog DLG_PASSWD Text [ portuguese ] = "Confirmar senha" ; Text [ finnish ] = "Vahvista salasana" ; Text [ danish ] = "Bekrft adgangskode" ; - Text [ french ] = "Confirmer le mot de passe" ; + Text [ french ] = "Confirmation du mot de passe" ; Text [ swedish ] = "Bekrfta lsenord" ; Text [ dutch ] = "Wachtwoord bevestigen" ; Text [ spanish ] = "Confirmar contrasea" ; @@ -260,18 +264,20 @@ ModalDialog DLG_PASSWD Text[ chinese_simplified ] = "确认密码"; Text[ russian ] = " "; Text[ polish ] = "Potwierd haso"; - Text[ japanese ] = "ﾊﾟｽﾜｰﾄﾞの確認"; + Text[ japanese ] = "パスワードの確認"; Text[ chinese_traditional ] = "確認密碼"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "코드 워드 확인"; + Text[ korean ] = "암호 확인"; Text[ turkish ] = "ifreyi onayla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Confirmar contrasea"; + Text[ catalan ] = "Confirmeu la contrasenya"; + Text[ thai ] = "ยืนยันรหัสผ่าน"; }; Text[ turkish ] = "ifreyi girin"; Text[ language_user1 ] = " "; Text[ catalan ] = "Introduzca la contrasea"; + Text[ thai ] = "ใส่รหัสผ่าน"; }; // ********************************************************************** EOF @@ -286,3 +292,8 @@ ModalDialog DLG_PASSWD + + + + + diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 58f5e7ced668..e4a8351d82d2 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printopt.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ka $ $Date: 2001-06-28 13:40:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,6 +162,28 @@ SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItem // ----------------------------------------------------------------------------- +Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const +{ + if ( pWindow == (Window *)&aReduceGradientsStepCountNF ) + return (Window *)&aReduceGradientsStripesRB; + else if ( pWindow == (Window *)&aReduceBitmapsResolutionLB ) + return (Window *)&aReduceBitmapsResolutionRB; + else + return SfxTabPage::GetParentLabeledBy( pWindow ); +} + +Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) const +{ + if ( pWindow == (Window *)&aReduceGradientsStripesRB ) + return (Window *)&aReduceGradientsStepCountNF; + else if ( pWindow == (Window *)&aReduceBitmapsResolutionRB ) + return (Window *)&aReduceBitmapsResolutionLB; + else + return SfxTabPage::GetParentLabelFor( pWindow ); +} + +// ----------------------------------------------------------------------------- + BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { SvtPrintWarningOptions aWarnOptions; diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src index c51d49f5ef1f..eb58ad072513 100644 --- a/sfx2/source/dialog/printopt.src +++ b/sfx2/source/dialog/printopt.src @@ -2,9 +2,9 @@ * * $RCSfile: printopt.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:54:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,18 +93,19 @@ TabPage TP_COMMONPRINTOPTIONS Text[ french ] = "Rduire les donnes d'impression"; Text[ spanish ] = "Reducir datos de impresin"; Text[ italian ] = "Riduci i dati di stampa"; - Text[ danish ] = "Reduce printing data"; + Text[ danish ] = "Reducer udskriftsdata"; Text[ swedish ] = "Reducera utskriftsdata"; Text[ polish ] = "Zmniejsz ilo danych do wydruku"; Text[ portuguese_brazilian ] = "Reduce printing data"; - Text[ japanese ] = "印刷ﾃﾞｰﾀを減らす"; + Text[ japanese ] = "印刷データを減らす"; Text[ korean ] = "인쇄 데이터 감소"; Text[ chinese_simplified ] = "减少打印数据"; Text[ chinese_traditional ] = "減少列印資料"; Text[ turkish ] = "Reduce printing data"; Text[ arabic ] = "Reduce printing data"; - Text[ catalan ] = "Reduce printing data"; - Text[ finnish ] = "Druckdaten reduzieren"; + Text[ catalan ] = "Redueix les dades d'impressi"; + Text[ finnish ] = "Pienenn tulostustietoja"; + Text[ thai ] = "ลดข้อมูลการพิมพ์"; }; FixedText FT_OUTPUTTYPE { @@ -121,18 +122,19 @@ TabPage TP_COMMONPRINTOPTIONS Text[ french ] = "Paramtres pour"; Text[ spanish ] = "Configuracin para"; Text[ italian ] = "Impostazioni per"; - Text[ danish ] = "Settings for"; + Text[ danish ] = "Indstillinger for"; Text[ swedish ] = "Instllningar fr"; Text[ polish ] = "Ustawienia dotycz"; Text[ portuguese_brazilian ] = "Settings for"; Text[ japanese ] = "設定"; - Text[ korean ] = "..에 대한 설정"; + Text[ korean ] = "설정"; Text[ chinese_simplified ] = "设定用于"; Text[ chinese_traditional ] = "設定用於"; Text[ turkish ] = "Settings for"; Text[ arabic ] = "Settings for"; - Text[ catalan ] = "Settings for"; - Text[ finnish ] = "Einstellungen fr"; + Text[ catalan ] = "Parmetres de"; + Text[ finnish ] = "Asetukset:"; + Text[ thai ] = "กำหนดสำหรับ"; }; RadioButton RB_PRINTEROUTPUT { @@ -146,21 +148,22 @@ TabPage TP_COMMONPRINTOPTIONS Text[ russian ] = ""; Text[ greek ] = "~Printer"; Text[ dutch ] = "~Printer"; - Text[ french ] = "~Imprimante"; - Text[ spanish ] = "Imp~resora"; + Text[ french ] = "Imprimante"; + Text[ spanish ] = "Impresora"; Text[ italian ] = "~Stampante"; Text[ danish ] = "~Printer"; Text[ swedish ] = "~Skrivare"; Text[ polish ] = "drukarki"; Text[ portuguese_brazilian ] = "~Printer"; - Text[ japanese ] = "ﾌﾟﾘﾝﾀ(~P)"; + Text[ japanese ] = "プリンタ(~P)"; Text[ korean ] = "프린터(~P)"; Text[ chinese_simplified ] = "打印机(~P)"; Text[ chinese_traditional ] = "印表機(~P)"; Text[ turkish ] = "~Printer"; Text[ arabic ] = "~Printer"; - Text[ catalan ] = "~Printer"; - Text[ finnish ] = "~Drucker"; + Text[ catalan ] = "Im~pressora"; + Text[ finnish ] = "~Tulostin"; + Text[ thai ] = "เ~ครื่องพิมพ์"; }; RadioButton RB_PRINTFILEOUTPUT { @@ -171,24 +174,25 @@ TabPage TP_COMMONPRINTOPTIONS Text [ ENGLISH ] = "Print to ~file" ; Text[ english_us ] = "Print to ~file"; Text[ portuguese ] = "Imprimir em ~ficheiro"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "Print to ~file"; - Text[ dutch ] = "Afdrukken in ~bestand"; - Text[ french ] = "~Imprimer dans un fichier"; + Text[ dutch ] = "Afdrukken naar ~bestand"; + Text[ french ] = "Imprimer dans un fichier"; Text[ spanish ] = "Imprimir en ~archivo"; Text[ italian ] = "Stampa nel ~file"; - Text[ danish ] = "Print to ~file"; + Text[ danish ] = "Udskriv i ~fil"; Text[ swedish ] = "Skriv ut t~ill fil"; Text[ polish ] = "drukowania do pliku"; Text[ portuguese_brazilian ] = "Print to ~file"; - Text[ japanese ] = "ﾌｧｲﾙに出力(~F)"; + Text[ japanese ] = "ファイルに出力(~F)"; Text[ korean ] = "파일로 인쇄(~F)"; Text[ chinese_simplified ] = "打印成文件(~F)"; Text[ chinese_traditional ] = "列印成檔案(~F)"; Text[ turkish ] = "Print to ~file"; Text[ arabic ] = "Print to ~file"; - Text[ catalan ] = "Print to ~file"; - Text[ finnish ] = "Drucken ~in Datei"; + Text[ catalan ] = "Imprimeix a ~fitxer"; + Text[ finnish ] = "Tulosta tie~dostoon"; + Text[ thai ] = "พิมพ์ถึงแ~ฟ้ม"; }; // ----------- @@ -211,10 +215,10 @@ TabPage TP_COMMONPRINTOPTIONS Text[ russian ] = "~ "; Text[ greek ] = "~Reduce transparency"; Text[ dutch ] = "~Transparantie reduceren"; - Text[ french ] = "Rduire la ~transparence"; - Text[ spanish ] = "~Reducir transparencia"; - Text[ italian ] = "~Riduci trasparenza"; - Text[ danish ] = "~Reduce transparency"; + Text[ french ] = "Rduire la transparence"; + Text[ spanish ] = "Reducir transparencia"; + Text[ italian ] = "Riduci trasparenza"; + Text[ danish ] = "~Reducer transparens"; Text[ swedish ] = "~Reducera transparens"; Text[ polish ] = "Zredukuj przezroczysto"; Text[ portuguese_brazilian ] = "~Reduce transparency"; @@ -224,8 +228,9 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "減少透明(~R)"; Text[ turkish ] = "~Reduce transparency"; Text[ arabic ] = "~Reduce transparency"; - Text[ catalan ] = "~Reduce transparency"; - Text[ finnish ] = "Transparenz ~reduzieren"; + Text[ catalan ] = "~Redueix la transparncia"; + Text[ finnish ] = "~Heikenn lpinkyvyytt"; + Text[ thai ] = "~ลดความโปร่งแสง"; }; RadioButton RB_REDUCETRANSPARENCY_AUTO { @@ -239,10 +244,10 @@ TabPage TP_COMMONPRINTOPTIONS Text[ russian ] = ""; Text[ greek ] = "Auto~matic"; Text[ dutch ] = "Auto~matisch"; - Text[ french ] = "Auto~matique"; - Text[ spanish ] = "Auto~mtico"; + Text[ french ] = "Automatique"; + Text[ spanish ] = "~Automticamente"; Text[ italian ] = "Auto~matico"; - Text[ danish ] = "Auto~matic"; + Text[ danish ] = "~Automatisk"; Text[ swedish ] = "Auto~matiskt"; Text[ polish ] = "Automatycznie"; Text[ portuguese_brazilian ] = "Auto~matic"; @@ -252,8 +257,9 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "自動(~M)"; Text[ turkish ] = "Auto~matic"; Text[ arabic ] = "Auto~matic"; - Text[ catalan ] = "Auto~matic"; - Text[ finnish ] = "~Automaattisesti"; + Text[ catalan ] = "Auto~mtic"; + Text[ finnish ] = "A~utomaattiseesti"; + Text[ thai ] = "อย่างอัตโน~มัติ"; }; RadioButton RB_REDUCETRANSPARENCY_NONE { @@ -267,10 +273,10 @@ TabPage TP_COMMONPRINTOPTIONS Text[ russian ] = "~ "; Text[ greek ] = "~No transparency"; Text[ dutch ] = "~Geen transparantie"; - Text[ french ] = "~Aucune transparence"; + Text[ french ] = "Aucune transparence"; Text[ spanish ] = "~Sin transparencia"; Text[ italian ] = "Nessuna trasparenza"; - Text[ danish ] = "~No transparency"; + Text[ danish ] = "~Ingen transparens"; Text[ swedish ] = "I~ngen transparens"; Text[ polish ] = "Bez przezroczystoci"; Text[ portuguese_brazilian ] = "~No transparency"; @@ -280,8 +286,9 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "不透明(~N)"; Text[ turkish ] = "~No transparency"; Text[ arabic ] = "~No transparency"; - Text[ catalan ] = "~No transparency"; - Text[ finnish ] = "~Ei lpikuultavuutta"; + Text[ catalan ] = "~Sense transparncia"; + Text[ finnish ] = "E~i lpinkyvyytt"; + Text[ thai ] = "ไ~ม่โปร่งแสง"; }; // ----------- @@ -295,24 +302,25 @@ TabPage TP_COMMONPRINTOPTIONS Text [ ENGLISH ] = "Reduce ~gradients" ; Text[ english_us ] = "Reduce ~gradients"; Text[ portuguese ] = "Reduzir gradaes"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "Reduce ~gradients"; - Text[ dutch ] = "Kleur~verlopen reduceren"; + Text[ dutch ] = "Kle~urverlopen reduceren"; Text[ french ] = "Rduire les d~grads"; Text[ spanish ] = "Reducir ~gradientes"; Text[ italian ] = "Riduci sfumature"; - Text[ danish ] = "Reduce ~gradients"; + Text[ danish ] = "Reducer farve~gradueringer"; Text[ swedish ] = "Reducera frg~gradienter"; Text[ polish ] = "Zredukuj gradienty"; Text[ portuguese_brazilian ] = "Reduce ~gradients"; - Text[ japanese ] = "ｸﾞﾗﾃﾞｰｼｮﾝを減らす(~G)"; - Text[ korean ] = "그라데이션 감소(~G)"; + Text[ japanese ] = "グラデーションを減らす(~G)"; + Text[ korean ] = "그라디언트 감소(~G)"; Text[ chinese_simplified ] = "减少彩色图案(~G)"; Text[ chinese_traditional ] = "減少彩色圖案(~G)"; Text[ turkish ] = "Reduce ~gradients"; Text[ arabic ] = "Reduce ~gradients"; - Text[ catalan ] = "Reduce ~gradients"; - Text[ finnish ] = "Farb~verlufe reduzieren"; + Text[ catalan ] = "Redueix les gradacions"; + Text[ finnish ] = "~Pienenn liukuvrjyst"; + Text[ thai ] = "ลดตัวไ~ล่ระดับสี"; }; RadioButton RB_REDUCEGRADIENTS_STRIPES { @@ -325,22 +333,23 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "Faixas de gradao"; Text[ russian ] = " "; Text[ greek ] = "Gradient ~stripes"; - Text[ dutch ] = "~Strepen in kleurverloop"; + Text[ dutch ] = "~Strepen in kleurovergangen"; Text[ french ] = "Bandes de dgrads"; Text[ spanish ] = "Tiras de gra~dientes"; Text[ italian ] = "~Bande sfumate"; - Text[ danish ] = "Gradient ~stripes"; + Text[ danish ] = "Farvegraduerings~striber"; Text[ swedish ] = "Frggra~dientrnder"; Text[ polish ] = "Paski gradientu"; Text[ portuguese_brazilian ] = "Gradient ~stripes"; - Text[ japanese ] = "ｸﾞﾗﾃﾞｰｼｮﾝの線形(~S)"; - Text[ korean ] = "그라데이션 선 (stripe, streak)"; + Text[ japanese ] = "グラデーションの線形(~S)"; + Text[ korean ] = "그라디언트선 (줄무늬)(~S)"; Text[ chinese_simplified ] = "彩色图案条纹(~S)"; Text[ chinese_traditional ] = "彩色圖案條紋(~S)"; Text[ turkish ] = "Gradient ~stripes"; Text[ arabic ] = "Gradient ~stripes"; - Text[ catalan ] = "Gradient ~stripes"; - Text[ finnish ] = "Fabverlauf~sstreifen"; + Text[ catalan ] = "~Tires de gradients"; + Text[ finnish ] = "Liukuvr~jysviivat"; + Text[ thai ] = "~ลายทางไล่ระดับสี"; }; NumericField NF_REDUCEGRADIENTS_STEPCOUNT { @@ -364,12 +373,12 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "Co~r intermdia"; Text[ russian ] = " "; Text[ greek ] = "Medium ~color"; - Text[ dutch ] = "~Tussenkleur"; - Text[ french ] = "Couleur ~intermdiaire"; - Text[ spanish ] = "~Color intermedio"; + Text[ dutch ] = "Tussenkleu~r"; + Text[ french ] = "Couleur intermdiaire"; + Text[ spanish ] = "Color intermedio"; Text[ italian ] = "Colore intermedio"; - Text[ danish ] = "Medium ~color"; - Text[ swedish ] = "~Mellanfrg"; + Text[ danish ] = "~Mellemfarve"; + Text[ swedish ] = "Mellan~frg"; Text[ polish ] = "Kolor poredni"; Text[ portuguese_brazilian ] = "Medium ~color"; Text[ japanese ] = "中間色(~C)"; @@ -378,8 +387,9 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "中間色(~C)"; Text[ turkish ] = "Medium ~color"; Text[ arabic ] = "Medium ~color"; - Text[ catalan ] = "Medium ~color"; - Text[ finnish ] = "~Zwischenfarbe"; + Text[ catalan ] = "~Color intermig"; + Text[ finnish ] = "Vli~vri"; + Text[ thai ] = "~สีระดับกลาง"; }; // ----------- @@ -393,24 +403,25 @@ TabPage TP_COMMONPRINTOPTIONS Text [ ENGLISH ] = "Reduce ~bitmaps" ; Text[ english_us ] = "Reduce ~bitmaps"; Text[ portuguese ] = "Reduzir ~bitmaps"; - Text[ russian ] = " "; + Text[ russian ] = " ~"; Text[ greek ] = "Reduce ~bitmaps"; - Text[ dutch ] = "~Bitmaps reduceren"; + Text[ dutch ] = "Bitmaps redu~ceren"; Text[ french ] = "Rduire les ~bitmaps"; Text[ spanish ] = "Reducir ~bitmaps"; Text[ italian ] = "Riduci bitmap"; - Text[ danish ] = "Reduce ~bitmaps"; + Text[ danish ] = "Reducer ~bitmaps"; Text[ swedish ] = "Reducera ~bitmaps"; Text[ polish ] = "Zredukuj mapy bitowe"; Text[ portuguese_brazilian ] = "Reduce ~bitmaps"; - Text[ japanese ] = "ﾋﾞｯﾄﾏｯﾌﾟを減らす(~B)"; + Text[ japanese ] = "ビットマップを減らす(~B)"; Text[ korean ] = "비트맵 감소(~B)"; Text[ chinese_simplified ] = "减少位图(~B)"; Text[ chinese_traditional ] = "減少點陣圖(~B)"; Text[ turkish ] = "Reduce ~bitmaps"; Text[ arabic ] = "Reduce ~bitmaps"; - Text[ catalan ] = "Reduce ~bitmaps"; - Text[ finnish ] = "~Bitmaps reduzieren"; + Text[ catalan ] = "Redueix els mapes de ~bits"; + Text[ finnish ] = "Pienenn ~bittikarttaa"; + Text[ thai ] = "ลด~บิทแม็ป"; }; RadioButton RB_REDUCEBITMAPS_OPTIMAL { @@ -423,22 +434,23 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "~Qualidade de impresso optimizada"; Text[ russian ] = "~ "; Text[ greek ] = "~Good quality"; - Text[ dutch ] = "~Goede afdrukkwaliteit"; + Text[ dutch ] = "Goede afdru~kkwaliteit"; Text[ french ] = "Qualit d'impression optimale"; Text[ spanish ] = "~Calidad de impresin ptima"; - Text[ italian ] = "Stampa di ~ottima qualit"; - Text[ danish ] = "~Good quality"; + Text[ italian ] = "Qualit ottima"; + Text[ danish ] = "Hj ~udskriftskvalitet"; Text[ swedish ] = "Hg utskrifts~kvalitet"; Text[ polish ] = "Wysoka jako wydruku"; Text[ portuguese_brazilian ] = "~Good quality"; Text[ japanese ] = "高度な印刷品質(~H)"; - Text[ korean ] = "고품질 인쇄(~H)"; + Text[ korean ] = "고 인쇄용 품질(~H)"; Text[ chinese_simplified ] = "很好的打印质量(~H)"; Text[ chinese_traditional ] = "很好的列印品質(~H)"; Text[ turkish ] = "~Good quality"; Text[ arabic ] = "~Good quality"; - Text[ catalan ] = "~Good quality"; - Text[ finnish ] = "~Gute Druckqualitt"; + Text[ catalan ] = "~Bona qualitat"; + Text[ finnish ] = "H~yv tulostuslaatu"; + Text[ thai ] = "คุณภาพการพิมพ์~สูง"; }; RadioButton RB_REDUCEBITMAPS_NORMAL { @@ -451,22 +463,23 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "Qualidade de impresso ~normal"; Text[ russian ] = " "; Text[ greek ] = "N~ormal quality"; - Text[ dutch ] = "N~ormale afdrukkwaliteit"; + Text[ dutch ] = "~Normale afdrukkwaliteit"; Text[ french ] = "Qualit d'impression ~standard"; Text[ spanish ] = "Calidad ~normal de impresin"; Text[ italian ] = "Qualit ~normale"; - Text[ danish ] = "N~ormal quality"; + Text[ danish ] = "N~ormal udskriftskvalitet"; Text[ swedish ] = "N~ormal utskriftskvalitet"; Text[ polish ] = "Zwyka jako wydruku"; Text[ portuguese_brazilian ] = "N~ormal quality"; Text[ japanese ] = "標準の印刷品質(~O)"; - Text[ korean ] = "일반 품질(~O)"; + Text[ korean ] = "일반 인쇄용 품질(~O)"; Text[ chinese_simplified ] = "一般的打印质量(~O)"; Text[ chinese_traditional ] = "一般的品質(~O)"; Text[ turkish ] = "N~ormal quality"; Text[ arabic ] = "N~ormal quality"; - Text[ catalan ] = "N~ormal quality"; - Text[ finnish ] = "N~ormale Druckqualitt"; + Text[ catalan ] = "Qualitat n~ormal"; + Text[ finnish ] = "~Normaali tulostuslaatu"; + Text[ thai ] = "คุณภาพการพิมพ์ป~กติ"; }; RadioButton RB_REDUCEBITMAPS_RESOLUTION { @@ -479,22 +492,23 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "~Resoluo"; Text[ russian ] = ""; Text[ greek ] = "Reso~lution"; - Text[ dutch ] = "Reso~lution"; + Text[ dutch ] = "Reso~lutie"; Text[ french ] = "~Rsolution"; Text[ spanish ] = "R~esolucin"; - Text[ italian ] = "~Risoluzione"; - Text[ danish ] = "Reso~lution"; + Text[ italian ] = "Risoluzione"; + Text[ danish ] = "Opl~sning"; Text[ swedish ] = "Uppl~sning"; Text[ polish ] = "Rozdzielczo"; Text[ portuguese_brazilian ] = "Reso~lution"; Text[ japanese ] = "解像度(~L)"; - Text[ korean ] = "디졸브(~L)"; + Text[ korean ] = "해상도(~L)"; Text[ chinese_simplified ] = "分辨率(~L)"; Text[ chinese_traditional ] = "解析度(~L)"; Text[ turkish ] = "Reso~lution"; Text[ arabic ] = "Reso~lution"; - Text[ catalan ] = "Reso~lution"; - Text[ finnish ] = "~Tarkkuus"; + Text[ catalan ] = "Reso~luci"; + Text[ finnish ] = "Ta~rkkuus"; + Text[ thai ] = "ความ~ละเอียด"; }; ListBox LB_REDUCEBITMAPS_RESOLUTION { @@ -564,8 +578,8 @@ TabPage TP_COMMONPRINTOPTIONS < "96 DPI"; 0; > ; < "150 DPI (Fax)"; 0; > ; < "200 DPI (Voreinstellung)"; 0; > ; - < "300 DPI"; 0; > ; - < "600 DPI"; 0; > ; + < "300 dpi"; 0; > ; + < "600 dpi"; 0; > ; }; StringList [ dutch ] = { @@ -608,9 +622,9 @@ TabPage TP_COMMONPRINTOPTIONS < "72 DPI"; 0; > ; < "96 DPI"; 0; > ; < "150 DPI (Fax)"; 0; > ; - < "200 DPI (Voreinstellung)"; 0; > ; - < "300 DPI"; 0; > ; - < "600 DPI"; 0; > ; + < "200 DPI (forudindstilling)"; 0; > ; + < "300 dpi"; 0; > ; + < "600 dpi"; 0; > ; }; StringList [ swedish ] = { @@ -653,7 +667,7 @@ TabPage TP_COMMONPRINTOPTIONS < "72 DPI"; 0; > ; < "96 DPI"; 0; > ; < "150 DPI (팩스)"; 0; > ; - < "200 DPI (사전 설정)"; 0; > ; + < "200 DPI (기본값)"; 0; > ; < "300 DPI"; 0; > ; < "600 DPI"; 0; > ; }; @@ -681,8 +695,8 @@ TabPage TP_COMMONPRINTOPTIONS < "96 DPI"; 0; > ; < "150 DPI (Fax)"; 0; > ; < "200 DPI (Voreinstellung)"; 0; > ; - < "300 DPI"; 0; > ; - < "600 DPI"; 0; > ; + < "300 dpi"; 0; > ; + < "600 dpi"; 0; > ; }; StringList [ arabic ] = { @@ -695,19 +709,28 @@ TabPage TP_COMMONPRINTOPTIONS }; StringList [ catalan ] = { - < "72 DPI"; 0; > ; + < "72 PPP"; 0; > ; + < "96 PPP"; 0; > ; + < "150 PPP (fax)"; 0; > ; + < "200 PPP (per defecte)"; 0; > ; + < "300 PPP"; 0; > ; + < "600 PPP"; 0; > ; + }; + StringList [ finnish ] = + { + < "72 DPI"; 0; > ; < "96 DPI"; 0; > ; - < "150 DPI (Fax)"; 0; > ; - < "200 DPI (Voreinstellung)"; 0; > ; + < "150 DPI (faksi)"; 0; > ; + < "200 DPI (oletus)"; 0; > ; < "300 DPI"; 0; > ; < "600 DPI"; 0; > ; }; - StringList [ finnish ] = + StringList [ thai ] = { - < "72 DPI"; 0; > ; + < "72 DPI"; 0; > ; < "96 DPI"; 0; > ; - < "150 DPI (Fax)"; 0; > ; - < "200 DPI (Voreinstellung)"; 0; > ; + < "150 DPI (โทรสาร)"; 0; > ; + < "200 DPI (ค่าเริ่มต้น)"; 0; > ; < "300 DPI"; 0; > ; < "600 DPI"; 0; > ; }; @@ -721,24 +744,25 @@ TabPage TP_COMMONPRINTOPTIONS Text [ ENGLISH ] = "Include transparent ob~jects" ; Text[ english_us ] = "Include transparent ob~jects"; Text[ portuguese ] = "Incluir ob~jectos transparentes"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = "Include transparent ob~jects"; - Text[ dutch ] = "Transparante ob~jecten includeren"; + Text[ dutch ] = "Inclusief transparante ob~jecten"; Text[ french ] = "Inclure les ob~jets transparents"; Text[ spanish ] = "Incluir ob~jetos transparentes"; Text[ italian ] = "Includi oggetti trasparenti"; - Text[ danish ] = "Include transparent ob~jects"; + Text[ danish ] = "Medtag transparente ob~jekter"; Text[ swedish ] = "Inkludera transparenta ob~jekt"; Text[ polish ] = "Docz przezroczyste obiekty"; Text[ portuguese_brazilian ] = "Include transparent ob~jects"; - Text[ japanese ] = "透過性のあるｵﾌﾞｼﾞｪｸﾄも含む(~J)"; + Text[ japanese ] = "透過性のあるオブジェクトも含む(~J)"; Text[ korean ] = "투명 개체 포함(~J)"; Text[ chinese_simplified ] = "包括透明对象(~J)"; Text[ chinese_traditional ] = "包括透明物件(~J)"; Text[ turkish ] = "Include transparent ob~jects"; Text[ arabic ] = "Include transparent ob~jects"; - Text[ catalan ] = "Include transparent ob~jects"; - Text[ finnish ] = "Transparente Ob~jekte einschlieen"; + Text[ catalan ] = "Inclou els ob~jectes transparents"; + Text[ finnish ] = "Lis~ lpinkyvt objektit"; + Text[ thai ] = "รวมวัต~ถุโปร่งแสง"; }; // ----------- @@ -754,22 +778,23 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "Con~verter cores em tons cinzentos"; Text[ russian ] = " "; Text[ greek ] = "Con~vert colors to greyscales"; - Text[ dutch ] = "Kleuren naar grijswaarden con~verteren"; + Text[ dutch ] = "Kleuren naar grijs~waarden converteren"; Text[ french ] = "Con~vertir les couleurs en niveaux de gris"; Text[ spanish ] = "Con~vertir colores en escala de grises"; Text[ italian ] = "Con~verti i colori in sfumature di grigio"; - Text[ danish ] = "Con~vert colors to greyscales"; + Text[ danish ] = "Kon~verter farver til grtoner"; Text[ swedish ] = "Om~vandla frger till grskalor"; Text[ polish ] = "Zamie kolory na odcienie szaroci"; Text[ portuguese_brazilian ] = "Con~vert colors to greyscales"; - Text[ japanese ] = "色をｸﾞﾚｰｽｹｰﾙに変換する(~V)"; - Text[ korean ] = "컬러를 회색도로 전환(~V)"; + Text[ japanese ] = "色をグレースケールに変換する(~V)"; + Text[ korean ] = "색상을 회색조로 변환(~V)"; Text[ chinese_simplified ] = "彩色转换成灰度(~V)"; Text[ chinese_traditional ] = "彩色轉換成灰階(~V)"; Text[ turkish ] = "Con~vert colors to greyscales"; Text[ arabic ] = "Con~vert colors to greyscales"; - Text[ catalan ] = "Con~vert colors to greyscales"; - Text[ finnish ] = "Farben in Graustufen um~wandeln"; + Text[ catalan ] = "Con~verteix els colors a escala de grisos"; + Text[ finnish ] = "~Muunna vrit harmaasvyiksi"; + Text[ thai ] = "แป~ลงสีเป็นสเกลสีเทา"; }; // ----------- @@ -785,22 +810,23 @@ TabPage TP_COMMONPRINTOPTIONS Text [ portuguese_brazilian ] = "Advert?ncias" ; Text [ portuguese ] = "Advertncias" ; Text [ finnish ] = "Tulostinvaroitukset" ; - Text [ danish ] = "Advarsler" ; + Text [ danish ] = "Printer-advarsler" ; Text [ french ] = "Avertissements" ; Text [ swedish ] = "Skrivarvarningar" ; - Text [ dutch ] = "Printer-waarschuwingen" ; - Text [ spanish ] = "Advertencias de impresora" ; + Text [ dutch ] = "Printerwaarschuwingen" ; + Text [ spanish ] = "Advertencias" ; Text [ english_us ] = "Printer warnings" ; Text[ chinese_simplified ] = "打印机的警告"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Ostrzeenia wydawane przez drukark"; - Text[ japanese ] = "ﾌﾟﾘﾝﾀの警告"; + Text[ japanese ] = "プリンタの警告"; Text[ chinese_traditional ] = "印表機的警告"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "프린터-주의"; + Text[ korean ] = "프린터 경고"; Text[ turkish ] = "Uyarlar"; - Text[ catalan ] = "Printer warnings"; + Text[ catalan ] = "Avisos de la impressora"; + Text[ thai ] = "คำเตือนเครื่องพิมพ์"; }; CheckBox CB_PAPERSIZE { @@ -812,23 +838,24 @@ TabPage TP_COMMONPRINTOPTIONS Text [ english_us ] = "P~aper size" ; Text [ italian ] = "~Dimensione carta" ; Text [ spanish ] = "~Tamao del papel" ; - Text [ french ] = "T~aille du papier" ; + Text [ french ] = "Taille du papier" ; Text [ dutch ] = "Papiergr~ootte" ; Text [ swedish ] = "P~appersstorlek" ; - Text [ danish ] = "Papirstrrelse" ; + Text [ danish ] = "Papirstrre~lse" ; Text [ portuguese_brazilian ] = "Papiergr~?e" ; Text [ portuguese ] = "~Tamanho do papel" ; Text[ chinese_simplified ] = "纸张大小(~A)"; Text[ russian ] = " "; Text[ polish ] = "Rozmiar papieru"; - Text[ japanese ] = "用紙ｻｲｽﾞ(~A)"; + Text[ japanese ] = "用紙サイズ(~A)"; Text[ chinese_traditional ] = "紙張大小(~A)"; Text[ arabic ] = " "; Text[ greek ] = " "; Text[ korean ] = "용지 크기(~A)"; Text[ turkish ] = "Sayfa boyutu"; - Text[ catalan ] = "P~aper size"; - Text[ finnish ] = "P~apiergre"; + Text[ catalan ] = "Mida del p~aper"; + Text[ finnish ] = "Paperi~koko"; + Text[ thai ] = "ขนาดกระ~ดาษ"; }; CheckBox CB_PAPERORIENTATION { @@ -837,13 +864,13 @@ TabPage TP_COMMONPRINTOPTIONS Size = MAP_APPFONT ( 123 , 10 ) ; Text = "Papi~erorientierung" ; Text [ ENGLISH ] = "Pap~er orientation" ; - Text [ dutch ] = "Papi~erorintering" ; + Text [ dutch ] = "Papi~erorintatie" ; Text [ english_us ] = "Pap~er orientation" ; Text [ italian ] = "~Orientamento carta" ; Text [ spanish ] = "~Orientacin del papel" ; Text [ french ] = "~Orientation du papier" ; Text [ swedish ] = "Papp~ersorientering" ; - Text [ danish ] = "Papirretning" ; + Text [ danish ] = "Papirr~etning" ; Text [ portuguese_brazilian ] = "~Papierorientierung" ; Text [ portuguese ] = "~Orientao do papel" ; Text[ chinese_simplified ] = "进纸方向(~E)"; @@ -853,10 +880,11 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "紙張方向(~E)"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "용지 방향 설정(~E)"; + Text[ korean ] = "용지 방향(~E)"; Text[ turkish ] = "Sayfa duruu"; - Text[ catalan ] = "Pap~er orientation"; + Text[ catalan ] = "Orientaci del pap~er"; Text[ finnish ] = "Paperin ~suunta"; + Text[ thai ] = "การวางแนวกระดา~ษ"; }; CheckBox CB_TRANSPARENCY { @@ -869,11 +897,11 @@ TabPage TP_COMMONPRINTOPTIONS Text[ portuguese ] = "~Transparncia"; Text[ russian ] = ""; Text[ greek ] = "~Transparency"; - Text[ dutch ] = "~Transparantie"; - Text[ french ] = "~Transparence"; - Text[ spanish ] = "~Transparencia"; + Text[ dutch ] = "Tr~ansparantie"; + Text[ french ] = "Transparence"; + Text[ spanish ] = "Transparencia"; Text[ italian ] = "~Trasparenza"; - Text[ danish ] = "~Transparency"; + Text[ danish ] = "Tra~nsparens"; Text[ swedish ] = "Trans~parens"; Text[ polish ] = "Przezroczysto"; Text[ portuguese_brazilian ] = "~Transparency"; @@ -883,8 +911,9 @@ TabPage TP_COMMONPRINTOPTIONS Text[ chinese_traditional ] = "透明(~T)"; Text[ turkish ] = "~Transparency"; Text[ arabic ] = "~Transparency"; - Text[ catalan ] = "~Transparency"; + Text[ catalan ] = "~Transparncia"; Text[ finnish ] = "~Lpinkyvyys"; + Text[ thai ] = "โ~ปร่งแสง"; }; }; @@ -901,7 +930,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text[ english_us ] = "Warning" ; Text[ portuguese_brazilian ] = "Warnung" ; Text[ swedish ] = "Varning" ; - Text[ danish ] = "Advarsel" ; + Text[ danish ] = "Advarsel!" ; Text[ italian ] = "Avvertimento" ; Text[ spanish ] = "Advertencia" ; Text[ french ] = "Avertissement" ; @@ -914,7 +943,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text[ chinese_traditional ] = "警告"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "주의"; + Text[ korean ] = "경고"; Text[ turkish ] = "Uyar"; Text[ language_user1 ] = "-"; Moveable = TRUE ; @@ -931,13 +960,13 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text = "Ihr Dokument enthlt transparente Objekte.\nAuf vielen Druckern fhrt dies zu\nverlngerten Druckzeiten. Soll die Transparenz\nfr diesen Ausdruck ignoriert werden?"; Text [ english ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?"; Text [ english_us ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?"; - Text[ russian ] = " .\n \n . ?"; + Text[ russian ] = " .\n \n . ?"; Text[ greek ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe ignored?"; - Text[ danish ] = "Dokumentet indeholder transparente objekter.\nP nogle printere kan dette fre til lngere\nudskrivningstider. Skal transparensinformationerne\nfor udskrivningen ignoreres?"; + Text[ danish ] = "Dokumentet indeholder transparente objekter.\nP mange printere medfrer dette \nlngere udskriftstider. Skal transparens\nignoreres ved denne udskrivning?"; Text[ polish ] = "Dokument zawiera przezroczyste obiekty.\nW przypadku niektrych drukarek wydruk tych obiektw\nmoe potrwa troch duej. Czy zignorowa\ninformacje o przezroczystoci?"; Text[ portuguese_brazilian ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe ignored?"; - Text[ japanese ] = "ﾄﾞｷｭﾒﾝﾄには透過性のあるｵﾌﾞｼﾞｪｸﾄが含まれています。\nそのためにﾌﾟﾘﾝﾀによっては\n印刷に時間がかかるものもあります。透過性を\n無視しますか。"; - Text[ korean ] = "문서에 투명 개체가 포함되어 있습니다.\n다량 인쇄시 인쇄시간이 더 오래걸립니다.\n이 표현에서 투명도를 무시하시겠습니까?"; + Text[ japanese ] = "ドキュメントには透過性のあるオブジェクトが含まれています。\nそのためにプリンタによっては\n印刷に時間がかかるものもあります。透過性を\n無視しますか。"; + Text[ korean ] = "문서에 투명 개체가 포함되어 있습니다.\n따라서 다량 인쇄시 인쇄 시간이 더 오래 걸립니다.\n이 표현에서 투명도를 무시하겠습니까?"; Text[ chinese_simplified ] = "您的文档含有透明对象。\n许多打印机会因此需要很长的时间来完成打印任务。\n让打印机忽略这些透明对象吗？"; Text[ chinese_traditional ] = "您的文件含有透明物件。\n許多印表機會因此需要很長的時間來完成列印任務。\n要讓印表機忽略這些透明物件？"; Text[ turkish ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe ignored?"; @@ -948,8 +977,9 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text[ spanish ] = "El documento contiene objetos transparentes.\nEsto puede causar demoras en muchas impresoras.\nDesea que se ignoren las informaciones\nde transparencia para la impresin?"; Text[ italian ] = "Il vostro documento contiene oggetti trasparenti.\nCon alcune stampanti il processo di stampa potrebbe\ndurare pi a lungo del solito. Volete ignorare\nle informazioni di trasparenza per la stampa?"; Text[ swedish ] = "Dokumentet innehller transparenta objekt.\nDet kan leda till lngre vntetid p vissa skrivare.\nSka transparensen ignoreras fr\nutskriften?"; - Text[ catalan ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?"; - Text[ finnish ] = "Ihr Dokument enthlt transparente Objekte.\nAuf vielen Druckern fhrt dies zu\nverlngerten Druckzeiten. Soll die Transparenz\nfr diesen Ausdruck ignoriert werden?"; + Text[ catalan ] = "Aquest document cont objectes transparents.\nAix pot provocar un temps ms llarg d'impressi en algunes\nimpressores. S'han d'ignorar les transparncies?"; + Text[ finnish ] = "Asiakirjassa on lpinkyvi objekteja.\nTm saattaa hidastaa tulostusta joissakin\ntulostimissa. Vhennetnk\nlpinkyvyytt?"; + Text[ thai ] = "เอกสารของคุณมีวัตถุโปร่งแสง\nนี้จะนำไปสู่การพิมพ์ที่ใช้เวลานานบน\nเครื่องพิมพ์ ต้องการลดความโปร่งแสงลงหรือไม่?"; }; OKButton BTN_PRINTTRANS_YES { @@ -962,7 +992,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text [ english_us ] = "~Yes" ; Text [ portuguese_brazilian ] = "~Ja" ; Text [ swedish ] = "~Ja" ; - Text [ danish ] = "Ja" ; + Text [ danish ] = "~Ja" ; Text [ italian ] = "~S" ; Text [ spanish ] = "~S" ; Text [ french ] = "~Oui" ; @@ -977,8 +1007,9 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text[ korean ] = "예(~Y)"; Text[ turkish ] = "~Evet"; Text[ language_user1 ] = "-"; - Text[ catalan ] = "~Yes"; + Text[ catalan ] = "~S"; Text[ finnish ] = "~Kyll"; + Text[ thai ] = "ใ~ช่"; }; PushButton BTN_PRINTTRANS_NO { @@ -989,7 +1020,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text [ english_us ] = "~No" ; Text [ portuguese_brazilian ] = "~Nein" ; Text [ swedish ] = "~Nej" ; - Text [ danish ] = "Nej" ; + Text [ danish ] = "~Nej" ; Text [ italian ] = "~No" ; Text [ spanish ] = "~No" ; Text [ french ] = "~Non" ; @@ -1007,6 +1038,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text[ language_user1 ] = "-"; Text[ catalan ] = "~No"; Text[ finnish ] = "~Ei"; + Text[ thai ] = "ไ~ม่ใช่"; }; CancelButton BTN_PRINTTRANS_CANCEL { @@ -1016,24 +1048,25 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text [ English ] = "~Cancel" ; Text [ english_us ] = "~Cancel" ; Text[ portuguese ] = "~Cancelar"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ greek ] = "~Cancel"; Text[ dutch ] = "~Annuleren"; - Text[ french ] = "~Annuler"; + Text[ french ] = "Annuler"; Text[ spanish ] = "~Cancelar"; Text[ italian ] = "~Annulla"; - Text[ danish ] = "~Cancel"; + Text[ danish ] = "~Annuller"; Text[ swedish ] = "~Avbryt"; Text[ polish ] = "Anuluj"; Text[ portuguese_brazilian ] = "~Cancel"; - Text[ japanese ] = "ｷｬﾝｾﾙ(~C)"; - Text[ korean ] = "중단(~C)"; + Text[ japanese ] = "キャンセル(~C)"; + Text[ korean ] = "취소(~C)"; Text[ chinese_simplified ] = "取消(~C)"; Text[ chinese_traditional ] = "取消(~C)"; Text[ turkish ] = "~Cancel"; Text[ arabic ] = "~Cancel"; - Text[ catalan ] = "~Cancel"; - Text[ finnish ] = "~Peruuta"; + Text[ catalan ] = "~Cancel.la"; + Text[ finnish ] = "P~eruuta"; + Text[ thai ] = "~ยกเลิก"; }; CheckBox CBX_NOPRINTTRANSWARN { @@ -1045,26 +1078,28 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY Text [ english_us ] = "~Do not show warning again" ; Text [ portuguese_brazilian ] = "~Diese Warnung nicht mehr anzeigen" ; Text [ swedish ] = "Visa inte ~den hr varningen igen" ; - Text [ danish ] = "Vis denne advarsel ikke igen" ; + Text [ danish ] = "Vis ikke denne ad~varsel igen" ; Text [ italian ] = "~Non mostrare pi questa avvertenza" ; Text [ spanish ] = "~No mostrar ms esta advertencia" ; Text [ french ] = "~Ne plus afficher cet avertissement" ; Text [ dutch ] = "~Deze waarschuwing niet meer weergeven" ; Text[ chinese_simplified ] = "不再显示这个警告(~D)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nie pokazuj wicej tego ostrzeenia"; Text[ japanese ] = "今後この警告を表示しない。(~D)"; Text[ chinese_traditional ] = "不再顯示這個警告(~D)"; Text[ arabic ] = " "; Text[ greek ] = " ~"; - Text[ korean ] = "이 주의를 더 이상 표시않기(~D)"; + Text[ korean ] = "이 경고를 다시 표시하지 않음(~D)"; Text[ turkish ] = "~Bu uyary bir daha gsterme"; Text[ language_user1 ] = "-"; - Text[ catalan ] = "~Don't show warning again"; - Text[ finnish ] = "~Diese Warnung nicht mehr anzeigen"; + Text[ catalan ] = "No ~tornis a mostrar aquest avs"; + Text[ finnish ] = "~l nyt varoitusta vastaisuudessa."; + Text[ thai ] = "~ห้ามแสดงคำเตือนอีก"; }; - Text[ catalan ] = "Warning"; + Text[ catalan ] = "Avs"; Text[ finnish ] = "Varoitus"; + Text[ thai ] = "คำเตือน"; }; @@ -1083,3 +1118,11 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY + + + + + + + + diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index c3ac31828fe2..f48ce4488601 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: recfloat.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mba $ $Date: 2002-09-04 08:49:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,6 +89,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParent , , pBindings( pBind ) { pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParent ); + SetWantsFocus( FALSE ); eChildAlignment = SFX_ALIGN_NOALIGNMENT; ( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo ); } diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src index 49957208ae5b..74659bf089c4 100644 --- a/sfx2/source/dialog/recfloat.src +++ b/sfx2/source/dialog/recfloat.src @@ -2,9 +2,9 @@ * * $RCSfile: recfloat.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2002-09-12 10:02:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,3 +154,5 @@ String STR_CANCEL_RECORDING Text[ turkish ] = "Cancel Recording"; Text[ arabic ] = "Cancel Recording"; }; + + diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 5fcc00045962..62f60be76521 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: splitwin.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2002-04-30 08:14:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,11 @@ * ************************************************************************/ +#ifdef SOLARIS +// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 +#include <ctime> +#endif + #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #ifndef _WRKWIN_HXX //autogen diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 67c9c1f13284..c5742ec494e0 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: templdlg.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: pb $ $Date: 2002-10-31 09:55:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1133,6 +1133,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr) { aFmtLb.MakeVisible( pEntry ); aFmtLb.Select( pEntry ); + bWaterDisabled = !HasSelectedStyle(); //added by BerryJia for fixing Bug76391 2003-1-22 FmtSelectHdl( NULL ); } } @@ -1243,7 +1244,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() } //------------------------------------------------------------------------- -inline BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const +BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const { return pTreeBox? pTreeBox->FirstSelected() != 0: aFmtLb.GetSelectionCount() != 0; @@ -1392,14 +1393,20 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) { // EnableItem(SID_STYLE_WATERCAN, pItem != 0); bWaterDisabled = pItem == 0; +//added by BerryJia for fixing Bug76391 2003-1-7 + if(!bWaterDisabled) + bWaterDisabled = !HasSelectedStyle(); - if(pItem) + if(pItem && !bWaterDisabled) { CheckItem(SID_STYLE_WATERCAN, pItem->GetValue()); EnableItem( SID_STYLE_WATERCAN, TRUE ); } else - EnableItem(SID_STYLE_WATERCAN, FALSE); + if(!bWaterDisabled) + EnableItem(SID_STYLE_WATERCAN, TRUE); + else + EnableItem(SID_STYLE_WATERCAN, FALSE); //Waehrend Giesskannenmodus Statusupdates ignorieren. diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index b5a09351ffa4..4bc035949166 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: templdlg.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: gt $ $Date: 2002-09-02 07:54:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,7 @@ ModalDialog RID_STYLECATALOG Text [ finnish ] = "Tyyliluettelo" ; Text [ english_us ] = "Style Catalog" ; Text[ chinese_simplified ] = "样式目录"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Katalog stylw"; Text[ japanese ] = "スタイルのカタログ"; Text[ chinese_traditional ] = "樣式目錄"; @@ -148,11 +148,11 @@ ModalDialog RID_STYLECATALOG Text [ spanish ] = "~Administrar..." ; Text [ danish ] = "Administrer..." ; Text [ swedish ] = "~Administrera..." ; - Text [ finnish ] = "~Jrjestelytykalu" ; + Text [ finnish ] = "~Jrjestelytykalu..." ; Text [ english_us ] = "~Organizer..." ; TabStop = TRUE ; Text[ chinese_simplified ] = "管理(~O)..."; - Text[ russian ] = "..."; + Text[ russian ] = "..."; Text[ polish ] = "Zarzdzaj..."; Text[ japanese ] = "管理(~O)..."; Text[ chinese_traditional ] = "管理(~O)..."; @@ -175,10 +175,10 @@ ModalDialog RID_STYLECATALOG Text [ portuguese ] = "E~liminar..." ; Text [ french ] = "~Supprimer..." ; Text [ dutch ] = "~Wissen..." ; - Text [ spanish ] = "~Eliminar..." ; + Text [ spanish ] = "~Borrar..." ; Text [ danish ] = "Slet..." ; Text [ swedish ] = "~Radera..." ; - Text [ finnish ] = "~Poista" ; + Text [ finnish ] = "~Poista..." ; Text [ english_us ] = "~Delete..." ; TabStop = TRUE ; Text[ chinese_simplified ] = "删除(~D)..."; @@ -208,7 +208,7 @@ ModalDialog RID_STYLECATALOG Text [ spanish ] = "~Modificar..." ; Text [ danish ] = "Modificer..." ; Text [ swedish ] = "n~dra..." ; - Text [ finnish ] = "~Muokkaa" ; + Text [ finnish ] = "~Muuta..." ; Text [ english_us ] = "~Modify..." ; TabStop = TRUE ; Text[ chinese_simplified ] = "更改(~M)..."; @@ -234,7 +234,7 @@ ModalDialog RID_STYLECATALOG Text [ portuguese_brazilian ] = "~Novo..." ; Text [ portuguese ] = "~Novo..." ; Text [ english_us ] = "~New..." ; - Text [ finnish ] = "~Uusi" ; + Text [ finnish ] = "~Uusi..." ; Text [ danish ] = "Ny..." ; Text [ french ] = "~Nouveau..." ; Text [ swedish ] = "~Nytt..." ; @@ -300,7 +300,7 @@ String DLG_STYLE_DESIGNER Text [ dutch ] = "Stylist" ; Text [ portuguese ] = "Estilista" ; Text[ chinese_simplified ] = "各类样式"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Stylista"; Text[ japanese ] = "スタイリスト"; Text[ chinese_traditional ] = "各類樣式"; @@ -376,14 +376,14 @@ DockingWindow DLG_STYLE_DESIGNER Text [ portuguese_brazilian ] = "Watercan" ; Text [ portuguese ] = "Preenchimento completo" ; Text [ english_us ] = "Fill Format Mode" ; - Text [ finnish ] = "Tyttmuodon laji" ; + Text [ finnish ] = "Tyttmuotoilutila" ; Text [ danish ] = "Fyldmodus" ; Text [ french ] = "Mode Remplir tout" ; Text [ swedish ] = "Tilldelningslge" ; Text [ dutch ] = "Gietermodus" ; Text [ spanish ] = "Modo regadera" ; Text[ chinese_simplified ] = "充填模式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Tryb konewki"; Text[ japanese ] = "水やりモード"; Text[ chinese_traditional ] = "充填模式"; @@ -412,13 +412,13 @@ DockingWindow DLG_STYLE_DESIGNER Text [ dutch ] = "Nieuw opmaakprofiel uit selectie" ; Text [ spanish ] = "Nuevo estilo a partir de seleccin" ; Text[ chinese_simplified ] = "选中的新样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Nowy styl z selekcji"; Text[ japanese ] = "選択スタイルから新規作成"; Text[ chinese_traditional ] = "選取的新樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "선택에 있는 새 템플릿"; + Text[ korean ] = "선택 스타일로부터 새로 만들기 "; Text[ turkish ] = "Yeni biim seimi"; Text[ catalan ] = "Nou estil a partir de la selecci"; Text[ thai ] = "ลักษณะใหม่จากการเลือก"; @@ -438,16 +438,16 @@ DockingWindow DLG_STYLE_DESIGNER Text [ danish ] = "Opdater typografi" ; Text [ french ] = "Actualiser le style" ; Text [ swedish ] = "Uppdatera formatmall" ; - Text [ dutch ] = "Opmaakprofiel actualiseren" ; + Text [ dutch ] = "Opmaakprofiel bijwerken" ; Text [ spanish ] = "Actualizar estilo" ; Text[ chinese_simplified ] = "更新样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Aktualizuj styl"; Text[ japanese ] = "スタイルの更新"; Text[ chinese_traditional ] = "更新樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "템플릿 업데이트"; + Text[ korean ] = "스타일 업데이트"; Text[ turkish ] = "Biimi gncelle"; Text[ catalan ] = "Actualitza l'estil"; Text[ thai ] = "ปรับปรุงลักษณะ"; @@ -456,3 +456,5 @@ DockingWindow DLG_STYLE_DESIGNER }; }; + + diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 4775278f48d6..534c7d21809c 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tplpitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2002-04-08 16:45:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,3 +120,4 @@ BYTE SfxTemplateItem::GetFlagCount() const return sizeof(USHORT) * 8; } + diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src index f94118d97b69..66aed4c4abfb 100644 --- a/sfx2/source/dialog/versdlg.src +++ b/sfx2/source/dialog/versdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: versdlg.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2002-09-05 17:04:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ ModalDialog DLG_VERSIONS Text [ swedish ] = "Nya versioner" ; Text [ danish ] = "Nye versioner" ; Text [ italian ] = "Nuove versioni" ; - Text [ spanish ] = "Nuevas versiones" ; + Text [ spanish ] = "Versiones nuevas" ; Text [ french ] = "Nouvelles versions" ; Text [ dutch ] = "Nieuwe versies" ; Text [ portuguese ] = "Novas verses" ; @@ -94,8 +94,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "새 버전"; Text[ turkish ] = "Yeni srmler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevas versiones"; + Text[ catalan ] = "Versions noves"; Text[ finnish ] = "Uudet versiot"; + Text[ thai ] = "เวอร์ชั่นใหม่"; }; PushButton PB_SAVE { @@ -114,7 +115,7 @@ ModalDialog DLG_VERSIONS Text [ dutch ] = "~Nieuwe versie opslaan" ; Text [ portuguese ] = "~Guardar nova verso" ; Text[ chinese_simplified ] = "保存新版本(~N)"; - Text[ russian ] = " "; + Text[ russian ] = "..."; Text[ polish ] = "Zapisz now wersj"; Text[ japanese ] = "新しいバージョンの保存(~N)"; Text[ chinese_traditional ] = "保存新版本(~N)"; @@ -123,8 +124,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "새 버전 저장(~N)"; Text[ turkish ] = "~Yeni srm kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Guardar versin nueva"; + Text[ catalan ] = "~Desa versi nova"; Text[ finnish ] = "Tallenna ~uusi versio"; + Text[ thai ] = "บันทึกเวอร์ชั่นใ~หม่"; }; CheckBox CB_SAVEONCLOSE { @@ -143,7 +145,7 @@ ModalDialog DLG_VERSIONS Text [ dutch ] = "~Bij sluiten altijd versie opslaan" ; Text [ portuguese ] = "~Guardar sempre uma verso ao fechar." ; Text[ chinese_simplified ] = "在关闭时自动保存版本信息(~A)"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zawsze zapisuj wersj przy zamykaniu"; Text[ japanese ] = "閉じるとき、常にバージョンの保存(~A)"; Text[ chinese_traditional ] = "在關閉時自動保存版本資訊(~A)"; @@ -152,8 +154,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "닫을 때 항상 버전 저장(~A)"; Text[ turkish ] = "~Kapatrken daima srm kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar ~versin siempre al cerrar"; - Text[ finnish ] = "~Tallenna versio aina suljettaessa"; + Text[ catalan ] = "Desa la ~versi sempre al tancar"; + Text[ finnish ] = "Tallenna versio ~aina suljettaessa"; + Text[ thai ] = "บันทึกเวอร์ชั่นเ~สมอขณะกำลังปิด"; }; FixedLine GB_OLDVERSIONS { @@ -180,8 +183,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "기존 버전"; Text[ turkish ] = "Mevcut srmler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Versiones existentes"; + Text[ catalan ] = "Versions existents"; Text[ finnish ] = "Nykyiset versiot"; + Text[ thai ] = "เวอร์ชั่นที่มีอยู่"; }; FixedText FT_DATETIME { @@ -205,11 +209,12 @@ ModalDialog DLG_VERSIONS Text[ chinese_traditional ] = "日期和時間"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "날짜와 시간"; + Text[ korean ] = "날짜 및 시간"; Text[ turkish ] = "Tarih ve saat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fecha y hora"; + Text[ catalan ] = "Data i hora"; Text[ finnish ] = "Pivmr ja aika"; + Text[ thai ] = "วันที่และเวลา"; }; FixedText FT_SAVEDBY { @@ -227,7 +232,7 @@ ModalDialog DLG_VERSIONS Text [ dutch ] = "opgeslagen door" ; Text [ portuguese ] = "Guardado por" ; Text[ chinese_simplified ] = "作者"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Zapisana przez"; Text[ japanese ] = "保存者"; Text[ chinese_traditional ] = "作者"; @@ -236,8 +241,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "저장 주체"; Text[ turkish ] = "Kaydeden"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardado por"; + Text[ catalan ] = "Desat per"; Text[ finnish ] = "Tallentanut"; + Text[ thai ] = "บันทึกโดย"; }; FixedText FT_COMMENTS { @@ -252,20 +258,21 @@ ModalDialog DLG_VERSIONS Text [ italian ] = "Commento" ; Text [ spanish ] = "Comentario" ; Text [ french ] = "Commentaire" ; - Text [ dutch ] = "Commentaar" ; + Text [ dutch ] = "Opmerkingen" ; Text [ portuguese ] = "Comentrio" ; Text[ chinese_simplified ] = "注解"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "Komentarz"; Text[ japanese ] = "コメント"; Text[ chinese_traditional ] = "註解"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "주석"; + Text[ korean ] = "설명"; Text[ turkish ] = "Aklama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comentari"; + Text[ catalan ] = "Comentaris"; Text[ finnish ] = "Huomautukset"; + Text[ thai ] = "ข้อคิดเห็น"; }; Control TLB_VERSIONS { @@ -300,8 +307,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "닫기"; Text[ turkish ] = "Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tanca"; - Text[ finnish ] = "~Sulje"; + Text[ catalan ] = "Cerrar"; + Text[ finnish ] = "Sulje"; + Text[ thai ] = "~ปิด"; }; PushButton PB_OPEN { @@ -331,6 +339,7 @@ ModalDialog DLG_VERSIONS Text[ language_user1 ] = " "; Text[ catalan ] = "Obre"; Text[ finnish ] = "Avaa"; + Text[ thai ] = "เปิด"; }; PushButton PB_VIEW { @@ -350,7 +359,7 @@ ModalDialog DLG_VERSIONS Text [ dutch ] = "~Weergeven..." ; Text [ portuguese ] = "~Mostrar..." ; Text[ chinese_simplified ] = "显示(~S)..."; - Text[ russian ] = "..."; + Text[ russian ] = "..."; Text[ polish ] = "Po~ka..."; Text[ japanese ] = "表示(~S)..."; Text[ chinese_traditional ] = "顯示(~S)..."; @@ -359,8 +368,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "표시(~S)..."; Text[ turkish ] = "~Grntle..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mostrar..."; - Text[ finnish ] = "~Nyt"; + Text[ catalan ] = "~Mostra..."; + Text[ finnish ] = "~Nyt..."; + Text[ thai ] = "แ~สดง..."; }; PushButton PB_DELETE { @@ -374,7 +384,7 @@ ModalDialog DLG_VERSIONS Text [ swedish ] = "~Radera" ; Text [ danish ] = "Slet" ; Text [ italian ] = "~Elimina" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ french ] = "Supprimer" ; Text [ dutch ] = "~Wissen" ; Text [ portuguese ] = "E~liminar" ; @@ -388,8 +398,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "삭제(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Suprimeix"; + Text[ catalan ] = "S~uprimeix"; Text[ finnish ] = "~Poista"; + Text[ thai ] = "~ลบ"; }; PushButton PB_COMPARE { @@ -417,8 +428,9 @@ ModalDialog DLG_VERSIONS Text[ korean ] = "비교"; Text[ turkish ] = "Karlatr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comparar"; + Text[ catalan ] = "Compara"; Text[ finnish ] = "Vertaa"; + Text[ thai ] = "เปรียบเทียบ"; }; HelpButton PB_HELP { @@ -436,7 +448,7 @@ ModalDialog DLG_VERSIONS Text [ french ] = "Versions de" ; Text [ dutch ] = "Versies in" ; Text[ chinese_simplified ] = "版本"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Wersje w"; Text[ japanese ] = "バージョン"; Text[ chinese_traditional ] = "版本在"; @@ -445,8 +457,9 @@ ModalDialog DLG_VERSIONS Text[ greek ] = " "; Text[ korean ] = "버전"; Text[ turkish ] = "Mevcut srmler:"; - Text[ catalan ] = "Versiones en"; + Text[ catalan ] = "Versions de"; Text[ finnish ] = "Versiot"; + Text[ thai ] = "เวอร์ชั่นของ"; }; ModalDialog DLG_COMMENTS { @@ -469,20 +482,21 @@ ModalDialog DLG_COMMENTS Text [ italian ] = "Data e ora : " ; Text [ spanish ] = "Fecha y hora: " ; Text [ french ] = "Date et heure : " ; - Text [ dutch ] = "Datum en tijd : " ; + Text [ dutch ] = "Datum en tijd:" ; Text [ portuguese ] = "Data e horas : " ; Text[ chinese_simplified ] = "日期和时间： "; - Text[ russian ] = " : "; + Text[ russian ] = " : "; Text[ polish ] = "Data i godzina : "; Text[ japanese ] = "日付と時刻: "; Text[ chinese_traditional ] = "日期和時間： "; Text[ arabic ] = " : "; Text[ greek ] = " : "; - Text[ korean ] = "날짜와 시간 : "; + Text[ korean ] = "날짜 및 시간: "; Text[ turkish ] = "Tarih ve saat : "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fecha y hora: "; + Text[ catalan ] = "Data i hora : "; Text[ finnish ] = "Pivmr ja aika: "; + Text[ thai ] = "วันที่และเวลา : "; }; FixedText FT_SAVEDBY { @@ -497,10 +511,10 @@ ModalDialog DLG_COMMENTS Text [ italian ] = "salvato da " ; Text [ spanish ] = "guardado por " ; Text [ french ] = "Enregistr par " ; - Text [ dutch ] = "opgeslagen door " ; + Text [ dutch ] = "opgeslagen door" ; Text [ portuguese ] = "Guardado por " ; Text[ chinese_simplified ] = "作者 "; - Text[ russian ] = " "; + Text[ russian ] = ": "; Text[ polish ] = "zapisany przez "; Text[ japanese ] = "保存者 "; Text[ chinese_traditional ] = "作者 "; @@ -509,8 +523,9 @@ ModalDialog DLG_COMMENTS Text[ korean ] = "저장"; Text[ turkish ] = "Kaydeden "; Text[ language_user1 ] = " "; - Text[ catalan ] = "guardado por "; - Text[ finnish ] = "Tallentanut"; + Text[ catalan ] = "Desat per "; + Text[ finnish ] = "Tallentanut "; + Text[ thai ] = "บันทึกโดย "; }; MultiLineEdit ME_VERSIONS { @@ -560,6 +575,7 @@ ModalDialog DLG_COMMENTS Text[ language_user1 ] = " "; Text[ catalan ] = "~Tanca"; Text[ finnish ] = "~Sulje"; + Text[ thai ] = "~ปิด"; }; HelpButton PB_HELP { @@ -574,20 +590,21 @@ ModalDialog DLG_COMMENTS Text [ italian ] = "Inserisci commento versioni" ; Text [ spanish ] = "Escribir comentario sobre la versin" ; Text [ french ] = "Saisie du commentaire de version (facultatif)" ; - Text [ dutch ] = "Versiecommentaar invoeren" ; + Text [ dutch ] = "Versie-opmerkingen invoeren" ; Text [ portuguese ] = "Inserir comentrio sobre verso" ; Text[ chinese_simplified ] = "键入版本注解"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Wprowad komentarz do wersji"; Text[ japanese ] = "バージョンコメントの入力"; Text[ chinese_traditional ] = "輸入版本註解"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "버전-주석 입력"; + Text[ korean ] = "버전 설명 입력"; Text[ turkish ] = "Srm aklamas ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Escribir comentario sobre la versin"; + Text[ catalan ] = "Escriure comentari sobre la versi"; Text[ finnish ] = "Lis versiohuomautus"; + Text[ thai ] = "แทรกเวอร์ชั่นข้อคิดเห็น"; }; String DLG_COMMENTS { @@ -601,7 +618,7 @@ String DLG_COMMENTS Text [ italian ] = "Commento versioni" ; Text [ spanish ] = "Comentario sobre la versin" ; Text [ french ] = "Commentaire de version" ; - Text [ dutch ] = "Versiecommentaar" ; + Text [ dutch ] = "Versie-opmerkingen" ; Text[ chinese_simplified ] = "版本注解"; Text[ russian ] = " "; Text[ polish ] = "Komentarz do wersji"; @@ -609,10 +626,16 @@ String DLG_COMMENTS Text[ chinese_traditional ] = "版本註解"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "버전 주석"; + Text[ korean ] = "버전 설명"; Text[ turkish ] = "Srm aklamas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comentario sobre la versin"; + Text[ catalan ] = "Comentari sobre la versi"; Text[ finnish ] = "Versiohuomautus"; + Text[ thai ] = "เวอร์ชั่นข้อคิดเห็น"; }; + + + + + diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index e6474aaa2bc6..f576823d1e5a 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -2,9 +2,9 @@ * * $RCSfile: doc.src,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: hr $ $Date: 2002-11-14 12:46:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,20 +75,20 @@ QueryBox MSG_CONFIRM_FILTER Message [ italian ] = "Salvare in formati estranei pu causare\nla perdita di informazioni. Chiudere lo stesso?" ; Message [ portuguese_brazilian ] = "Gravar em formatos estrangeiros poder provocar \na perda de Informa??s." ; Message [ portuguese ] = "Ao guardar em formatos estranhos poder provocar \na perda de informaes. Mesmo assim, guardar?" ; - Message [ finnish ] = "Tallennus ulkoiseen muotoon on saattanut\naiheuttaa tietojen katoamista. Haluatko silti sulkea?" ; + Message [ finnish ] = "Tallennus ulkoiseen muotoon on saattanut\naiheuttaa joidenkin tietojen katoamisen. Haluatko silti sulkea?" ; Message [ danish ] = "Lagring i fremmedformater kan have forrsaget\ninformationstab. Vil du lukke alligevel?" ; Message [ french ] = "L'enregistrement dans un format externe peut entraner\nune perte de certaines informations. Voulez-vous vraiment poursuivre ?" ; Message [ swedish ] = "Om du sparar i ett externt format kan\ninformation g frlorad. Stnga nd?" ; - Message [ dutch ] = "Bij het opslaan in een extern formaat kan\ninformatie verloren gegaan zijn. Toch sluiten?" ; + Message [ dutch ] = "Bij het opslaan in een externe indeling kan\ninformatie verloren gegaan zijn. Toch sluiten?" ; Message [ spanish ] = "Al guardar en formatos extraos podra haberse provocado una prdida\nde informacin. Desea cerrar de todas formas?" ; Message [ english_us ] = "Saving in external formats may have caused\n information loss. Do you still want to close?" ; Message[ chinese_simplified ] = "在文件存盘成一个外来的格式时\n可能会遗失信息。\n您还是要关闭这个文件？"; - Message[ russian ] = " \n . ?"; + Message[ russian ] = " \n . ?"; Message[ polish ] = "Podczas zapisu w obcych formatach n\nmoe doj do utraty informacji. Mimo to zamkn?"; Message[ japanese ] = "外部書式で保存すると\n情報が失われる可能性があります。閉じてもよろしいですか?"; Message[ chinese_traditional ] = "在文件儲存成一個外來的格式時\n未能訊息可能會流失。\n還是要關閉這個文件？"; Message[ arabic ] = " \n . ߿"; - Message[ dutch ] = "Bij het opslaan in een extern formaat kan\ninformatie verloren gegaan zijn. Toch sluiten?"; + Message[ dutch ] = "Bij het opslaan in een externe indeling kan\ninformatie verloren gegaan zijn. Toch sluiten?"; Message[ chinese_simplified ] = "在文件存盘成一个外来的格式时\n可能会遗失信息。\n您还是要关闭这个文件？"; Message[ greek ] = " \n . ;"; Message[ korean ] = "외부 서식을 저장할 때 \n 정보가 손실될 수도 있습니다. 그래도 닫으시겠습니까?"; @@ -107,7 +107,7 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE Message [ italian ] = "Nome gi in uso.\nSovrascrivere il modello di documento?" ; Message [ portuguese_brazilian ] = "Nome j? em uso.\nSobregravar o modelo do documento?" ; Message [ portuguese ] = "J existe um modelo com este nome.\nSobregravar o modelo do documento?" ; - Message [ finnish ] = "Nimi on jo kytss.\nHaluatko korvata asiakirjan mallipohjan?" ; + Message [ finnish ] = "Nimi on jo kytss.\nHaluatko korvata asiakirjan mallin?" ; Message [ danish ] = "Der eksisterer allerede et dokument med dette navn.\nSkal det erstattes?" ; Message [ french ] = "Un modle de ce nom existe dj.\nRemplacer le modle existant ?" ; Message [ swedish ] = "Det finns redan en mall med det hr namnet.\nVill du skriva ver den?" ; @@ -115,7 +115,7 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE Message [ spanish ] = "Ya existe una plantilla con este nombre.\nDesea sobrescribirla?" ; Message [ english_us ] = "Name already in use.\nDo you want to overwrite document template?" ; Message[ chinese_simplified ] = "一个同名的样式已经存在。\n要改写它？"; - Message[ russian ] = " .\n?"; + Message[ russian ] = " .\n?"; Message[ polish ] = "Ju istnieje szablon o tej nazwie.\nCzy go zastpi innym?"; Message[ japanese ] = "この名前のテンプレートはすでにあります。\n上書きしますか。"; Message[ chinese_traditional ] = "一個同名的樣式已經存在。\n您要覆寫它？"; @@ -123,7 +123,7 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE Message[ dutch ] = "Er bestaat reeds een sjabloon met deze naam.\nOverschrijven?"; Message[ chinese_simplified ] = "一个同名的样式已经存在。\n要改写它？"; Message[ greek ] = " .\n ;"; - Message[ korean ] = "이 이름을 가진 템플릿이 이미 존재합니다.\n덮어쓰겠습니까?"; + Message[ korean ] = "이 이름을 가진 템플릿이 이미 존재합니다.\n겹쳐쓰시겠습니까?"; Message[ turkish ] = "Ayn ad tayan bir ablon zaten mevcut.\nBu ablonun zerine yazlsn m?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Ja existeix una plantilla amb aquest nom.\nVoleu sobrescriure-la?"; @@ -139,8 +139,8 @@ QueryBox MSG_QUERY_LOAD_TEMPLATE MESSAGE [ English ] = "Die Formatvorlagen dieses Dokuments stimmen nicht mit Ihren aktuellen Vorlagen berein. Sollen Ihre aktuellen Vorlagen auf dieses Dokument angewendet werden?" ; MESSAGE[ english_us ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?"; MESSAGE[ portuguese ] = "Os estilos de formato deste documento no coincidem com os estilos actuais. Aplicar os seus estilos actuais a este documento?"; - MESSAGE[ russian ] = " .\n ?"; - MESSAGE[ dutch ] = "De sjablonen bij dit document komen niet overeen met uw actuele sjablonen. Wilt u dat uw actuele sjablonen op dit documentworden toegepast?"; + MESSAGE[ russian ] = " .\n ?"; + MESSAGE[ dutch ] = "De sjablonen bij dit document komen niet overeen met uw huidige sjablonen. Wilt u uw huidige sjablonen op dit document toepassen?"; MESSAGE[ french ] = "Les styles de format utiliss dans ce document ne concordent pas avec les styles actifs.\nSouhaitez-vous appliquer les styles actifs dans ce document ?"; MESSAGE[ spanish ] = "Los estilos de este documento no coinciden con sus estilos actuales.\nDesea aplicar sus estilos actuales a este documento?"; MESSAGE[ italian ] = "I modelli del documento non corrispondono ai modelli attuali.\nApplicare i modelli attuali al documento?"; @@ -152,10 +152,10 @@ QueryBox MSG_QUERY_LOAD_TEMPLATE MESSAGE[ chinese_simplified ] = "这个文档的格式样式已经被更改。\n要用当前的新样式来改写这个文档？"; MESSAGE[ chinese_traditional ] = "這個檔案樣式已經變更。\n您要更新這個樣式？"; MESSAGE[ arabic ] = " . Ͽ"; - MESSAGE[ dutch ] = "De sjablonen bij dit document komen niet overeen met uw actuele sjablonen. Wilt u dat uw actuele sjablonen op dit documentworden toegepast?"; + MESSAGE[ dutch ] = "De sjablonen bij dit document komen niet overeen met uw huidige sjablonen. Wilt u uw huidige sjablonen op dit document toepassen?"; MESSAGE[ chinese_simplified ] = "这个文档的格式样式已经被更改。\n要用当前的新样式来改写这个文档？"; MESSAGE[ greek ] = " . ;"; - MESSAGE[ korean ] = "이 문서의 서식 템플릿은 현재 템플릿과 일치하지 않습니다. 현재 템플릿을 이 문서에 적용하겠습니까?"; + MESSAGE[ korean ] = "이 문서의 스타일은 현재 사용중인 스타일과 일치하지 않습니다. 현재 스타일을 이 문서에 적용하시겠습니까?"; MESSAGE[ turkish ] = "Bu belgenin biimleri, yrrlkteki biimlerle rtmyor. Yrrlkteki biimler bu belgenize uygulansn m?"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Els estils en aquest document no coincideixen amb els vostres estils actuals. S'haurien d'aplicar els vostres estils actuals en aquest document?"; @@ -171,9 +171,9 @@ String STR_DELETE_REGION Text [ swedish ] = "Skall omrdet \"$1\" raderas?" ; Text [ danish ] = "Er du sikker p, at du vil slette omrdet \"$1\"?" ; Text [ italian ] = "Eliminare la categoria \"$1\"?" ; - Text [ spanish ] = "Desea eliminar el rea \"$1\"?" ; + Text [ spanish ] = "Desea borrar el rea \"$1\"?" ; Text [ french ] = "Voulez-vous vraiment supprimer la catgorie $1?" ; - Text [ dutch ] = "Wilt u het bereik \"$1\" wissen?" ; + Text [ dutch ] = "Wilt u bereik \"$1\" wissen?" ; Text [ portuguese ] = "Eliminar realmente a categoria \"$1\"?" ; Text[ chinese_simplified ] = "要删除区域 $1 ？"; Text[ russian ] = " \"$1\"?"; @@ -181,7 +181,7 @@ String STR_DELETE_REGION Text[ japanese ] = "グループ「$1」を削除しますか?"; Text[ chinese_traditional ] = "要刪除這個區域 $1？"; Text[ arabic ] = " \"$1\""; - Text[ dutch ] = "Wilt u het bereik \"$1\" wissen?"; + Text[ dutch ] = "Wilt u bereik \"$1\" wissen?"; Text[ chinese_simplified ] = "要删除区域 $1 ？"; Text[ greek ] = " $1?"; Text[ korean ] = "영역\"$1\"을(를）삭제하겠습니까?"; @@ -200,12 +200,12 @@ String STR_DELETE_TEMPLATE Text [ swedish ] = "Skall posten \"$1\" raderas?" ; Text [ danish ] = "Er du sikker p, at du vil slette elementet \"$1\"?" ; Text [ italian ] = "Volete eliminare la voce \"$1\"?" ; - Text [ spanish ] = "Desea eliminar la entrada \"$1\"?" ; + Text [ spanish ] = "Desea borrar la entrada \"$1\"?" ; Text [ french ] = "Voulez-vous vraiment supprimer l'entre $1?" ; Text [ dutch ] = "Wilt u item \"$1\" wissen?" ; Text [ portuguese ] = "Deseja realmente eliminar a entrada \"$1\"?" ; Text[ chinese_simplified ] = "要删除条目 $1 ？"; - Text[ russian ] = " \"$1\"?"; + Text[ russian ] = " \"$1\"?"; Text[ polish ] = "Usun wpis \"$1\"?"; Text[ japanese ] = "テンプレート「$1」を削除しますか?"; Text[ chinese_traditional ] = "要刪除這個項目 $1 ？"; @@ -235,10 +235,10 @@ QueryBox MSG_REGION_NOTEMPTY Message [ french ] = "La catgorie n'est pas vide.\nSupprimer quand mme ?" ; Message [ swedish ] = "Omrdet r ej tomt.\nRadera nd?" ; Message [ dutch ] = "Het bereik is niet leeg.\nToch verwijderen?" ; - Message [ spanish ] = "El rea no est vaca.\nDesea eliminarla de todas formas?" ; + Message [ spanish ] = "La categora no est vaca.\nDesea borrarla de todas formas?" ; Message [ english_us ] = "The category is not empty.\nDelete anyway?" ; Message[ chinese_simplified ] = "这个区域含有数据。\n您还是要删除它？"; - Message[ russian ] = " .\n ?"; + Message[ russian ] = " .\n, ?"; Message[ polish ] = "Obszar nie jest pusty.\nMimo to usun?"; Message[ japanese ] = "範囲は空ではありません。\nそれでも削除しますか?"; Message[ chinese_traditional ] = "這個區域含有資料。\n還是要刪除它？"; @@ -246,7 +246,7 @@ QueryBox MSG_REGION_NOTEMPTY Message[ dutch ] = "Het bereik is niet leeg.\nToch verwijderen?"; Message[ chinese_simplified ] = "这个区域含有数据。\n您还是要删除它？"; Message[ greek ] = " .\n ;"; - Message[ korean ] = "영역이 비어 있지 않습니다.\n그래도 삭제하겠습니까?"; + Message[ korean ] = "영역이 비어 있지 않습니다.\n그래도 삭제하시겠습니까?"; Message[ turkish ] = "Kategori bo deil.\nYine de silinsin mi?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Aquesta rea no est buida.\nVoleu eliminar-la de totes maneres?"; @@ -264,16 +264,16 @@ String STR_QUERY_SAVE_DOCUMENT Text [ danish ] = "Dokumentet \"$(DOC)\" er blevet ndret.\nSkal ndringerne gemmes?" ; Text [ french ] = "Le document '$(DOC)' a t modifi.\nSouhaitez-vous enregistrer les modifications apportes ?" ; Text [ swedish ] = "Dokumentet \"$(DOC)\" har ndrats.\nSkall ndringarna sparas?" ; - Text [ dutch ] = "Het document \"$(DOC)\" is gewijzigd.\nWilt u uw wijzigingen opslaan?" ; + Text [ dutch ] = "Het document \"$(DOC)\" is gewijzigd.\nWilt u de wijzigingen opslaan?" ; Text [ spanish ] = "El documento \"$(DOC)\" ha sido modificado.\nDesea guardar las modificaciones?" ; Text [ english_us ] = "The document \"$(DOC)\" has been modified.\nDo you want to save your changes?" ; Text[ chinese_simplified ] = "文档 $(DOC) 已经被修改。\n要存盘这些更改吗？"; - Text[ russian ] = " '$(DOC)' .\n ?"; + Text[ russian ] = " '$(DOC)' .\n ?"; Text[ polish ] = "Zmieniono dokument \"$(DOC)\".\nCzy zapisa zmiany?"; Text[ japanese ] = "ドキュメント \"$(DOC)\" は変更されています。\n変更を保存しますか。"; Text[ chinese_traditional ] = "這個文件 $(DOC) 已經變更。\n要儲存這些變更？"; Text[ arabic ] = " \"$(DOC)\".\n ʿ"; - Text[ dutch ] = "Het document \"$(DOC)\" is gewijzigd.\nWilt u uw wijzigingen opslaan?"; + Text[ dutch ] = "Het document \"$(DOC)\" is gewijzigd.\nWilt u de wijzigingen opslaan?"; Text[ chinese_simplified ] = "文档 $(DOC) 已经被修改。\n要存盘这些更改吗？"; Text[ greek ] = " '$(DOC)' .\n ;"; Text[ korean ] = "문서'$(DOC)'이(가) 변경되었습니다.\n변경 사항을 저장하겠습니까?"; @@ -311,7 +311,7 @@ String STR_STYLES Text[ dutch ] = "Opmaakprofielen"; Text[ chinese_simplified ] = "样式"; Text[ greek ] = ""; - Text[ korean ] = "템플릿"; + Text[ korean ] = "스타일"; Text[ turkish ] = "Biimler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estils"; @@ -371,7 +371,7 @@ String STR_CONFIG Text[ dutch ] = "Configuratie"; Text[ chinese_simplified ] = "配置"; Text[ greek ] = ""; - Text[ korean ] = "구성"; + Text[ korean ] = "설정"; Text[ turkish ] = "Konfigrasyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Configuraci"; @@ -385,11 +385,11 @@ String STR_PRINT_STYLES_HEADER Text [ italian ] = "Modelli in " ; Text [ portuguese_brazilian ] = "Estilos em " ; Text [ portuguese ] = "Estilos em " ; - Text [ finnish ] = "Tyylit" ; + Text [ finnish ] = "Tyylit " ; Text [ danish ] = "Formattypografi i " ; Text [ french ] = "Styles dans " ; Text [ swedish ] = "Formatmallar i " ; - Text [ dutch ] = "Opmaakprofielen in " ; + Text [ dutch ] = "Opmaakprofielen in" ; Text [ spanish ] = "Estilos en " ; Text [ english_us ] = "Styles in " ; Text[ chinese_simplified ] = "格式样式在 "; @@ -398,10 +398,10 @@ String STR_PRINT_STYLES_HEADER Text[ japanese ] = "書式スタイル "; Text[ chinese_traditional ] = "格式樣式在 "; Text[ arabic ] = " "; - Text[ dutch ] = "Opmaakprofielen in "; + Text[ dutch ] = "Opmaakprofielen in"; Text[ chinese_simplified ] = "格式样式在 "; Text[ greek ] = " "; - Text[ korean ] = "서식 문서"; + Text[ korean ] = "스타일"; Text[ turkish ] = "Biimler: "; Text[ language_user1 ] = " "; Text[ catalan ] = "Estils a "; @@ -420,10 +420,10 @@ String STR_PRINT_STYLES Text [ french ] = "Impression des styles" ; Text [ swedish ] = "Skriver ut formatmallar" ; Text [ dutch ] = "Opmaakprofielen afdrukken" ; - Text [ spanish ] = "Imprimiento estilos de impresin" ; + Text [ spanish ] = "Impresin de estilos" ; Text [ english_us ] = "Printing Styles" ; Text[ chinese_simplified ] = "打印格式样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Drukuj style formatu"; Text[ japanese ] = "印刷書式スタイル"; Text[ chinese_traditional ] = "列印格式樣式"; @@ -431,7 +431,7 @@ String STR_PRINT_STYLES Text[ dutch ] = "Opmaakprofielen afdrukken"; Text[ chinese_simplified ] = "打印格式样式"; Text[ greek ] = " "; - Text[ korean ] = "서식 템플릿 인쇄 출력"; + Text[ korean ] = "스타일 인쇄"; Text[ turkish ] = "Biimler yazdrlyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'estan imprimint els estils"; @@ -457,7 +457,7 @@ ErrorBox MSG_PRINT_ERROR Message [ italian ] = "Non stato possibile avviare il lavoro di stampa." ; Message [ portuguese_brazilian ] = "O servi?o de impress?o n?o pode ser iniciado." ; Message [ portuguese ] = "Impossvel iniciar a impresso." ; - Message [ finnish ] = "Tulostustyn aloittaminen ei onnistu" ; + Message [ finnish ] = "Tulostustyn aloittaminen ei onnistu." ; Message [ danish ] = "Det var ikke muligt at starte udskrivningen." ; Message [ french ] = "Le travail d'impression n'a pas pu tre lanc." ; Message [ swedish ] = "Utskriftsarbetet kunde inte pbrjas." ; @@ -465,7 +465,7 @@ ErrorBox MSG_PRINT_ERROR Message [ spanish ] = "No se pudo inicializar la impresin." ; Message [ english_us ] = "The print job could not be started." ; Message[ chinese_simplified ] = "无法启动打印操作。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Zadanie wydruku nie mogo zosta rozpoczte."; Message[ japanese ] = "印刷処理は開始できませんでした。"; Message[ chinese_traditional ] = "無法執行列印操作。"; @@ -521,18 +521,18 @@ WarningBox MSG_WARNING_BACKUP Message [ danish ] = "Det var ikke muligt at oprette sikkerhedskopi." ; Message [ french ] = "Cration de la copie de sauvegarde impossible." ; Message [ swedish ] = "Skerhetskopia kunde inte skapas." ; - Message [ dutch ] = "Reservekopie kon niet worden gemaakt." ; + Message [ dutch ] = "Reservekopie kan niet worden gemaakt." ; Message [ spanish ] = "No se pudo crear la copia de seguridad." ; Message [ english_us ] = "Could not create backup copy." ; Buttons = WB_OK ; DefButton = WB_DEF_OK ; Message[ chinese_simplified ] = "无法建立安全备件。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Kopii zapasowej nie mona byo utworzy."; Message[ japanese ] = "バックアップ コピーは作成できませんでした。"; Message[ chinese_traditional ] = "無法產生安全備份。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Reservekopie kon niet worden gemaakt."; + Message[ dutch ] = "Reservekopie kan niet worden gemaakt."; Message[ chinese_simplified ] = "无法建立安全备件。"; Message[ greek ] = " ."; Message[ korean ] = "백업 복사를 하지 못했습니다."; @@ -549,7 +549,7 @@ InfoBox MSG_CANT_OPEN_TEMPLATE Message [ italian ] = "Impossibile aprire il modello." ; Message [ portuguese_brazilian ] = "O modelo do documento n?o pode ser aberto." ; Message [ portuguese ] = "No possvel abrir o modelo do documento." ; - Message [ finnish ] = "Mallipohjaa ei voitu avata." ; + Message [ finnish ] = "Mallia ei voitu avata." ; Message [ danish ] = "Det er ikke muligt at bne dokumentskabelonen." ; Message [ french ] = "Impossible d'ouvrir le modle de document." ; Message [ swedish ] = "Dokumentmallen kan inte ppnas." ; @@ -557,7 +557,7 @@ InfoBox MSG_CANT_OPEN_TEMPLATE Message [ spanish ] = "No se puede abrir la plantilla del documento." ; Message [ english_us ] = "The template could not be opened." ; Message[ chinese_simplified ] = "无法打开文件样式 "; - Message[ russian ] = " "; + Message[ russian ] = " ."; Message[ polish ] = "Szablonu dokumentu nie mona otworzy."; Message[ japanese ] = "ドキュメント テンプレートは開くことができません。"; Message[ chinese_traditional ] = "無法開啟文件樣式 "; @@ -589,7 +589,7 @@ InfoBox MSG_VIEW_OPEN_CANT_SAVE MESSAGE [ spanish ] = "Este documento ya est abierto para editar." ; MESSAGE [ english_us ] = "Document already open for editing." ; MESSAGE[ chinese_simplified ] = "这个文件已经被打开编辑。"; - MESSAGE[ russian ] = " ."; + MESSAGE[ russian ] = " ."; MESSAGE[ polish ] = "Dokument jest ju otwarty do edycji."; MESSAGE[ japanese ] = "ドキュメントはすでに編集用に開かれています。"; MESSAGE[ chinese_traditional ] = "這個檔案已經開啟編輯。"; @@ -611,20 +611,20 @@ String STR_ERROR_SAVE Text [ italian ] = "Errore durante la scrittura del documento. " ; Text [ portuguese_brazilian ] = "Erro ao gravar o documento " ; Text [ portuguese ] = "Erro ao gravar o documento " ; - Text [ finnish ] = "On ilmennyt virhe tallennettaessa asiakirjaa" ; + Text [ finnish ] = "On ilmennyt virhe tallennettaessa asiakirjaa " ; Text [ danish ] = "Fejl under skrivning af dokumentet " ; Text [ french ] = "Erreur lors de l'criture du document " ; Text [ swedish ] = "Fel vid skrivning av dokument " ; - Text [ dutch ] = "Fout bij schrijven van document " ; + Text [ dutch ] = "Fout bij schrijven van document" ; Text [ spanish ] = "Error al escribir documento " ; Text [ english_us ] = "Error recording document " ; Text[ chinese_simplified ] = "在写入文档时发生一个错误 "; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bd przy zapisie dokumentu "; Text[ japanese ] = "ドキュメントの移動の際のエラー "; Text[ chinese_traditional ] = "在寫入文件時發生一個錯誤 "; Text[ arabic ] = " "; - Text[ dutch ] = "Fout bij schrijven van document "; + Text[ dutch ] = "Fout bij schrijven van document"; Text[ chinese_simplified ] = "在写入文档时发生一个错误 "; Text[ greek ] = " "; Text[ korean ] = "문서 쓰기에서 오류 발생. "; @@ -641,7 +641,7 @@ String STR_TEMPLATE_FILTER Text [ italian ] = "Modelli" ; Text [ portuguese_brazilian ] = "Modelos do documento" ; Text [ portuguese ] = "Modelos de documentos" ; - Text [ finnish ] = "Mallipohjat" ; + Text [ finnish ] = "Mallit" ; Text [ danish ] = "Dokumentskabeloner" ; Text [ french ] = "Modles de document" ; Text [ swedish ] = "Dokumentmallar" ; @@ -649,7 +649,7 @@ String STR_TEMPLATE_FILTER Text [ spanish ] = "Plantillas" ; Text [ english_us ] = "Templates" ; Text[ chinese_simplified ] = "文档样式"; - Text[ russian ] = " "; + Text[ russian ] = ""; Text[ polish ] = "Szablony dokumentw"; Text[ japanese ] = "ドキュメントテンプレート"; Text[ chinese_traditional ] = "文件樣式"; @@ -657,7 +657,7 @@ String STR_TEMPLATE_FILTER Text[ dutch ] = "Sjablonen"; Text[ chinese_simplified ] = "文档样式"; Text[ greek ] = " "; - Text[ korean ] = "문서 템플릿"; + Text[ korean ] = "서식 파일"; Text[ turkish ] = "Belge ablonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Plantilles"; @@ -671,20 +671,20 @@ String STR_ERROR_COPY_TEMPLATE Text [ italian ] = "Errore durante la copia del modello \"$1\".\nProbabilmente il modello esiste gi." ; Text [ portuguese_brazilian ] = "Erro ao copiar o modelo" ; Text [ portuguese ] = "Erro ao copiar o modelo \"$1\".\n possvel que j exista." ; - Text [ finnish ] = "On ilmennyt virhe kopioitaessa mallipohjaa $1. \nTmn niminen mallipohja saattaa olla jo olemassa." ; + Text [ finnish ] = "On ilmennyt virhe siirrettess mallia $1. \nTmn niminen malli saattaa olla jo olemassa." ; Text [ danish ] = "Fejl ved kopiering af skabelonen \"$1\".\nMuligvis findes skabelonen allerede." ; Text [ french ] = "Erreur lors de la copie du modle \"$1\".\nIl se peut qu'il existe dj." ; Text [ swedish ] = "Fel vid kopiering av mallen \"$1\".\nEventuellt existerar mallen redan." ; - Text [ dutch ] = "Fout bij kopiren van sjabloon \"$1\".\nEventueel bestaat deze reeds." ; + Text [ dutch ] = "Fout bij kopiren van sjabloon \"$1\".\nMogelijk bestaat deze reeds." ; Text [ spanish ] = "Error al copiar la plantilla \"$1\".\nEs posible que esta ya exista." ; Text [ english_us ] = "Error copying template \"$1\". \nA template with this name may already exist." ; Text[ chinese_simplified ] = "在复制样式\"$1\"时发生错误。\n可能样式已经存在。"; - Text[ russian ] = " \"$1\".\n, ."; + Text[ russian ] = " \"$1\".\n, ."; Text[ polish ] = "Bd podczas kopiowania szablonu \"$1\".\nSzablon ju by moe istnieje."; Text[ japanese ] = "テンプレート\"$1\"をコピーする際のエラー｡\nおそらくこのテンプレートはすでにあります。"; Text[ chinese_traditional ] = "在複製樣式時發生一個錯誤。\n可能樣式已經存在。"; Text[ arabic ] = " \"$1\".\n ."; - Text[ dutch ] = "Fout bij kopiren van sjabloon \"$1\".\nEventueel bestaat deze reeds."; + Text[ dutch ] = "Fout bij kopiren van sjabloon \"$1\".\nMogelijk bestaat deze reeds."; Text[ chinese_simplified ] = "在复制样式\"$1\"时发生错误。\n可能样式已经存在。"; Text[ greek ] = " \"$1\". \n ."; Text[ korean ] = "템플릿 \"$1\" 복사 오류.\n이 템플릿이 이미 존재할 수도 있습니다."; @@ -702,12 +702,12 @@ String STR_ERROR_DELETE_TEMPLATE Text [ swedish ] = "Mallen \"$1\" kan inte raderas." ; Text [ danish ] = "Det er ikke muligt at slette skabelonen \"$1\"." ; Text [ italian ] = "Impossibile eliminare il modello $1." ; - Text [ spanish ] = "No es posible eliminar la plantilla \"$1\"." ; + Text [ spanish ] = "No es posible borrar la plantilla \"$1\"." ; Text [ french ] = "Impossible de supprimer le modle \"$1\"." ; Text [ dutch ] = "De sjabloon \"$1\" kan niet worden gewist." ; Text [ portuguese ] = "Impossvel eliminar o modelo \"$1\"." ; Text[ chinese_simplified ] = "无法删除样式 $1。"; - Text[ russian ] = " \"$1\" ."; + Text[ russian ] = " \"$1\"."; Text[ polish ] = "Szablonu \"$1\" nie mona usun."; Text[ japanese ] = "テンプレート\"$1\"は削除できません。"; Text[ chinese_traditional ] = "無法刪除這個樣式 $1 。"; @@ -719,7 +719,7 @@ String STR_ERROR_DELETE_TEMPLATE Text[ turkish ] = "\"$1\" ablonu silinemiyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "La plantilla \"$1\" no s'ha pogut suprimir."; - Text[ finnish ] = "Mallipohjaa $1 ei voi poistaa."; + Text[ finnish ] = "Mallia $1 ei voi poistaa."; Text[ thai ] = "ไม่สามารถลบแม่แบบ \"$1\" ได้"; }; String STR_ERROR_MOVE_TEMPLATE @@ -730,7 +730,7 @@ String STR_ERROR_MOVE_TEMPLATE Text [ italian ] = "Errore durante lo spostamento del modello \"$1\"." ; Text [ portuguese_brazilian ] = "Erro ao mover o modelo " ; Text [ portuguese ] = "Erro ao mover o modelo \"$1\"." ; - Text [ finnish ] = "On ilmennyt virhe siirrettess mallipohjaa $1." ; + Text [ finnish ] = "On ilmennyt virhe siirrettess mallia $1." ; Text [ danish ] = "Fejl under flytning af skabelonen \"$1\"." ; Text [ french ] = "Erreur lors du dplacement du modle \"$1\"." ; Text [ swedish ] = "Fel vid flyttning av mall \"$1\" " ; @@ -738,7 +738,7 @@ String STR_ERROR_MOVE_TEMPLATE Text [ spanish ] = "Error al desplazar la plantilla \"$1\" " ; Text [ english_us ] = "Error moving template \"$1\"." ; Text[ chinese_simplified ] = "在移动样式\"$1\"时发生错误"; - Text[ russian ] = " \"$1\"."; + Text[ russian ] = " \"$1\"."; Text[ polish ] = "Bd przy przenoszeniu szablonu \"$1\"."; Text[ japanese ] = "テンプレート\"$1\"の移動の際のエラー。"; Text[ chinese_traditional ] = "在移動樣式 $1 時發生錯誤 。"; @@ -770,7 +770,7 @@ ErrorBox MSG_ERROR_RESCAN Message [ spanish ] = "No se pudieron guardar las actualizaciones." ; Message [ english_us ] = "The update could not be saved." ; Message[ chinese_simplified ] = "无法存盘更新内容。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Aktualizacje nie mogy zosta zapisane."; Message[ japanese ] = "更新した内容は保存できませんでした。"; Message[ chinese_traditional ] = "無法儲存更新內容。"; @@ -792,20 +792,20 @@ String STR_ERROR_SAVE_TEMPLATE Text [ italian ] = "Errore durante la scrittura del modello " ; Text [ portuguese_brazilian ] = "Erro ao gravar o modelo " ; Text [ portuguese ] = "Erro ao gravar o modelo " ; - Text [ finnish ] = "On ilmennyt virhe tallennettaessa mallipohjaa" ; + Text [ finnish ] = "On ilmennyt virhe tallennettaessa mallia " ; Text [ danish ] = "Fejl under skrivning af skabelonen " ; Text [ french ] = "Erreur lors de l'criture du modle " ; Text [ swedish ] = "Fel vid skrivning av mall " ; - Text [ dutch ] = "Fout bij schrijven van sjabloon " ; + Text [ dutch ] = "Fout bij schrijven van sjabloon" ; Text [ spanish ] = "Error de escritura de plantilla " ; Text [ english_us ] = "Error saving template " ; Text[ chinese_simplified ] = "在写入样式时发生一个错误 "; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bd przy zapisie szablonu "; Text[ japanese ] = "テンプレートの移動の際のエラー "; Text[ chinese_traditional ] = "在寫入樣式時發生一個錯誤 "; Text[ arabic ] = " "; - Text[ dutch ] = "Fout bij schrijven van sjabloon "; + Text[ dutch ] = "Fout bij schrijven van sjabloon"; Text[ chinese_simplified ] = "在写入样式时发生一个错误 "; Text[ greek ] = " "; Text[ korean ] = "템플릿 쓰기에서 오류 발생 "; @@ -824,23 +824,23 @@ ErrorBox MSG_ERROR_RENAME_TEMPLATE Message [ italian ] = "Errore durante la rinominazione del modello." ; Message [ portuguese_brazilian ] = "Erro ao renomear o modelo." ; Message [ portuguese ] = "Erro ao renomear o modelo." ; - Message [ finnish ] = "On ilmennyt virhe nimettess mallipohjaa uudelleen." ; + Message [ finnish ] = "On ilmennyt virhe nimettess mallia uudelleen." ; Message [ danish ] = "Fejl under omdbning af skabelonen." ; Message [ french ] = "Erreur lors du changement du nom du modle." ; Message [ swedish ] = "Fel vid namnndring p mall." ; - Message [ dutch ] = "Fout bij de naamswijziging van de sjabloon." ; + Message [ dutch ] = "Fout bij naamswijziging van sjabloon." ; Message [ spanish ] = "Error al cambiar el nombre de la plantilla." ; Message [ english_us ] = "Error renaming template." ; Message[ chinese_simplified ] = "重命名样式时发生错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd przy zmianie nazwy szablonu."; Message[ japanese ] = "テンプレートの名前変更の際のエラー｡"; Message[ chinese_traditional ] = "重新命名樣式時發生錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij de naamswijziging van de sjabloon."; + Message[ dutch ] = "Fout bij naamswijziging van sjabloon."; Message[ chinese_simplified ] = "重命名样式时发生错误。"; Message[ greek ] = " ."; - Message[ korean ] = "템플릿 이름 변경시 오류 발생."; + Message[ korean ] = "서식 파일 이름 바꾸는 중 오류"; Message[ turkish ] = "ablon yeniden adlandrlrken hata olutu."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha produt un error en renombrar la plantilla."; @@ -856,23 +856,23 @@ ErrorBox MSG_ERROR_RENAME_TEMPLATE_REGION Message [ italian ] = "Errore durante la rinominazione dell'area." ; Message [ portuguese_brazilian ] = "Erro ao renomear a regiao do modelo." ; Message [ portuguese ] = "Erro ao renomear a regio do modelo." ; - Message [ finnish ] = "On ilmennyt virhe nimettess mallipohjaluokkaa uudelleen." ; + Message [ finnish ] = "On ilmennyt virhe nimettess malliluokkaa uudelleen." ; Message [ danish ] = "Fejl under omdbning af omrdet." ; Message [ french ] = "Erreur du changement du nom de la catgorie." ; Message [ swedish ] = "Fel vid namnndring p mallomrde." ; - Message [ dutch ] = "Fout bij de naamsverandering van het bereik." ; - Message [ spanish ] = "Error al cambiar el nombre del rea." ; + Message [ dutch ] = "Fout bij naamswijziging van bereik." ; + Message [ spanish ] = "Error al cambiar el nombre de la categora." ; Message [ english_us ] = "Error renaming template category." ; Message[ chinese_simplified ] = "重命名区域时发生错误。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Bd przy zmianie nazwy obszaru."; Message[ japanese ] = "範囲の名前変更の際のエラー｡"; Message[ chinese_traditional ] = "重新命名區域時發生錯誤。"; Message[ arabic ] = " ."; - Message[ dutch ] = "Fout bij de naamsverandering van het bereik."; + Message[ dutch ] = "Fout bij naamswijziging van bereik."; Message[ chinese_simplified ] = "重命名区域时发生错误。"; Message[ greek ] = " ."; - Message[ korean ] = "영역 이름 변경시 오류 발생."; + Message[ korean ] = "영역 이름 바꾸는 중 오류"; Message[ turkish ] = "Kategori yeniden adlandrlrken hata olutu."; Message[ language_user1 ] = " "; Message[ catalan ] = "S'ha produt un error al canviar el nom de l'rea."; @@ -892,16 +892,16 @@ ErrorBox MSG_ERROR_EMPTY_NAME Message [ danish ] = "Du skal angive et navn." ; Message [ french ] = "Veuillez indiquer un nom." ; Message [ swedish ] = "Ett namn mste anges." ; - Message [ dutch ] = "U moet een naam invullen." ; + Message [ dutch ] = "U moet een naam invoeren." ; Message [ spanish ] = "Es necesario introducir un nombre." ; Message [ english_us ] = "Please specify a name." ; Message[ chinese_simplified ] = "必须指定一个名称。"; - Message[ russian ] = " ."; + Message[ russian ] = " ."; Message[ polish ] = "Trzeba poda nazw."; Message[ japanese ] = "名前を指定してください。"; Message[ chinese_traditional ] = "您必須輸入一個名稱。"; Message[ arabic ] = " ."; - Message[ dutch ] = "U moet een naam invullen."; + Message[ dutch ] = "U moet een naam invoeren."; Message[ chinese_simplified ] = "必须指定一个名称。"; Message[ greek ] = " ."; Message[ korean ] = "이름을 지정해야 합니다."; @@ -928,7 +928,7 @@ ErrorBox MSG_ERROR_UNIQ_NAME Message [ spanish ] = "Debe especificar un nombre nico.\nNo se distingue entre maysculas y minsculas." ; Message [ english_us ] = "Please specify a unique name.\nEntries must not be case specific." ; Message[ chinese_simplified ] = "必须给定一个确切的名称。\n不必区别字母大小写。"; - Message[ russian ] = " .\n ."; + Message[ russian ] = " .\n ."; Message[ polish ] = "Musi zosta podana jednoznaczna nazwa. \nNie ma rozrniania duych i maych liter."; Message[ japanese ] = "明確な名前を指定してください。\n大文字と小文字は区別されません。"; Message[ chinese_traditional ] = "您必須輸入一個正確的名稱。\n您不必區別字母大小寫。"; @@ -950,7 +950,7 @@ String STR_QUERY_DEFAULT_TEMPLATE TEXT [ italian ] = "Volete che il modello \"$(TESTO)\" diventi il modello predefinito?" ; TEXT [ portuguese_brazilian ] = "O modelo $(TEXTO) deve se tornar o modelo padr o?" ; TEXT [ portuguese ] = "Deseja usar o modelo \"$(TEXTO)\" como modelo padro?" ; - TEXT [ finnish ] = "Tehdnk mallipohjasta $(TEXT) oletusmallipohja?" ; + TEXT [ finnish ] = "Tehdnk mallista $(TEXT) oletusmalli?" ; TEXT [ danish ] = "Vil du definere skabelonen \"$(TEKST)\" som standardskabelon?" ; TEXT [ french ] = "Souhaitez-vous faire du modle \"$(TEXT)\" le modle par dfaut ?" ; TEXT [ swedish ] = "Skall mallen \"$(TEXT)\" gras till standardmall?" ; @@ -958,7 +958,7 @@ String STR_QUERY_DEFAULT_TEMPLATE TEXT [ spanish ] = "Desea convertir la plantilla \"$(TEXT)\" en una plantilla predeterminada?" ; TEXT [ english_us ] = "Should the template \"$(TEXT)\" become the default template?" ; TEXT[ chinese_simplified ] = "您要将样式 $(TEXT) 设定成标准样式吗？"; - TEXT[ russian ] = " , \"$(TEXT)\" ?"; + TEXT[ russian ] = " \"$(TEXT)\" ?"; TEXT[ polish ] = "Czy przeksztaci \"$(TEXT)\" na szablon domylny?"; TEXT[ japanese ] = "テンプレート\"$(TEXT)\"を標準スタイルにしますか?"; TEXT[ chinese_traditional ] = "要將這個樣式$(TEXT)設定成標準樣式？"; @@ -966,7 +966,7 @@ String STR_QUERY_DEFAULT_TEMPLATE TEXT[ dutch ] = "Moet de sjabloon \"$(TEKST)\" de standaardsjabloon worden?"; TEXT[ chinese_simplified ] = "您要将样式 $(TEXT) 设定成标准样式吗？"; TEXT[ greek ] = " $(TEXT) ;"; - TEXT[ korean ] = "템플릿 \"$(TEXT)\"을(를) 기본 템플릿로 만들겠습니까?"; + TEXT[ korean ] = "서식 파일 \"$(TEXT)\"을(를) 기본 서식 파일로 지정하시겠습니까?"; TEXT[ turkish ] = "\"$(TEXT)\" ablonu, standart ablon olarak belirlensin mi?"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Ha d'esdevenir la plantilla \"$(TEXT)\" la plantilla per defecte?"; @@ -982,23 +982,23 @@ QueryBox MSG_QUERY_RESET_DEFAULT_TEMPLATE Message [ italian ] = "Reimpostare il modello predefinito?" ; Message [ portuguese_brazilian ] = "Deseja redefinir o modelo padr?o?" ; Message [ portuguese ] = "Deseja redefinir o modelo padro?" ; - Message [ finnish ] = "Haluatko palauttaa oletusmallipohjat?" ; + Message [ finnish ] = "Haluatko palauttaa oletusmallit?" ; Message [ danish ] = "Vil du nulstille standardskabelonen?" ; Message [ french ] = "Souhaitez-vous restaurer le modle par dfaut ?" ; Message [ swedish ] = "Vill du terstlla standardmallen?" ; - Message [ dutch ] = "Wilt u de veranderingen in de standaardsjabloon ongedaan maken?" ; + Message [ dutch ] = "Wilt u de wijzigingen in de standaardsjabloon ongedaan maken?" ; Message [ spanish ] = "Desea usted restablecer la plantilla predeterminada?" ; Message [ english_us ] = "Do you want to reset the default template?" ; Message[ chinese_simplified ] = "您要重设标准样式文件吗？"; - Message[ russian ] = " ?"; + Message[ russian ] = " ?"; Message[ polish ] = "Czy chcesz przywrci szablon standardowy?"; Message[ japanese ] = "標準スタイルをリセットしますか。"; Message[ chinese_traditional ] = "您要重設標準樣式檔案？"; Message[ arabic ] = " "; - Message[ dutch ] = "Wilt u de veranderingen in de standaardsjabloon ongedaan maken?"; + Message[ dutch ] = "Wilt u de wijzigingen in de standaardsjabloon ongedaan maken?"; Message[ chinese_simplified ] = "您要重设标准样式文件吗？"; Message[ greek ] = " ;"; - Message[ korean ] = "기본 템플릿을 원래대로 되돌리겠습니까?"; + Message[ korean ] = "기본 서식 파일을 원래대로 설정하시겠습니까?"; Message[ turkish ] = "Standart ablonu baa almak istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Voleu reiniciar la plantilla per defecte?"; @@ -1012,7 +1012,7 @@ InfoBox MSG_TEMPLATE_DIR_NOT_EXIST Message [ italian ] = "La cartella dei modelli\n$(DIR)\nnon esiste." ; Message [ portuguese_brazilian ] = "O diret?io modelo\n$(DIR)\nn?o existe." ; Message [ portuguese ] = "O directrio dos modelos\n$(DIR)\nno existe." ; - Message [ finnish ] = "Mallipohjahakemistoa \n$(DIR)\nei ole." ; + Message [ finnish ] = "Mallihakemistoa \n$(DIR)\nei ole." ; Message [ danish ] = "Skabelonbiblioteket\n$(DIR)\neksisterer ikke." ; Message [ french ] = "Ce rpertoire de modles\n$(DIR)\nn'existe pas." ; Message [ swedish ] = "Mallkatalogen\n$(DIR)\nfinns inte." ; @@ -1028,7 +1028,7 @@ InfoBox MSG_TEMPLATE_DIR_NOT_EXIST Message[ dutch ] = "De sjablonenmap\n$(DIR)\nbestaat niet."; Message[ chinese_simplified ] = "这个样式目录\n$(DIR)\n不存在。"; Message[ greek ] = " \n$(DIR)\n ."; - Message[ korean ] = "템플릿 디렉토리\n$(DIR)\n이(가) 없습니다."; + Message[ korean ] = "서식 파일 디렉토리\n$(DIR)\n이(가) 없습니다."; Message[ turkish ] = "\n$(DIR)\nablon dizini mevcut deil."; Message[ language_user1 ] = " "; Message[ catalan ] = "El directori de plantilles\n$(DIR)\nno existeix."; @@ -1038,7 +1038,7 @@ InfoBox MSG_DOCINFO_CANTREAD { Message = "Die Dokumenteigenschaften knnen nicht gelesen werden." ; Message [ ENGLISH ] = "The document properties can't be read." ; - Message [ dutch ] = "De documentinformatie kon niet worden gelezen." ; + Message [ dutch ] = "De documentinformatie kan niet worden gelezen." ; Message [ english_us ] = "Document info cannot be read." ; Message [ italian ] = "Impossibile leggere le informazioni relative al documento." ; Message [ spanish ] = "No se pueden leer las informaciones sobre el documento." ; @@ -1048,12 +1048,12 @@ InfoBox MSG_DOCINFO_CANTREAD Message [ portuguese ] = "No possvel ler as propriedades do documento." ; Message [ portuguese_brazilian ] = "Die Dokumenteigenschaften k?nen nicht gelesen werden." ; Message[ chinese_simplified ] = "无法读取文档属性。"; - Message[ russian ] = " "; + Message[ russian ] = " ."; Message[ polish ] = "Waciwoci dokumentu nie mona odczyta."; Message[ japanese ] = "ドキュメントの属性は読み取れませんでした。"; Message[ chinese_traditional ] = "無法讀取文件屬性。"; Message[ arabic ] = " ."; - Message[ dutch ] = "De documentinformatie kon niet worden gelezen."; + Message[ dutch ] = "De documentinformatie kan niet worden gelezen."; Message[ chinese_simplified ] = "无法读取文档属性。"; Message[ greek ] = " ."; Message[ korean ] = "문서 등록정보를 읽을 수 없습니다."; @@ -1074,19 +1074,19 @@ String STR_ERROR_NOSTORAGE Text [ portuguese_brazilian ] = "The chosen file is in wrong format." ; Text [ portuguese ] = "O ficheiro seleccionado tem um formato errado." ; Text [ french ] = "Le fichier slectionn a un format incorrect." ; - Text [ dutch ] = "Het gekozen bestand heeft een verkeerd formaat." ; + Text [ dutch ] = "Het gekozen bestand heeft een foutieve indeling." ; Text [ spanish ] = "El archivo seleccionado tiene un formato incorrecto." ; Text [ danish ] = "Den udvalgte fil har et forkert format." ; Text [ swedish ] = "Den valda filen har ett felaktigt format." ; Text [ finnish ] = "Valitun tiedoston muoto ei ole kelvollinen." ; Text [ english_us ] = "The selected file has an incorrect format." ; Text[ chinese_simplified ] = "选中的文件的格式无效。"; - Text[ russian ] = " ."; + Text[ russian ] = " ."; Text[ polish ] = "Wybrany plik zawiera nieprawidowy format."; Text[ japanese ] = "選択したファイルは書式が正しくありません。"; Text[ chinese_traditional ] = "選中的檔案格式無效。"; Text[ arabic ] = " ."; - Text[ dutch ] = "Het gekozen bestand heeft een verkeerd formaat."; + Text[ dutch ] = "Het gekozen bestand heeft een foutieve indeling."; Text[ chinese_simplified ] = "选中的文件的格式无效。"; Text[ greek ] = " ."; Text[ korean ] = "선택한 파일의 형식이 올바르지 않습니다."; @@ -1099,7 +1099,7 @@ String STR_QUERY_SAVEOWNFORMAT { Text = "Dieses Dokument kann Formatierungen und Informationen\nenthalten, die nicht im $(FORMAT) Format gespeichert\nwerden knnen. Mchten Sie die nderungen im\n$(OWNFORMAT) Format speichern?" ; Text [ ENGLISH ] = "This document may contain attributes and informations\nthat cannot be saved using the $(FORMAT). Do you want\nto save your changes using the $(OWNFORMAT) format?" ; - Text [ dutch ] = "Dit document kan opmaakattributen en gegevens \nbevatten die niet in $(FORMAT) formaat opgeslagen\nkunnen worden. Wilt u deze wijzigingen in\n$(OWNFORMAT) formaat opslaan?" ; + Text [ dutch ] = "Dit document kan opmaakattributen en gegevens \nbevatten die niet in $(FORMAT)-indeling opgeslagen\nkunnen worden. Wilt u deze wijzigingen in\n$(OWNFORMAT)-indeling opslaan?" ; Text [ english_us ] = "This document may contain attributes and information that cannot be saved under\n$(FORMAT). Do you want to save your changes using the\n$(OWNFORMAT) format?" ; Text [ italian ] = "Il presente documento pu contenere formattazioni e informazioni\nche non possono essere salvate nel formato \n$(FORMAT). Salvare le modifiche nel formato \n$(OWNFORMAT)?" ; Text [ spanish ] = "Este documento puede contener informaciones y formatos\nque no se pueden guardar en el formato $(FORMAT).\nDesea guardar los cambios en formato\n$(OWNFORMAT)?" ; @@ -1109,12 +1109,12 @@ String STR_QUERY_SAVEOWNFORMAT Text [ portuguese ] = "Este documento poder conter atributos e informaes que no podem ser guardados no\nformato $(FORMAT). Guardar as modificaes no\nformato $(OWNFORMAT)?" ; Text [ portuguese_brazilian ] = "Dieses Dokument kann Formatierungen und Informationen\nenthalten, die nicht im $(FORMAT) Format gespeichert\nwerden k?nen. M?hten Sie die ?nderungen im\n$(OWNFORMAT) Format speichern?" ; Text[ chinese_simplified ] = "这个文档可能含有一些无法用 $(FORMAT) 格式存盘的格式和信息。\n您要使用 $(OWNFORMAT) 格式存盘文档的更改吗？"; - Text[ russian ] = ", \n , \n $(FORMAT). \n $(OWNFORMAT)?"; + Text[ russian ] = " \n , \n $(FORMAT). \n $(OWNFORMAT)?"; Text[ polish ] = "Dokument ten moe zawiera formatowania\ni informacje, ktrych nie bdzie mona zapisa\nw formacie $(FORMAT). Czy chcesz zapisa\nzmiany w formacie $(OWNFORMAT)?"; Text[ japanese ] = "このドキュメントは $(FORMAT) 書式で保存できない書式設定と情報を\n含んでいます。変更を\n$(OWNFORMAT) 書式に保存しますか。"; Text[ chinese_traditional ] = "這個文件可能含有一些無法用 $(FORMAT) 格式儲存的格式。\n要使用 $(OWNFORMAT) 格式儲存文件的變更？"; Text[ arabic ] = " ʡ ϡ\n $(FORMAT). \n $(OWNFORMAT)"; - Text[ dutch ] = "Dit document kan opmaakattributen en gegevens \nbevatten die niet in $(FORMAT) formaat opgeslagen\nkunnen worden. Wilt u deze wijzigingen in\n$(OWNFORMAT) formaat opslaan?"; + Text[ dutch ] = "Dit document kan opmaakattributen en gegevens \nbevatten die niet in $(FORMAT)-indeling opgeslagen\nkunnen worden. Wilt u deze wijzigingen in\n$(OWNFORMAT)-indeling opslaan?"; Text[ chinese_simplified ] = "这个文档可能含有一些无法用 $(FORMAT) 格式存盘的格式和信息。\n您要使用 $(OWNFORMAT) 格式存盘文档的更改吗？"; Text[ greek ] = " \n \n $(FORMAT). \n $(OWNFORMAT);"; Text[ korean ] = "이 문서에는 $(FORMAT) 형식에 저장할 수 없는 형식과 정보가\n포함되어 있을 수 있습니다. 변경 사항을\n$(OWNFORMAT) 형식에 저장하겠습니까?"; @@ -1132,18 +1132,18 @@ String STR_QUERY_MUSTOWNFORMAT Text [ italian ] = "I documenti non possono essere salvati nel formato $(FORMAT).\nVolete salvarli nel formato $(OWNFORMAT)?" ; Text [ spanish ] = "Los documentos no se pueden guardar en el formato $(FORMAT).\nDesea guardar el documento en formato $(OWNFORMAT)?" ; Text [ french ] = "Impossible d'enregistrer les documents au format $(FORMAT).\nSouhaitez-vous enregistrer le document au format $(OWNFORMAT) ?" ; - Text [ dutch ] = "Documenten kunnen niet in $(FORMAT) formaat worden \nopgeslagen. Wilt u het document in $(OWNFORMAT) formaat\nopslaan?" ; + Text [ dutch ] = "Documenten kunnen niet in $(FORMAT)-indeling worden \nopgeslagen. Wilt u document in $(OWNFORMAT)-indeling\nopslaan?" ; Text [ swedish ] = "Dokument kan inte sparas i $(FORMAT)-format.\nSkall dokumentet sparas i $(OWNFORMAT)-format?" ; Text [ danish ] = "Det er ikke muligt at gemmme dokumenter i $(FORMAT) format.\nVil du gemme dokumentet i $(OWNFORMAT) format?" ; Text [ portuguese_brazilian ] = "Dokumente k?nen nicht im $(FORMAT) Format gespeichert\nwerden. M?hten Sie das Dokument im $(OWNFORMAT) Format\nspeichern?" ; Text [ portuguese ] = "Impossvel guardar documentos no formato $(FORMAT).\nDeseja guardar o documento no formato $(OWNFORMAT)?" ; Text[ chinese_simplified ] = "无法用 $(FORMAT) 格式存盘文档。\n您要使用 $(OWNFORMAT) 格式存盘吗？"; - Text[ russian ] = " $(FORMAT) .\n \n $(OWNFORMAT)?"; + Text[ russian ] = " $(FORMAT).\n $(OWNFORMAT)?"; Text[ polish ] = "Dokumentw nie mona zapisa w formacie $(FORMAT).\nCzy zapisa dokument\nw formacie $(OWNFORMAT) ?"; Text[ japanese ] = "ドキュメントは $(FORMAT) 書式に\n保存できませんでした。ドキュメントを $(OWNFORMAT) 書式に\n保存しますか。"; Text[ chinese_traditional ] = "無法用 $(FORMAT) 格式儲存文件。\n您要使用 $(OWNFORMAT) 格式儲存？"; Text[ arabic ] = " $(FORMAT).\n \n$(OWNFORMAT)"; - Text[ dutch ] = "Documenten kunnen niet in $(FORMAT) formaat worden \nopgeslagen. Wilt u het document in $(OWNFORMAT) formaat\nopslaan?"; + Text[ dutch ] = "Documenten kunnen niet in $(FORMAT)-indeling worden \nopgeslagen. Wilt u document in $(OWNFORMAT)-indeling\nopslaan?"; Text[ chinese_simplified ] = "无法用 $(FORMAT) 格式存盘文档。\n您要使用 $(OWNFORMAT) 格式存盘吗？"; Text[ greek ] = " $(FORMAT).\n $(OWNFORMAT);"; Text[ korean ] = "문서를 $(FORMAT) 형식으로 저장할 수 없습니다. 문서를 $(OWNFORMAT) 형식으로\n저장하겠습니까?"; @@ -1168,7 +1168,7 @@ String STR_SAVEDOC Text[ chinese_simplified ] = "存盘(~S)"; Text[ russian ] = ""; Text[ polish ] = "Zapisz"; - Text[ japanese ] = "保存(~S)"; + Text[ japanese ] = "はい(~S)"; Text[ chinese_traditional ] = "儲存(~S)"; Text[ arabic ] = ""; Text[ dutch ] = "~Opslaan"; @@ -1189,7 +1189,7 @@ String STR_UPDATEDOC Text [ italian ] = "~Aggiorna" ; Text [ spanish ] = "Actuali~zacin" ; Text [ french ] = "Actuali~se" ; - Text [ dutch ] = "Aktuali~seer" ; + Text [ dutch ] = "~Bijwerken" ; Text [ swedish ] = "~Uppdatera" ; Text [ danish ] = "Opdater" ; Text [ portuguese_brazilian ] = "Aktuali~siere" ; @@ -1200,7 +1200,7 @@ String STR_UPDATEDOC Text[ japanese ] = "更新(~U)"; Text[ chinese_traditional ] = "更新(~U)"; Text[ arabic ] = ""; - Text[ dutch ] = "Aktuali~seer"; + Text[ dutch ] = "~Bijwerken"; Text[ chinese_simplified ] = "更新(~U)"; Text[ greek ] = ""; Text[ korean ] = "업데이트(~U)"; @@ -1236,7 +1236,7 @@ String STR_SAVEASDOC Text[ turkish ] = "~Farkl kaydet..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Anomena i desa"; - Text[ finnish ] = "Tallenna~ nimell"; + Text[ finnish ] = "Tallenna ni~mell..."; Text[ thai ] = "บันทึกเ~ป็น..."; }; String STR_SAVECOPYDOC @@ -1265,7 +1265,7 @@ String STR_SAVECOPYDOC Text[ turkish ] = "Kopyasn farkl ka~ydet..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desa-ho en cpia ~com a..."; - Text[ finnish ] = "~Tallenna kopio nimell..."; + Text[ finnish ] = "Tallenna ~kopio nimell..."; Text[ thai ] = "บันทึกสำเนาเ~ป็น..."; }; String STR_CLOSEDOC @@ -1307,25 +1307,25 @@ String STR_CLOSEDOC_ANDRETURN Text [ italian ] = "Chiudi e ritorna a " ; Text [ spanish ] = "C~errar y regresar a " ; Text [ french ] = "~Fermer & retourner " ; - Text [ dutch ] = "S~luiten en terug naar " ; + Text [ dutch ] = "S~luiten en terug naar" ; Text [ swedish ] = "St~ng och tillbaka till " ; Text [ danish ] = "Luk og g tilbage til " ; Text [ portuguese_brazilian ] = "S~chlie?en & zur?k zu " ; Text [ portuguese ] = "~Fechar & Regressar a " ; Text[ chinese_simplified ] = "关闭和返回(~C)"; - Text[ russian ] = " & "; + Text[ russian ] = " "; Text[ polish ] = "Zamknij & Powr do "; Text[ japanese ] = "閉じる & 戻る(~C)"; Text[ chinese_traditional ] = "關閉和返回(~C)"; Text[ arabic ] = " "; - Text[ dutch ] = "S~luiten en terug naar "; + Text[ dutch ] = "S~luiten en terug naar"; Text[ chinese_simplified ] = "关闭和返回(~C)"; Text[ greek ] = " "; - Text[ korean ] = "닫고 돌아갈 위치 (~C)"; + Text[ korean ] = "닫기 & 돌아가기(~C)"; Text[ turkish ] = "Kapat ve geri dn "; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tanca i retorna a "; - Text[ finnish ] = "~Sulje ja palauta"; + Text[ finnish ] = "Sulje ja ~palauta "; Text[ thai ] = "~ปิดและกลับไปยัง "; }; String STR_WIZARD @@ -1334,27 +1334,27 @@ String STR_WIZARD Text [ ENGLISH ] = "wizard" ; Text [ english_us ] = " AutoPilot" ; Text [ italian ] = "wizard" ; - Text [ spanish ] = "asistente" ; - Text [ french ] = "Assistant" ; + Text [ spanish ] = "Piloto automtico" ; + Text [ french ] = "AutoPilote" ; Text [ dutch ] = "wizard" ; Text [ swedish ] = "wizard" ; Text [ danish ] = "wizard" ; Text [ portuguese_brazilian ] = "wizard" ; Text [ portuguese ] = "wizard" ; Text[ chinese_simplified ] = "向导"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ polish ] = "kreator"; - Text[ japanese ] = "ウィザード"; + Text[ japanese ] = "オートパイロット"; Text[ chinese_traditional ] = "嚮導"; Text[ arabic ] = ""; Text[ dutch ] = "wizard"; Text[ chinese_simplified ] = "向导"; Text[ greek ] = ""; - Text[ korean ] = "마법사"; + Text[ korean ] = "자동 파일럿"; Text[ turkish ] = "Sihirbaz"; Text[ language_user1 ] = " "; Text[ catalan ] = " AutoPilot"; - Text[ finnish ] = " Automaattinen ohjaus"; + Text[ finnish ] = " Ohjattu toiminto"; Text[ thai ] = " นำร่องอัตโนมัติ"; }; String RID_STR_FILTCONFIG @@ -1364,7 +1364,7 @@ String RID_STR_FILTCONFIG Text [ dutch ] = "Configuraties" ; Text [ english_us ] = "Configurations" ; Text [ italian ] = "Configurazioni" ; - Text [ spanish ] = "Configuraciones" ; + Text [ spanish ] = "Configuracin" ; Text [ french ] = "Paramtres" ; Text [ swedish ] = "Konfigurationer" ; Text [ danish ] = "Konfigurationer" ; @@ -1379,11 +1379,11 @@ String RID_STR_FILTCONFIG Text[ dutch ] = "Configuraties"; Text[ chinese_simplified ] = "配置"; Text[ greek ] = ""; - Text[ korean ] = "구성"; + Text[ korean ] = "설정"; Text[ turkish ] = "Konfigrasyonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Configuracions"; - Text[ finnish ] = "Kokoonpanot"; + Text[ finnish ] = "Kokoonpano"; Text[ thai ] = "โครงแบบ"; }; String RID_STR_FILTBASIC @@ -1393,8 +1393,8 @@ String RID_STR_FILTBASIC Text [ dutch ] = "%PRODUCTNAME Basic Bibliotheken" ; Text [ english_us ] = "%PRODUCTNAME Basic libraries" ; Text [ italian ] = "Library di %PRODUCTNAME Basic" ; - Text [ spanish ] = "Bibliotecas %PRODUCTNAME Basic" ; - Text [ french ] = "Bibilothques %PRODUCTNAME Basic" ; + Text [ spanish ] = "%PRODUCTNAME Basic - Bibliotecas" ; + Text [ french ] = "Bibliothques %PRODUCTNAME Basic" ; Text [ swedish ] = "%PRODUCTNAME Basic-bibliotek" ; Text [ danish ] = "%PRODUCTNAME Basic-biblioteker" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME Basic Bibliotheken" ; @@ -1412,7 +1412,7 @@ String RID_STR_FILTBASIC Text[ turkish ] = "%PRODUCTNAME Basic kitaplklar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Biblioteques %PRODUCTNAME Basic"; - Text[ finnish ] = "Ohjelman %PRODUCTNAME peruskirjastot"; + Text[ finnish ] = "%PRODUCTNAME Basic -kirjastot"; Text[ thai ] = "ไลบรารีพื้นฐาน %PRODUCTNAME "; }; String RID_STR_WARNSTYLEOVERWRITE @@ -1437,7 +1437,7 @@ String RID_STR_WARNSTYLEOVERWRITE Text[ dutch ] = "Wilt u opmaakprofiel \"$(ARG1)\" vervangen?"; Text[ chinese_simplified ] = "要替换样式 $(ARG1)？"; Text[ greek ] = " $(ARG1);"; - Text[ korean ] = "유형 $(ARG1)을(를) 변경하겠습니까?"; + Text[ korean ] = "스타일 \"$(ARG1)\"을(를) 바꾸시겠습니까?"; Text[ turkish ] = "\"$(ARG1)\" biimi bakas ile deitirilsin mi?"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; Text[ catalan ] = "Voleu substituir l'estil \"$(ARG1)\"?"; @@ -1466,7 +1466,7 @@ String STR_DOC_LOADING Text[ dutch ] = "Document wordt geladen"; Text[ chinese_simplified ] = "正在装入文档"; Text[ greek ] = " "; - Text[ korean ] = "문서를 로드하고 있습니다."; + Text[ korean ] = "문서를 로드하는 중"; Text[ turkish ] = "Belge ykleniyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est carregant el document"; @@ -1489,7 +1489,7 @@ Resource RID_DLSTATUS Text [ portuguese_brazilian ] = "Verbindung zu: $(HOST). Warten auf Antwort..." ; Text [ portuguese ] = "Ligao com: $(HOST). Esperando resposta..." ; Text[ chinese_simplified ] = "连接到：$(HOST)。正在等候答复..."; - Text[ russian ] = " : $(HOST). ..."; + Text[ russian ] = " : $(HOST). ..."; Text[ polish ] = "Poczenie z: $(HOST). Czekanie na odpowied..."; Text[ japanese ] = "接続:$(HOST)。応答を待っています..."; Text[ chinese_traditional ] = "連線到$(HOST)。正在等候答復..."; @@ -1501,7 +1501,7 @@ Resource RID_DLSTATUS Text[ turkish ] = "Balanlan: $(HOST). Yant bekleniyor..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Connectant amb: $(HOST). Esperant resposta..."; - Text[ finnish ] = "Yhdistetn kohteeseen: $(HOST).Odotetaan vastausta"; + Text[ finnish ] = "Yhdistetn kohteeseen: $(HOST). Odotetaan vastausta..."; Text[ thai ] = "เชื่อมต่อ: $(HOST) กำลังรอการตอบสนอง..."; }; String INET_CONNECT_START @@ -1547,7 +1547,7 @@ Resource RID_DLSTATUS Text [ portuguese_brazilian ] = "?bertragen wird: $(TARGET) von $(HOST). Gelesen: $(BYTE)" ; Text [ portuguese ] = "Transferir: $(TARGET) de $(HOST). Lidos: $(BYTE)" ; Text[ chinese_simplified ] = "传递：$(HOST)的$(TARGET)。已经阅读：$(BYTE)"; - Text[ russian ] = ": $(TARGET) $(HOST). : $(BYTE)"; + Text[ russian ] = ": $(TARGET) $(HOST). : $(BYTE)"; Text[ polish ] = "adowanie: $(TARGET) z $(HOST). Zaadowano: $(BYTE)"; Text[ japanese ] = "転送する:$(HOST)の$(TARGET)。 読み取り: $(BYTE)"; Text[ chinese_traditional ] = "傳遞：$(HOST)的$(TARGET)。已經閱讀： $(BYTE)"; @@ -1559,7 +1559,7 @@ Resource RID_DLSTATUS Text[ turkish ] = "Aktarlan: $(HOST) sunucusundan $(TARGET). Okunan: $(BYTE)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carregant: $(TARGET) des de $(HOST). Carregat: $(BYTE)"; - Text[ finnish ] = "Ladataan $(TARGET) koneelta $(HOST). Ladattu: $(BYTE)"; + Text[ finnish ] = "Ladattu: $(TARGET) kohteesta $(HOST). Loaded: $(BYTE)"; Text[ thai ] = "กำลังโหลด: $(TARGET) จาก $(HOST). โหลด: $(BYTE)"; }; String INET_CONNECTION_CLOSED @@ -1576,7 +1576,7 @@ Resource RID_DLSTATUS Text [ portuguese ] = "Ligao cancelada" ; Text [ portuguese_brazilian ] = "Verbindung abgebaut" ; Text[ chinese_simplified ] = "已经结束连接"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Poczenie rozczone"; Text[ japanese ] = "接続が中止されました"; Text[ chinese_traditional ] = "已經結束連線"; @@ -1602,20 +1602,20 @@ QueryBox MSG_OPEN_READONLY MESSAGE [ italian ] = "Impossibile aprire il documento per la scrittura.\nAprirlo in sola lettura?" ; MESSAGE [ portuguese_brazilian ] = "O documento n?o pode ser aberto para grava??o.\nDeseja abri-lo como s?leitura?" ; MESSAGE [ portuguese ] = "Impossvel abrir documento para editar.\n Abri-lo apenas para leitura?" ; - MESSAGE [ finnish ] = "Asiakirjaa ei voida avata muokattavaksi.\nHaluatko tallentaa sen vain luku -muodossa?" ; + MESSAGE [ finnish ] = "Asiakirjaa ei voi avata muokattavaksi.\nHaluatko tallentaa sen vain luku -muodossa?" ; MESSAGE [ danish ] = "Det er ikke muligt at bne dokumentet til redigering.\nVil du bne det i skrivebeskyttet tilstand?" ; MESSAGE [ french ] = "Impossible d'ouvrir le document pour modification.\nVoulez-vous l'ouvrir en lecture seule ?" ; MESSAGE [ swedish ] = "Dokumentet kan inte ppnas fr redigering. \nVill du ppna det fr lsning?" ; - MESSAGE [ dutch ] = "Dit document is schrijfbeveiligd.\nWilt u het alleen-lezen?" ; + MESSAGE [ dutch ] = "Dit document is schrijfbeveiligd.\nWilt u het alleen lezen?" ; MESSAGE [ spanish ] = "El documento no se puede abrir para editar.\nDesea abrirlo slo para leer?" ; MESSAGE [ english_us ] = "Document cannot be opened for editing.\nDo you want to open it as read-only?" ; MESSAGE[ chinese_simplified ] = "您不能编辑这个文件。\n您要打开阅读它吗？"; - MESSAGE[ russian ] = " .\n ?"; + MESSAGE[ russian ] = " .\n ?"; MESSAGE[ polish ] = "Dokumentu nie mona otworzy do edycji.\nCzy chcesz go otworzy do odczytu?"; MESSAGE[ japanese ] = "ドキュメントは編集用に開くことはできません。\n読み取り用に開きますか?"; MESSAGE[ chinese_traditional ] = "您不能編輯這個檔案。\n要開啟閱讀它？"; MESSAGE[ arabic ] = " .\n ɿ"; - MESSAGE[ dutch ] = "Dit document is schrijfbeveiligd.\nWilt u het alleen-lezen?"; + MESSAGE[ dutch ] = "Dit document is schrijfbeveiligd.\nWilt u het alleen lezen?"; MESSAGE[ chinese_simplified ] = "您不能编辑这个文件。\n您要打开阅读它吗？"; MESSAGE[ greek ] = " .\n ;"; MESSAGE[ korean ] = "문서를 열어 편집할 수 없습니다.\n문서를 열어서 읽으시겠습니까?"; @@ -1659,9 +1659,9 @@ String RID_OFFICEFILTER Text [ English ] = "StarOffice Documents" ; Text [ english_us ] = "%PRODUCTNAME Documents" ; Text [ italian ] = "Documenti %PRODUCTNAME" ; - Text [ spanish ] = "%PRODUCTNAME Documentos" ; + Text [ spanish ] = "%PRODUCTNAME - Documentos" ; Text [ french ] = "Documents %PRODUCTNAME" ; - Text [ dutch ] = "%PRODUCTNAME-documenten" ; + Text [ dutch ] = "%PRODUCTNAME Documenten" ; Text [ swedish ] = "%PRODUCTNAME-dokument" ; Text [ danish ] = "%PRODUCTNAME dokumenter" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME Dokumente" ; @@ -1672,14 +1672,14 @@ String RID_OFFICEFILTER Text[ japanese ] = "%PRODUCTNAMEドキュメント"; Text[ chinese_traditional ] = "%PRODUCTNAME 文件"; Text[ arabic ] = " %PRODUCTNAME "; - Text[ dutch ] = "%PRODUCTNAME-documenten"; + Text[ dutch ] = "%PRODUCTNAME Documenten"; Text[ chinese_simplified ] = "%PRODUCTNAME 文档"; Text[ greek ] = "%PRODUCTNAME - "; Text[ korean ] = "%PRODUCTNAME 문서"; Text[ turkish ] = "%PRODUCTNAME belgeleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "%PRODUCTNAME Documents"; - Text[ finnish ] = " Ohjelman %PRODUCTNAME asiakirjat"; + Text[ finnish ] = "%PRODUCTNAME-asiakirjat"; Text[ thai ] = "เอกสาร %PRODUCTNAME "; }; String RID_OFFICEFILTER_WILDCARD @@ -1716,11 +1716,11 @@ String STR_FRAMEOBJECT_PROPERTIES Text[ dutch ] = "~Eigenschappen ..."; Text[ chinese_simplified ] = "属性(~I)..."; Text[ greek ] = " ..."; - Text[ korean ] = "등록정보(~I)..."; + Text[ korean ] = "등록 정보(~I)..."; Text[ turkish ] = "~zellikler ..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Prop~ietats ..."; - Text[ finnish ] = "Ominai~suudet"; + Text[ finnish ] = "Ominaisuu~det..."; Text[ thai ] = "คุณ~สมบัติ ..."; }; String STR_FSET_FILTERNAME0 @@ -1749,7 +1749,7 @@ String STR_FSET_FILTERNAME0 Text[ turkish ] = "HTML (FrameSet)"; Text[ language_user1 ] = " "; Text[ catalan ] = "HTML (conjunt de marcs)"; - Text[ finnish ] = "HTML (kehys)"; + Text[ finnish ] = "HTML (kehysasettelu)"; Text[ thai ] = "HTML (FrameSet)"; }; String STR_FSET_FILTERNAME1 @@ -1762,12 +1762,12 @@ String STR_FSET_FILTERNAME1 Text [ swedish ] = "%PRODUCTNAME Frame-dokument" ; Text [ danish ] = "%PRODUCTNAME Frame-dokument" ; Text [ italian ] = "Documento %PRODUCTNAME Frame" ; - Text [ spanish ] = "%PRODUCTNAME Frame Documento" ; + Text [ spanish ] = "%PRODUCTNAME Frame - Documento" ; Text [ french ] = "Document %PRODUCTNAME Frame" ; Text [ dutch ] = "%PRODUCTNAME Frame-document" ; Text [ portuguese ] = "Documento %PRODUCTNAME Frame" ; Text[ chinese_simplified ] = "%PRODUCTNAME 框对象文档"; - Text[ russian ] = " %PRODUCTNAME Frame"; + Text[ russian ] = " %PRODUCTNAME"; Text[ polish ] = "%PRODUCTNAME Frame - Dokument"; Text[ japanese ] = "%PRODUCTNAME Frame ドキュメント"; Text[ chinese_traditional ] = "%PRODUCTNAME 訊框文件"; @@ -1779,7 +1779,7 @@ String STR_FSET_FILTERNAME1 Text[ turkish ] = "%PRODUCTNAME frame belgesi"; Text[ language_user1 ] = " "; Text[ catalan ] = "%PRODUCTNAME Document de marcs"; - Text[ finnish ] = "Ohjelman %PRODUCTNAME kehysasiakirja"; + Text[ finnish ] = "%PRODUCTNAME-kehysasiakirja"; Text[ thai ] = "เอกสารกรอบ%PRODUCTNAME "; }; String STR_TEMPL_MOVED @@ -1793,22 +1793,22 @@ String STR_TEMPL_MOVED Text [ italian ] = "Il modello $(TEMPLATE) non stato trovato al suo posto originario. Un modello con lo stesso nome esiste in $(FOUND). Volete usare in futuro questo modello per l'aggiornamento?" ; Text [ spanish ] = "La plantilla \"$(TEMPLATE)\" no se encontr en su ubicacin original. Una plantilla con el mismo nombre se encontr en \"$(FOUND)\". Desea utilizar esta plantilla al sincronizar en el futuro?" ; Text [ french ] = "Le modle \"$(TEMPLATE)\" n'a pas t trouv son emplacement d'origine. Un modle du mme nom a t dtect sur le chemin \"$(FOUND)\". Voulez-vous que ce modle soit utilis l'avenir en remplacement du modle introuvable ?" ; - Text [ dutch ] = "Sjabloon \"$(TEMPLATE)\" werd niet op de oorspronkelijke plaats gevonden. Een sjabloon met dezelfde naam bevindt zich op \"$(FOUND)\". Wilt u deze sjabloon in de toekomst voor het synchroniseren gebruiken?" ; + Text [ dutch ] = "Sjabloon \"$(TEMPLATE)\" is niet op de oorspronkelijke plaats gevonden. Een sjabloon met dezelfde naam bevindt zich op \"$(FOUND)\". Wilt u deze sjabloon in de toekomst voor het synchroniseren gebruiken?" ; Text [ portuguese ] = "O modelo \"$(TEMPLATE)\" no foi encontrado no seu lugar original. J existe um modelo com o mesmo nome em \"$(FOUND)\". Deseja usar este modelo para actualizaes futuras?" ; Text[ chinese_simplified ] = "没有在原来位置找到样式 $(TEMPLATE) 。有一个同名的样式在 $(FOUND)。今后要使用这个样式进行调整吗？"; - Text[ russian ] = " \"$(TEMPLATE)\" . \"$(FOUND)\". ?"; + Text[ russian ] = " \"$(TEMPLATE)\" . \"$(FOUND)\". ?"; Text[ polish ] = "Szablonu \"$(TEMPLATE)\" nie znaleziono na jego pierwotnym miejscu. Szablon o tej samej nazwie istnieje w \"$(FOUND)\". Czy uy w przyszoci tego szablonu do aktualizacji?"; Text[ japanese ] = "テンプレート \"$(TEMPLATE)\" は元の場所に見つかりませんでした。同じ名前のテンプレートが \"$(FOUND)\" にあります。今後このテンプレートを同期化に使いますか。"; Text[ chinese_traditional ] = "沒有在原來的位置找到這個樣式$(TEMPLATE)。有一個同名的樣式在 $(FOUND) 。今後您要比較這個樣式？"; Text[ arabic ] = " \"$(TEMPLATE)\" . \"$(FOUND)\". "; - Text[ dutch ] = "Sjabloon \"$(TEMPLATE)\" werd niet op de oorspronkelijke plaats gevonden. Een sjabloon met dezelfde naam bevindt zich op \"$(FOUND)\". Wilt u deze sjabloon in de toekomst voor het synchroniseren gebruiken?"; + Text[ dutch ] = "Sjabloon \"$(TEMPLATE)\" is niet op de oorspronkelijke plaats gevonden. Een sjabloon met dezelfde naam bevindt zich op \"$(FOUND)\". Wilt u deze sjabloon in de toekomst voor het synchroniseren gebruiken?"; Text[ chinese_simplified ] = "没有在原来位置找到样式 $(TEMPLATE) 。有一个同名的样式在 $(FOUND)。今后要使用这个样式进行调整吗？"; Text[ greek ] = " $(TEMPLATE) . $(FOUND). ? "; - Text[ korean ] = "템플릿$(TEMPLATE)을 원래 위치에서 찾지 못했습니다. 이름이 같은 템플릿이 $(FOUND)에 있습니다. 앞으로 이 파일을 동기화에 사용하겠습니까?"; + Text[ korean ] = "서식 파일$(TEMPLATE)을 원래 위치에서 찾지 못했습니다. 이름이 같은 서식 파일이 $(FOUND)에 있습니다. 앞으로 이 파일을 동기화에 사용하시겠습니까?"; Text[ turkish ] = "\"$(TEMPLATE)\" ablonu asl yerinde bulunamad. Ayn adl ablonun bulunduu yerin ad: \"$(FOUND)\". Bu ablon gelecekte karlatrma iin kullanlsn m?"; Text[ language_user1 ] = " "; Text[ catalan ] = "La plantilla \"$(TEMPLATE)\" no s'ha trobat en la seva ubicaci original. Una plantilla amb el mateix nom s'ha trobat a \"$(FOUND)\". Voleu utilitzar aquesta plantilla al sincronitzar a partir d'ara?"; - Text[ finnish ] = "Mallipohjaa $(TEMPLATE) ei lytynyt alkuperisest sijainnista. Samanniminen mallipohja on kohteessa $(FOUND). Kytetnk tt mallipohjaa vastaisuudessa vertailuihin?"; + Text[ finnish ] = "Mallia $(TEMPLATE) ei lytynyt alkuperisest sijainnista. Samanniminen malli on kohteessa $(FOUND). Kytetnk tt mallia vastaisuudessa vertailuihin?"; Text[ thai ] = "ไม่พบแม่แบบ \"$(TEMPLATE)\" ที่ที่ตั้งเดิม มีชื่อแม่แบบเหมือนกันอยู่ที่ \"$(FOUND)\" ต้องการใช้แม่แบบนี้ในอนาคตเมื่อทำการเปรียบเทียบหรือไม่?"; }; String STR_TEMPL_RESET @@ -1822,22 +1822,22 @@ String STR_TEMPL_RESET Text [ italian ] = "Il modello $(TEMPLATE) non stato trovato. Volete che venga cercato anche in futuro?" ; Text [ spanish ] = "No se encontr la plantilla \"$(TEMPLATE)\". Desea que se busque la prxima vez que abra el documento?" ; Text [ french ] = "Le modle $(TEMPLATE) est introuvable. Devra-t-il tre recherch la prochaine ouverture du document ?" ; - Text [ dutch ] = "De sjabloon \"$(TEMPLATE)\" werd niet gevonden. Wilt u dat er ook in de toekomst naar wordt gezocht?" ; + Text [ dutch ] = "De sjabloon \"$(TEMPLATE)\" is niet gevonden. Wilt u dat er ook in de toekomst naar wordt gezocht?" ; Text [ portuguese ] = "O modelo \"$(TEMPLATE)\" no foi encontrado. Deseja continuar a procura quando abrir o documento novamente?" ; Text[ chinese_simplified ] = "没有找到样式\"$(TEMPLATE)\"。下一次还要搜寻它？"; - Text[ russian ] = " \"$(TEMPLATE)\" . ?"; + Text[ russian ] = " \"$(TEMPLATE)\" . ?"; Text[ polish ] = "Szablonu \"$(TEMPLATE)\" nie znaleziono. Czy szuka go nadal?"; Text[ japanese ] = "テンプレート\"$(TEMPLATE)\"は見つかりませんでした。これからも続けて検索しますか?"; Text[ chinese_traditional ] = "沒有找到這個樣式 $(TEMPLATE)。今後還要繼續搜尋它？"; Text[ arabic ] = " \"$(TEMPLATE)\". "; - Text[ dutch ] = "De sjabloon \"$(TEMPLATE)\" werd niet gevonden. Wilt u dat er ook in de toekomst naar wordt gezocht?"; + Text[ dutch ] = "De sjabloon \"$(TEMPLATE)\" is niet gevonden. Wilt u dat er ook in de toekomst naar wordt gezocht?"; Text[ chinese_simplified ] = "没有找到样式\"$(TEMPLATE)\"。下一次还要搜寻它？"; Text[ greek ] = " $(TEMPLATE) . ;"; Text[ korean ] = "템플릿$(TEMPLATE)을 찾지 못했습니다. 이 파일을 계속 찾으시겠습니까?"; Text[ turkish ] = "\"$(TEMPLATE)\" ablonu bulunamad. Bu ablon gelecekte de aransn m?"; Text[ language_user1 ] = " "; Text[ catalan ] = "No s'ha trobat la plantilla \"$(TEMPLATE)\". Voleu que es cerqui la propera vegada que s'obri el document?"; - Text[ finnish ] = "Mallipohjaa $(TEMPLATE) ei lytynyt. Etsitnk mallipohjaa seuraavan kerran, kun asiakirja avataan?"; + Text[ finnish ] = "Mallia $(TEMPLATE) ei lytynyt. Etsitnk mallia seuraavan kerran, kun asiakirja avataan?"; Text[ thai ] = "ไม่พบแม่แบบ \"$(TEMPLATE)\" ต้องการมองหาแม่แบบสำหรับเอกสารครั้งถัดไปที่ถูกเปิดหรือไม่ ?"; }; String STR_AUTOMATICVERSION @@ -1903,7 +1903,7 @@ String STR_DOCTYPENAME_SWWEB Text [ ENGLISH ] = "HTML Document" ; Text[ english_us ] = "HTML Document"; Text[ portuguese ] = "Documento HTML"; - Text[ russian ] = " HTML"; + Text[ russian ] = "-"; Text[ greek ] = " HTML"; Text[ dutch ] = "HTML-document"; Text[ french ] = "Document HTML"; @@ -1930,9 +1930,9 @@ String STR_DOCTYPENAME_SWGLOB Text [ ENGLISH ] = "Master Document" ; Text[ english_us ] = "Master Document"; Text[ portuguese ] = "Documento-mestre"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; - Text[ dutch ] = "Master-document"; + Text[ dutch ] = "Masterdocument"; Text[ french ] = "Document matre"; Text[ spanish ] = "Documento maestro"; Text[ italian ] = "Documento master"; @@ -1947,7 +1947,7 @@ String STR_DOCTYPENAME_SWGLOB Text[ turkish ] = "Ana belge"; Text[ arabic ] = " "; Text[ catalan ] = "Document mestre"; - Text[ finnish ] = "Pasiakirja"; + Text[ finnish ] = "Perusasiakirja"; Text[ thai ] = "เอกสารต้นฉบับ"; }; @@ -1957,7 +1957,7 @@ String STR_DOCTYPENAME_SC Text [ ENGLISH ] = "Spreadsheet" ; Text[ english_us ] = "Spreadsheet"; Text[ portuguese ] = "Folha de clculo"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ greek ] = " "; Text[ dutch ] = "Werkbladdocument"; Text[ french ] = "Classeur"; @@ -1968,7 +1968,7 @@ String STR_DOCTYPENAME_SC Text[ polish ] = "Arkusz kalkulacyjny"; Text[ portuguese_brazilian ] = "Spreadsheet"; Text[ japanese ] = "表計算ドキュメント"; - Text[ korean ] = "스프레드시트 문서"; + Text[ korean ] = "스프레드시트"; Text[ chinese_simplified ] = "工作表文档"; Text[ chinese_traditional ] = "工作表文件"; Text[ turkish ] = "Hesap tablosu"; @@ -2065,7 +2065,7 @@ String STR_NOSAVEANDCLOSE Text [ ENGLISH ] = "~Discard" ; Text [ english_us ] = "~Discard" ; Text[ portuguese ] = "~Rejeitar"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ dutch ] = "~Verwerpen"; Text[ french ] = "~Ignorer"; Text[ spanish ] = "~Rechazar"; @@ -2074,7 +2074,7 @@ String STR_NOSAVEANDCLOSE Text[ swedish ] = "I~gnorera"; Text[ polish ] = "Odrzu"; Text[ portuguese_brazilian ] = "~Discard"; - Text[ japanese ] = "破棄(~D)"; + Text[ japanese ] = "いいえ(~D)"; Text[ chinese_simplified ] = "舍弃(~D)"; Text[ chinese_traditional ] = "捨棄(~D)"; Text[ arabic ] = ""; @@ -2097,7 +2097,7 @@ String STR_PACKNGO_NOACCESS Text[ portuguese ] = "Recusado o acesso ao suporte de dados actual."; Text[ russian ] = " ."; Text[ greek ] = " ."; - Text[ dutch ] = "Geen toegang tot het actuele medium"; + Text[ dutch ] = "Geen toegang tot de huidige opslageenheid"; Text[ french ] = "Impossible d'accder au mdia actuel !"; Text[ spanish ] = "No se pudo acceder al medio actual."; Text[ italian ] = "Non stato possibile accedere al supporto dati attuale."; @@ -2122,9 +2122,9 @@ String STR_PACKNGO_NEWMEDIUM Text [ ENGLISH ] = "Insert the next media and press OK."; Text [ english_us ] = "Insert the next data carrier and click OK." ; Text[ portuguese ] = "Coloque o suporte de dados seguinte e prima OK."; - Text[ russian ] = " OK."; + Text[ russian ] = " ."; Text[ greek ] = " OK."; - Text[ dutch ] = "Leg het volgende medium in het station en klik op OK."; + Text[ dutch ] = "Plaats de volgende opslageenheid in het station en klik op OK."; Text[ french ] = "Insrez le mdia suivant et cliquez sur OK."; Text[ spanish ] = "Inserte el siguiente medio y pulse el botn Aceptar."; Text[ italian ] = "Inserite il supporto dati successivo, quindi confermate con OK."; @@ -2179,7 +2179,7 @@ String STR_EDITOBJECT Text [ English ] = "~Edit"; Text [ English_us ] = "~Edit"; Text[ portuguese ] = "~Editar"; - Text[ russian ] = ""; + Text[ russian ] = ""; Text[ dutch ] = "~Bewerken"; Text[ french ] = "diter"; Text[ spanish ] = "~Editar"; @@ -2260,7 +2260,7 @@ QueryBox DLG_MACROQUERY Title[ turkish ] = "Makroyu altr"; Title[ language_user1 ] = " "; Title[ catalan ] = "Executa macro"; - Title[ finnish ] = "Suorita makro"; + Title[ finnish ] = "Run Macro"; Message = "Dieses Dokument enthlt Makros. $(TEXT)"; Message [English] = "Dieses Dokument enthlt Makros. $(TEXT)"; @@ -2271,10 +2271,10 @@ QueryBox DLG_MACROQUERY Message[ italian ] = "Questo documento contiene macro. $(TEXT)"; Message[ korean ] = "이 문서에는 매크로가 포함되어 있습니다. $(TEXT)"; Message[ portuguese ] = "Dieses Dokument enthlt Makros. $(TEXT)"; - Message[ russian ] = "Dieses Dokument enthlt Makros. $(TEXT)"; + Message[ russian ] = " . $(TEXT)"; Message[ greek ] = "Dieses Dokument enthlt Makros. $(TEXT)"; - Message[ dutch ] = "Dieses Dokument enthlt Makros. $(TEXT)"; - Message[ finnish ] = "Dieses Dokument enthlt Makros. $(TEXT)"; + Message[ dutch ] = "Dit document bevat macro's. $(TEXT)"; + Message[ finnish ] = "Tm asiakirja sislt makroja. $(TEXT)"; Message[ danish ] = "Dette dokument indeholder makroer. $(TEXT)"; Message[ swedish ] = "Det hr dokumentet innehller makron. $(TEXT)"; Message[ polish ] = "Dieses Dokument enthlt Makros. $(TEXT)"; @@ -2357,10 +2357,10 @@ String FT_CANCEL Text[ italian ] = "In base alle impostazioni di sicurezza le macro di questo documento non devono essere eseguite. Volete eseguirle ugualmente?"; Text[ korean ] = "보안 설정에 따라 이 문서의 매크로는 실행될 수 없습니다. 이 매크로를 실행하시겠습니까?"; Text[ portuguese ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; - Text[ russian ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; + Text[ russian ] = " . , ? "; Text[ greek ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; - Text[ dutch ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; - Text[ finnish ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; + Text[ dutch ] = "Volgens de beveiligingsopties mogen de macro's in dit document niet worden uitgevoerd. Wilt u de macro's toch uitvoeren?"; + Text[ finnish ] = "Suojausasetusten mukaan tmn asiakirjan makroja ei tulisi suorittaa. Suoritetaanko ne siit huolimatta?"; Text[ danish ] = "Iflge sikkerhedsindstillingerne skal makroerne i dette dokument ikke udfres. Vil du alligevel udfre dem?"; Text[ swedish ] = "Enligt skerhetsinstllningarna ska makrona i det hr dokumentet inte kras. Vill du kra dem i alla fall?"; Text[ polish ] = "Nach den Sicherheitseinstellungen sollen die Makros dieses Dokuments nicht ausgefhrt werden. Mchten Sie sie trotzdem ausfhren?"; @@ -2382,10 +2382,10 @@ String FT_OK Text[ italian ] = "Volete far eseguire questa macro?"; Text[ korean ] = "이 매크로가 실행되도록 허락하시겠습니까?"; Text[ portuguese ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; - Text[ russian ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; + Text[ russian ] = " ?"; Text[ greek ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; - Text[ dutch ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; - Text[ finnish ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; + Text[ dutch ] = "Wilt u het uitvoeren van deze macro's toestaan?"; + Text[ finnish ] = "Haluatko sallia kaikkien makrojen suorittamisen?"; Text[ danish ] = "Vil du tillade, at disse makroer udfres?"; Text[ swedish ] = "Vill du tillta att de hr makrona krs?"; Text[ polish ] = "Mchten Sie erlauben, dass diese Makros ausgefhrt werden?"; @@ -2512,6 +2512,26 @@ String STR_LABEL_FILEFORMAT Text = "Dateiformat:" ; Text[ english ] = "File format:" ; Text[ english_us ] = "File format:" ; + Text[ portuguese ] = "File format:"; + Text[ russian ] = "File format:"; + Text[ greek ] = "File format:"; + Text[ dutch ] = "File format:"; + Text[ french ] = "Format de fichier :"; + Text[ spanish ] = "Formato de archivo:"; + Text[ finnish ] = "File format:"; + Text[ italian ] = "Formato file:"; + Text[ danish ] = "File format:"; + Text[ swedish ] = "Filformat:"; + Text[ polish ] = "File format:"; + Text[ portuguese_brazilian ] = "File format:"; + Text[ japanese ] = "ファイル書式:"; + Text[ korean ] = "파일 서식:"; + Text[ chinese_simplified ] = "文件格式："; + Text[ chinese_traditional ] = "檔案格式："; + Text[ turkish ] = "File format:"; + Text[ arabic ] = "File format:"; + Text[ catalan ] = "File format:"; + Text[ thai ] = "File format:"; }; // ******************************************************************* EOF @@ -2537,3 +2557,8 @@ String STR_LABEL_FILEFORMAT + + + + + diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index f2513a0aa183..caf35fe00fb6 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfac.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-07-09 14:54:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,18 +97,15 @@ #include "doc.hrc" //======================================================================== + DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ); -typedef SfxViewFactory* SfxViewFactoryPtr; -SV_DECL_PTRARR_DEL(SfxGlobalViewFactoryArr_Impl, SfxViewFactoryPtr, 2, 2); -SV_IMPL_PTRARR(SfxGlobalViewFactoryArr_Impl, SfxViewFactoryPtr); //======================================================================== DBG_NAME(SfxObjectFactory); TYPEINIT1(SfxObjectFactory,SvFactory); static SfxObjectFactoryArr_Impl* pObjFac = 0; -static SfxGlobalViewFactoryArr_Impl* pViewFac = 0; //======================================================================== @@ -158,6 +155,15 @@ struct SfxObjectFactory_Impl if ( bOwnsAccel ) delete pAccMgr; } + + void ClearAccMgr() + { + if ( bOwnsAccel ) + { + delete pAccMgr; + pAccMgr = 0; + } + } }; //======================================================================== @@ -340,17 +346,30 @@ SfxObjectFactory::~SfxObjectFactory() delete pImpl; } +//-------------------------------------------------------------------- + void SfxObjectFactory::RemoveAll_Impl() { - GetObjFacArray_Impl(); for( USHORT n=0; n<pObjFac->Count(); ) { SfxObjectFactoryPtr pFac = pObjFac->GetObject(n); pObjFac->Remove( n ); delete pFac; } +} - DELETEZ( pViewFac ); +//-------------------------------------------------------------------- + +void SfxObjectFactory::ClearAll_Impl() +{ + for( USHORT n=0; n<pObjFac->Count(); n++ ) + { + // Clear accelerator manager as it uses the same global SfxMacroConfig object as + // the application class does. This can lead to problems by using a newly created + // SfxMacroConfig object that doesn't have any macros inside => an assertion occur! + SfxObjectFactoryPtr pFac = pObjFac->GetObject(n); + pFac->pImpl->ClearAccMgr(); + } } //-------------------------------------------------------------------- @@ -366,14 +385,7 @@ void SfxObjectFactory::RegisterViewFactory pImpl->aViewFactoryArr[nPos]->GetOrdinal() <= rFactory.GetOrdinal(); ++nPos ) /* empty loop */; - SfxViewFactoryPtr pFact = &rFactory; - pImpl->aViewFactoryArr.Insert( nPos, pFact ); - - if ( !pViewFac ) - pViewFac = new SfxGlobalViewFactoryArr_Impl; - - if ( !pViewFac->GetPos( pFact ) ) - pViewFac->Insert( pFact, nPos ); + pImpl->aViewFactoryArr.Insert(nPos, &rFactory); } //-------------------------------------------------------------------- @@ -575,15 +587,20 @@ const SfxObjectFactory* SfxObjectFactory::GetFactory( const String& rFactoryURL const SfxFilter* SfxObjectFactory::GetTemplateFilter() const { - sal_uInt16 nCount = GetFilterCount(); - for ( sal_uInt16 n=0; n<nCount; n++ ) + USHORT nFilterCount = pImpl->pFilterContainer->GetFilterCount(); + USHORT nVersion = 0; + const SfxFilter *pFilter = NULL; + for( int n=0; n<nFilterCount; n++) { - const SfxFilter *pFilter = pImpl->pFilterContainer->GetFilter(n); - if ( pFilter->GetFilterFlags() & SFX_FILTER_TEMPLATE) - return pFilter; + const SfxFilter *pTemp = pImpl->pFilterContainer->GetFilter(n); + if( pTemp && pTemp->IsOwnFormat() && pTemp->IsOwnTemplateFormat() && ( pTemp->GetVersion() > nVersion ) ) + { + pFilter = pTemp; + nVersion = pTemp->GetVersion(); + } } - return 0; + return pFilter; } void SfxObjectFactory::SetCreateNewSlotId( sal_uInt16 nId ) @@ -651,7 +668,7 @@ sal_Bool SfxObjectFactory::HasObjectFactories() return ( GetObjFacArray_Impl().Count() != 0 ); } -SfxObjectFactoryArr_Impl& SfxObjectFactory::GetObjFacArray_Impl() +SfxObjectFactoryArr_Impl& SfxObjectFactory::GetObjFacArray_Impl() { if ( !pObjFac ) pObjFac = new SfxObjectFactoryArr_Impl; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index eb3418b558ae..dd59f20189be 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfile.cxx,v $ * - * $Revision: 1.127 $ + * $Revision: 1.128 $ * - * last change: $Author: hr $ $Date: 2002-11-14 14:16:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -196,14 +196,17 @@ using namespace ::com::sun::star::io; #include <comphelper/processfactory.hxx> #include <so3/transbnd.hxx> // SvKeyValueIterator #include <tools/urlobj.hxx> +#include <tools/inetmime.hxx> #include <unotools/ucblockbytes.hxx> #include <svtools/pathoptions.hxx> #include <svtools/asynclink.hxx> +#include <svtools/inettype.hxx> #include <ucbhelper/contentbroker.hxx> #include <ucbhelper/commandenvironment.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbhelper.hxx> +#include <unotools/progresshandlerwrap.hxx> #include <ucbhelper/content.hxx> #include <sot/stg.hxx> @@ -450,6 +453,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xInteraction; + sal_Bool m_bRemoveBackup; + ::rtl::OUString m_aBackupURL; + SfxPoolCancelManager* GetCancelManager(); SfxMedium_Impl( SfxMedium* pAntiImplP ); @@ -510,7 +516,8 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) bDontCreateCancellable( sal_False ), pTempDir( NULL ), bIsDiskSpannedJAR( sal_False ), bDownloadDone( sal_True ), bDontCallDoneLinkOnSharingError( sal_False ),nFileVersion( 0 ), pEaMgr( NULL ), pTempFile( NULL ), nLastStorageError( 0 ), - bIsCharsetInitialized( sal_False ) + bIsCharsetInitialized( sal_False ), + m_bRemoveBackup( sal_False ) { aHandler = new SfxLockBytesHandler_Impl( pAntiImpl ); aDoneLink.CreateMutex(); @@ -807,6 +814,8 @@ sal_Bool SfxMedium::Commit() if ( ( GetError() == SVSTREAM_OK ) && pImp->pTempFile ) Transfer_Impl(); + ClearBackup_Impl(); + return GetError() == SVSTREAM_OK; } @@ -908,15 +917,14 @@ sal_Bool SfxMedium::TryStorage() pImp->pTempDir->EnableKillingFile( sal_True ); // unpack all files to temp dir - - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteractionHandler( - xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), UNO_QUERY ); - - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs(1); - aArgs.getArray()[0].Name = DEFINE_CONST_UNICODE( "InteractionHandler" ); - aArgs.getArray()[0].Value <<= xInteractionHandler ; - + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); + if (xInteractionHandler.is()) + { + aArgs.realloc(1); + aArgs.getArray()[0].Name = DEFINE_CONST_UNICODE( "InteractionHandler" ); + aArgs.getArray()[0].Value <<= xInteractionHandler ; + } ::com::sun::star::uno::Sequence< ::rtl::OUString > files(0); if( !xPacker->unpack( pImp->pTempDir->GetURL(), aPath, files, aArgs ) ) @@ -928,7 +936,7 @@ sal_Bool SfxMedium::TryStorage() CloseInStream_Impl(); String aTemp; ::utl::LocalFileHelper::ConvertURLToPhysicalName( aNewName, aTemp ); - SetPhysicalName( aTemp ); + SetPhysicalName_Impl( aTemp ); GetStorage(); if ( aStorage.Is() ) @@ -1038,7 +1046,37 @@ SvStorage* SfxMedium::GetStorage_Impl( BOOL bUCBStorage ) if ( !pImp->aDoneLink.IsSet() ) DownLoad(); - if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) + SFX_ITEMSET_ARG( GetItemSet(), pItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False); + if ( pItem && pItem->GetValue() ) + { + CreateTempFile(); + Reference< ::com::sun::star::ucb::XProgressHandler > xProgressHandler; + Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator; + SFX_ITEMSET_ARG( GetItemSet(), pxProgressItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False ); + if( pxProgressItem && ( pxProgressItem->GetValue() >>= xStatusIndicator ) ) + xProgressHandler = Reference< ::com::sun::star::ucb::XProgressHandler >( + new utl::ProgressHandlerWrap( xStatusIndicator ) ); + + INetURLObject aObj( aName ); + if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) + { + String aURL; + ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ); + aObj.SetURL( aURL ); + } + + GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + nStorOpenMode = SFX_STREAM_READONLY; + UCBStorage* pUCBStorage = new UCBStorage( aObj.GetMainURL( INetURLObject::NO_DECODE ), + nStorOpenMode, + bDirect ? 0 : STORAGE_TRANSACTED, + sal_True, + sal_True, + xProgressHandler ); + + aStorage = new SvStorage( pUCBStorage ); + } + else if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) { CreateTempFile(); aStorage = new SvStorage( bUCBStorage, aName, nStorOpenMode, bDirect ? 0 : STORAGE_TRANSACTED ); @@ -1138,7 +1176,7 @@ SvStorage* SfxMedium::GetStorage_Impl( BOOL bUCBStorage ) String aTemp; ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp ); - SetPhysicalName( aTemp ); + SetPhysicalName_Impl( aTemp ); pImp->bIsTemp = sal_True; GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); @@ -1198,6 +1236,119 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen, bSetFilter = sal_False; } +sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, + const INetURLObject& aDest, + const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv ) +{ + sal_Bool bResult = sal_False; + Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference< XOutputStream > aDestStream; + Reference< XSimpleFileAccess > aSimpleAccess; + ::ucb::Content aOriginalContent; + + DBG_ASSERT( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL( INetURLObject::NO_DECODE ) ), + "SfxMedium::TransactedTransferForFS() should be used only for local contents!" ); + + if( ::ucb::Content::create( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, aOriginalContent ) ) + { + Close(); + ::ucb::Content aTempCont; + if( ::ucb::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, aTempCont ) ) + { + sal_Bool bTransactStarted = sal_False; + SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, sal_False ); + SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, sal_False ); + sal_Bool bRename = pRename ? pRename->GetValue() : FALSE; + sal_Bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename; + + try + { + if( bOverWrite && ::utl::UCBContentHelper::IsDocument( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) ) + { + if( ! pImp->m_aBackupURL.getLength() ) + DoInternalBackup_Impl( aOriginalContent ); + + if( pImp->m_aBackupURL.getLength() ) + { + Reference< XInputStream > aTempInput = aTempCont.openStream(); + bTransactStarted = sal_True; + aOriginalContent.writeStream( aTempInput, bOverWrite ); + bResult = sal_True; + } + else + { + WarningBox( NULL, SfxResId( MSG_WARNING_BACKUP ) ).Execute(); + eError = ERRCODE_ABORT; + } + } + else + { + Reference< XInputStream > aTempInput = aTempCont.openStream(); + aOriginalContent.writeStream( aTempInput, bOverWrite ); + bResult = sal_True; + } + } + catch ( ::com::sun::star::ucb::CommandAbortedException& ) + { + eError = ERRCODE_ABORT; + } + catch ( ::com::sun::star::ucb::CommandFailedException& ) + { + eError = ERRCODE_ABORT; + } + catch ( ::com::sun::star::ucb::InteractiveIOException& r ) + { + if ( r.Code == IOErrorCode_ACCESS_DENIED ) + eError = ERRCODE_IO_ACCESSDENIED; + else if ( r.Code == IOErrorCode_NOT_EXISTING ) + eError = ERRCODE_IO_NOTEXISTS; + else if ( r.Code == IOErrorCode_CANT_READ ) + eError = ERRCODE_IO_CANTREAD; + else + eError = ERRCODE_IO_GENERAL; + } + catch ( ::com::sun::star::uno::Exception& e ) + { + eError = ERRCODE_IO_GENERAL; + } + + if ( bResult ) + { + pImp->pTempFile->EnableKillingFile( sal_True ); + delete pImp->pTempFile; + pImp->pTempFile = NULL; + + // without a TempFile the physical and logical name should be the same + ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), + aName ); + } + else if ( bTransactStarted ) + { + try + { + ::ucb::Content aTransactCont; + if( ::ucb::Content::create( pImp->m_aBackupURL, xDummyEnv, aTransactCont ) ) + { + Reference< XInputStream > aOrigInput = aTransactCont.openStream(); + aOriginalContent.writeStream( aOrigInput, sal_True ); + } + } + catch( Exception& ) + { + // in case of failure here the backup file should not be removed + pImp->m_bRemoveBackup = sal_False; + eError = ERRCODE_IO_GENERAL; + } + } + } + else + eError = ERRCODE_IO_CANTREAD; + } + + return bResult; +} + + //------------------------------------------------------------------ void SfxMedium::Transfer_Impl() { @@ -1321,7 +1472,7 @@ void SfxMedium::Transfer_Impl() // take new unpacked storage as own storage Close(); DELETEZ( pImp->pTempFile ); - ::utl::LocalFileHelper::ConvertURLToPhysicalName( aLogicName, aName ); + ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aName ); SetStorage_Impl( xStor ); } else if ( !GetError() ) @@ -1339,70 +1490,15 @@ void SfxMedium::Transfer_Impl() // a special case, an interaction handler should be used for // authentication in case it is available Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler; - - SFX_ITEMSET_ARG( GetItemSet(), pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False ); - if( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteractionHandler ) - && xInteractionHandler.is() ) + Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); + if (xInteractionHandler.is()) xComEnv = new ::ucb::CommandEnvironment( xInteractionHandler, Reference< ::com::sun::star::ucb::XProgressHandler >() ); - Reference< XOutputStream > aDestStream; - Reference< XSimpleFileAccess > aSimpleAccess; - ::ucb::Content aOriginalContent; - if ( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) - && ::ucb::Content::create( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, aOriginalContent ) ) + if ( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) ) { - Close(); - ::ucb::Content aTempCont; - if( ::ucb::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aTempCont ) ) - { - try - { - Reference< XInputStream > aTempInput = aTempCont.openStream(); - SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, sal_False ); - SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, sal_False ); - sal_Bool bRename = pRename ? pRename->GetValue() : FALSE; - sal_Bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename; - aOriginalContent.writeStream( aTempInput, bOverWrite ); - bSuccess = sal_True; - } - catch ( ::com::sun::star::ucb::CommandAbortedException& ) - { - eError = ERRCODE_ABORT; - } - catch ( ::com::sun::star::ucb::CommandFailedException& ) - { - eError = ERRCODE_ABORT; - } - catch ( ::com::sun::star::ucb::InteractiveIOException& r ) - { - if ( r.Code == IOErrorCode_ACCESS_DENIED ) - eError = ERRCODE_IO_ACCESSDENIED; - else if ( r.Code == IOErrorCode_NOT_EXISTING ) - eError = ERRCODE_IO_NOTEXISTS; - else if ( r.Code == IOErrorCode_CANT_READ ) - eError = ERRCODE_IO_CANTREAD; - else - eError = ERRCODE_IO_GENERAL; - } - catch ( ::com::sun::star::uno::Exception& e ) - { - eError = ERRCODE_IO_GENERAL; - } - - if ( bSuccess ) - { - pImp->pTempFile->EnableKillingFile( sal_True ); - delete pImp->pTempFile; - pImp->pTempFile = NULL; - - // without a TempFile the physical and logical name should be the same - ::utl::LocalFileHelper::ConvertURLToPhysicalName( aLogicName, aName ); - } - - return; - } + TransactedTransferForFS_Impl( aSource, aDest, xComEnv ); + return; } if ( aDest.removeSegment() ) @@ -1469,15 +1565,60 @@ void SfxMedium::Transfer_Impl() } // do not switch from temporary file in case of nonfile protocol + } } } +} +//------------------------------------------------------------------ +void SfxMedium::DoInternalBackup_Impl( const ::ucb::Content& aOriginalContent ) +{ + ::rtl::OUString aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, + true, + INetURLObject::NO_DECODE ); + + sal_Int32 nPrefixLen = aFileName.lastIndexOf( '.' ); + String aPrefix = ( nPrefixLen == -1 ) ? aFileName : aFileName.copy( 0, nPrefixLen ); + String aExtension = ( nPrefixLen == -1 ) ? String() : String(aFileName.copy( nPrefixLen )); + String aBakDir = SvtPathOptions().GetBackupPath(); + + ::utl::TempFile aTransactTemp( aPrefix, &aExtension, &aBakDir ); + aTransactTemp.EnableKillingFile( sal_False ); + + INetURLObject aBackObj( aTransactTemp.GetURL() ); + ::rtl::OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ); + + Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + ::ucb::Content aBackupCont; + if( ::ucb::Content::create( aBakDir, xDummyEnv, aBackupCont ) ) + { + try + { + if( aBackupCont.transferContent( aOriginalContent, + ::ucb::InsertOperation_COPY, + aBackupName, + NameClash::OVERWRITE ) ) + { + pImp->m_aBackupURL = aBackObj.GetMainURL( INetURLObject::NO_DECODE ); + pImp->m_bRemoveBackup = sal_True; + } + } + catch( Exception& ) + {} } } + //------------------------------------------------------------------ void SfxMedium::DoBackup_Impl() { + // source file name is the logical name of this medium + INetURLObject aSource( GetURLObject() ); + + // there is nothing to backup in case source file does not exist + if ( !::utl::UCBContentHelper::IsDocument( aSource.GetMainURL( INetURLObject::NO_DECODE ) ) ) + return; + sal_Bool bSuccess = sal_False; // get path for backups @@ -1487,34 +1628,58 @@ void SfxMedium::DoBackup_Impl() // create content for the parent folder ( = backup folder ) ::ucb::Content aContent; Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; - ::ucb::Content::create( aBakDir, xEnv, aContent ); - - // source file name is the logical name of this medium - INetURLObject aSource( GetURLObject() ); - - // save as ".bak" file - INetURLObject aDest( aBakDir ); - aDest.insertName( aSource.getName() ); - aDest.setExtension( DEFINE_CONST_UNICODE( "bak" ) ); - String aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - - // create a content for the source file - ::ucb::Content aSourceContent; - if ( ::ucb::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aSourceContent ) ) + if( ::ucb::Content::create( aBakDir, xEnv, aContent ) ) { - try - { - // do the transfer ( copy source file to backup dir ) - bSuccess = aContent.transferContent( aSourceContent, ::ucb::InsertOperation_COPY, aFileName, NameClash::OVERWRITE ); - } - catch ( ::com::sun::star::uno::Exception& ) + // save as ".bak" file + INetURLObject aDest( aBakDir ); + aDest.insertName( aSource.getName() ); + aDest.setExtension( DEFINE_CONST_UNICODE( "bak" ) ); + String aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + + // create a content for the source file + ::ucb::Content aSourceContent; + if ( ::ucb::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aSourceContent ) ) { + try + { + // do the transfer ( copy source file to backup dir ) + bSuccess = aContent.transferContent( aSourceContent, + ::ucb::InsertOperation_COPY, + aFileName, + NameClash::OVERWRITE ); + if( bSuccess ) + { + pImp->m_aBackupURL = aDest.GetMainURL( INetURLObject::NO_DECODE ); + pImp->m_bRemoveBackup = sal_False; + } + } + catch ( ::com::sun::star::uno::Exception& ) + { + } } } } - if ( ! bSuccess ) + if ( !bSuccess ) + { + eError = ERRCODE_ABORT; WarningBox( NULL, SfxResId( MSG_WARNING_BACKUP ) ).Execute(); + } +} + +//------------------------------------------------------------------ +void SfxMedium::ClearBackup_Impl() +{ + if( pImp->m_bRemoveBackup ) + { + if ( pImp->m_aBackupURL.getLength() ) + if ( !::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) ) + DBG_ERROR("Couldn't remove backup file!"); + + pImp->m_bRemoveBackup = sal_False; + } + + pImp->m_aBackupURL = ::rtl::OUString(); } //---------------------------------------------------------------- @@ -1524,22 +1689,7 @@ void SfxMedium::GetMedium_Impl() { pImp->bDownloadDone = sal_False; pImp->bStreamReady = sal_False; -/*AS - Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); -*/ - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler; - if ( pImp->bUseInteractionHandler ) - { - xInteractionHandler = pImp->xInteraction; - if( xInteractionHandler.is() == sal_False ) - { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - if( xFactory.is() == sal_True ) - { - xInteractionHandler = ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), ::com::sun::star::uno::UNO_QUERY ); - } - } - } + Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); ::utl::UcbLockBytesHandler* pHandler = pImp->aHandler; INetProtocol eProt = GetURLObject().GetProtocol(); @@ -1657,7 +1807,8 @@ void SfxMedium::GetMedium_Impl() if ( bSynchron ) pImp->xLockBytes->SetSynchronMode( sal_True ); if ( !pImp->bDownloadDone ) - pImp->pCancellable = new UcbLockBytesCancellable_Impl( pImp->xLockBytes, pImp->GetCancelManager(), aLogicName ); + pImp->pCancellable = new UcbLockBytesCancellable_Impl( pImp->xLockBytes, pImp->GetCancelManager(), + GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); pInStream = new SvStream( pImp->xLockBytes ); pInStream->SetBufferSize( 4096 ); pImp->bStreamReady = sal_True; @@ -1814,7 +1965,7 @@ void SfxMedium::Init_Impl() // try to convert the URL into a physical name - but never change a physical name // physical name may be set if the logical name is changed after construction if ( !aName.Len() ) - ::utl::LocalFileHelper::ConvertURLToPhysicalName( aLogicName, aName ); + ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aName ); else DBG_ASSERT( pSalvageItem, "Suspicious change of logical name!" ); } @@ -1884,28 +2035,32 @@ void SfxMedium::UseInteractionHandler( BOOL bUse ) //------------------------------------------------------------------ -void SfxMedium::SetInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) -{ - pImp->xInteraction = xHandler; -} - -//------------------------------------------------------------------ - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SfxMedium::GetInteractionHandler() { - if ( pImp->bUseInteractionHandler ) + // if interaction isnt allowed explicitly ... return empty reference! + if ( !pImp->bUseInteractionHandler ) + return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >(); + + // otherwhise return cached default handler ... if it exist. + if ( pImp->xInteraction.is() ) + return pImp->xInteraction; + + // search a possible existing handler inside cached item set + if ( pSet ) { - if( pImp->xInteraction.is() ) - return pImp->xInteraction; - else - { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); - if( xFactory.is() == sal_True ) - { - return ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), ::com::sun::star::uno::UNO_QUERY ); - } - } + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xHandler; + SFX_ITEMSET_ARG( pSet, pHandler, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False); + if ( pHandler && (pHandler->GetValue() >>= xHandler) && xHandler.is() ) + return xHandler; + } + + // create default handler and cache it! + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + if ( xFactory.is() ) + { + pImp->xInteraction = ::com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >( xFactory->createInstance( DEFINE_CONST_UNICODE("com.sun.star.task.InteractionHandler") ), ::com::sun::star::uno::UNO_QUERY ); + return pImp->xInteraction; } return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >(); @@ -2041,7 +2196,7 @@ const String& SfxMedium::GetOrigURL() const //---------------------------------------------------------------- -void SfxMedium::SetPhysicalName( const String& rNameP ) +void SfxMedium::SetPhysicalName_Impl( const String& rNameP ) { if ( rNameP != aName ) { @@ -2060,6 +2215,26 @@ void SfxMedium::SetPhysicalName( const String& rNameP ) } } +//---------------------------------------------------------------- +void SfxMedium::MoveTempTo_Impl( SfxMedium* pMedium ) +{ + if ( pMedium && pMedium != this && pImp->pTempFile ) + { + if( pMedium->pImp->pTempFile ) + delete pMedium->pImp->pTempFile; + pMedium->pImp->pTempFile = pImp->pTempFile; + + pImp->pTempFile->EnableKillingFile( sal_True ); + pImp->pTempFile = NULL; + + pMedium->aName = pMedium->pImp->pTempFile->GetFileName(); + + pMedium->CloseInStream(); + pMedium->CloseStorage(); + pMedium->pImp->aContent = ::ucb::Content(); + } +} + //------------------------------------------------------------------ void SfxMedium::SetTemporary( sal_Bool bTemp ) { @@ -2207,6 +2382,8 @@ const INetURLObject& SfxMedium::GetURLObject() const { SfxMedium* pThis = const_cast < SfxMedium* > (this); pThis->pURLObj = new INetURLObject( aLogicName ); + if ( pThis->pURLObj->HasMark() ) + (*pThis->pURLObj) = INetURLObject( aLogicName ).GetURLNoMark(); } return *pURLObj; @@ -2384,10 +2561,26 @@ LoadEnvironment_Impl* SfxMedium::GetLoadEnvironment_Impl() const SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { if( !pImp->xAttributes.Is() ) -/*!!!! if ( pImp->xBinding.Is() ) - pImp->xAttributes = pImp->xBinding->GetHeaders(); - else -*/ pImp->xAttributes = SvKeyValueIteratorRef( new SvKeyValueIterator ); + { + pImp->xAttributes = SvKeyValueIteratorRef( new SvKeyValueIterator ); + + if ( GetContent().is() ) + { + pImp->bIsCharsetInitialized = sal_True; + + try + { + Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ); + ::rtl::OUString aContentType; + aAny >>= aContentType; + + pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString::createFromAscii( "content-type" ), aContentType ) ); + } + catch ( ::com::sun::star::uno::Exception& ) + { + } + } + } return pImp->xAttributes; } @@ -2604,12 +2797,61 @@ sal_Bool SfxMedium::IsReadOnly() SFX_ITEMSET_ARG( GetItemSet(), pItem, SfxBoolItem, SID_DOC_READONLY, sal_False); if ( pItem ) bReadOnly = pItem->GetValue(); + + // repair mode is used + SFX_ITEMSET_ARG( GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE ); + if ( pRepairItem && pRepairItem->GetValue() ) + bReadOnly = sal_True; } return bReadOnly; } //---------------------------------------------------------------- +void SfxMedium::TryToSwitchToRepairedTemp() +{ + // the medium should be opened in repair mode + SFX_ITEMSET_ARG( GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE ); + if ( pRepairItem && pRepairItem->GetValue() ) + { + DBG_ASSERT( aStorage, "Possible performance problem" ); + if ( GetStorage() ) + { + ::utl::TempFile* pTmpFile = new ::utl::TempFile(); + pTmpFile->EnableKillingFile( sal_True ); + ::rtl::OUString aNewName = pTmpFile->GetFileName(); + + if( aNewName.getLength() ) + { + SvStorageRef aNewStorage = new SvStorage( sal_True, aNewName, STREAM_WRITE | STREAM_TRUNC, STORAGE_TRANSACTED ); + if ( aNewStorage->GetError() == SVSTREAM_OK ) + { + aStorage->CopyTo( &aNewStorage ); + aNewStorage->Commit(); + + if ( aNewStorage->GetError() == SVSTREAM_OK ) + { + CloseInStream(); + CloseStorage(); + if ( pImp->pTempFile ) + DELETEZ( pImp->pTempFile ); + + pImp->pTempFile = pTmpFile; + aName = aNewName; + } + } + + SetError( aNewStorage->GetError() ); + } + else + SetError( ERRCODE_IO_CANTWRITE ); + } + else + SetError( ERRCODE_IO_CANTREAD ); + } +} + +//---------------------------------------------------------------- void SfxMedium::CreateTempFile() { if ( pImp->pTempFile ) @@ -2648,7 +2890,7 @@ void SfxMedium::CreateTempFile() pOutStream->Write( pBuf, nRead ); } - delete pBuf; + delete[] pBuf; CloseInStream(); } CloseOutStream_Impl(); @@ -2703,11 +2945,15 @@ SfxLoadEnvironment* SfxMedium::GetLoadEnvironment() const ::rtl::OUString aField; aAny >>= aField; - sal_Int32 nIndex = aField.indexOf( ::rtl::OUString::createFromAscii( "charset=" ) ); - if( nIndex >= 0 ) + ::rtl::OString sContent = ::rtl::OUStringToOString( aField, RTL_TEXTENCODING_ASCII_US ); + ByteString sType, sSubType; + INetContentTypeParameterList aParameters; + + if( INetContentTypes::parse( sContent, sType, sSubType, &aParameters ) ) { - DBG_ASSERT( nIndex + 8 < aField.getLength(), "OUString ariphmetic problem" ); - pImp->aCharset = aField.copy( nIndex + 8 ); + const INetContentTypeParameter * pCharset = aParameters.find("charset"); + if (pCharset != 0) + pImp->aCharset = pCharset->m_sValue; } } catch ( ::com::sun::star::uno::Exception& ) diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src index c3fcb75ff7d9..d347c0141ae8 100644 --- a/sfx2/source/doc/doctdlg.src +++ b/sfx2/source/doc/doctdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: doctdlg.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2001-09-26 20:16:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,24 +75,24 @@ ModalDialog DLG_DOC_TEMPLATE Text [ italian ] = "Modelli" ; Text [ portuguese_brazilian ] = "Editar o modelo do 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 ] = "Plantilla de documento" ; + Text [ spanish ] = "Plantillas" ; Text [ english_us ] = "Templates" ; Text[ chinese_simplified ] = "文档样式"; Text[ russian ] = ""; Text[ polish ] = "Szablony dokumentu"; - Text[ japanese ] = "柴酌執鹿者爵柴偲爵捨釈尺鴫柴"; + Text[ japanese ] = "ドキュメントテンプレート"; Text[ chinese_traditional ] = "文件樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "문서 서식파일"; + Text[ korean ] = "서식 파일"; Text[ turkish ] = "Belge ablonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Plantilla de documento"; + Text[ catalan ] = "Plantilles"; Moveable = TRUE ; FixedLine FL_EDIT { @@ -100,10 +100,10 @@ ModalDialog DLG_DOC_TEMPLATE Size = MAP_APPFONT ( 212 , 8 ) ; Text = "Neue Dokumentvorlage" ; Text [ English ] = "New Template" ; - Text [ dutch ] = "Nieuw sjabloon" ; + Text [ dutch ] = "Nieuwe sjabloon" ; Text [ english_us ] = "New template" ; Text [ italian ] = "Nuovo modello" ; - Text [ spanish ] = "Nueva plantilla" ; + Text [ spanish ] = "Plantilla nueva" ; Text [ french ] = "Nouveau modle de document" ; Text [ swedish ] = "Ny dokumentmall" ; Text [ danish ] = "Ny dokumentskabelon" ; @@ -112,15 +112,16 @@ ModalDialog DLG_DOC_TEMPLATE Text[ chinese_simplified ] = "新建文档样式"; Text[ russian ] = " "; Text[ polish ] = "Nowy szablon dokumentu"; - Text[ japanese ] = "新しいﾄﾞｷｭﾒﾝﾄﾃﾝﾌﾟﾚｰﾄ"; + Text[ japanese ] = "新しいドキュメントテンプレート"; Text[ chinese_traditional ] = "開啟新文件樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "새 문서 유형"; + Text[ korean ] = "새 문서 템플릿"; Text[ turkish ] = "Yeni belge ablonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nueva plantilla"; - Text[ finnish ] = "Uusi mallipohja"; + Text[ catalan ] = "Nova plantilla"; + Text[ finnish ] = "Uusi malli"; + Text[ thai ] = "แม่แบบใหม่"; }; Edit ED_NAME { @@ -138,8 +139,8 @@ ModalDialog DLG_DOC_TEMPLATE Text [ italian ] = "Modelli" ; Text [ portuguese_brazilian ] = "Modelos" ; Text [ portuguese ] = "Modelos" ; - Text [ finnish ] = "Mallipohjat" ; - Text [ danish ] = "Skabeloner" ; + Text [ finnish ] = "Mallit" ; + Text [ danish ] = "Typografier" ; Text [ french ] = "Modles" ; Text [ swedish ] = "Mallar" ; Text [ dutch ] = "Sjablonen" ; @@ -148,14 +149,15 @@ ModalDialog DLG_DOC_TEMPLATE Text[ chinese_simplified ] = "样式"; Text[ russian ] = ""; Text[ polish ] = "Szablony"; - Text[ japanese ] = "ﾃﾝﾌﾟﾚｰﾄ"; + Text[ japanese ] = "テンプレート"; Text[ chinese_traditional ] = "樣式"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "유형"; + Text[ korean ] = "서식 파일"; Text[ turkish ] = "ablon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Plantillas"; + Text[ catalan ] = "Plantilles"; + Text[ thai ] = "แม่แบบ"; }; FixedText FT_SECTION { @@ -184,7 +186,8 @@ ModalDialog DLG_DOC_TEMPLATE Text[ korean ] = "영역(~C)"; Text[ turkish ] = "~Kategori"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~reas"; + Text[ catalan ] = "~Categories"; + Text[ thai ] = "~ประเภท"; }; ListBox LB_SECTION { @@ -202,7 +205,7 @@ ModalDialog DLG_DOC_TEMPLATE Text [ italian ] = "~Modelli" ; Text [ portuguese_brazilian ] = "~Modelos" ; Text [ portuguese ] = "Modelos" ; - Text [ finnish ] = "~Mallipohjat" ; + Text [ finnish ] = "Mallit" ; Text [ danish ] = "Skabeloner" ; Text [ french ] = "~Modles" ; Text [ swedish ] = "~Mallar" ; @@ -212,14 +215,15 @@ ModalDialog DLG_DOC_TEMPLATE Text[ chinese_simplified ] = "样式(~T)"; Text[ russian ] = ""; Text[ polish ] = "Szablony"; - Text[ japanese ] = "ﾃﾝﾌﾟﾚｰﾄ(~T)"; + Text[ japanese ] = "テンプレート(~T)"; Text[ chinese_traditional ] = "樣式(~T)"; Text[ arabic ] = ""; Text[ greek ] = ""; Text[ korean ] = "서식 파일(~T)"; Text[ turkish ] = "~ablon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P~lantillas"; + Text[ catalan ] = "~Plantilles"; + Text[ thai ] = "แ~ม่แบบ"; }; ListBox LB_STYLESHEETS { @@ -253,8 +257,8 @@ ModalDialog DLG_DOC_TEMPLATE Text [ english_us ] = "~Edit" ; Text [ dutch ] = "Be~werken" ; Text [ italian ] = "Modifica" ; - Text [ spanish ] = "~Editar" ; - Text [ french ] = "~diter" ; + Text [ spanish ] = "Editar" ; + Text [ french ] = "diter" ; Text [ swedish ] = "~Redigera" ; Text [ danish ] = "Rediger" ; Text [ portuguese ] = "~Editar" ; @@ -269,8 +273,9 @@ ModalDialog DLG_DOC_TEMPLATE Text[ korean ] = "편집(~E)"; Text[ turkish ] = "~Dzenle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editar"; + Text[ catalan ] = "~Edita"; Text[ finnish ] = "~Muokkaa"; + Text[ thai ] = "แ~ก้ไข"; }; PushButton BT_ORGANIZE { @@ -282,7 +287,7 @@ ModalDialog DLG_DOC_TEMPLATE Text [ italian ] = "Gestisci..." ; Text [ portuguese_brazilian ] = "~Gerenciar..." ; Text [ portuguese ] = "~Gerir..." ; - Text [ finnish ] = "~Jrjestelytykalu" ; + Text [ finnish ] = "~Jrjestelytykalu..." ; Text [ danish ] = "Administrer..." ; Text [ french ] = "~Grer..." ; Text [ swedish ] = "~Administrera..." ; @@ -290,7 +295,7 @@ ModalDialog DLG_DOC_TEMPLATE Text [ spanish ] = "~Administrar..." ; Text [ english_us ] = "~Organizer..." ; Text[ chinese_simplified ] = "管理(~O)..."; - Text[ russian ] = "..."; + Text[ russian ] = "..."; Text[ polish ] = "Zarzdzaj..."; Text[ japanese ] = "管理(~O)..."; Text[ chinese_traditional ] = "管理(~O)..."; @@ -299,8 +304,10 @@ ModalDialog DLG_DOC_TEMPLATE Text[ korean ] = "관리(~O)..."; Text[ turkish ] = "Ynet..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Administrar..."; + Text[ catalan ] = "~Organitzador..."; + Text[ thai ] = "~ตัวจัดระเบียบ..."; }; + Text[ thai ] = "แม่แบบ"; }; @@ -315,3 +322,10 @@ ModalDialog DLG_DOC_TEMPLATE + + + + + + + diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src index 443b912bce02..68a9754a79c4 100644 --- a/sfx2/source/doc/doctempl.src +++ b/sfx2/source/doc/doctempl.src @@ -2,9 +2,9 @@ * * $RCSfile: doctempl.src,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:21:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,8 +112,8 @@ StringArray TEMPLATE_LONG_NAMES_ARY { < "Default" ; > ; < "Business Correspondence" ; > ; - < "Other Business documents" ; > ; - < "Personal Correspondence And Documents" ; > ; + < "Other Business Documents" ; > ; + < "Personal Correspondence and Documents" ; > ; < "Forms and Contracts" ; > ; < "Finances" ; > ; < "Education" ; > ; @@ -136,11 +136,11 @@ StringArray TEMPLATE_LONG_NAMES_ARY }; ItemList[ russian ] = { - < "" ; > ; + < "" ; > ; < " " ; > ; < " " ; > ; < " " ; > ; - < " " ; > ; + < " " ; > ; < "" ; > ; < "" ; > ; < " " ; > ; @@ -165,7 +165,7 @@ StringArray TEMPLATE_LONG_NAMES_ARY < "Standaard" ; > ; < "Zakelijke correspondentie" ; > ; < "Andere zakelijke documenten" ; > ; - < "Privcorrespondentie en documenten" ; > ; + < "Priv-correspondentie en -documenten" ; > ; < "Formulieren en contracten" ; > ; < "Financieel" ; > ; < "Opleiding" ; > ; @@ -188,7 +188,7 @@ StringArray TEMPLATE_LONG_NAMES_ARY }; ItemList[ spanish ] = { - < "Estndar" ; > ; + < "Predeterminado" ; > ; < "Correspondencia comercial" ; > ; < "Otros documentos comerciales" ; > ; < "Correspondencia privada y documentos" ; > ; @@ -214,7 +214,7 @@ StringArray TEMPLATE_LONG_NAMES_ARY }; ItemList[ danish ] = { - < "Normal" ; > ; + < "Standard" ; > ; < "Arbejdsrelateret korrespondance" ; > ; < "Andre arbejdsrelaterede dokumenter" ; > ; < "Privat korrespondance og private dokumenter" ; > ; @@ -266,55 +266,55 @@ StringArray TEMPLATE_LONG_NAMES_ARY }; ItemList[ japanese ] = { - < "W" ; > ; - < "Зp" ; > ; - < "̑̎Зp" ; > ; - < "lȂƕ" ; > ; - < "Ɩpނƌ_" ; > ; - < "" ; > ; - < "{" ; > ; - < "ھðݔwi" ; > ; - < "ھð" ; > ; - < "̑" ; > ; + < "標準" ; > ; + < "社用書簡" ; > ; + < "その他の社用文書" ; > ; + < "個人書簡と文書" ; > ; + < "業務用書類と契約書" ; > ; + < "財政" ; > ; + < "教養" ; > ; + < "プレゼンテーション背景" ; > ; + < "プレゼンテーション" ; > ; + < "その他" ; > ; }; ItemList[ korean ] = { - < "ǥ" ; > ; - < "롡ţ" ; > ; - < "Ÿ " ; > ; - < "Ρų" ; > ; - < "İ " ; > ; - < "ȸ" ; > ; - < "" ; > ; - < "̼ǡ" ; > ; - < "̼" ; > ; - < "Ÿ" ; > ; + < "기본값" ; > ; + < "업무적인 통신" ; > ; + < "기타 사무용 문서" ; > ; + < "개인적 통신 및 문서" ; > ; + < "업무용 양식 및 계약서" ; > ; + < "재정 관리" ; > ; + < "교육" ; > ; + < "프레젠테이션 배경" ; > ; + < "프레젠테이션" ; > ; + < "기타" ; > ; }; ItemList[ chinese_simplified ] = { - < "" ; > ; - < "ź" ; > ; - < "ĵ" ; > ; - < "˽źĵ" ; > ; - < "ͺͬ" ; > ; - < "" ; > ; - < "" ; > ; - < "ʾĸ屳" ; > ; - < "ʾĸ" ; > ; - < "" ; > ; + < "标准" ; > ; + < "商务信函" ; > ; + < "其他商务文档" ; > ; + < "私人信函和文档" ; > ; + < "表单和合同" ; > ; + < "财务" ; > ; + < "教育" ; > ; + < "演示文稿背景" ; > ; + < "演示文稿" ; > ; + < "其它" ; > ; }; ItemList[ chinese_traditional ] = { - < "з" ; > ; - < "ӰȫH" ; > ; - < "LӰȤ" ; > ; - < "pHHM" ; > ; - < "MXP" ; > ; - < "]" ; > ; - < "Ш|" ; > ; - < "²I" ; > ; - < "²" ; > ; - < "䥦" ; > ; + < "標準" ; > ; + < "商務信函" ; > ; + < "其他商務文件" ; > ; + < "私人信函和文件" ; > ; + < "表單和合同" ; > ; + < "財務" ; > ; + < "教育" ; > ; + < "簡報背景" ; > ; + < "簡報" ; > ; + < "其它" ; > ; }; ItemList[ arabic ] = { @@ -358,23 +358,23 @@ ItemList [ language_user1 ] = }; ItemList [ catalan ] = { - < "Estndar" ; > ; + < "Per defecte" ; > ; < "Correspondencia comercial" ; > ; - < "Otros documentos comerciales" ; > ; - < "Correspondencia privada y documentos" ; > ; - < "Formularios y contratos" ; > ; - < "Finanzas" ; > ; - < "Educacin" ; > ; - < "Fondos de presentacin" ; > ; - < "Presentaciones" ; > ; + < "Altres documents de negocis" ; > ; + < "Correspondencia privada i documents" ; > ; + < "Formularis i contractes" ; > ; + < "Finances" ; > ; + < "Educaci" ; > ; + < "Fons de presentaci" ; > ; + < "Presentacions" ; > ; < "Diversos" ; > ; }; ItemList [ finnish ] = { - < "Oletusarvo" ; > ; - < "Liiketoiminnan kirjeenvaihto" ; > ; - < "Muut liiketoiminta-asiakirjat" ; > ; - < "Henkilkohtainen kirjeenvaihto ja asiakirjat" ; > ; + < "Oletus" ; > ; + < "Liikekirjeenvaihto" ; > ; + < "Muut liikeasiakirjat" ; > ; + < "Yksityinen kirjeenvaihto ja asiakirjat" ; > ; < "Lomakkeet ja sopimukset" ; > ; < "Talous" ; > ; < "Koulutus" ; > ; @@ -382,6 +382,19 @@ ItemList [ language_user1 ] = < "Esitykset" ; > ; < "Sekalaiset" ; > ; }; + ItemList [ thai ] = + { + < "ค่าเริ่มต้น" ; > ; + < "การโต้ตอบทางธุรกิจ" ; > ; + < "เอกสารธุรกิจอื่น ๆ" ; > ; + < "การโต้ตอบและเอกสารส่วนตัว" ; > ; + < "แบบฟอร์มและสัญญา" ; > ; + < "การเงิน" ; > ; + < "การศึกษา" ; > ; + < "พื้นหลังการนำเสนอ" ; > ; + < "การนำเสนอ" ; > ; + < "เบ็ดเตล็ด" ; > ; + }; }; String RID_CNT_STR_WAITING @@ -397,18 +410,19 @@ String RID_CNT_STR_WAITING Text[ french ] = "Initialisation des modles pour une premire utilisation ..."; Text[ spanish ] = "Las plantillas se inicializarn ahora para el primer uso."; Text[ italian ] = "Inizializzazione dei modelli per il primo utilizzo del programma."; - Text[ danish ] = "%PRODUCTNAME-komponenterne initialiseres."; + Text[ danish ] = "Skabelonerne initialiseres nu til frste brug."; Text[ swedish ] = "Mallarna initieras nu fr den frsta anvndningen."; Text[ polish ] = "Rozpocznie si teraz inicjalizacja uytych pierwszy raz szablonw"; Text[ portuguese_brazilian ] = "Die %PRODUCTNAME Komponenten werden initialisiert"; - Text[ japanese ] = "ڰĂ͍߂ĎgpɂāA܂܂B"; - Text[ korean ] = " 1ȸ Ͽ ġ˴ϴ."; - Text[ chinese_simplified ] = "״γʼҪʹõʽļ"; - Text[ chinese_traditional ] = "{blƻݭnϥΪ˦ɮסC"; + Text[ japanese ] = "テンプレートは今回初めて使用するにあたって、まず初期化されます。"; + Text[ korean ] = "지금 서식 파일이 처음 사용을 위해 설치되고 있습니다."; + Text[ chinese_simplified ] = "现在首次初始化需要使用的样式文件。"; + Text[ chinese_traditional ] = "現在首次初始化需要使用的樣式檔案。"; Text[ turkish ] = "Kurulumdan sonra %PRODUCTNAME bileenleri imdi yeniden balatlacak."; Text[ arabic ] = " %PRODUCTNAME ."; - Text[ catalan ] = "Los componentes de %PRODUCTNAME van a ser inicializados ahora tras la instalacin."; - Text[ finnish ] = "Alustetaan ohjelman %PRODUCTNAME osat ensimmist kertaa asennuksen jlkeen."; + Text[ catalan ] = "Els components d'%PRODUCTNAME s'inicialitzaran desprs de la instal.laci."; + Text[ finnish ] = "Malleja alustetaan ensimmist kyttkertaa varten."; + Text[ thai ] = "เริ่มแม่แบบสำหรับการใช้ครั้งแรก"; }; @@ -417,3 +431,17 @@ String RID_CNT_STR_WAITING + + + + + + + + + + + + + + diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 4fe315c48884..d6bba1801144 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docvor.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: obo $ $Date: 2002-11-20 11:42:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ friend class SfxOrganizeListBox_Impl; SvStringsDtor* GetAllFactoryURLs_Impl() const; sal_Bool GetFactoryURL_Impl( String& rFactoryURL, String& rFileURL ) const; - long Dispatch_Impl( USHORT nId ); + long Dispatch_Impl( USHORT nId, Menu* _pMenu ); String GetPath_Impl( BOOL bOpen, const String& rFileName ); void InitBitmaps( void ); @@ -286,7 +286,7 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, INetURLObject aObj( aWorkPath ); DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL !" ); aObj.setFinalSlash(); - aLastDir = aObj.GetMainURL(); + aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } else { @@ -294,7 +294,7 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, String aProgURL = SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(PROGURL)") ); INetURLObject aObj( aProgURL ); DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL !" ); - aLastDir = aObj.GetMainURL(); + aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } InitBitmaps(); @@ -1096,7 +1096,7 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( SOT_FORMAT_FILE == nId && aHelper.GetString( nId, aFileName ) ) { INetURLObject aObj( aFileName, INET_PROT_FILE ); - bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL() ); + bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) ); } } bDropMoveOk = TRUE; @@ -1597,11 +1597,11 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName ) aObj.removeExtension(); aObj.setExtension( aExtension ); - aPath = aObj.GetMainURL(); + aPath = aObj.GetMainURL(INetURLObject::DECODE_TO_IURI); } aObj.removeSegment(); - aLastDir = aObj.GetMainURL(); + aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } return aPath; } @@ -1681,7 +1681,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetFactoryURL_Impl( String& rFactoryURL, String& r return bRet; } -long SfxOrganizeDlg_Impl::Dispatch_Impl(USHORT nId) +long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu ) /* [Beschreibung] @@ -1904,8 +1904,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl(USHORT nId) if ( !bHandled && ( nId > ID_RESET_DEFAULT_TEMPLATE || nId <= ID_RESET_DEFAULT_TEMPLATE_END ) ) { - String aObjFacURL = aEditBtn.GetPopupMenu()->GetPopupMenu( ID_RESET_DEFAULT_TEMPLATE )->GetItemCommand( nId ); - SfxObjectFactory::SetStandardTemplate( aObjFacURL, String() ); + Menu* pSubMenu = _pMenu ? _pMenu : aEditBtn.GetPopupMenu()->GetPopupMenu( ID_RESET_DEFAULT_TEMPLATE ); + if ( pSubMenu ) + { + String aObjFacURL = pSubMenu->GetItemCommand( nId ); + SfxObjectFactory::SetStandardTemplate( aObjFacURL, String() ); + bHandled = sal_True; + } } return bHandled ? 1 : 0; @@ -1928,7 +1933,7 @@ IMPL_LINK_INLINE_START( SfxOrganizeDlg_Impl, MenuSelect_Impl, Menu *, pMenu ) */ { - return Dispatch_Impl(pMenu->GetCurItemId()); + return Dispatch_Impl( pMenu->GetCurItemId(), pMenu ); } IMPL_LINK_INLINE_END( SfxOrganizeDlg_Impl, MenuSelect_Impl, Menu *, pMenu ) @@ -1948,12 +1953,12 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl, Accelerator *, pAccel ) 0: Event wurde nicht verarbeitet (SV) */ + { - SvLBoxEntry *pEntry=pFocusBox && pFocusBox->GetSelectionCount() - ? pFocusBox->FirstSelected() : 0 ; - return pEntry && (pAccel->GetCurItemId() == ID_NEW || - !DontDelete_Impl(pEntry)) ? - Dispatch_Impl(pAccel->GetCurItemId()): 0; + SvLBoxEntry* pEntry = pFocusBox && pFocusBox->GetSelectionCount() ? + pFocusBox->FirstSelected() : NULL ; + return pEntry && ( pAccel->GetCurItemId() == ID_NEW || !DontDelete_Impl( pEntry ) ) ? + Dispatch_Impl( pAccel->GetCurItemId(), NULL ) : 0; return 0; } @@ -2209,7 +2214,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AddFiles_Impl, Button *, pButton ) INetURLObject aObj( aPath ); aObj.removeSegment(); aObj.setFinalSlash(); - aLastDir = aObj.GetMainURL(); + aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } return 0; diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src index 35ee9881ef8e..eecf479910ab 100644 --- a/sfx2/source/doc/docvor.src +++ b/sfx2/source/doc/docvor.src @@ -2,9 +2,9 @@ * * $RCSfile: docvor.src,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2002-08-05 20:17:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ ModalDialog DLG_ORGANIZE Text [ italian ] = "Gestione dei modelli" ; Text [ portuguese_brazilian ] = "Editar os modelos do documento" ; Text [ portuguese ] = "Gerir modelos de documentos" ; - Text [ finnish ] = "Mallipohjien hallinta" ; + Text [ finnish ] = "Mallien hallinta" ; Text [ danish ] = "Administrer dokumentskabeloner" ; Text [ french ] = "Gestion des modles de document" ; Text [ swedish ] = "Administrera dokumentmallar" ; @@ -139,7 +139,7 @@ ModalDialog DLG_ORGANIZE Text [ italian ] = "~File..." ; Text [ portuguese_brazilian ] = "~Arquivos..." ; Text [ portuguese ] = "~Ficheiro..." ; - Text [ finnish ] = "~Tiedosto" ; + Text [ finnish ] = "Tie~dosto..." ; Text [ danish ] = "~Fil..." ; Text [ french ] = "~Fichier..." ; Text [ swedish ] = "~Fil..." ; @@ -185,7 +185,7 @@ ModalDialog DLG_ORGANIZE Text[ turkish ] = "~Address Book..."; Text[ arabic ] = " ..."; Text[ catalan ] = "Llibreta d'~adreces..."; - Text[ finnish ] = "~Osoitekirja"; + Text[ finnish ] = "O~soitekirja..."; Text[ thai ] = "สมุด~ที่อยู่..."; }; ListBox LB_LEFT_TYP @@ -228,7 +228,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ finnish ] = { - < "Mallipohjat" ; Default ; > ; + < "Mallit" ; Default ; > ; < "Asiakirjat" ; Default ; > ; }; StringList [ danish ] = @@ -253,7 +253,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ spanish ] = { - < "Plantillas de documento" ; Default ; > ; + < "Plantillas" ; Default ; > ; < "Documentos" ; Default ; > ; }; StringList [ english_us ] = @@ -298,7 +298,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ korean ] = { - < "문서 템플릿" ; Default ; > ; + < "서식 파일" ; Default ; > ; < "문서" ; Default ; > ; }; StringList [ turkish ] = @@ -362,7 +362,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ finnish ] = { - < "Mallipohjat" ; Default ; > ; + < "Mallit" ; Default ; > ; < "Asiakirjat" ; Default ; > ; }; StringList [ danish ] = @@ -387,7 +387,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ spanish ] = { - < "Plantillas de documento" ; Default ; > ; + < "Plantillas" ; Default ; > ; < "Documentos" ; Default ; > ; }; StringList [ english_us ] = @@ -432,7 +432,7 @@ ModalDialog DLG_ORGANIZE }; StringList [ korean ] = { - < "문서 템플릿" ; Default ; > ; + < "서식 파일" ; Default ; > ; < "문서" ; Default ; > ; }; StringList [ turkish ] = @@ -511,7 +511,7 @@ ModalDialog DLG_ORGANIZE Text [ french ] = "~Commandes" ; Text [ swedish ] = "~Kommandon" ; Text [ dutch ] = "~Opdrachten" ; - Text [ spanish ] = "~Comandos" ; + Text [ spanish ] = "~rdenes" ; Text [ english_us ] = "Commands" ; TabStop = TRUE ; ButtonMenu = Menu @@ -569,7 +569,7 @@ ModalDialog DLG_ORGANIZE Text [ french ] = "~Supprimer" ; Text [ swedish ] = "R~adera" ; Text [ dutch ] = "~Wissen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; AccelKey = KeyCode { @@ -632,7 +632,7 @@ ModalDialog DLG_ORGANIZE Text [ italian ] = "~Importa modello..." ; Text [ portuguese_brazilian ] = "Copiar para..." ; Text [ portuguese ] = "I~mportar modelo..." ; - Text [ finnish ] = "Tuo mallipohja..." ; + Text [ finnish ] = "Tuo malli..." ; Text [ danish ] = "Importer skabelon..." ; Text [ french ] = "I~mporter un modle..." ; Text [ swedish ] = "~Importera mall..." ; @@ -646,7 +646,7 @@ ModalDialog DLG_ORGANIZE Text[ chinese_traditional ] = "匯入樣式..."; Text[ arabic ] = " ..."; Text[ greek ] = "~ ..."; - Text[ korean ] = "템플릿 가져오기..."; + Text[ korean ] = "서식 파일 가져오기..."; Text[ turkish ] = "ablonu ie aktar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Importa plantilla..."; @@ -662,7 +662,7 @@ ModalDialog DLG_ORGANIZE Text [ italian ] = "Esporta modello..." ; Text [ portuguese_brazilian ] = "Copiar de..." ; Text [ portuguese ] = "E~xportar modelo..." ; - Text [ finnish ] = "Vie mallipohja..." ; + Text [ finnish ] = "Vie malli..." ; Text [ danish ] = "Eksporter skabelon..." ; Text [ french ] = "E~xporter un modle..." ; Text [ swedish ] = "~Exportera mall..." ; @@ -676,7 +676,7 @@ ModalDialog DLG_ORGANIZE Text[ chinese_traditional ] = "匯出樣式..."; Text[ arabic ] = " ..."; Text[ greek ] = "~ ..."; - Text[ korean ] = "템플릿 내보내기..."; + Text[ korean ] = "서식 파일 내보내기..."; Text[ turkish ] = "ablonu da aktar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Exporta plantilla..."; @@ -696,7 +696,7 @@ ModalDialog DLG_ORGANIZE Text [ italian ] = "Stam~pa" ; Text [ portuguese_brazilian ] = "~Imprimir" ; Text [ portuguese ] = "~Imprimir" ; - Text [ finnish ] = "~Tulosta" ; + Text [ finnish ] = "Tu~losta" ; Text [ danish ] = "~Udskriv" ; Text [ french ] = "~Imprimer" ; Text [ swedish ] = "Skriv ~ut" ; @@ -764,7 +764,7 @@ ModalDialog DLG_ORGANIZE Text [ danish ] = "Opdater" ; Text [ french ] = "~Actualiser" ; Text [ swedish ] = "Upp~datera" ; - Text [ dutch ] = "~Actualiseren" ; + Text [ dutch ] = "~Bijwerken" ; Text [ spanish ] = "~Actualizar" ; Text [ english_us ] = "Update" ; Text[ chinese_simplified ] = "更新"; @@ -791,19 +791,19 @@ ModalDialog DLG_ORGANIZE Text = "Als S~tandardvorlage setzen" ; Text [ english_us ] = "Set As Default Template" ; Text[ portuguese ] = "~Definir como modelo padro"; - Text[ russian ] = "~ "; + Text[ russian ] = " "; Text[ greek ] = "Set As Default Template"; Text[ dutch ] = "Als s~tandaardsjabloon"; Text[ french ] = "Dfinir comme modle ~par dfaut"; Text[ spanish ] = "Definir como plantilla predeterminada"; - Text[ finnish ] = "Set As Default Template"; + Text[ finnish ] = "Aseta oletusmalliksi"; Text[ italian ] = "~Imposta come modello standard"; Text[ danish ] = "Anvend som s~tandardskabelon"; Text[ swedish ] = "Definiera som s~tandardmall"; Text[ polish ] = "~Osad jako szablon standardowy"; Text[ portuguese_brazilian ] = "Set As Default Template"; Text[ japanese ] = "標準テンプレートとして設定"; - Text[ korean ] = "기본 템플릿으로 설정"; + Text[ korean ] = "기본 서식 파일로 설정"; Text[ chinese_simplified ] = "设定成标准样式"; Text[ chinese_traditional ] = "設定成標準樣式"; Text[ turkish ] = "Set As Default Template"; @@ -818,19 +818,19 @@ ModalDialog DLG_ORGANIZE Text = "~Standardvorlage zurcksetzen" ; Text [ english_us ] = "Reset Default Template" ; Text[ portuguese ] = "~Restaurar modelo padro"; - Text[ russian ] = "~ "; + Text[ russian ] = "~ "; Text[ greek ] = "Reset Default Template"; Text[ dutch ] = "~Standaardsjabloon"; Text[ french ] = "Restaurer le modle par ~dfaut"; Text[ spanish ] = "Restaurar plantilla predeterminada"; - Text[ finnish ] = "Reset Default Template"; + Text[ finnish ] = "Palauta oletusmalli"; Text[ italian ] = "~Ripristina il modello standard"; Text[ danish ] = "Nulstil ~standardskabeloner"; Text[ swedish ] = "terstll ~standardmall"; Text[ polish ] = "~Przywr szablon standardowy"; Text[ portuguese_brazilian ] = "Reset Default Template"; Text[ japanese ] = "標準テンプレートを元に戻す"; - Text[ korean ] = "기본 템플릿 초기화"; + Text[ korean ] = "기본 서식 파일을 원래대로"; Text[ chinese_simplified ] = "重设标准样式"; Text[ chinese_traditional ] = "重設標準樣式"; Text[ turkish ] = "Reset Default Template"; @@ -917,13 +917,13 @@ ModalDialog DLG_ORGANIZE Size = MAP_APPFONT ( 131 , 10 ) ; };*/ Text[ chinese_simplified ] = "管理文档样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zarzdzaj szablonami dokumentw"; Text[ japanese ] = "ドキュメントテンプレートの管理"; Text[ chinese_traditional ] = "管理文件樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "서식 문서 관리"; + Text[ korean ] = "서식 파일 관리"; Text[ turkish ] = "Belge ablonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Organitza les plantilles"; @@ -931,3 +931,5 @@ ModalDialog DLG_ORGANIZE }; // ********************************************************************** EOF + + diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 29aeeda45a55..ea8e430000c1 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmdescr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pl $ $Date: 2001-10-25 14:42:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -444,7 +444,7 @@ void SfxFrameDescriptor::SetURL( const String& rURL ) void SfxFrameDescriptor::SetURL( const INetURLObject& rURL ) { - aURL = rURL.GetMainURL(); + aURL = rURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); SetActualURL( aURL ); } @@ -457,7 +457,7 @@ void SfxFrameDescriptor::SetActualURL( const String& rURL ) void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL ) { - SetActualURL( rURL.GetMainURL() ); + SetActualURL( rURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); } void SfxFrameDescriptor::SetEditable( BOOL bSet ) @@ -523,7 +523,8 @@ BOOL SfxFrameDescriptor::Store( SvStream& rStream ) const if ( bReadOnly ) nFlags1 |= 0x04; - rStream.WriteByteString( INetURLObject::AbsToRel( aURL.GetMainURL() ), RTL_TEXTENCODING_UTF8 ); + rStream.WriteByteString( INetURLObject::AbsToRel( aURL.GetMainURL( + INetURLObject::DECODE_TO_IURI ) ), RTL_TEXTENCODING_UTF8 ); rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); rStream << aMargin << nWidth @@ -952,7 +953,7 @@ USHORT SfxFrameDescriptor::GetItemPos() const SfxFrameProperties::SfxFrameProperties( const SfxFrameDescriptor *pD ) - : aURL( pD->GetURL().GetMainURL() ) + : aURL( pD->GetURL().GetMainURL( INetURLObject::DECODE_TO_IURI ) ) , aName( pD->GetName() ) , lMarginWidth( pD->GetMargin().Width() ) , lMarginHeight( pD->GetMargin().Height() ) diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk index 5cac47089be6..fcbf8d55fc8f 100644 --- a/sfx2/source/doc/makefile.mk +++ b/sfx2/source/doc/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: mba $ $Date: 2001-09-10 15:36:46 $ +# last change: $Author: hr $ $Date: 2003-03-27 11:28:13 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -112,6 +112,7 @@ EXCEPTIONSFILES=$(SLO)$/objuno.obj \ $(SLO)$/doctemplates.obj \ $(SLO)$/sfxbasemodel.obj \ $(SLO)$/objxtor.obj \ + $(SLO)$/objstor.obj \ $(SLO)$/xmlversion.obj # --- Tagets ------------------------------------------------------- diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 581861ab1ec7..582fa7bf01a7 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -2,9 +2,9 @@ * * $RCSfile: new.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ka $ $Date: 2002-08-26 11:49:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,6 +238,7 @@ void SfxPreviewWin_Impl::ImpPaint( } Point bPoint=Point(nWidth,nHeight)-aPoint; + pWindow->SetLineColor(); Color aLightGrayCol( COL_LIGHTGRAY ); pWindow->SetFillColor( aLightGrayCol ); @@ -269,9 +270,12 @@ SfxPreviewWin::SfxPreviewWin( SetHelpId( HID_PREVIEW_FRAME ); // adjust contrast mode initially - bool bUseContrast = true && GetSettings().GetStyleSettings().GetHighContrastMode(); - bUseContrast = bUseContrast && UseHighContrastSetting(); + bool bUseContrast = UseHighContrastSetting(); SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); + + // #107818# This preview window is for document previews. Therefore + // right-to-left mode should be off + EnableRTL( FALSE ); } void SfxPreviewWin::Paint( const Rectangle& rRect ) @@ -316,16 +320,14 @@ void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { // adjust contrast mode - bool bUseContrast = true && GetSettings().GetStyleSettings().GetHighContrastMode(); - bUseContrast = bUseContrast && UseHighContrastSetting(); + bool bUseContrast = UseHighContrastSetting(); SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); } } bool SfxPreviewWin::UseHighContrastSetting() const { - SvtAccessibilityOptions aAccOptions; - return true && aAccOptions.GetIsForDrawings(); + return GetSettings().GetStyleSettings().GetHighContrastMode(); } diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src index d20096c48fe7..7cdaabf2a5fd 100644 --- a/sfx2/source/doc/new.src +++ b/sfx2/source/doc/new.src @@ -2,9 +2,9 @@ * * $RCSfile: new.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2002-09-05 17:09:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,7 +136,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "영역(~C)"; Text[ turkish ] = "~Kategori"; Text[ language_user1 ] = " "; - Text[ catalan ] = "rees"; + Text[ catalan ] = "~Categories"; + Text[ thai ] = "~ประเภท"; }; FixedText FT_TEMPLATE { @@ -163,10 +164,11 @@ ModalDialog DLG_NEW_FILE Text[ chinese_traditional ] = "樣式(~E)"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "스타일(~E)"; + Text[ korean ] = "서식 파일(~E)"; Text[ turkish ] = "~ablon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Estils"; + Text[ catalan ] = "~Plantilles"; + Text[ thai ] = "แม่แ~บบ"; }; ListBox LB_TEMPLATE { @@ -195,7 +197,7 @@ ModalDialog DLG_NEW_FILE Delta = 148 ; MapUnit = MAP_APPFONT ; Text[ chinese_simplified ] = "附加(~M)"; - Text[ russian ] = "~"; + Text[ russian ] = "~"; Text[ polish ] = "~Dodatki"; Text[ japanese ] = "詳細(~M)"; Text[ chinese_traditional ] = "附加(~M)"; @@ -204,7 +206,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "옵션(~M)"; Text[ turkish ] = "~Aralar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "~Opcions"; + Text[ thai ] = "~รายละเอียด"; }; Window WIN_PREVIEW { @@ -233,7 +236,7 @@ ModalDialog DLG_NEW_FILE Text [ english_us ] = "Pre~view" ; Hide = TRUE ; Text[ chinese_simplified ] = "预览(~V)"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ polish ] = "Po~dgld"; Text[ japanese ] = "プレビュー(~V)"; Text[ chinese_traditional ] = "檢視(~V)"; @@ -242,7 +245,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "미리보기(~V)"; Text[ turkish ] = "~nizleme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pre~visualizacin"; + Text[ catalan ] = "Pre~visualitzaci"; + Text[ thai ] = "แสด~งตัวอย่าง"; }; FixedLine GB_DOCINFO { @@ -271,7 +275,8 @@ ModalDialog DLG_NEW_FILE Text[ turkish ] = "Tanm"; Text[ language_user1 ] = " "; Text[ catalan ] = "Descripci"; - Text[ finnish ] = "Kuvaus"; + Text[ finnish ] = "Asiakirjan tiedot"; + Text[ thai ] = "คำอธิบาย"; }; CheckBox CB_TEXT_STYLE { @@ -300,6 +305,7 @@ ModalDialog DLG_NEW_FILE Text[ turkish ] = "~Metin"; Text[ finnish ] = "Teks~ti"; Text[ catalan ] = "Te~xt"; + Text[ thai ] = "ข้อ~ความ"; }; CheckBox CB_FRAME_STYLE { @@ -318,7 +324,7 @@ ModalDialog DLG_NEW_FILE Text [ portuguese_brazilian ] = "Rahmen" ; Text [ portuguese ] = "Mol~dura" ; Text[ chinese_simplified ] = "框(~F)"; - Text[ russian ] = ""; + Text[ russian ] = "~"; Text[ polish ] = "Ramka"; Text[ japanese ] = "枠(~F)"; Text[ chinese_traditional ] = "文字方塊(~F)"; @@ -327,7 +333,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "프레임(~F)"; Text[ turkish ] = "ereve"; Text[ finnish ] = "~Kehys"; - Text[ catalan ] = "~Frame"; + Text[ catalan ] = "~Marc"; + Text[ thai ] = "~กรอบ"; }; CheckBox CB_PAGE_STYLE { @@ -355,7 +362,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "페이지(~P)"; Text[ turkish ] = "Sayfa"; Text[ finnish ] = "~Sivut"; - Text[ catalan ] = "~Pages"; + Text[ catalan ] = "~Pgines"; + Text[ thai ] = "~หน้า"; }; CheckBox CB_NUM_STYLE { @@ -382,8 +390,9 @@ ModalDialog DLG_NEW_FILE Text[ greek ] = ""; Text[ korean ] = "번호 매기기(~U)"; Text[ turkish ] = "Numaralama"; - Text[ finnish ] = "Nu~merointi"; - Text[ catalan ] = "N~umbering"; + Text[ finnish ] = "Numerointi"; + Text[ catalan ] = "N~umeraci"; + Text[ thai ] = "ลำดับ~ตัวเลข"; }; CheckBox CB_MERGE_STYLE { @@ -410,8 +419,9 @@ ModalDialog DLG_NEW_FILE Text[ greek ] = ""; Text[ korean ] = "덮어쓰기(~O)"; Text[ turkish ] = "zerine yaz"; - Text[ finnish ] = "~Korvaa"; - Text[ catalan ] = "~Overwrite"; + Text[ finnish ] = "Korvaa"; + Text[ catalan ] = "~Sobrescriu"; + Text[ thai ] = "เ~ขียนทับ"; }; PushButton PB_LOAD_FILE { @@ -424,10 +434,10 @@ ModalDialog DLG_NEW_FILE Text[ portuguese ] = "Do ficheiro..."; Text[ russian ] = " ..."; Text[ greek ] = "From file..."; - Text[ dutch ] = "From file..."; + Text[ dutch ] = "Uit bestand..."; Text[ french ] = " partir d'un fichier..."; Text[ spanish ] = "De archivo..."; - Text[ finnish ] = "Tiedostosta"; + Text[ finnish ] = "Tiedostosta..."; Text[ italian ] = "Da file..."; Text[ danish ] = "Fra fil..."; Text[ swedish ] = "Frn fil..."; @@ -439,7 +449,8 @@ ModalDialog DLG_NEW_FILE Text[ chinese_traditional ] = "從檔案..."; Text[ turkish ] = "From file..."; Text[ arabic ] = "From file..."; - Text[ catalan ] = "From file..."; + Text[ catalan ] = "Del fitxer..."; + Text[ thai ] = "จากแฟ้ม..."; }; String STR_LOAD_TEMPLATE { @@ -447,7 +458,7 @@ ModalDialog DLG_NEW_FILE Text [ English ] = "Load templates" ; Text [ english_us ] = "Load Styles" ; Text [ italian ] = "Carica modelli" ; - Text [ spanish ] = "Cargar plantillas" ; + Text [ spanish ] = "Cargar estilos" ; Text [ french ] = "Charger les styles" ; Text [ dutch ] = "Opmaakprofielen laden" ; Text [ swedish ] = "Ladda mallar" ; @@ -455,16 +466,17 @@ ModalDialog DLG_NEW_FILE Text [ portuguese ] = "Carregar estilos" ; Text [ portuguese_brazilian ] = "Vorlagen laden" ; Text[ chinese_simplified ] = "装入样式"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "aduj style"; Text[ japanese ] = "スタイルの読み込み"; Text[ chinese_traditional ] = "載入樣式"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "템플릿 로드"; + Text[ korean ] = "스타일 로드"; Text[ turkish ] = "Biim ykle"; - Text[ finnish ] = "Lataa mallipohjat"; - Text[ catalan ] = "Load Templates"; + Text[ finnish ] = "Lataa tyylit"; + Text[ catalan ] = "Carrega plantilles"; + Text[ thai ] = "โหลดแม่แบบ"; }; FixedText FT_TITLE { @@ -495,6 +507,7 @@ ModalDialog DLG_NEW_FILE Text[ turkish ] = "~Balk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Ttol"; + Text[ thai ] = "~ชื่อ"; }; Edit ED_TITLE { @@ -519,7 +532,7 @@ ModalDialog DLG_NEW_FILE Text [ french ] = "S~ujet" ; Text [ swedish ] = "Te~ma" ; Text [ dutch ] = "~Onderwerp" ; - Text [ spanish ] = "Tema" ; + Text [ spanish ] = "~Asunto" ; Text [ english_us ] = "Subject" ; Hide = TRUE ; Text[ chinese_simplified ] = "主题"; @@ -532,7 +545,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "주제"; Text[ turkish ] = "Konu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tema"; + Text[ catalan ] = "Assumpte"; + Text[ thai ] = "ชื่อเรื่อง"; }; Edit ED_THEMA { @@ -552,7 +566,7 @@ ModalDialog DLG_NEW_FILE Text [ italian ] = "Parole chiave" ; Text [ portuguese_brazilian ] = "Palavras-chave" ; Text [ portuguese ] = "~Palavras-chave" ; - Text [ finnish ] = "~Avainsanat" ; + Text [ finnish ] = "Avain~sanat" ; Text [ danish ] = "Ngleord" ; Text [ french ] = "Mots-cl~s" ; Text [ swedish ] = "~Nyckelord" ; @@ -570,7 +584,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "키워드(~K)"; Text[ turkish ] = "A~nahtar szckler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Palabras ~clave"; + Text[ catalan ] = "~Paraules clau"; + Text[ thai ] = "คำ~สำคัญ"; }; Edit ED_KEYWORDS { @@ -590,7 +605,7 @@ ModalDialog DLG_NEW_FILE Text [ italian ] = "Descrizione" ; Text [ portuguese_brazilian ] = "Descri??o" ; Text [ portuguese ] = "~Descrio" ; - Text [ finnish ] = "~Kuvaus" ; + Text [ finnish ] = "Ku~vaus" ; Text [ danish ] = "Beskrivelse" ; Text [ french ] = "Description" ; Text [ swedish ] = "B~eskrivning" ; @@ -608,7 +623,8 @@ ModalDialog DLG_NEW_FILE Text[ korean ] = "설명(~D)"; Text[ turkish ] = "~Tanm"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Descripcin"; + Text[ catalan ] = "~Descripci"; + Text[ thai ] = "~คำอธิบาย"; }; MultiLineEdit ED_DESC { @@ -631,9 +647,15 @@ ModalDialog DLG_NEW_FILE Text[ chinese_traditional ] = "開啟新檔"; Text[ arabic ] = ""; Text[ greek ] = ""; - Text[ korean ] = "새로"; + Text[ korean ] = "새로 만들기"; Text[ turkish ] = "Yeni"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nou"; + Text[ thai ] = "ใหม่"; }; + + + + + diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e62c10dafc23..696b0c633656 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objcont.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: hr $ $Date: 2002-11-14 14:30:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -253,8 +253,8 @@ SfxViewFrame* SfxObjectShell::LoadWindows_Impl( SfxTopFrame *pPreferedFrame ) if ( pImp->bLoadingWindows || !pPreferedFrame ) return NULL; - const SfxFilter* pFilter; - if( GetMedium() && ( pFilter = GetMedium()->GetFilter() ) && !pFilter->UsesStorage() ) + DBG_ASSERT( GetMedium(), "A Medium should exist here!"); + if( !GetMedium() ) return 0; // get correct mode @@ -809,7 +809,7 @@ void SfxObjectShell::DocInfoDlg_Impl( SfxDocumentInfo &rDocInfo ) aURL += String::CreateFromAscii( GetFactory().GetShortName() ); aURL += DEFINE_CONST_UNICODE( "]" ); INetURLObject aURLObj( pImp->aNewName ); - aURL += aURLObj.GetMainURL(); + aURL += aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); // aTitle = aURLObj.GetBase(); } aTitle = GetTitle(); @@ -1793,6 +1793,7 @@ SfxEventConfigItem_Impl* SfxObjectShell::GetEventConfig_Impl( BOOL bForce ) { pImp->pEventConfig = new SfxEventConfigItem_Impl( SFX_ITEMTYPE_DOCEVENTCONFIG, SFX_APP()->GetEventConfig(), this ); + pImp->pEventConfig->Initialize(); } return pImp->pEventConfig; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index daa128859de6..1062e9bf49a4 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objmisc.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2002-11-14 14:31:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,6 +154,8 @@ using namespace ::com::sun::star::document; #include <svtools/pathoptions.hxx> #include <unotools/ucbhelper.hxx> +#include <tools/inetmime.hxx> +#include <svtools/inettype.hxx> #include "appdata.hxx" #include "request.hxx" @@ -450,6 +452,24 @@ sal_Bool SfxObjectShell::IsInModalMode() const return pImp->bModalMode || pImp->bRunningMacro; } +//------------------------------------------------------------------------- + +sal_Bool SfxObjectShell::HasModalViews() const +{ + SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); + while( pFrame ) + { + if ( pFrame->IsInModalMode() ) + return sal_True; + + pFrame = SfxViewFrame::GetNext( *pFrame, this ); + } + + return sal_False; +} + +//------------------------------------------------------------------------- + void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) { if ( !pImp->bRunningMacro != !bModal ) @@ -665,15 +685,6 @@ String SfxObjectShell::GetTitle return X( pNameItem->GetValue() ); } - if ( nMaxLength >= SFX_TITLE_CAPTION && nMaxLength <= SFX_TITLE_HISTORY ) - { - sal_uInt16 nRemote; - if( !pMed || pMed->GetURLObject().GetProtocol() == INET_PROT_FILE ) - nRemote = 0; - else nRemote = 1; - nMaxLength = aTitleMap_Impl[nMaxLength-SFX_TITLE_CAPTION][nRemote]; - } - // noch unbenannt? DBG_ASSERT( !HasName() || pMed, "HasName() aber kein Medium?!?" ); if ( !HasName() || !pMed ) @@ -692,9 +703,18 @@ String SfxObjectShell::GetTitle return X(aNoName); } + const INetURLObject& aURL = INetURLObject( pMed->GetName() ); + if ( nMaxLength >= SFX_TITLE_CAPTION && nMaxLength <= SFX_TITLE_HISTORY ) + { + sal_uInt16 nRemote; + if( !pMed || aURL.GetProtocol() == INET_PROT_FILE ) + nRemote = 0; + else + nRemote = 1; + nMaxLength = aTitleMap_Impl[nMaxLength-SFX_TITLE_CAPTION][nRemote]; + } // lokale Datei? - const INetURLObject& aURL = pMed->GetURLObject(); if ( aURL.GetProtocol() == INET_PROT_FILE ) { String aName( aURL.HasMark() ? INetURLObject( aURL.GetURLNoMark() ).PathToFileName() : aURL.PathToFileName() ); @@ -740,7 +760,7 @@ String SfxObjectShell::GetTitle return X(aName); } else if ( nMaxLength == SFX_TITLE_FULLNAME ) - return X(aURL.GetMainURL()); + return X(aURL.GetMainURL( INetURLObject::DECODE_TO_IURI )); // ggf. Titel aus Dateiname generieren if ( !pImp->aTitle.Len() ) @@ -958,7 +978,8 @@ void SfxObjectShell::SetAutoLoad( if ( bReload ) { pImp->pReloadTimer = new AutoReloadTimer_Impl( - rUrl.GetMainURL(), nTime, bReload, this ); + rUrl.GetMainURL( INetURLObject::DECODE_TO_IURI ), + nTime, bReload, this ); pImp->pReloadTimer->Start(); } } @@ -1004,6 +1025,12 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) pImp->nLoadedFlags & SFX_LOADED_IMAGES ) GetMedium()->SetUsesCache( sal_True ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, + SfxBoolItem, SID_HIDDEN, sal_False ); + pImp->bHidden = sal_False; + if ( pHiddenItem ) + pImp->bHidden = pHiddenItem->GetValue(); + if ( bSetModifiedTRUE ) SetModified( sal_True ); if ( pImp->nEventId ) @@ -1012,8 +1039,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) // mu\s das jetzt nachgeholt werden, indem der Frame benachrichtigt wird. Broadcast( SfxEventHint( SFX_EVENT_LOADFINISHED, this ) ); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); - if ( pHiddenItem && pHiddenItem->GetValue() ) + if ( pImp->bHidden ) { sal_uInt16 nId = pImp->nEventId; pImp->nEventId = 0; @@ -1334,8 +1360,8 @@ String SfxObjectShell::QueryTitle( SfxTitleQuery eType ) const case SFX_TITLE_QUERY_SAVE_NAME_PROPOSAL: { SfxMedium* pMed = GetMedium(); - const INetURLObject& rObj = pMed->GetURLObject(); - aRet = rObj.GetMainURL(); + const INetURLObject aObj( pMed->GetName() ); + aRet = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); if ( !aRet.Len() ) aRet = GetTitle( SFX_TITLE_CAPTION ); break; @@ -1365,8 +1391,7 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV ) if( aURL.Copy(0, 4).CompareIgnoreCaseToAscii( "url=" ) == COMPARE_EQUAL ) { INetURLObject aObj; - pDoc->GetMedium()->GetURLObject().GetNewAbsURL( - aURL.Copy( 4 ), &aObj ); + INetURLObject( pDoc->GetMedium()->GetName() ).GetNewAbsURL( aURL.Copy( 4 ), &aObj ); rInfo.SetReloadURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); } rInfo.EnableReload( sal_True ); @@ -1387,6 +1412,19 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV ) pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) ); } } + else if( rKV.GetKey().CompareIgnoreCaseToAscii( "content-type" ) == COMPARE_EQUAL ) + { + ::rtl::OString sContent = ::rtl::OUStringToOString( aValue, RTL_TEXTENCODING_ASCII_US ); + ByteString sType, sSubType; + INetContentTypeParameterList aParameters; + + if( INetContentTypes::parse( sContent, sType, sSubType, &aParameters ) ) + { + const INetContentTypeParameter * pCharset = aParameters.find("charset"); + if (pCharset != 0) + pDoc->GetMedium()->SetCharset( pCharset->m_sValue ); + } + } } void SfxHeaderAttributes_Impl::Append( const SvKeyValue& rKV ) @@ -1696,7 +1734,10 @@ String SfxObjectShell::UpdateTitle( SfxMedium* pMed, USHORT nDocViewNumber ) // Titel des Fensters String aTitle; if ( pMed ) - aTitle = pMed->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + { + INetURLObject aTmp( pMed->GetName() ); + aTitle = aTmp.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + } else { pMed = GetMedium(); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 341fee9e15fe..f9ce2822c6ee 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objserv.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: gt $ $Date: 2002-11-21 09:27:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -546,7 +546,8 @@ sal_Bool SfxObjectShell::GUISaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest) pFileDlg->CreateMatcher( GetFactory() ); } - if ( HasName() ) + SFX_ITEMSET_ARG( pMedSet, pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False ); + if ( HasName() && !( pRepairItem && pRepairItem->GetValue() ) ) { String aLastName = QueryTitle( SFX_TITLE_QUERY_SAVE_NAME_PROPOSAL ); const SfxFilter* pMedFilter = GetMedium()->GetFilter(); @@ -586,6 +587,10 @@ sal_Bool SfxObjectShell::GUISaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest) if ( pPassItem != NULL ) pParams->Put( SfxStringItem( SID_PASSWORD, ::rtl::OUString() ) ); + Reference < ::com::sun::star::view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), UNO_QUERY ); + if ( xSel.is() && xSel->getSelection().hasValue() ) + pParams->Put( SfxBoolItem( SID_SELECTION, TRUE ) ); + if ( pFileDlg->Execute( pParams, aFilterName ) != ERRCODE_NONE ) { SetError(ERRCODE_IO_ABORT); @@ -883,11 +888,10 @@ sal_Bool SfxObjectShell::GUISaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest) if( bOk ) { - const SfxFilter* pFilter = GetMedium()->GetFilter(); - if ( bDialogUsed && pFilter - && pFilter->IsOwnFormat() - && pFilter->UsesStorage() - && pFilter->GetVersion() >= SOFFICE_FILEFORMAT_60 + if ( bDialogUsed + && pFilt->IsOwnFormat() + && pFilt->UsesStorage() + && pFilt->GetVersion() >= SOFFICE_FILEFORMAT_60 ) { SfxViewFrame* pDocViewFrame = SfxViewFrame::GetFirst( this ); @@ -1414,7 +1418,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SfxDocumentTemplates *pTemplates = new SfxDocumentTemplates; // Find the template filter with the highest version number - const SfxFilter* pFilter; + const SfxFilter* pFilter=NULL; const SfxObjectFactory& rFactory = GetFactory(); USHORT nFilterCount = rFactory.GetFilterCount(); ULONG nVersion = 0; @@ -1692,12 +1696,24 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) break; } - if ( !GetMedium() ) - rSet.DisableItem(nWhich); + const SfxFilter* pCombinedFilters = NULL; + SfxFactoryFilterContainer* pFilterContainer = GetFactory().GetFilterContainer(); + + if ( pFilterContainer ) + { + SfxFilterFlags nMust = SFX_FILTER_IMPORT | SFX_FILTER_EXPORT; + SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED; + + pCombinedFilters = pFilterContainer->GetAnyFilter( nMust, nDont ); + } + + if ( !pCombinedFilters || !GetMedium() ) + rSet.DisableItem( nWhich ); else if ( pObj && pObj->GetProtocol().IsEmbed() ) rSet.Put( SfxStringItem( nWhich, String( SfxResId( STR_SAVECOPYDOC ) ) ) ); else rSet.Put( SfxStringItem( nWhich, String( SfxResId( STR_SAVEASDOC ) ) ) ); + break; } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 416a6b63b3f0..d7e3c2b8523f 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objstor.cxx,v $ * - * $Revision: 1.111 $ + * $Revision: 1.112 $ * - * last change: $Author: hr $ $Date: 2002-11-14 14:33:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,6 +110,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_MACROEXECMODE_HPP_ +#include <com/sun/star/document/MacroExecMode.hpp> +#endif #ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #endif @@ -341,6 +344,8 @@ sal_Bool SfxObjectShell::DoInitNew( SvStorage * pStor ) if ( InitNew( pStor ) ) { + // empty documents always get their macros from the user, so there is no reason to restrict access + pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN; if ( SFX_CREATE_MODE_EMBEDDED == eCreateMode ) SetTitle( String( SfxResId( STR_NONAME ) )); @@ -365,6 +370,25 @@ sal_Bool SfxObjectShell::DoInitNew( SvStorage * pStor ) //------------------------------------------------------------------------- +void SfxObjectShell::DoHandsOffNoMediumClose() +{ + const SfxFilter *pFilter = pMedium->GetFilter(); + if( !pFilter || pFilter->IsOwnFormat() || ( pFilter->GetFilterFlags() & SFX_FILTER_PACKED ) ) + HandsOff(); + + // Force document library containers to release storage + SotStorageRef xDummyStorage; + SfxDialogLibraryContainer* pDialogCont = pImp->pDialogLibContainer; + if( pDialogCont ) + pDialogCont->setStorage( xDummyStorage ); + + SfxScriptLibraryContainer* pBasicCont = pImp->pBasicLibContainer; + if( pBasicCont ) + pBasicCont->setStorage( xDummyStorage ); +} + +//------------------------------------------------------------------------- + void SfxObjectShell::DoHandsOff() /* [Beschreibung] @@ -382,20 +406,7 @@ void SfxObjectShell::DoHandsOff() */ { - const SfxFilter *pFilter = pMedium->GetFilter(); - if( !pFilter || pFilter->IsOwnFormat() || ( pFilter->GetFilterFlags() & SFX_FILTER_PACKED ) ) - HandsOff(); - - // Force document library containers to release storage - SotStorageRef xDummyStorage; - SfxDialogLibraryContainer* pDialogCont = pImp->pDialogLibContainer; - if( pDialogCont ) - pDialogCont->setStorage( xDummyStorage ); - - SfxScriptLibraryContainer* pBasicCont = pImp->pBasicLibContainer; - if( pBasicCont ) - pBasicCont->setStorage( xDummyStorage ); - + DoHandsOffNoMediumClose(); pMedium->Close(); // DELETEZ( pMedium ); } @@ -561,11 +572,14 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) } } - sal_uInt32 nError = HandleFilter( pMedium, this ); - if ( nError != ERRCODE_NONE ) - SetError( nError ); + if ( pMedium->GetFilter() ) + { + sal_uInt32 nError = HandleFilter( pMedium, this ); + if ( nError != ERRCODE_NONE ) + SetError( nError ); + } - if ( GetError() == ERRCODE_NONE && bHasStorage && !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) + if ( GetError() == ERRCODE_NONE && bHasStorage && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) ) { SvStorageRef xStor( pMed->GetStorage() ); if( pMed->GetLastStorageCreationState() == ERRCODE_NONE ) @@ -592,7 +606,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SvStorageInfoList aList; xStor->FillInfoList( &aList ); if ( !aList.Count() && !xStor->IsOLEStorage() ) - SetError( ERRCODE_IO_WRONGFORMAT ); + SetError( ERRCODE_IO_BROKENPACKAGE ); else { BOOL bHasMacros = FALSE; @@ -603,6 +617,11 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( bHasMacros ) AdjustMacroMode( String() ); + else + { + // if macros will be added by the user later, the security check is obsolete + pImp->nMacroMode = MacroExecMode::ALWAYS_EXECUTE_NO_WARN; + } } } @@ -673,8 +692,8 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { try { - ::ucb::Content aContent( pMedium->GetName(), Reference < XCommandEnvironment >() ); - Reference < XPropertySetInfo > xProps = aContent.getProperties(); + ::ucb::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < XCommandEnvironment >() ); + com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { ::rtl::OUString aAuthor( RTL_CONSTASCII_USTRINGPARAM("Author") ); @@ -729,6 +748,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) pMedium->GetItemSet()->ClearItem( SID_DOCUMENT ); } + pMedium->GetItemSet()->ClearItem( SID_REFERER ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ( GetModel(), ::com::sun::star::uno::UNO_QUERY ); if ( xModel.is() ) { @@ -778,11 +798,11 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo SFX_ITEMSET_ARG( pSet, pData, SfxUsrAnyItem, SID_FILTER_DATA, sal_False ); if ( !pData && !pOptions ) { - Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - Reference< XNameAccess > xFilterCFG; + com::sun::star::uno::Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); + com::sun::star::uno::Reference< XNameAccess > xFilterCFG; if( xServiceManager.is() ) { - xFilterCFG = Reference< XNameAccess >( + xFilterCFG = com::sun::star::uno::Reference< XNameAccess >( xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY ); } @@ -805,7 +825,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo aProps[nProperty].Value >>= aServiceName; if( aServiceName.getLength() ) { - Reference< XInteractionHandler > rHandler = pMedium->GetInteractionHandler(); + com::sun::star::uno::Reference< XInteractionHandler > rHandler = pMedium->GetInteractionHandler(); if( rHandler.is() ) { // we need some properties in the media descriptor, so we have to make sure that they are in @@ -822,7 +842,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo TransformItems( SID_OPENDOC, *pSet, rProperties, NULL ); RequestFilterOptions* pFORequest = new RequestFilterOptions( pDoc->GetModel(), rProperties ); - Reference< XInteractionRequest > rRequest( pFORequest ); + com::sun::star::uno::Reference< XInteractionRequest > rRequest( pFORequest ); rHandler->handle( rRequest ); if ( !pFORequest->isAbort() ) @@ -1210,11 +1230,31 @@ sal_Bool SfxObjectShell::SaveTo_Impl bOk = rMedium.Commit(); EnableSetModified( sal_True ); - // watch: if the document was successfully saved into an own format, no "SaveCompleted" was called, - // this must be done by the caller ( because they want to do different calls ) - if ( xNewTempRef.Is() && xNewTempRef != GetStorage() ) - // if the new object storage is a temporary one, because the target format is an alien format - SaveCompleted( xNewTempRef ); + if ( bOk ) + { + // watch: if the document was successfully saved into an own format, no "SaveCompleted" was called, + // this must be done by the caller ( because they want to do different calls ) + if( xNewTempRef.Is() && xNewTempRef != GetStorage() ) + // if the new object storage is a temporary one, because the target format is an alien format + SaveCompleted( xNewTempRef ); + } + else + { + // if the storing process fails on medium commit step it means that + // the new medium should contain successfully written temporary representation + // of the document, so the docshell can just switch to new medium. + // it is reasonable in case an open document suddenly became unavailable. + + OUString aOrigName = pMedium ? OUString(pMedium->GetName()) : OUString(); + if ( aOrigName && aOrigName.compareToAscii( "private:", 8 ) != COMPARE_EQUAL + && !::utl::UCBContentHelper::Exists( aOrigName ) ) + { + if ( !IsHandsOff() ) + DoHandsOff(); + + rMedium.MoveTempTo_Impl( pMedium ); + } + } } } @@ -1237,8 +1277,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { - ::ucb::Content aContent( rMedium.GetName(), Reference < XCommandEnvironment >() ); - Reference < XPropertySetInfo > xProps = aContent.getProperties(); + ::ucb::Content aContent( rMedium.GetName(), com::sun::star::uno::Reference < XCommandEnvironment >() ); + com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { ::rtl::OUString aAuthor( RTL_CONSTASCII_USTRINGPARAM("Author") ); @@ -1565,11 +1605,20 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium ) if ( !bHasInputStream ) { pNewValue[i].Name = sInputStream; - pNewValue[i].Value <<= Reference < com::sun::star::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( *rMedium.GetInStream() ) ); + pNewValue[i].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( *rMedium.GetInStream() ) ); } else aArgs.realloc ( i-1 ); - xLoader->filter( aArgs ); + + try + { + xLoader->filter( aArgs ); + } + catch (com::sun::star::uno::Exception&) + { + return sal_False; + } + return sal_True; } @@ -1640,7 +1689,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) if ( !bHasStream ) { pNewValue[i].Name = sOutputStream; - pNewValue[i].Value <<= Reference < com::sun::star::io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) ); + pNewValue[i].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) ); } else aArgs.realloc ( i-1 ); @@ -1777,7 +1826,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // an interaction handler here can aquire only in case of GUI Saving // and should be removed after the saving is done - Reference< XInteractionHandler > xInteract; + com::sun::star::uno::Reference< XInteractionHandler > xInteract; SFX_ITEMSET_ARG( pArgs, pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False ); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny( xInteract ) ) ); @@ -1933,40 +1982,41 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl if (!pImp->bSetStandardName) pImp->bDidWarnFormat=sal_False; - // Muss !!! - if ( IsOwnStorageFormat_Impl(*GetMedium())) - SetFileName( GetMedium()->GetPhysicalName() ); - // Daten am Medium updaten SfxItemSet *pSet = GetMedium()->GetItemSet(); - pSet->ClearItem( SID_REFERER ); - pSet->ClearItem( SID_POSTDATA ); - pSet->ClearItem( SID_TEMPLATE ); - pSet->ClearItem( SID_DOC_READONLY ); - pSet->ClearItem( SID_CONTENTTYPE ); - pSet->ClearItem( SID_CHARSET ); - pSet->ClearItem( SID_FILTER_NAME ); - pSet->ClearItem( SID_OPTIONS ); - //pSet->ClearItem( SID_FILE_FILTEROPTIONS ); - pSet->ClearItem( SID_VERSION ); - //pSet->ClearItem( SID_USE_FILTEROPTIONS ); pSet->ClearItem( SID_INTERACTIONHANDLER ); - SFX_ITEMSET_GET( (*aParams), pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False ); - if ( pFilterItem ) - pSet->Put( *pFilterItem ); - - SFX_ITEMSET_GET( (*aParams), pOptionsItem, SfxStringItem, SID_OPTIONS, sal_False ); - if ( pOptionsItem ) - pSet->Put( *pOptionsItem ); - - SFX_ITEMSET_GET( (*aParams), pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); - if ( pFilterOptItem ) - pSet->Put( *pFilterOptItem ); + if ( !bSaveTo ) + { + pSet->ClearItem( SID_REFERER ); + pSet->ClearItem( SID_POSTDATA ); + pSet->ClearItem( SID_TEMPLATE ); + pSet->ClearItem( SID_DOC_READONLY ); + pSet->ClearItem( SID_CONTENTTYPE ); + pSet->ClearItem( SID_CHARSET ); + pSet->ClearItem( SID_FILTER_NAME ); + pSet->ClearItem( SID_OPTIONS ); + //pSet->ClearItem( SID_FILE_FILTEROPTIONS ); + pSet->ClearItem( SID_VERSION ); + //pSet->ClearItem( SID_USE_FILTEROPTIONS ); + pSet->ClearItem( SID_EDITDOC ); + + SFX_ITEMSET_GET( (*aParams), pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + if ( pFilterItem ) + pSet->Put( *pFilterItem ); + + SFX_ITEMSET_GET( (*aParams), pOptionsItem, SfxStringItem, SID_OPTIONS, sal_False ); + if ( pOptionsItem ) + pSet->Put( *pOptionsItem ); + + SFX_ITEMSET_GET( (*aParams), pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); + if ( pFilterOptItem ) + pSet->Put( *pFilterOptItem ); + } SFX_APP()->NotifyEvent(SfxEventHint(SFX_EVENT_SAVEASDOCDONE,this)); - if ( bWasReadonly ) + if ( bWasReadonly && !bSaveTo ) Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); return sal_True; @@ -1994,6 +2044,8 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl pMergedParams->ClearItem( SID_INPUTSTREAM ); pMergedParams->ClearItem( SID_CONTENT ); + pMergedParams->ClearItem( SID_REPAIRPACKAGE ); + // "SaveAs" will never store any version information - it's a complete new file ! pMergedParams->ClearItem( SID_VERSION ); @@ -2048,7 +2100,8 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // distinguish between "Save" and "SaveAs" pImp-> bIsSaving = sal_False; - if ( IsOwnStorageFormat_Impl(*pNewFile) ) + sal_Bool bToOwnFormat = IsOwnStorageFormat_Impl(*pNewFile); + if ( bToOwnFormat ) { // If the filter is a "cross export" filter ( f.e. a filter for exporting an impress document from // a draw document ), the ClassId of the destination storage is different from the ClassId of this @@ -2083,7 +2136,13 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // notify the document that saving was done successfully if ( !bCopyTo ) + { + // Muss !!! + if ( bToOwnFormat ) + SetFileName( pNewFile->GetPhysicalName() ); + bOk = DoSaveCompleted( pNewFile ); + } if( bOk ) { diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index eda1da75e325..f7454b18954c 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objxtor.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: mba $ $Date: 2002-09-20 16:02:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,7 +124,6 @@ #include <unotools/ucbhelper.hxx> #include <svtools/asynclink.hxx> -#include "picklist.hxx" #include "docfac.hxx" #include "docfile.hxx" #include "event.hxx" @@ -167,11 +166,8 @@ DBG_NAME(SfxObjectShell); #define DocumentInfo #include "sfxslots.hxx" -#if SUPD>636 extern svtools::AsynchronLink* pPendingCloser; -#else -extern AsynchronLink* pPendingCloser; -#endif +static SfxObjectShell* pWorkingDoc = NULL; //========================================================================= @@ -570,10 +566,6 @@ sal_uInt16 SfxObjectShell::PrepareClose { // Bei Nein nicht noch Informationlost bClose = sal_True; - - // nicht mehr aus Cache nachladen - MemCache_Impl &rCache = SfxPickList_Impl::Get()->GetMemCache(); - rCache.RemoveObject( this ); } } } @@ -843,6 +835,11 @@ SfxObjectShell* SfxObjectShell::GetObjectShell() SEQUENCE< OUSTRING > SfxObjectShell::GetEventNames() { + return GetEventNames_Impl(); +} + +SEQUENCE< OUSTRING > SfxObjectShell::GetEventNames_Impl() +{ ::vos::OGuard aGuard( Application::GetSolarMutex() ); ResStringArray aEventNames( SfxResId( EVENT_NAMES_ARY ) ); @@ -915,3 +912,31 @@ void SfxObjectShell::SetAutoStyleFilterIndex(sal_uInt16 nSet) pImp->nStyleFilter = nSet; } +void SfxObjectShell::SetWorkingDocument( SfxObjectShell* pDoc ) +{ + pWorkingDoc = pDoc; + StarBASIC* pBas = SFX_APP()->GetBasic_Impl(); + if ( pDoc && pBas ) + { + SFX_APP()->Get_Impl()->pThisDocument = pDoc; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface ( pDoc->GetModel() , ::com::sun::star::uno::UNO_QUERY ); + ::com::sun::star::uno::Any aComponent; + aComponent <<= xInterface; + SbxVariable *pCompVar = pBas->Find( DEFINE_CONST_UNICODE("ThisComponent"), SbxCLASS_PROPERTY ); + if ( pCompVar ) + { + pCompVar->PutObject( GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aComponent ) ); + } + else + { + SbxObjectRef xUnoObj = GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aComponent ); + xUnoObj->SetFlag( SBX_DONTSTORE ); + pBas->Insert( xUnoObj ); + } + } +} + +SfxObjectShell* SfxObjectShell::GetWorkingDocument() +{ + return pWorkingDoc; +} diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f1d8817256cd..3dc3c6c18118 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxbasemodel.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: mib $ $Date: 2002-11-05 08:10:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,10 @@ // include of other projects //________________________________________________________________________________________________________ +#ifndef _COM_SUN_STAR_VIEW_XPRINTJOB_HPP_ +#include <com/sun/star/view/XPrintJob.hpp> +#endif + #ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_ #include <com/sun/star/view/XSelectionSupplier.hpp> #endif @@ -163,6 +167,7 @@ #endif #include <vos/mutex.hxx> +#include <svtools/printdlg.hxx> //________________________________________________________________________________________________________ // includes of my own project @@ -226,6 +231,8 @@ #include "topfrm.hxx" #include "appdata.hxx" +#include "docfac.hxx" +#include "fcontnr.hxx" //________________________________________________________________________________________________________ // defines @@ -252,7 +259,7 @@ #define OIMPLEMENTATIONID ::cppu::OImplementationId #define MUTEXGUARD ::osl::MutexGuard #define XINDEXCONTAINER ::com::sun::star::container::XIndexContainer - +#define XPRINTJOBLISTENER ::com::sun::star::view::XPrintJobListener //________________________________________________________________________________________________________ // namespaces //________________________________________________________________________________________________________ @@ -287,12 +294,12 @@ struct IMPL_SfxBaseModel_DataContainer REFERENCE< XCONTROLLER > m_xCurrent ; REFERENCE< XDOCUMENTINFO > m_xDocumentInfo ; REFERENCE< XSTARBASICACCESS > m_xStarBasicAccess ; -#if SUPD>614 REFERENCE< XNAMEREPLACE > m_xEvents ; -#endif SEQUENCE< PROPERTYVALUE> m_seqArguments ; SEQUENCE< REFERENCE< XCONTROLLER > > m_seqControllers ; REFERENCE< XINDEXACCESS > m_contViewData ; + REFERENCE< com::sun::star::view::XPrintJob> m_xPrintJob ; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrintOptions; IMPL_SfxBaseModel_DataContainer::IMPL_SfxBaseModel_DataContainer( MUTEX& aMutex , SfxObjectShell* pObjectShell ) @@ -325,6 +332,44 @@ Size impl_Size_Struct2Object( const SIZE& aSize ) return aReturnValue ; } +class SfxPrintJob_Impl : public cppu::WeakImplHelper1 +< + com::sun::star::view::XPrintJob +> +{ + IMPL_SfxBaseModel_DataContainer* m_pData; + +public: + SfxPrintJob_Impl( IMPL_SfxBaseModel_DataContainer* pData ); + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException); + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException); + virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException); +}; + +SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_SfxBaseModel_DataContainer* pData ) + : m_pData( pData ) +{ +} + +Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException) +{ + return m_pData->m_aPrintOptions; +} + +Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException) +{ + Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell->GetModel(), UNO_QUERY ); + if ( xPrintable.is() ) + return xPrintable->getPrinter(); + return Sequence< ::com::sun::star::beans::PropertyValue >(); +} + +Reference< ::com::sun::star::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException) +{ + Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell->GetModel(), UNO_QUERY ); + return xPrintable; +} + //________________________________________________________________________________________________________ // constructor //________________________________________________________________________________________________________ @@ -374,6 +419,7 @@ ANY SAL_CALL SfxBaseModel::queryInterface( const UNOTYPE& rType ) throw( RUNTIME if ( aReturn.hasValue() == sal_False ) { aReturn = ::cppu::queryInterface( rType , + static_cast< XPRINTJOBBROADCASTER* > ( this ) , static_cast< XCLOSEBROADCASTER* > ( this ) , static_cast< XVIEWDATASUPPLIER* > ( this ) , static_cast< XEVENTBROADCASTER* > ( this ) , @@ -452,6 +498,7 @@ SEQUENCE< UNOTYPE > SAL_CALL SfxBaseModel::getTypes() throw( RUNTIMEEXCEPTION ) ::getCppuType(( const REFERENCE< XEVENTBROADCASTER >*)NULL ) ); static OTYPECOLLECTION aTypeCollection ( ::getCppuType(( const REFERENCE< XVIEWDATASUPPLIER >*)NULL ) , + ::getCppuType(( const REFERENCE< XPRINTJOBBROADCASTER >*)NULL ) , ::getCppuType(( const REFERENCE< XEVENTSSUPPLIER >*)NULL ) , aTypeCollectionFirst.getTypes() ); @@ -754,6 +801,17 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUSTRING& ::osl::MutexGuard aGuard( m_aMutex ); m_pData->m_sURL = rURL ; m_pData->m_seqArguments = rArgs ; + + if ( m_pData->m_pObjectShell ) + { + SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() ); + TransformParameters( SID_OPENDOC, rArgs, aSet ); + m_pData->m_pObjectShell->GetMedium()->GetItemSet()->Put( aSet ); + SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + if ( pItem ) + m_pData->m_pObjectShell->GetMedium()->SetFilter( m_pData->m_pObjectShell->GetFactory().GetFilterContainer()->GetFilter( pItem->GetValue() ) ); + } + return sal_True ; } @@ -774,6 +832,49 @@ OUSTRING SAL_CALL SfxBaseModel::getURL() throw(::com::sun::star::uno::RuntimeExc SEQUENCE< PROPERTYVALUE > SAL_CALL SfxBaseModel::getArgs() throw(::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); + + if ( m_pData->m_pObjectShell ) + { + SEQUENCE< PROPERTYVALUE > seqArgsNew; + SEQUENCE< PROPERTYVALUE > seqArgsOld; + SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() ); + + // we need to know which properties are supported by the transformer + // hopefully it is a temporary solution, I guess nonconvertable properties + // should not be supported so then there will be only ItemSet from medium + + TransformItems( SID_OPENDOC, *(m_pData->m_pObjectShell->GetMedium()->GetItemSet()), seqArgsNew ); + TransformParameters( SID_OPENDOC, m_pData->m_seqArguments, aSet ); + TransformItems( SID_OPENDOC, aSet, seqArgsOld ); + + sal_Int32 nOrgLength = m_pData->m_seqArguments.getLength(); + sal_Int32 nOldLength = seqArgsOld.getLength(); + sal_Int32 nNewLength = seqArgsNew.getLength(); + + for ( sal_Int32 nOrg = 0; nOrg < nOrgLength; nOrg++ ) + { + sal_Int32 nOldInd = 0; + while ( nOldInd < nOldLength ) + { + if ( m_pData->m_seqArguments[nOrg].Name.equals( seqArgsOld[nOldInd].Name ) ) + break; + nOldInd++; + } + + if ( nOldInd == nOldLength ) + { + // the entity with this name should be new for seqArgsNew + // since it is not supported by transformer + + seqArgsNew.realloc( ++nNewLength ); + seqArgsNew[ nNewLength - 1 ].Name = m_pData->m_seqArguments[nOrg].Name; + seqArgsNew[ nNewLength - 1 ].Value = m_pData->m_seqArguments[nOrg].Value; + } + + } + m_pData->m_seqArguments = seqArgsNew; + } + return m_pData->m_seqArguments ; } @@ -1705,6 +1806,66 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , postEvent_Impl( *pNamedHint ); } + SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint ); + if ( pPrintHint ) + { + if ( pPrintHint->GetWhich() == -1 ) + { + if ( !m_pData->m_xPrintJob.is() ) + m_pData->m_xPrintJob = new SfxPrintJob_Impl( m_pData ); + + PrintDialog* pDlg = pPrintHint->GetPrintDialog(); + Printer* pPrinter = pPrintHint->GetPrinter(); + ::rtl::OUString aPrintFile ( pPrinter ? pPrinter->GetPrintFile() : String() ); + ::rtl::OUString aRangeText ( ( pDlg && pDlg->IsRangeChecked(PRINTDIALOG_RANGE) ) ? pDlg->GetRangeText() : String() ); + sal_Bool bSelectionOnly = ( ( pDlg && pDlg->IsRangeChecked(PRINTDIALOG_SELECTION) ) ? sal_True : sal_False ); + + sal_Int32 nArgs = 2; + if ( aPrintFile.getLength() ) + nArgs++; + if ( aRangeText.getLength() ) + nArgs++; + else if ( bSelectionOnly ) + nArgs++; + + m_pData->m_aPrintOptions.realloc(nArgs); + m_pData->m_aPrintOptions[0].Name = DEFINE_CONST_UNICODE("CopyCount"); + m_pData->m_aPrintOptions[0].Value <<= (sal_Int16) (pPrinter ? pPrinter->GetCopyCount() : 1 ); + m_pData->m_aPrintOptions[1].Name = DEFINE_CONST_UNICODE("Collate"); + m_pData->m_aPrintOptions[1].Value <<= (sal_Bool) (pDlg ? pDlg->IsCollateChecked() : sal_False ); + + if ( bSelectionOnly ) + { + m_pData->m_aPrintOptions[2].Name = DEFINE_CONST_UNICODE("Selection"); + m_pData->m_aPrintOptions[2].Value <<= bSelectionOnly; + } + else if ( aRangeText.getLength() ) + { + m_pData->m_aPrintOptions[2].Name = DEFINE_CONST_UNICODE("Pages"); + m_pData->m_aPrintOptions[2].Value <<= aRangeText; + } + + if ( aPrintFile.getLength() ) + { + m_pData->m_aPrintOptions[nArgs-1].Name = DEFINE_CONST_UNICODE("FileName"); + m_pData->m_aPrintOptions[nArgs-1].Value <<= aPrintFile; + } + } + else + { + view::PrintJobEvent aEvent; + aEvent.Source = m_pData->m_xPrintJob; + aEvent.State = (com::sun::star::view::PrintableState) pPrintHint->GetWhich(); + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) ); + if ( pContainer!=NULL ) + { + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + while (pIterator.hasMoreElements()) + ((view::XPrintJobListener*)pIterator.next())->printJobEvent( aEvent ); + } + } + } + if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_TITLECHANGED ) { ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle(); @@ -1941,3 +2102,22 @@ sal_Bool SfxBaseModel::hasEventListeners() const return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const REFERENCE< XDOCEVENTLISTENER >*)0) ) ); } + +void SAL_CALL SfxBaseModel::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +{ + // object already disposed? + if ( impl_isDisposed() ) + return; + + m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener ); +} + +void SAL_CALL SfxBaseModel::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +{ + // object already disposed? + if ( impl_isDisposed() ) + return; + + m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener ); +} + diff --git a/sfx2/source/doc/sfxbasemodel.src b/sfx2/source/doc/sfxbasemodel.src index f286d262e6ef..c3340a983927 100644 --- a/sfx2/source/doc/sfxbasemodel.src +++ b/sfx2/source/doc/sfxbasemodel.src @@ -2,9 +2,9 @@ * * $RCSfile: sfxbasemodel.src,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dv $ $Date: 2001-02-09 12:33:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,7 @@ StringArray EVENT_NAMES_ARY < "OnFocus" ; SFX_EVENT_ACTIVATEDOC ; > ; < "OnUnfocus" ; SFX_EVENT_DEACTIVATEDOC ; > ; < "OnPrint" ; SFX_EVENT_PRINTDOC ; > ; - < "OnError" ; SFX_EVENT_ONERROR ; > ; - < "OnNewMail" ; SFX_EVENT_NEWMESSAGE ; > ; +/* < "OnModifyChange" ; SFX_EVENT_MODIFYCHANGED ; > ; */ }; }; @@ -88,6 +87,8 @@ StringArray EVENT_NAMES_ARY these events are defined by the applications or aren't used any longer + < "OnNewMail" ; SFX_EVENT_NEWMESSAGE ; > ; + < "OnError" ; SFX_EVENT_ONERROR ; > ; < "OnSelect" ; > ; < "OnInsertStart" ; > ; < "OnInsertDone" ; > ; diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index e341d39ace14..b22d139116e4 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: appdata.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mba $ $Date: 2002-03-19 17:18:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ #include <svtools/lstner.hxx> #include <vcl/timer.hxx> #include <tools/string.hxx> +#include "rtl/ref.hxx" #include "bitset.hxx" @@ -102,6 +103,7 @@ class SfxObjectFactory; class SfxObjectShell; class ResMgr; class Window; +namespace sfx2 { namespace appl { class ImeStatusWindow; } } //========================================================================= // SfxAppData_Impl @@ -171,6 +173,8 @@ public: USHORT nAsynchronCalls; USHORT nAppEvent; // command line interpretation + rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow; + BOOL bDirectAliveCount : 1; BOOL bInQuit : 1; BOOL bInvalidateOnUnlock : 1; diff --git a/sfx2/source/inc/cfg.hxx b/sfx2/source/inc/cfg.hxx index 88b5ad80e322..d1b6a8dc4bfa 100644 --- a/sfx2/source/inc/cfg.hxx +++ b/sfx2/source/inc/cfg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cfg.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: cd $ $Date: 2002-09-24 08:36:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,11 +177,12 @@ private: String aHelpText; String aStr; String aCommand; + BOOL bConfigure; public: SfxMenuConfigEntry( USHORT nInitId, const String& rInitStr, const String& rHelpText, BOOL bPopup = FALSE ); - SfxMenuConfigEntry() : nId( 0 ), bPopUp( FALSE ) {} + SfxMenuConfigEntry() : nId( 0 ), bPopUp( FALSE ), bConfigure( TRUE ) {} ~SfxMenuConfigEntry(); USHORT GetId() const { return nId; } @@ -192,9 +193,11 @@ public: const String& GetHelpText() const { return aHelpText; } void SetHelpText( const String& rStr ) { aHelpText = rStr; } void SetPopup( BOOL bOn = TRUE ) { bPopUp = bOn; } + void SetConfigurable( BOOL bOn = TRUE ) { bConfigure = bOn; } BOOL IsBinding() const { return nId != 0 && !bPopUp; } BOOL IsSeparator() const { return nId == 0; } BOOL IsPopup() const { return bPopUp; } + BOOL IsConfigurable() const { return bConfigure; } const String& GetCommand() const { return aCommand; } }; @@ -303,6 +306,9 @@ class SfxAccCfgTabListBox_Impl : public SfxMenuCfgTabListBox_Impl void KeyInput( const KeyEvent &rKEvt ); +protected: + virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image& ); + public: SfxAccCfgTabListBox_Impl( SfxAcceleratorConfigPage* pAccelConfigPage, @@ -331,6 +337,8 @@ private: const SfxMacroInfoItem* m_pMacroInfoItem; SfxAccCfgTabListBox_Impl aEntriesBox; FixedLine aKeyboardGroup; + RadioButton aOfficeButton; + RadioButton aModuleButton; PushButton aChangeButton; PushButton aRemoveButton; FixedText aGroupText; @@ -343,8 +351,6 @@ private: PushButton aLoadButton; PushButton aSaveButton; PushButton aResetButton; - RadioButton aOfficeButton; - RadioButton aModuleButton; USHORTArr aConfigCodeArr; USHORTArr aConfigAccelArr; @@ -374,6 +380,8 @@ private: void Init( SfxAcceleratorManager* pAccMgr ); void ResetConfig(); + void CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 ); + public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index fc5a9a9ad823..fa8c4e33da2b 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -2,9 +2,9 @@ * * $RCSfile: eventsupplier.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mba $ $Date: 2001-11-30 13:56:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,12 @@ #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTBROADCASTER_HPP_ #include <com/sun/star/document/XEventBroadcaster.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP_ +#include <com/sun/star/document/XEventsSupplier.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ #include <com/sun/star/uno/Reference.hxx> @@ -94,12 +100,17 @@ #ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> #endif +#ifndef _CPPUHELPER_IMPLBASE3_HXX_ +#include <cppuhelper/implbase3.hxx> +#endif #ifndef _SFX_SFXUNO_HXX #include <sfxuno.hxx> #endif #include <vos/mutex.hxx> +#include <cppuhelper/interfacecontainer.hxx> +#include <svtools/lstner.hxx> //-------------------------------------------------------------------------------------------------------- @@ -108,6 +119,7 @@ #define DOCEVENTOBJECT ::com::sun::star::document::EventObject #define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster #define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener +#define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier #define EVENTOBJECT ::com::sun::star::lang::EventObject #define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException #define WRAPPEDTARGETEXCEPTION ::com::sun::star::lang::WrappedTargetException @@ -117,15 +129,16 @@ #define SEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type #define OUSTRING ::rtl::OUString +#define OINTERFACECONTAINERHELPER ::cppu::OInterfaceContainerHelper //-------------------------------------------------------------------------------------------------------- class SfxObjectShell; class SfxBaseModel; +class SvxMacro; //-------------------------------------------------------------------------------------------------------- - class SfxEvents_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameReplace, ::com::sun::star::document::XEventListener > { SEQUENCE< OUSTRING > maEventNames; @@ -166,7 +179,26 @@ public: virtual void SAL_CALL disposing( const EVENTOBJECT& Source ) throw( RUNTIMEEXCEPTION ); - static SvxMacro* ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc ); + static SvxMacro* ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc ); +}; + +class SfxGlobalEvents_Impl : public ::cppu::WeakImplHelper3< ::com::sun::star::document::XEventsSupplier, + ::com::sun::star::document::XEventBroadcaster, ::com::sun::star::lang::XServiceInfo >, + public SfxListener +{ + SfxEvents_Impl* pImp; + REFERENCE < XNAMEREPLACE > m_xEvents; + OINTERFACECONTAINERHELPER m_aInterfaceContainer; + ::osl::Mutex m_aMutex; + + void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ); +public: + SfxGlobalEvents_Impl( const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& ); + ~SfxGlobalEvents_Impl(); + SFX_DECL_XSERVICEINFO + virtual REFERENCE< XNAMEREPLACE > SAL_CALL getEvents() throw( RUNTIMEEXCEPTION ); + virtual void SAL_CALL addEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ); + virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ); }; #endif diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index cf72b013b033..83d1ab41597f 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fltoptint.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2002-05-29 16:19:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,9 @@ #include <com/sun/star/frame/XModel.hpp> #endif +#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_ #include <framework/interaction.hxx> +#endif using namespace ::framework; diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index aa58488bef10..5370c00e14dc 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: objshimp.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mba $ $Date: 2002-09-20 16:02:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,8 @@ struct SfxObjectShell_Impl bForbidReload : 1, bSupportsEventMacros: 1, bLoadingWindows: 1, - bBasicInitialized :1; + bBasicInitialized :1, + bHidden :1; // indicates a hidden view shell String aNewName; // Der Name, unter dem das Doc gespeichert @@ -223,7 +224,8 @@ struct SfxObjectShell_Impl bReadOnlyUI( sal_False ), bHiddenLockedByAPI( sal_False ), bInCloseEvent( sal_False ), - bLoadingWindows( sal_False ) + bLoadingWindows( sal_False ), + bHidden( sal_False ) , nStyleFilter( 0 ) , nMacroMode( -1 ) , bDisposing( sal_False ) diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index fc306f120723..db4cb52167cc 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inettbc.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: mba $ $Date: 2002-05-29 08:04:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,9 @@ #ifndef _SFXCANCEL_HXX //autogen #include <svtools/cancel.hxx> #endif +#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX +#include <svtools/historyoptions.hxx> +#endif #include <vcl/toolbox.hxx> #ifndef _VOS_THREAD_HXX //autogen #include <vos/thread.hxx> @@ -91,7 +94,6 @@ #include <unotools/localfilehelper.hxx> -#include "picklist.hxx" #include "sfx.hrc" #include "dispatch.hxx" #include "viewfrm.hxx" @@ -127,30 +129,14 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL bNew ) const String aFilter; String aOptions; - SfxPickEntry_Impl* pEntry = SfxPickList_Impl::Get()->GetHistoryPickEntryFromTitle( rName ); - - if ( pEntry ) + INetURLObject aObj( rName ); + if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - aName = pEntry->aName; - aFilter = pEntry->aFilter; - USHORT nPos = aFilter.Search( '|' ); - if( nPos != STRING_NOTFOUND ) - { - aOptions = aFilter.Copy( nPos + 1 ); - aFilter.Erase( nPos + 1 ); - } + String aBaseURL = GetURLBox()->GetBaseURL(); + aName = SvtURLBox::ParseSmart( rName, aBaseURL, SvtPathOptions().GetWorkPath() ); } else - { - INetURLObject aObj( rName ); - if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) - { - String aBaseURL = GetURLBox()->GetBaseURL(); - aName = SvtURLBox::ParseSmart( rName, aBaseURL, SvtPathOptions().GetWorkPath() ); - } - else - aName = rName; - } + aName = rName; if ( !aName.Len() ) return; @@ -231,20 +217,30 @@ void SfxURLToolBoxControl_Impl::StateChanged else if ( !GetURLBox()->IsModified() && SFX_ITEM_AVAILABLE == eState ) { SvtURLBox* pURLBox = GetURLBox(); - - SfxPickList_Impl* pPickList = SfxPickList_Impl::Get(); - DBG_ASSERT( pPickList , "Pickliste invalid" ); pURLBox->Clear(); - const ULONG nPickEntryCount = pPickList->HistoryPickEntryCount(); - ULONG nPickEntry; - for ( nPickEntry = 0; nPickEntry < nPickEntryCount; ++nPickEntry ) + + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > lList = SvtHistoryOptions().GetList(eHISTORY); + for (sal_Int32 i=0; i<lList.getLength(); ++i) { - DBG_ASSERT( pPickList->GetHistoryPickEntry( nPickEntry ), - "Pickentry ist invalid" ); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lProps = lList[i]; + for (sal_Int32 p=0; p<lProps.getLength(); ++p) + { + if (lProps[p].Name != HISTORY_PROPERTYNAME_URL) + continue; + + ::rtl::OUString sURL; + if (!(lProps[p].Value>>=sURL) || !sURL.getLength()) + continue; - INetURLObject aURL ( pPickList->GetHistoryPickEntry( nPickEntry )->aTitle ); + INetURLObject aURL ( sURL ); + String sMainURL( aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); + String sFile; - pURLBox->InsertEntry( aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); + if (::utl::LocalFileHelper::ConvertURLToSystemPath(sMainURL,sFile)) + pURLBox->InsertEntry(sFile); + else + pURLBox->InsertEntry(sMainURL); + } } const SfxStringItem *pURL = PTR_CAST(SfxStringItem,pState); diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src index 8fe9d8f7db4f..856ada5ce54c 100644 --- a/sfx2/source/menu/menu.src +++ b/sfx2/source/menu/menu.src @@ -2,9 +2,9 @@ * * $RCSfile: menu.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2002-11-04 16:18:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ String STR_MENU_CFGITEM TEXT [ spanish ] = "Men" ; TEXT [ english_us ] = "Configuration Menu" ; TEXT[ chinese_simplified ] = "菜单"; - TEXT[ russian ] = ""; + TEXT[ russian ] = " "; TEXT[ polish ] = "Menu"; TEXT[ japanese ] = "メニュー"; TEXT[ chinese_traditional ] = "功能表"; @@ -101,18 +101,18 @@ String STR_MENU_ADDONS TEXT[ russian ] = "~Add-Ons"; TEXT[ greek ] = "~Add-Ons"; TEXT[ dutch ] = "~Add-Ons"; - TEXT[ french ] = "~Add-Ons"; - TEXT[ spanish ] = "~Add-Ons"; + TEXT[ french ] = "Add-ons"; + TEXT[ spanish ] = "~Add-ons"; TEXT[ finnish ] = "~Add-Ons"; - TEXT[ italian ] = "~Add-Ons"; + TEXT[ italian ] = "~Complementari"; TEXT[ danish ] = "~Add-Ons"; - TEXT[ swedish ] = "~Add-Ons"; + TEXT[ swedish ] = "~Tillgg"; TEXT[ polish ] = "~Add-Ons"; TEXT[ portuguese_brazilian ] = "~Add-Ons"; - TEXT[ japanese ] = "~Add-Ons"; + TEXT[ japanese ] = "アドオン(~A)"; TEXT[ korean ] = "~Add-Ons"; TEXT[ chinese_simplified ] = "~Add-Ons"; - TEXT[ chinese_traditional ] = "~Add-Ons"; + TEXT[ chinese_traditional ] = "附加元件(~A)"; TEXT[ turkish ] = "~Add-Ons"; TEXT[ arabic ] = "~Add-Ons"; TEXT[ catalan ] = "~Add-Ons"; @@ -133,7 +133,7 @@ Menu MN_CLIPBOARDFUNCS Text [ italian ] = "Ta~glia" ; Text [ portuguese_brazilian ] = "Co~rtar" ; Text [ portuguese ] = "Co~rtar" ; - Text [ finnish ] = "L~eikkaa" ; + Text [ finnish ] = "~Leikkaa" ; Text [ danish ] = "~Klip" ; Text [ french ] = "~Couper" ; Text [ swedish ] = "~Klipp ut" ; @@ -149,7 +149,7 @@ Menu MN_CLIPBOARDFUNCS Text[ dutch ] = "Kn~ippen"; Text[ chinese_simplified ] = "剪切(~T)"; Text[ greek ] = "~"; - Text[ korean ] = "잘라 내기(~T)"; + Text[ korean ] = "잘라내기(~T)"; Text[ turkish ] = "Kes"; Text[ catalan ] = "Re~talla"; Text[ thai ] = "ตั~ด"; @@ -164,7 +164,7 @@ Menu MN_CLIPBOARDFUNCS Text [ italian ] = "~Copia" ; Text [ portuguese_brazilian ] = "~Copiar" ; Text [ portuguese ] = "~Copiar" ; - Text [ finnish ] = "~Kopioi" ; + Text [ finnish ] = "K~opioi" ; Text [ danish ] = "K~opier" ; Text [ french ] = "Co~pier" ; Text [ swedish ] = "K~opiera" ; @@ -195,7 +195,7 @@ Menu MN_CLIPBOARDFUNCS Text [ italian ] = "~Incolla" ; Text [ portuguese_brazilian ] = "~Colar" ; Text [ portuguese ] = "Co~lar" ; - Text [ finnish ] = "L~iit" ; + Text [ finnish ] = "Lii~t" ; Text [ danish ] = "St i~nd" ; Text [ french ] = "C~oller" ; Text [ swedish ] = "K~listra in" ; @@ -384,18 +384,18 @@ String SID_WIN_FULLSCREEN Text[ russian ] = "Leave Full-Screen Mode"; Text[ greek ] = "Leave Full-Screen Mode"; Text[ dutch ] = "Leave Full-Screen Mode"; - Text[ french ] = "Leave Full-Screen Mode"; - Text[ spanish ] = "Leave Full-Screen Mode"; + Text[ french ] = "Quitter le mode Plein cran"; + Text[ spanish ] = "Abandonar el modo Pantalla completa"; Text[ finnish ] = "Leave Full-Screen Mode"; Text[ italian ] = "Leave Full-Screen Mode"; Text[ danish ] = "Leave Full-Screen Mode"; - Text[ swedish ] = "Leave Full-Screen Mode"; + Text[ swedish ] = "Lmna helskrmslge"; Text[ polish ] = "Leave Full-Screen Mode"; Text[ portuguese_brazilian ] = "Leave Full-Screen Mode"; - Text[ japanese ] = "Leave Full-Screen Mode"; - Text[ korean ] = "Leave Full-Screen Mode"; - Text[ chinese_simplified ] = "Leave Full-Screen Mode"; - Text[ chinese_traditional ] = "Leave Full-Screen Mode"; + Text[ japanese ] = "全画面表示モードを保持"; + Text[ korean ] = "전체 화면 모드 마침"; + Text[ chinese_simplified ] = "离开全屏幕模式"; + Text[ chinese_traditional ] = "離開全螢幕模式"; Text[ turkish ] = "Leave Full-Screen Mode"; Text[ arabic ] = "Leave Full-Screen Mode"; Text[ catalan ] = "Leave Full-Screen Mode"; @@ -413,3 +413,5 @@ String SID_WIN_FULLSCREEN + + diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index cee9b994af63..20d4b20a0e95 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mnuitem.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: as $ $Date: 2002-07-05 12:26:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,11 @@ * ************************************************************************/ +#ifdef SOLARIS +// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 +#include <ctime> +#endif + #include <string> // HACK: prevent conflict between STLPORT and Workshop includes #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index c17a06afa42e..3e5d1fda27a5 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mnumgr.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2002-11-20 10:21:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,11 @@ * ************************************************************************/ +#ifdef SOLARIS +// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 +#include <ctime> +#endif + #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <cstdarg> // std::va_list @@ -528,36 +533,6 @@ int SfxMenuManager::Load( SvStream& rStream ) return SfxConfigItem::ERR_OK; } -void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp ) -{ - SfxVirtualMenu *pOldVirtMenu=0; - if ( pMenu ) - { - // Es wird umkonfiguriert - pOldVirtMenu = pMenu; - pBindings->ENTERREGISTRATIONS(); - } - - TryToHideDisabledEntries_Impl( pSVMenu ); - SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, bOLE ); - Construct(*pVMenu); - - if ( bMenuBar && pOldVirtMenu ) - { - SfxMenuBarManager *pBar = (SfxMenuBarManager*) this; - MenuBar* pOldBar = (MenuBar*) pOldVirtMenu->GetSVMenu(); - MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu(); - if ( pBar->GetWindow()->GetMenuBar() == pOldBar ) - pBar->GetWindow()->SetMenuBar( pSvBar ); - } - - if ( pOldVirtMenu ) - { - delete pOldVirtMenu; - pBindings->LEAVEREGISTRATIONS(); - } -} - //-------------------------------------------------------------------- void SfxMenuManager::UseDefault() @@ -1108,10 +1083,8 @@ void SfxMenuManager::Reconfigure() { SfxVirtualMenu *pVMenu; Menu *pSVMenu; - if (bMenuBar ) - { + if ( bMenuBar ) pSVMenu = new MenuBar; - } else pSVMenu = new PopupMenu; @@ -1135,6 +1108,36 @@ void SfxMenuManager::Reconfigure() SetDefault( FALSE ); } +void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp ) +{ + SfxVirtualMenu *pOldVirtMenu=0; + if ( pMenu ) + { + // Es wird umkonfiguriert + pOldVirtMenu = pMenu; + pBindings->ENTERREGISTRATIONS(); + } + + TryToHideDisabledEntries_Impl( pSVMenu ); + SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, bOLE ); + Construct(*pVMenu); + + if ( bMenuBar && pOldVirtMenu ) + { + SfxMenuBarManager *pBar = (SfxMenuBarManager*) this; + MenuBar* pOldBar = (MenuBar*) pOldVirtMenu->GetSVMenu(); + MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu(); + if ( pBar->GetWindow()->GetMenuBar() == pOldBar ) + pBar->GetWindow()->SetMenuBar( pSvBar ); + } + + if ( pOldVirtMenu ) + { + delete pOldVirtMenu; + pBindings->LEAVEREGISTRATIONS(); + } +} + //-------------------------------------------------------------------- // reload all KeyCodes @@ -1196,7 +1199,10 @@ SfxMenuBarManager::SfxMenuBarManager( const ResId& rResId, SfxBindings &rBinding aObjMenus[n].pResMgr = NULL; } - SetForceCtrlCreateMode( bOLE ); + // #107258# full menu bar hierarchy is needed, if accessibility is enabled + BOOL bAccessibilityEnabled = Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); + SetForceCtrlCreateMode( bOLE || bAccessibilityEnabled ); + Initialize(); } @@ -1242,7 +1248,7 @@ SvStream* SfxMenuBarManager::GetDefaultStream( StreamMode nMode ) String aUserConfig = SvtPathOptions().GetUserConfigPath(); INetURLObject aObj( aUserConfig ); aObj.insertName( GetStreamName() ); - return ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL(), nMode ); + return ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), nMode ); } BOOL SfxMenuBarManager::Load( SvStream& rStream, BOOL bOLEServer ) @@ -1277,6 +1283,42 @@ void SfxMenuManager::EraseItemCmds( Menu* pMenu ) } } +// Restore the correct macro ID so that menu items with an associated accelerator +// are correctly identified. This ensures that the accelerator info is displayed on +// the popup. +void SfxMenuManager::RestoreMacroIDs( Menu* pMenu ) +{ + USHORT nCount = pMenu->GetItemCount(); + for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ ) + { + USHORT nId = pMenu->GetItemId( nSVPos ); + PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nId ); + if ( pPopupMenu ) + RestoreMacroIDs( pPopupMenu ); + else if ( nId < SID_SFX_START ) + { + // Restore a valid ID for macro commands! + String aCommand = pMenu->GetItemCommand( nId ); + if ( aCommand.CompareToAscii("macro:", 6 ) == COMPARE_EQUAL ) + { + String aTitle = pMenu->GetItemText( nId ); + String aHelpText = pMenu->GetHelpText( nId ); + ULONG nHelpId = pMenu->GetHelpId( nId ); + MenuItemBits nBits = pMenu->GetItemBits( nId ); + + SfxMacroInfo aInfo( aCommand ); + SFX_APP()->GetMacroConfig()->GetSlotId( &aInfo ); + nId = aInfo.GetSlotId(); + + pMenu->RemoveItem( nSVPos ); + pMenu->InsertItem( nId, aTitle, nBits, nSVPos ); + pMenu->SetHelpText( nId, aHelpText ); + pMenu->SetHelpId( nId, nHelpId ); + } + } + } +} + MenuBar* SfxMenuBarManager::LoadMenuBar( SvStream& rStream ) { ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xInputStream = @@ -1287,6 +1329,8 @@ MenuBar* SfxMenuBarManager::LoadMenuBar( SvStream& rStream ) ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); ::framework::MenuConfiguration aConfig( aXMultiServiceFactory ); pSVMenu = aConfig.CreateMenuBarFromConfiguration( xInputStream ); + if ( pSVMenu ) + SfxMenuManager::RestoreMacroIDs( pSVMenu ); } catch ( ::com::sun::star::lang::WrappedTargetException& ) { @@ -1685,9 +1729,17 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram delete pSVMenu; pSVMenu = (PopupMenu*) pMenu; } + + SfxPopupMenuManager aPop( pSVMenu, pFrame->GetBindings() ); + aPop.RemoveDisabledEntries(); + aPop.Execute( rPoint, pWindow ); } +} - SfxPopupMenuManager aPop( pSVMenu, pFrame->GetBindings() ); - aPop.RemoveDisabledEntries(); - aPop.Execute( rPoint, pWindow ); +BOOL SfxMenuBarManager::ReInitialize() +{ + BOOL bRet = SfxConfigItem::ReInitialize(); + if ( bRet ) + UpdateObjectMenus(); + return bRet; } diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 14feeeae6aa6..992c71e34056 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: virtmenu.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: cd $ $Date: 2002-10-11 15:21:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,6 @@ #include "ipfrm.hxx" #include "ipenv.hxx" #include "appdata.hxx" -//#include "picklist.hxx" #include "viewsh.hxx" #include "imgmgr.hxx" #include "sfxpicklist.hxx" @@ -117,6 +116,10 @@ #include <framework/addonsoptions.hxx> #endif +#ifndef __FRAMEWORK_CLASSES_ADDONMENUS_HXX_ +#include <framework/addonmenu.hxx> +#endif + #ifndef __FRAMEWORK_CLASSES_MENUCONFIGURATION_HXX_ #include <framework/menuconfiguration.hxx> #endif @@ -219,8 +222,9 @@ void SfxVirtualMenu::Construct_Impl() pSVMenu->SetDeactivateHdl( LINK(this, SfxVirtualMenu, Deactivate) ); pSVMenu->SetSelectHdl( LINK(this, SfxVirtualMenu, Select) ); - // Accels eintragen -// InvalidateKeyCodes(); + // #107258# accelerator keys are needed for accessibility + if ( bOLE ) + InvalidateKeyCodes(); if ( !pResMgr && pParent ) pResMgr = pParent->pResMgr; @@ -378,6 +382,22 @@ void SfxVirtualMenu::CreateFromSVMenu() DBG_MEMTEST(); DBG_CHKTHIS(SfxVirtualMenu, 0); + // Merge Addon popup menus into the SV Menu + USHORT nHelpPos = pSVMenu->GetItemPos( SID_HELPMENU ); + if ( nHelpPos != MENU_ITEM_NOTFOUND ) + { + // retrieve addon popup menus and add them to our menu bar + Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface() ); + if ( xFrame.is() && pSVMenu->IsMenuBar() ) + { + Reference< com::sun::star::frame::XModel > xModel; + Reference< com::sun::star::frame::XController > xController( xFrame->getController(), UNO_QUERY ); + if ( xController.is() ) + xModel = Reference< com::sun::star::frame::XModel >( xController->getModel(), UNO_QUERY ); + framework::AddonPopupMenu::MergeAddonPopupMenus( xFrame, xModel, nHelpPos, (MenuBar *)pSVMenu ); + } + } + // get and store the number of items nCount = pSVMenu->GetItemCount(); diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 081b28fb921f..a3a8e624c308 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eventsupplier.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-06-03 10:55:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,38 +138,36 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & // check for correct type of the element if ( ::getCppuType( (const SEQUENCE < PROPERTYVALUE > *)0 ) == rElement.getValueType() ) { - ANY aValue = BlowUpMacro( rElement ); - maEventData[i] = aValue; - - SEQUENCE < PROPERTYVALUE > aProperties; - if ( aValue >>= aProperties ) + // create Configuration at first, creation might call this method also and that would overwrite everything + // we might have stored before! + USHORT nID = (USHORT) SfxEventConfiguration::GetEventId_Impl( aName ); + if ( nID ) { - long nCount = aProperties.getLength(); - for ( long nIndex = 0; nIndex < nCount; nIndex++ ) + SfxEventConfigItem_Impl* pConfig = + mpObjShell ? mpObjShell->GetEventConfig_Impl(TRUE) : SFX_APP()->GetEventConfig()->GetAppEventConfig_Impl(); + + ANY aValue = BlowUpMacro( rElement ); + + // pConfig becomes the owner of the new SvxMacro + SvxMacro *pMacro = ConvertToMacro( aValue, mpObjShell ); + pConfig->ConfigureEvent( nID, pMacro ); + maEventData[i] = aValue; + + SEQUENCE < PROPERTYVALUE > aProperties; + if ( aValue >>= aProperties ) { - if ( aProperties[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 ) + long nCount = aProperties.getLength(); + for ( long nIndex = 0; nIndex < nCount; nIndex++ ) { - ::rtl::OUString aType; - aProperties[ nIndex ].Value >>= aType; - if ( aType.compareToAscii( STAR_BASIC ) != COMPARE_EQUAL ) - return; - break; + if ( aProperties[ nIndex ].Name.compareToAscii( PROP_EVENT_TYPE ) == 0 ) + { + ::rtl::OUString aType; + aProperties[ nIndex ].Value >>= aType; + break; + } } } } - - SvxMacro *pMacro = ConvertToMacro( aValue, mpObjShell ); - USHORT nID = (USHORT) SfxEventConfiguration::GetEventId_Impl( aName ); - if ( nID ) - { - if ( pMacro ) - SFX_APP()->GetEventConfig()->ConfigureEvent( nID, *pMacro, mpObjShell ); - else - SFX_APP()->GetEventConfig()->ConfigureEvent( nID, String(), mpObjShell ); - } - - if ( pMacro ) - delete pMacro; } else throw ILLEGALARGUMENTEXCEPTION(); @@ -301,6 +299,10 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( { aProperties[ nIndex ].Value >>= aScript; } + else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_SCRIPT_URL ) == 0 ) + { + aProperties[ nIndex ].Value >>= aScript; + } else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 ) { aProperties[ nIndex ].Value >>= aLibrary; @@ -334,11 +336,11 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( SfxMacroLoader::loadMacro( aScript, mpObjShell ); } } - else if ( aType.compareToAscii( "Service" ) == 0 ) + else if ( aType.compareToAscii( "Service" ) == 0 || ( aType.compareToAscii( "Script" ) == 0 ) ) { if ( aScript.getLength() ) { - SfxViewFrame* pView = SfxViewFrame::GetFirst( mpObjShell ); + SfxViewFrame* pView = mpObjShell ? SfxViewFrame::GetFirst( mpObjShell ) : SfxViewFrame::Current(); ::com::sun::star::util::URL aURL; aURL.Complete = aScript; ::com::sun::star::uno::Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( @@ -351,11 +353,11 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); if ( xDisp.is() ) { - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); - ::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString::createFromAscii("Referer"); - pArg[0].Value <<= ::rtl::OUString( mpObjShell->GetMedium()->GetName() ); - xDisp->dispatch( aURL, aArgs ); + //::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); + //aArgs[0].Name = rtl::OUString::createFromAscii("Referer"); + //aArs[0].Value <<= ::rtl::OUString( mpObjShell->GetMedium()->GetName() ); + //xDisp->dispatch( aURL, aArgs ); + xDisp->dispatch( aURL, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >() ); } } } @@ -387,7 +389,11 @@ SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, REFERENCE< XEVENTBROADCASTER > xBroadcaster ) { // get the list of supported events and store it - maEventNames = pShell->GetEventNames(); + if ( pShell ) + maEventNames = pShell->GetEventNames(); + else + maEventNames = SfxObjectShell::GetEventNames_Impl(); + maEventData = SEQUENCE < ANY > ( maEventNames.getLength() ); mpObjShell = pShell; @@ -434,6 +440,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p { aProperties[ nIndex ].Value >>= aScriptURL; } + else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_SCRIPT_URL ) == 0 ) + { + aProperties[ nIndex ].Value >>= aScriptURL; + } else if ( aProperties[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 ) { aProperties[ nIndex ].Value >>= aLibrary; @@ -450,7 +460,9 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p if ( aType.compareToAscii( STAR_BASIC ) == COMPARE_EQUAL ) eType = STARBASIC; - else if ( aType.compareToAscii( JAVA_SCRIPT ) == COMPARE_EQUAL ) + else if ( aType.compareToAscii( "Script" ) == COMPARE_EQUAL && aScriptURL.getLength() ) + eType = EXTENDED_STYPE; + else if ( aType.compareToAscii( SVX_MACRO_LANGUAGE_JAVASCRIPT ) == COMPARE_EQUAL ) eType = JAVASCRIPT; else DBG_ERRORFILE( "ConvertToMacro: Unknown macro type" ); @@ -482,51 +494,14 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p if ( aMacroName.getLength() ) pMacro = new SvxMacro( aMacroName, aLibrary, eType ); + else if ( eType == EXTENDED_STYPE ) + pMacro = new SvxMacro( aScriptURL, aType ); } return pMacro; } //-------------------------------------------------------------------------------------------------------- -sal_Bool SfxEvents_Impl::Warn_Impl( const String& rMacName ) -{ - SvtSecurityOptions aOpt; - EBasicSecurityMode eMode = aOpt.GetBasicMode(); - if ( eMode == eNEVER_EXECUTE ) - return sal_False; - - String aReferer( mpObjShell->GetMedium()->GetName() ); - if ( !aReferer.Len() ) - { - // if document was created from template, take the templates' name for the checks - String aTempl( mpObjShell->GetDocInfo().GetTemplateFileName() ); - if ( aTempl.Len() ) - aReferer = INetURLObject( aTempl ).GetMainURL(); - else - // new documents from scratch are safe - return TRUE; - } - - sal_Bool bConfirm = aOpt.IsConfirmationEnabled(); - sal_Bool bWarn = aOpt.IsWarningEnabled(); - sal_Bool bSecure = aOpt.IsSecureURL( rMacName, aReferer ); - if ( bSecure && bWarn || !bSecure && bConfirm ) - { - OUSTRING aPrefix = OUSTRING( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) ); - OUSTRING aName = rMacName.Copy( (USHORT) aPrefix.getLength() ); - sal_Int32 nPos = aName.indexOf( '/' ); - aName = aName.copy( nPos+1 ); - SfxMacroQueryDlg_Impl aBox ( aName, bSecure ); - if ( aBox.Execute() ) - bWarn = sal_False; - } - else - return bSecure; - - return !bWarn; -} - -//-------------------------------------------------------------------------------------------------------- ANY SfxEvents_Impl::BlowUpMacro( const ANY& rEvent ) const { SEQUENCE < PROPERTYVALUE > aInProps; @@ -553,6 +528,8 @@ ANY SfxEvents_Impl::BlowUpMacro( const ANY& rEvent ) const aInProps[ nIndex ].Value >>= aType; else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_SCRIPT ) == 0 ) aInProps[ nIndex ].Value >>= aScript; + else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_SCRIPT_URL ) == 0 ) + aInProps[ nIndex ].Value >>= aScript; else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_LIBRARY ) == 0 ) aInProps[ nIndex ].Value >>= aLibrary; else if ( aInProps[ nIndex ].Name.compareToAscii( PROP_MACRO_NAME ) == 0 ) @@ -574,9 +551,10 @@ ANY SfxEvents_Impl::BlowUpMacro( const ANY& rEvent ) const if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) ) { OUSTRING aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); + SfxObjectShell* pDoc = mpObjShell ? mpObjShell : SfxObjectShell::Current(); if ( aBasMgrName.compareToAscii(".") == 0 ) - aLibrary = mpObjShell->GetTitle( SFX_TITLE_APINAME ); + aLibrary = pDoc->GetTitle( SFX_TITLE_APINAME ); else if ( aBasMgrName.getLength() ) aLibrary = aBasMgrName; else @@ -619,3 +597,62 @@ ANY SfxEvents_Impl::BlowUpMacro( const ANY& rEvent ) const return rEvent; } +SFX_IMPL_XSERVICEINFO( SfxGlobalEvents_Impl, "com.sun.star.frame.GlobalEventBroadcaster", "com.sun.star.comp.sfx2.GlobalEventBroadcaster" ) +SFX_IMPL_ONEINSTANCEFACTORY( SfxGlobalEvents_Impl ); + +SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& ) + : m_aInterfaceContainer( m_aMutex ) +{ + m_refCount++; + pImp = new SfxEvents_Impl( NULL, this ); + m_xEvents = pImp; + m_refCount--; + StartListening(*SFX_APP()); +} + +SfxGlobalEvents_Impl::~SfxGlobalEvents_Impl() +{ +} + +REFERENCE< XNAMEREPLACE > SAL_CALL SfxGlobalEvents_Impl::getEvents() throw( RUNTIMEEXCEPTION ) +{ + return m_xEvents; +} + +void SAL_CALL SfxGlobalEvents_Impl::addEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ) +{ + m_aInterfaceContainer.addInterface( xListener ); +} + +void SAL_CALL SfxGlobalEvents_Impl::removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ) +{ + m_aInterfaceContainer.removeInterface( xListener ); +} + +void SfxGlobalEvents_Impl::Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) +{ + SfxEventHint* pNamedHint = PTR_CAST( SfxEventHint, &aHint ); + if ( pNamedHint ) + { + OUSTRING aName = SfxEventConfiguration::GetEventName_Impl( pNamedHint->GetEventId() ); + REFERENCE < XEVENTSSUPPLIER > xSup; + if ( pNamedHint->GetObjShell() ) + xSup = REFERENCE < XEVENTSSUPPLIER >( pNamedHint->GetObjShell()->GetModel(), UNO_QUERY ); +// else +// xSup = (XEVENTSSUPPLIER*) this; + + DOCEVENTOBJECT aEvent( xSup, aName ); + ::cppu::OInterfaceIteratorHelper aIt( m_aInterfaceContainer ); + while( aIt.hasMoreElements() ) + { + try + { + ((XDOCEVENTLISTENER *)aIt.next())->notifyEvent( aEvent ); + } + catch( RUNTIMEEXCEPTION& ) + { + aIt.remove(); + } + } + } +} diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index d5d0f401975f..559ecd4497ac 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imgmgr.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: cd $ $Date: 2002-10-28 16:17:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -997,6 +997,16 @@ SfxImageManager::~SfxImageManager() delete pData; } +SfxConfigManager* SfxImageManager::GetConfigManager() +{ + return pImp->GetConfigManager(); +} + +USHORT SfxImageManager::GetType() const +{ + return pImp->GetType(); +} + BOOL SfxImageManager::Import( SvStream& rInStream, SotStorage& rOutStorage ) { SfxImageManager_Impl aImpl( NULL ); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a1323b4181f2..9daecd5ce2e1 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tbxitem.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: cd $ $Date: 2002-10-11 15:23:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,11 @@ * ************************************************************************/ +#ifdef SOLARIS +// HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8 +#include <ctime> +#endif + #include <string> // prevent conflict with STL includes #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ @@ -90,6 +95,9 @@ #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX #include <svtools/menuoptions.hxx> #endif +#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX +#include <svtools/miscopt.hxx> +#endif #pragma hdrstop @@ -237,6 +245,8 @@ void SfxToolBoxControl::StateChanged // enabled/disabled-Flag pauschal korrigieren pBox->EnableItem( GetId(), eState != SFX_ITEM_DISABLED ); + USHORT nItemBits = pBox->GetItemBits( GetId() ); + nItemBits &= ~TIB_CHECKABLE; TriState eTri = STATE_NOCHECK; switch ( eState ) { @@ -247,6 +257,7 @@ void SfxToolBoxControl::StateChanged // BoolItem fuer checken if ( ((const SfxBoolItem*)pState)->GetValue() ) eTri = STATE_CHECK; + nItemBits |= TIB_CHECKABLE; } else if ( pState->ISA(SfxEnumItemInterface) && ((SfxEnumItemInterface *)pState)->HasBoolValue()) @@ -254,6 +265,7 @@ void SfxToolBoxControl::StateChanged // EnumItem wie Bool behandeln if ( ((const SfxEnumItemInterface *)pState)->GetBoolValue() ) eTri = STATE_CHECK; + nItemBits |= TIB_CHECKABLE; } else if ( bShowString && pState->ISA(SfxStringItem) ) pBox->SetItemText(nId, ((const SfxStringItem*)pState)->GetValue() ); @@ -265,6 +277,7 @@ void SfxToolBoxControl::StateChanged } pBox->SetItemState( GetId(), eTri ); + pBox->SetItemBits( GetId(), nItemBits ); } //-------------------------------------------------------------------- @@ -669,19 +682,82 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl() delete pMenu; } -void SfxAppToolBoxControl_Impl::SetImage( const String &rURL ) +//_____________________________________________________ +/* + it return the existing state of the given URL in the popupmenu of this toolbox control. + + If the given URL can be located as an action command of one menu item of the + popup menu of this control, we return TRUE. Otherwhise we return FALSE. + Further we return a fallback URL, in case we have to return FALSE. Because + the outside code must select a valid item of the popup menu everytime ... + and we define it here. By the way this m ethod was written to handle + error situations gracefully. E.g. it can be called during creation time + but then we have no valid menu. For this case we know another fallback URL. + Then we return the private:factory/ URL of the default factory. + + @param *pMenu + pounts to the popup menu, on which item we try to locate the given URL + Can be NULL! Search will be supressed then. + + @param sURL + the URL for searching + + @param pFallback + contains the fallback URL in case we return FALSE + Must point to valid memory! + + @return TRUE - if URL could be located as an item of the popup menu. + FALSE - otherwhise. +*/ +BOOL Impl_ExistURLInMenu( const PopupMenu *pMenu , + const String &sURL , + String *pFallback ) { - String aURL = rURL; - if( !rURL.Len() ) + BOOL bValidFallback = FALSE; + if (pMenu && sURL.Len()) { - aURL = DEFINE_CONST_UNICODE("private:factory/"); - aURL += String::CreateFromAscii(SfxObjectFactory::GetDefaultFactory().GetShortName()); + USHORT c = pMenu->GetItemCount(); + for (USHORT p=0; p<c; ++p) + { + USHORT nId = pMenu->GetItemId(p); + String aCmd( pMenu->GetItemCommand(nId) ); + + if (!bValidFallback && aCmd.Len()) + { + *pFallback = aCmd; + bValidFallback = TRUE; + } + + if (sURL.Equals(aCmd)) + return TRUE; + } } + if (!bValidFallback) + { + *pFallback = DEFINE_CONST_UNICODE("private:factory/"); + *pFallback += String::CreateFromAscii(SfxObjectFactory::GetDefaultFactory().GetShortName()); + } + + return FALSE; +} + +void SfxAppToolBoxControl_Impl::SetImage( const String &rURL ) +{ + /* We accept URL's here only, which exist as items of our internal popup menu. + All other ones will be ignored and a fallback is used ... */ + String aURL = rURL; + String sFallback; + BOOL bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback); + if (!bValid) + aURL = sFallback; + + BOOL bBig = ( SvtMiscOptions().GetSymbolSet() == SFX_SYMBOLS_LARGE ); GetToolBox().SetItemImage( GetId(), SvFileInformationManager::GetImage( INetURLObject( aURL ), - FALSE, + bBig, GetToolBox().GetBackground().GetColor().IsDark() ) ); + aLastURL = aURL; } void SfxAppToolBoxControl_Impl::StateChanged @@ -691,10 +767,20 @@ void SfxAppToolBoxControl_Impl::StateChanged const SfxPoolItem* pState ) { - if ( !aLastURL.Len() && pState && pState->ISA(SfxStringItem) ) + if ( pState && pState->ISA(SfxStringItem) ) { + // Important step for following SetImage() call! + // It needs the valid pMenu item to fullfill it's specification + // to check for supported URLs ... + if ( !pMenu ) + { + Reference <com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); + ::framework::MenuConfiguration aConf( aXMultiServiceFactory ); + Reference<com::sun::star::frame::XFrame> aXFrame( GetBindings().GetDispatcher_Impl()->GetFrame()->GetFrame()->GetFrameInterface() ); + pMenu = aConf.CreateBookmarkMenu( aXFrame, BOOKMARK_NEWMENU ); + } GetToolBox().EnableItem( GetId(), eState != SFX_ITEM_DISABLED ); - SetImage( ((const SfxStringItem*)pState)->GetValue() ); + SetImage(((const SfxStringItem*)pState)->GetValue()); } else SfxToolBoxControl::StateChanged( nId, eState, pState ); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index d8958dd0b22c..ef08525cfe58 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: mba $ $Date: 2002-10-24 12:12:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1064,7 +1064,7 @@ sal_Bool SfxFrame::CheckContentForLoad_Impl() return sal_False; } - return (GetDescriptor()->GetActualURL().GetMainURL().Len() != 0); + return (GetDescriptor()->GetActualURL().GetMainURL( INetURLObject::NO_DECODE ).Len() != 0); } sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index ac3a51a39e2b..b215eac571af 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmload.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: mba $ $Date: 2002-10-31 09:36:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,8 @@ #include "frmload.hxx" +#include <framework/interaction.hxx> + #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif @@ -70,6 +72,9 @@ #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ +#include <com/sun/star/frame/XModel.hpp> +#endif #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> #endif @@ -123,6 +128,7 @@ #include <vos/mutex.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> +#include <sot/storinfo.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -146,6 +152,7 @@ using namespace ::rtl; #include "loadenv.hxx" #include "docfile.hxx" #include "docfilt.hxx" +#include "brokenpackageint.hxx" SfxFrameLoader_Impl::SfxFrameLoader_Impl( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) : pMatcher( 0 ) @@ -176,6 +183,8 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA String aTypeName; sal_uInt32 nPropertyCount = rArgs.getLength(); sal_Bool bReadOnlyTest = sal_False; + ::com::sun::star::uno::Reference< XInteractionHandler > xInteraction; + ::com::sun::star::uno::Reference < XModel > xModel; for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) { if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) @@ -205,25 +214,42 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA rArgs[nProperty].Value >>= sTemp; aFilterName = sTemp; } + if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("Model")) ) + rArgs[nProperty].Value >>= xModel; if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")) ) rArgs[nProperty].Value >>= bReadOnlyTest; + else if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ) + rArgs[nProperty].Value >>= xInteraction; } const SfxFilter* pFilter = NULL; SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher(); if ( !aFilterName.Len() ) { - // no filter detection made, give a warning for the developer - DBG_ERROR("load called without calling detect before!"); - if ( !aTypeName.Len() ) - return sal_False; - // try to find a filter with SFX filter detection using the typename SfxFilterFlags nMust = SFX_FILTER_IMPORT; SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED; - pFilter = rMatcher.GetFilter4EA( aTypeName, nMust, nDont ); + if ( aTypeName.Len() ) + pFilter = rMatcher.GetFilter4EA( aTypeName, nMust, nDont ); if ( !pFilter ) - return sal_False; + { + if ( xInteraction.is() ) + { + ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect( rURL ); + ::com::sun::star::uno::Reference< XInteractionRequest > xRequest ( pRequest ); + xInteraction->handle( xRequest ); + if( !pRequest->isAbort() ) + { + aFilterName = pRequest->getFilter(); + pFilter = rMatcher.GetFilter( aFilterName ); + } + } + + if ( pFilter ) + aTypeName = pFilter->GetTypeName(); + else + return sal_False; + } else // use filter names without prefix aFilterName = pFilter->GetFilterName(); @@ -251,6 +277,15 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA if ( !pFrame ) pFrame = SfxTopFrame::Create( rFrame ); + if ( xModel.is() ) + { + for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, FALSE ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, FALSE ) ) + { + if ( xModel == pDoc->GetModel() ) + return pFrame->InsertDocument( pDoc ); + } + } + // check for the URL pattern of our factory URLs BOOL bFactoryURL = FALSE; const SfxObjectFactory* pFactory = 0; @@ -283,75 +318,87 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA if ( pFactory ) { - INetURLObject aObj( rURL ); - if ( aParam.Len() ) + // in case an application has no import&export filter it can not be open for edit + const SfxFilter* pCombinedFilters = NULL; + SfxFactoryFilterContainer* pCont = pFactory->GetFilterContainer(); + if ( pCont ) { - // slots are executed on the module shell - sal_uInt16 nSlotId = (sal_uInt16) aParam.ToInt32(); - SfxModule* pMod = pFactory->GetModule()->Load(); - SfxRequest aReq( nSlotId, SFX_CALLMODE_SYNCHRON, pMod->GetPool() ); - aReq.AppendItem( SfxStringItem ( SID_FILE_NAME, rURL ) ); - aReq.AppendItem( SfxFrameItem ( SID_DOCFRAME, pFrame ) ); - - // the next parameter is especially needed for Impress, because they want to know - // wether their slot is called directly (like from Autopilot menue) or as part - // of a "NewDocument" request - aReq.AppendItem( SfxBoolItem ( SID_NEWDOCDIRECT, TRUE ) ); - - const SfxPoolItem* pRet = pMod->ExecuteSlot( aReq ); - if ( pRet ) - { - bLoadState = sal_True; - } - else + SfxFilterFlags nMust = SFX_FILTER_IMPORT | SFX_FILTER_EXPORT; + SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED; + pCombinedFilters = pCont->GetAnyFilter( nMust, nDont ); + } + + if ( pCombinedFilters ) + { + INetURLObject aObj( rURL ); + if ( aParam.Len() ) { - SfxObjectShell* pDoc = pFrame->GetCurrentDocument(); - if ( !pDoc ) + // slots are executed on the module shell + sal_uInt16 nSlotId = (sal_uInt16) aParam.ToInt32(); + SfxModule* pMod = pFactory->GetModule()->Load(); + SfxRequest aReq( nSlotId, SFX_CALLMODE_SYNCHRON, pMod->GetPool() ); + aReq.AppendItem( SfxStringItem ( SID_FILE_NAME, rURL ) ); + aReq.AppendItem( SfxFrameItem ( SID_DOCFRAME, pFrame ) ); + + // the next parameter is especially needed for Impress, because they want to know + // wether their slot is called directly (like from Autopilot menue) or as part + // of a "NewDocument" request + aReq.AppendItem( SfxBoolItem ( SID_NEWDOCDIRECT, TRUE ) ); + + const SfxPoolItem* pRet = pMod->ExecuteSlot( aReq ); + if ( pRet ) { - REFERENCE< XFrame > aXFrame; - pFrame->SetFrameInterface_Impl( aXFrame ); - pFrame->DoClose(); + bLoadState = sal_True; } + else + { + SfxObjectShell* pDoc = pFrame->GetCurrentDocument(); + if ( !pDoc ) + { + REFERENCE< XFrame > aXFrame; + pFrame->SetFrameInterface_Impl( aXFrame ); + pFrame->DoClose(); + } - bLoadState = sal_False; - } + bLoadState = sal_False; + } - return bLoadState; - } + return bLoadState; + } - String aPathName( aObj.GetMainURL() ); - if( pFactory->GetStandardTemplate().Len() ) - { - // standard template set -> load it "AsTemplate" - aSet.Put( SfxStringItem ( SID_FILE_NAME, pFactory->GetStandardTemplate() ) ); - aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - } - else - { - // execute "NewDocument" request - SfxViewShell *pView = pFrame->GetCurrentViewFrame() ? pFrame->GetCurrentViewFrame()->GetViewShell() : NULL; - SfxRequest aReq( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, aSet ); - aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, pFrame ) ); - aReq.AppendItem( SfxStringItem( SID_NEWDOCDIRECT, String::CreateFromAscii(pFactory->GetShortName()) ) ); - const SfxPoolItem* pRet = pApp->ExecuteSlot( aReq ); - if ( pFrame->GetCurrentViewFrame() && pView != pFrame->GetCurrentViewFrame()->GetViewShell() ) + if( pFactory->GetStandardTemplate().Len() ) { - bLoadState = sal_True; + // standard template set -> load it "AsTemplate" + aSet.Put( SfxStringItem ( SID_FILE_NAME, pFactory->GetStandardTemplate() ) ); + aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); } - else if ( xListener.is() ) + else { - if ( !pFrame->GetCurrentDocument() ) + // execute "NewDocument" request + SfxViewShell *pView = pFrame->GetCurrentViewFrame() ? pFrame->GetCurrentViewFrame()->GetViewShell() : NULL; + SfxRequest aReq( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, aSet ); + aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, pFrame ) ); + aReq.AppendItem( SfxStringItem( SID_NEWDOCDIRECT, String::CreateFromAscii(pFactory->GetShortName()) ) ); + const SfxPoolItem* pRet = pApp->ExecuteSlot( aReq ); + if ( pFrame->GetCurrentViewFrame() && pView != pFrame->GetCurrentViewFrame()->GetViewShell() ) { - REFERENCE< XFrame > aXFrame; - pFrame->SetFrameInterface_Impl( aXFrame ); - pFrame->DoClose(); + bLoadState = sal_True; + } + else if ( xListener.is() ) + { + if ( !pFrame->GetCurrentDocument() ) + { + REFERENCE< XFrame > aXFrame; + pFrame->SetFrameInterface_Impl( aXFrame ); + pFrame->DoClose(); + } + + bLoadState = sal_False; } - bLoadState = sal_False; + xFrame = REFERENCE< XFrame >(); + return bLoadState; } - - xFrame = REFERENCE< XFrame >(); - return bLoadState; } } } @@ -364,10 +411,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA aSet.Put( SfxFrameItem( SID_DOCFRAME, pFrame ) ); aSet.Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) ); - // create LoadEnvironment and set link for callback when it is finished - pLoader = LoadEnvironment_Impl::Create( aSet ); - pLoader->AddRef(); - pLoader->SetDoneLink( LINK( this, SfxFrameLoader_Impl, LoadDone_Impl ) ); + SfxAllItemSet aResSet( aSet ); if ( !pFactory ) { @@ -379,16 +423,98 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA if ( pFactory ) { + // in case an application has no import&export filter it should be used in readonly mode + SfxFilterFlags nMust = SFX_FILTER_IMPORT | SFX_FILTER_EXPORT; + SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED; + SfxFactoryFilterContainer* pCont = pFactory->GetFilterContainer(); + if ( pCont ) + { + const SfxFilter* pCombinedFilters = pCont->GetAnyFilter( nMust, nDont ); + if ( !pCombinedFilters ) + { + aSet.Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + aSet.Put( SfxBoolItem( SID_EDITDOC, sal_False ) ); + } + } + } + + // create LoadEnvironment and set link for callback when it is finished + pLoader = LoadEnvironment_Impl::Create( aSet ); + pLoader->AddRef(); + pLoader->SetDoneLink( LINK( this, SfxFrameLoader_Impl, LoadDone_Impl ) ); + + if ( pFactory ) + { bLoadDone = sal_False; pMatcher = new SfxFilterMatcher( pFactory->GetFilterContainer() ); + pLoader->SetFilterMatcher( pMatcher ); pLoader->Start(); // wait for callback while( bLoadDone == sal_False ) Application::Yield(); + + if ( pLoader->GetError() == ERRCODE_IO_BROKENPACKAGE && xInteraction.is() ) + { + OUString aDocName = INetURLObject(rURL).getName( INetURLObject::LAST_SEGMENT, true, + INetURLObject::DECODE_WITH_CHARSET ); + + SFX_ITEMSET_ARG( &aSet, pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE ); + if ( !pRepairItem || !pRepairItem->GetValue() ) + { + RequestPackageReparation* pRequest = new RequestPackageReparation( aDocName ); + ::com::sun::star::uno::Reference< XInteractionRequest > xRequest ( pRequest ); + xInteraction->handle( xRequest ); + if( pRequest->isApproved() ) + { + aResSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) ); + aResSet.Put( SfxBoolItem( SID_EDITDOC, sal_False ) ); + pLoader->ReleaseRef(); + pLoader = LoadEnvironment_Impl::Create( aResSet ); + pLoader->AddRef(); + pLoader->SetDoneLink( LINK( this, SfxFrameLoader_Impl, LoadDone_Impl ) ); + + bLoadDone = sal_False; + pLoader->SetFilterMatcher( pMatcher ); + pLoader->Start(); + + // wait for callback + while( bLoadDone == sal_False ) + Application::Yield(); + + if ( pLoader->GetError() == ERRCODE_IO_BROKENPACKAGE ) + { + NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName ); + xRequest = ::com::sun::star::uno::Reference< XInteractionRequest >( pNotifyRequest ); + xInteraction->handle( xRequest ); + } + } + } + else + { + NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName ); + ::com::sun::star::uno::Reference< XInteractionRequest > xRequest ( pNotifyRequest ); + xInteraction->handle( xRequest ); + } + } + } + + if ( pLoader->GetError() ) + { + SfxFrame* pFrame = pLoader->GetFrame(); + if ( pFrame && !pFrame->GetCurrentDocument() ) + { + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + REFERENCE< XFrame > aXFrame; + pFrame->SetFrameInterface_Impl( aXFrame ); + pFrame->DoClose(); + } } + xFrame = REFERENCE< XFrame >(); + xListener = REFERENCE< XLoadEventListener >(); + return bLoadState; } @@ -406,15 +532,6 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid ) if ( pLoader->GetError() ) { - SfxFrame* pFrame = pLoader->GetFrame(); - if ( pFrame && !pFrame->GetCurrentDocument() ) - { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); - REFERENCE< XFrame > aXFrame; - pFrame->SetFrameInterface_Impl( aXFrame ); - pFrame->DoClose(); - } - bLoadDone = sal_True ; bLoadState = sal_False; } @@ -424,8 +541,6 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid ) bLoadState = sal_True; } - xFrame = REFERENCE< XFrame >(); - xListener = REFERENCE< XLoadEventListener >(); return NULL; } @@ -592,11 +707,15 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid ) // ctor of SfxMedium uses owner transition of ItemSet SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, FALSE, NULL, pSet ); aMedium.UseInteractionHandler( TRUE ); - aMedium.SetInteractionHandler( xInteraction ); BOOL bIsStorage = aMedium.IsStorage(); if ( aMedium.GetErrorCode() == ERRCODE_NONE ) { + // remember input stream and content and put them into the descriptor later + // should be done here since later the medium can switch to a version + xStream = aMedium.GetInputStream(); + xContent = aMedium.GetContent(); + // maybe that IsStorage() already created an error! if ( bIsStorage ) { @@ -632,9 +751,6 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid ) if ( aMedium.GetFilter() ) pFilter = aMedium.GetFilter(); - // remember input stream and content and put them into the descriptor later - xStream = aMedium.GetInputStream(); - xContent = aMedium.GetContent(); bReadOnly = aMedium.IsReadOnly(); } @@ -778,6 +894,16 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid ) exPacked.TargetException <<= exAbort; throw exPacked; } + else if ( !pFilter && aMedium.GetStorage() ) + { + SvStorageInfoList aList; + aMedium.GetStorage()->FillInfoList( &aList ); + if ( pOldFilter && !aList.Count() && !aMedium.GetStorage()->IsOLEStorage() && pOldFilter->UsesStorage() && pOldFilter->GetVersion() >= SOFFICE_FILEFORMAT_60 ) + { + // possibly broken package + pFilter = pOldFilter; + } + } // may be - w4w filter doesn't close the stream // so we should do that here. diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index ab0a7844f86f..f64019f10e77 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -2,9 +2,9 @@ * * $RCSfile: impframe.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2002-10-24 12:13:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #include "frame.hxx" #include "loadenv.hxx" -#include "picklist.hxx" class SfxViewFrame; class SfxObjectShell; diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 33dd526cc879..d53432afade6 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: orgmgr.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mba $ $Date: 2001-11-28 17:00:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,7 +313,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx ) INetURLObject aFileObj( pEntry->aFileName ); BOOL bDum = FALSE; SfxApplication* pSfxApp = SFX_APP(); - String aFilePath = aFileObj.GetMainURL(); + String aFilePath = aFileObj.GetMainURL( INetURLObject::NO_DECODE ); pEntry->aDocShell = pSfxApp->DocAlreadyLoaded( aFilePath, FALSE, bDum ); if ( !pEntry->aDocShell.Is() ) { diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index f3d2c84b792b..89c71ecb1e1c 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: prnmon.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mba $ $Date: 2002-10-24 12:14:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,10 @@ * ************************************************************************/ +#ifndef _COM_SUN_STAR_VIEW_PRINTABLESTATE_HPP_ +#include <com/sun/star/view/PrintableState.hpp> +#endif + #ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ #include <com/sun/star/util/XCloseable.hpp> #endif @@ -100,6 +104,7 @@ #include "desrupt.hxx" #include "bindings.hxx" #include "sfxresid.hxx" +#include "event.hxx" #include "view.hrc" @@ -372,10 +377,12 @@ IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, pvoid ) if ( pImp->pMonitor ) pImp->pMonitor->Hide(); + SfxViewShell* pViewShell = pImp->pViewShell; + // Slots enablen - pImp->pViewShell->Invalidate( SID_PRINTDOC ); - pImp->pViewShell->Invalidate( SID_PRINTDOCDIRECT ); - pImp->pViewShell->Invalidate( SID_SETUPPRINTER ); + pViewShell->Invalidate( SID_PRINTDOC ); + pViewShell->Invalidate( SID_PRINTDOCDIRECT ); + pViewShell->Invalidate( SID_SETUPPRINTER ); // . . . falls der Printer im System umgestellt wurde, hier Aenderung // nachziehen. @@ -400,25 +407,26 @@ IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, pvoid ) } else // ggf. vorherigen Print-To-File-Status zuruecksetzen - pImp->pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile ); + pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile ); - // lief der Drucker im Thread? + // printing in thread will kill force us to kill this instance, so get necessary data before + BOOL bRestoreFlag = pImp->bRestoreFlag; + BOOL bOldFlag = pImp->bOldFlag; if ( pImp->bDeleteOnEndPrint ) { - // Dialog sofort l"oschen sonst wird ggf. das MDI vorher geschlossen DELETEZ(pImp->pMonitor); - - // Progress per PostMessage zerst"oren, nicht sofort sonst GPF - pImp->Delete( this ); + delete this; } else { - DBG_ASSERT( !pImp->pOldPrinter, "Printer konnte nicht korrekt restauriert werden!" ); + DBG_ASSERT( !pImp->pOldPrinter, "Unable to restore printer!" ); pImp->bRunning = FALSE; } - if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag ) - pImp->pViewShell->GetObjectShell()->EnableSetModified( TRUE ); + if ( bRestoreFlag && pViewShell->GetObjectShell()->IsEnableSetModified() != bOldFlag ) + pViewShell->GetObjectShell()->EnableSetModified( TRUE ); + + pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_COMPLETED, NULL, NULL ) ); return 0; } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index c172cd939112..036c7d62d289 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxbasecontroller.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: mba $ $Date: 2002-10-24 13:06:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,22 @@ // include of other projects //________________________________________________________________________________________________________ +#ifndef _COM_SUN_STAR_AWT_KEYEVENT_HPP_ +#include <com/sun/star/awt/KeyEvent.hpp> +#endif + +#ifndef _COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ +#include <com/sun/star/awt/KeyModifier.hpp> +#endif + +#ifndef _COM_SUN_STAR_AWT_MOUSEEVENT_HPP_ +#include <com/sun/star/awt/MouseEvent.hpp> +#endif + +#ifndef _COM_SUN_STAR_AWT_MOUSEBUTTON_HPP_ +#include <com/sun/star/awt/MouseButton.hpp> +#endif + #ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ #include <com/sun/star/util/XCloseable.hpp> #endif @@ -173,6 +189,8 @@ #define XSTATUSINDICATORSUPPLIER ::com::sun::star::task::XStatusIndicatorSupplier #define XCOMPONENT ::com::sun::star::lang::XComponent #define XINTERFACE ::com::sun::star::uno::XInterface +#define XKEYHANDLER ::drafts::com::sun::star::awt::XKeyHandler +#define XMOUSECLICKHANDLER ::drafts::com::sun::star::awt::XMouseClickHandler #define TIMEOUT_START_RESCHEDULE 10L /* 10th s */ @@ -379,10 +397,10 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const EVENT void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EVENTOBJECT& aEvent, sal_Bool bDeliverOwnership ) throw (RUNTIMEEXCEPTION) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pController != NULL ) { - BOOL bCanClose = m_pController->GetViewShell_Impl()->PrepareClose( FALSE ); + BOOL bCanClose = (BOOL) m_pController->GetViewShell_Impl()->PrepareClose( FALSE ); if ( !bCanClose ) { if ( bDeliverOwnership ) @@ -412,6 +430,8 @@ struct IMPL_SfxBaseController_DataContainer SfxBaseController* m_pController ; sal_Bool m_bDisposing ; sal_Bool m_bGotOwnerShip; + sal_Bool m_bHasKeyListeners; + sal_Bool m_bHasMouseClickListeners; IMPL_SfxBaseController_DataContainer( MUTEX& aMutex , SfxViewShell* pViewShell , @@ -424,6 +444,8 @@ struct IMPL_SfxBaseController_DataContainer , m_pController ( pController ) , m_bDisposing ( sal_False ) , m_bGotOwnerShip ( sal_False ) + , m_bHasKeyListeners ( sal_False ) + , m_bHasMouseClickListeners( sal_False ) { } @@ -450,7 +472,7 @@ IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper() void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACTIONEVENT& aEvent ) throw( RUNTIMEEXCEPTION ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( ( m_pController != NULL ) && ( aEvent.Frame == m_pController->getFrame() ) && @@ -459,12 +481,16 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT { if ( aEvent.Action == ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( FALSE ); } + if ( aEvent.Action == ::com::sun::star::frame::FrameAction_FRAME_ACTIVATED ) + { + SfxViewFrame* pFrame = m_pController->GetViewShell_Impl()->GetViewFrame(); + if ( !pFrame->GetActiveChildFrame_Impl() ) + pFrame->MakeActive_Impl( FALSE ); + } else if ( aEvent.Action == ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); m_pController->GetViewShell_Impl()->GetViewFrame()->GetBindings().ContextChanged_Impl(); } } @@ -476,7 +502,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const EVENTOBJECT& aEvent ) throw( ::com::sun::star::uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pController && m_pController->getFrame().is() ) m_pController->getFrame()->removeFrameActionListener( this ) ; } @@ -514,8 +540,8 @@ ANY SAL_CALL SfxBaseController::queryInterface( const UNOTYPE& rType ) throw( RU static_cast< XTYPEPROVIDER* > ( this ) , static_cast< XCOMPONENT* > ( this ) , static_cast< XCONTROLLER* > ( this ) , + static_cast< XUSERINPUTINTERCEPTION* > ( this ) , static_cast< XSTATUSINDICATORSUPPLIER* > ( this ) , - static_cast< XDISPATCHINFORMATIONPROVIDER* > ( this ) , static_cast< XCONTEXTMENUINTERCEPTION* > ( this ) , static_cast< XDISPATCHPROVIDER* > ( this ) ) ) ; @@ -579,10 +605,11 @@ SEQUENCE< UNOTYPE > SAL_CALL SfxBaseController::getTypes() throw( RUNTIMEEXCEPTI { // Create a static typecollection ... static OTYPECOLLECTION aTypeCollection( ::getCppuType(( const REFERENCE< XTYPEPROVIDER >*)NULL ) , - ::getCppuType(( const REFERENCE< XSTATUSINDICATORSUPPLIER >*)NULL ) , ::getCppuType(( const REFERENCE< XCONTROLLER >*)NULL ) , + ::getCppuType(( const REFERENCE< XDISPATCHPROVIDER >*)NULL ) , + ::getCppuType(( const REFERENCE< XSTATUSINDICATORSUPPLIER >*)NULL ) , ::getCppuType(( const REFERENCE< XCONTEXTMENUINTERCEPTION >*)NULL ) , - ::getCppuType(( const REFERENCE< XDISPATCHPROVIDER >*)NULL ) ) ; + ::getCppuType(( const REFERENCE< XUSERINPUTINTERCEPTION >*)NULL ) ); // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; } @@ -631,7 +658,7 @@ void SAL_CALL SfxBaseController::attachFrame( const REFERENCE< XFRAME >& xFrame { REFERENCE< XFRAME > xTemp( getFrame() ) ; - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( xTemp.is() ) { xTemp->removeFrameActionListener( m_pData->m_xListener ) ; @@ -657,6 +684,13 @@ void SAL_CALL SfxBaseController::attachFrame( const REFERENCE< XFRAME >& xFrame sal_Bool SAL_CALL SfxBaseController::attachModel( const REFERENCE< XMODEL >& xModel ) throw( ::com::sun::star::uno::RuntimeException ) { + if ( m_pData->m_pViewShell && xModel.is() && xModel != m_pData->m_pViewShell->GetObjectShell()->GetModel() ) + { + // don't allow to reattach a model! + DBG_ERROR("Can't reattach model!"); + return sal_False; + } + REFERENCE < ::com::sun::star::util::XCloseBroadcaster > xCloseable( xModel, com::sun::star::uno::UNO_QUERY ); if ( xCloseable.is() ) xCloseable->addCloseListener( m_pData->m_xCloseListener ); @@ -671,11 +705,10 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( ::com:: { if ( bSuspend == sal_True ) { - ::osl::MutexGuard aMutexGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( !m_pData->m_pViewShell ) return sal_True; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell->PrepareClose() ) { if ( getFrame().is() ) @@ -715,10 +748,9 @@ ANY SfxBaseController::getViewData() throw( ::com::sun::star::uno::RuntimeExcept { ANY aAny; String sData1; - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); m_pData->m_pViewShell->WriteUserData( sData1 ) ; OUSTRING sData( sData1 ); aAny <<= sData ; @@ -733,10 +765,9 @@ ANY SfxBaseController::getViewData() throw( ::com::sun::star::uno::RuntimeExcept void SAL_CALL SfxBaseController::restoreViewData( const ANY& aValue ) throw( ::com::sun::star::uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); OUSTRING sData; aValue >>= sData ; m_pData->m_pViewShell->ReadUserData( sData ) ; @@ -749,7 +780,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const ANY& aValue ) throw( ::c REFERENCE< XFRAME > SAL_CALL SfxBaseController::getFrame() throw( ::com::sun::star::uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); return m_pData->m_xFrame; } @@ -759,7 +790,7 @@ REFERENCE< XFRAME > SAL_CALL SfxBaseController::getFrame() throw( ::com::sun::st REFERENCE< XMODEL > SAL_CALL SfxBaseController::getModel() throw( ::com::sun::star::uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : REFERENCE < XMODEL > () ; } @@ -771,7 +802,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU const OUSTRING& sTargetFrameName, sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); REFERENCE< XDISPATCH > xDisp; if ( m_pData->m_pViewShell ) { @@ -779,7 +810,6 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch( const UNOU if ( !m_pData->m_bDisposing ) { sal_uInt16 nId = 0; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( sTargetFrameName.compareToAscii( "_beamer" ) == COMPARE_EQUAL ) { SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame(); @@ -862,7 +892,7 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SfxBaseController::queryDispatches( void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::RuntimeException ) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); REFERENCE < XCONTROLLER > xTmp( this ); m_pData->m_bDisposing = sal_True ; @@ -884,7 +914,6 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime aObject.Source = (OWEAKOBJECT*)this ; // Bei Reload hat die alte ViewShell keinen Frame! - ::vos::OGuard aGuard( Application::GetSolarMutex() ); SfxObjectShell* pDoc = pFrame->GetObjectShell() ; REFERENCE< XMODEL > xModel = pDoc->GetModel(); REFERENCE < ::com::sun::star::util::XCloseable > xCloseable( xModel, com::sun::star::uno::UNO_QUERY ); @@ -938,7 +967,7 @@ void SAL_CALL SfxBaseController::removeEventListener( const REFERENCE< XEVENTLIS void SfxBaseController::ReleaseShell_Impl() { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell ) { SfxObjectShell* pDoc = m_pData->m_pViewShell->GetObjectShell() ; @@ -959,74 +988,179 @@ SfxViewShell* SfxBaseController::GetViewShell_Impl() const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) throw (::com::sun::star::uno::RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell && !m_pData->m_xIndicator.is() ) m_pData->m_xIndicator = new SfxStatusIndicator( this, m_pData->m_pViewShell->GetViewFrame()->GetFrame()->GetWorkWindow_Impl() ); return m_pData->m_xIndicator; } -#if SUPD>630 -::rtl::OUString SAL_CALL SfxBaseController::queryDescription( const ::rtl::OUString& rURL ) throw( RUNTIMEEXCEPTION ) +void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION ) + +{ + m_pData->m_aInterceptorContainer.addInterface( xInterceptor ); + + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + if ( m_pData->m_pViewShell ) + m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor ); +} + +void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION ) + { + m_pData->m_aInterceptorContainer.removeInterface( xInterceptor ); + + ::vos::OGuard aGuard( Application::GetSolarMutex() ); if ( m_pData->m_pViewShell ) + m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor ); +} + +void SAL_CALL SfxBaseController::addKeyHandler( const ::com::sun::star::uno::Reference< XKEYHANDLER >& xHandler ) throw (::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + if ( !m_pData->m_bHasKeyListeners ) + m_pData->m_bHasKeyListeners = sal_True; + m_pData->m_aListenerContainer.addInterface( ::getCppuType((const REFERENCE< XKEYHANDLER >*)0), xHandler ); +} + +void SAL_CALL SfxBaseController::removeKeyHandler( const ::com::sun::star::uno::Reference< XKEYHANDLER >& xHandler ) throw (::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const REFERENCE< XKEYHANDLER >*)0), xHandler ); + m_pData->m_bHasKeyListeners = sal_False; + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( ::getCppuType( ( const REFERENCE < XKEYHANDLER >*) NULL ) ); + if ( pContainer ) { - SfxViewFrame* pAct = m_pData->m_pViewShell->GetViewFrame() ; - if ( !m_pData->m_bDisposing ) - { - sal_uInt16 nId = 0; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); - if ( rURL.compareToAscii( ".uno:", 5 ) == 0 ) - { - ::rtl::OUString aPath = rURL.copy( 5 ); - SfxSlotPool& rPool = SFX_APP()->GetSlotPool( pAct ); - const SfxSlot* pSlot = rPool.GetUnoSlot( aPath ); - return rPool.GetSlotName_Impl( *pSlot ); - } - else if ( rURL.compareToAscii( ".slot:", 6 ) == 0 ) - { - ::rtl::OUString aPath = rURL.copy( 6 ); - nId = (USHORT) rURL.toInt32(); - SfxSlotPool& rPool = SFX_APP()->GetSlotPool( pAct ); - return rPool.GetSlotName_Impl( nId ); - } - } + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + if (pIterator.hasMoreElements()) + m_pData->m_bHasKeyListeners = sal_True; } +} - return ::rtl::OUString(); +void SAL_CALL SfxBaseController::addMouseClickHandler( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + if ( !m_pData->m_bHasMouseClickListeners ) + m_pData->m_bHasMouseClickListeners = sal_True; + m_pData->m_aListenerContainer.addInterface( ::getCppuType((const REFERENCE< XMOUSECLICKHANDLER >*)0), xHandler ); } -void SAL_CALL SfxBaseController::queryDescriptions ( const SEQUENCE < ::rtl::OUString >& rURLs, SEQUENCE < ::rtl::OUString >& rDescriptions ) throw( RUNTIMEEXCEPTION ) +void SAL_CALL SfxBaseController::removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException) { - for ( sal_Int32 n=0; n<rURLs.getLength(); n++ ) + ::vos::OGuard aGuard( Application::GetSolarMutex() ); + m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const REFERENCE< XMOUSECLICKHANDLER >*)0), xHandler ); + m_pData->m_bHasMouseClickListeners = sal_False; + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( ::getCppuType( ( const REFERENCE < XMOUSECLICKHANDLER >*) NULL ) ); + if ( pContainer ) { - rDescriptions[n] = SfxBaseController::queryDescription( rURLs[n] ); + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + if (pIterator.hasMoreElements()) + m_pData->m_bHasMouseClickListeners = sal_True; } } -SEQUENCE < DISPATCHINFORMATION > SAL_CALL SfxBaseController::getConfigurableDispatchInformation() throw( RUNTIMEEXCEPTION ) +void ImplInitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent, const KeyEvent& rEvt ) { - return SEQUENCE < DISPATCHINFORMATION >(); + rEvent.Modifiers = 0; + if ( rEvt.GetKeyCode().IsShift() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT; + if ( rEvt.GetKeyCode().IsMod1() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1; + if ( rEvt.GetKeyCode().IsMod2() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2; + + rEvent.KeyCode = rEvt.GetKeyCode().GetCode(); + rEvent.KeyChar = (unsigned char)rEvt.GetCharCode(); + rEvent.KeyFunc = rEvt.GetKeyCode().GetFunction(); } -#endif - -void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION ) +void ImplInitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const MouseEvent& rEvt ) +{ + rEvent.Modifiers = 0; + if ( rEvt.IsShift() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT; + if ( rEvt.IsMod1() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1; + if ( rEvt.IsMod2() ) + rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2; + + rEvent.Buttons = 0; + if ( rEvt.IsLeft() ) + rEvent.Buttons |= ::com::sun::star::awt::MouseButton::LEFT; + if ( rEvt.IsRight() ) + rEvent.Buttons |= ::com::sun::star::awt::MouseButton::RIGHT; + if ( rEvt.IsMiddle() ) + rEvent.Buttons |= ::com::sun::star::awt::MouseButton::MIDDLE; + + rEvent.X = rEvt.GetPosPixel().X(); + rEvent.Y = rEvt.GetPosPixel().Y(); + rEvent.ClickCount = rEvt.GetClicks(); + rEvent.PopupTrigger = sal_False; +} +BOOL SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent ) { - m_pData->m_aInterceptorContainer.addInterface( xInterceptor ); + REFERENCE < ::com::sun::star::uno::XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) ); + com::sun::star::lang::EventObject aSource(static_cast< ::cppu::OWeakObject*>(this)); + USHORT nType = rEvent.GetType(); + BOOL bHandled = FALSE; + if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP ) + { + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( ::getCppuType( ( const REFERENCE < XKEYHANDLER >*) NULL ) ); + if ( pContainer ) + { + ::com::sun::star::awt::KeyEvent aEvent; + ImplInitKeyEvent( aEvent, *rEvent.GetKeyEvent() ); + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + while (pIterator.hasMoreElements()) + { + try + { + if ( nType == EVENT_KEYINPUT ) + bHandled = ((XKEYHANDLER*)pIterator.next())->keyPressed( aEvent ); + else + bHandled = ((XKEYHANDLER*)pIterator.next())->keyReleased( aEvent ); + } + catch( RUNTIMEEXCEPTION& ) + { + pIterator.remove(); + } + } + } + } + else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) + { + ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aListenerContainer.getContainer( ::getCppuType( ( const REFERENCE < XMOUSECLICKHANDLER >*) NULL ) ); + if ( pContainer ) + { + ::com::sun::star::awt::MouseEvent aEvent; + ImplInitMouseEvent( aEvent, *rEvent.GetMouseEvent() ); + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); + while (pIterator.hasMoreElements()) + { + try + { + if ( nType == EVENT_MOUSEBUTTONDOWN ) + bHandled = ((XMOUSECLICKHANDLER*)pIterator.next())->mousePressed( aEvent ); + else + bHandled = ((XMOUSECLICKHANDLER*)pIterator.next())->mouseReleased( aEvent ); + } + catch( RUNTIMEEXCEPTION& ) + { + pIterator.remove(); + } + } + } + } - ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pData->m_pViewShell ) - m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor ); + return bHandled; } -void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) throw( RUNTIMEEXCEPTION ) - +BOOL SfxBaseController::HasKeyListeners_Impl() { - m_pData->m_aInterceptorContainer.removeInterface( xInterceptor ); - - ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pData->m_pViewShell ) - m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor ); + return m_pData->m_bHasKeyListeners; } +BOOL SfxBaseController::HasMouseClickListeners_Impl() +{ + return m_pData->m_bHasMouseClickListeners; +} diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index d92f01fec1f8..3e74276d9009 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: topfrm.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: mba $ $Date: 2002-10-28 12:49:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,9 @@ #include "topfrm.hxx" +#ifndef _COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ +#include <com/sun/star/util/XURLTransformer.hpp> +#endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> #endif @@ -87,6 +90,12 @@ #ifndef _UNO_COM_SUN_STAR_AWT_POSSIZE_HPP_ #include <com/sun/star/awt/PosSize.hpp> #endif +#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ +#include <com/sun/star/container/XIndexAccess.hpp> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XPROPERTYSET_HPP_ +#include <com/sun/star/beans/XPropertySet.hpp> +#endif #ifndef _SV_MENU_HXX #include <vcl/menu.hxx> @@ -143,6 +152,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::beans; //------------------------------------------------------------------------ @@ -164,12 +175,10 @@ class SfxTopWindow_Impl : public Window { public: SfxTopFrame* pFrame; - Dialog* pModalDialog; SfxTopWindow_Impl( SfxTopFrame* pF ); // : Window( pF->pImp->pWindow, WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_3DLOOK ) // , pFrame( pF ) -// , pModalDialog( 0 ) // { SetBackground(); } ~SfxTopWindow_Impl( ); @@ -186,7 +195,6 @@ public: SfxTopWindow_Impl::SfxTopWindow_Impl( SfxTopFrame* pF ) : Window( pF->pImp->pWindow, WB_BORDER | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_3DLOOK ) , pFrame( pF ) - , pModalDialog( 0 ) { SetBackgroundBrush( Brush( Color( COL_WHITE )) ); } @@ -236,16 +244,14 @@ long SfxTopWindow_Impl::Notify( NotifyEvent& rNEvt ) if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) ) return TRUE; } - else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG ) + else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) { - pModalDialog = (Dialog*) rNEvt.GetWindow(); pView->SetModalMode( sal_True ); return sal_True; } - else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG ) + else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { - pModalDialog = NULL; - EnableInput( sal_True, sal_True ); + //EnableInput( sal_True, sal_True ); pView->SetModalMode( sal_False ); return sal_True; } @@ -255,7 +261,26 @@ long SfxTopWindow_Impl::Notify( NotifyEvent& rNEvt ) long SfxTopWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) + USHORT nType = rNEvt.GetType(); + if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP ) + { + SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); + SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; + if ( pShell && pShell->HasKeyListeners_Impl() && pShell->HandleNotifyEvent_Impl( rNEvt ) ) + return sal_True; + } + else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) + { + Window* pWindow = rNEvt.GetWindow(); + SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); + SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; + if ( pShell ) + if ( pWindow == pShell->GetWindow() || pShell->GetWindow()->IsChild( pWindow ) ) + if ( pShell->HasMouseClickListeners_Impl() && pShell->HandleNotifyEvent_Impl( rNEvt ) ) + return sal_True; + } + + if ( nType == EVENT_MOUSEBUTTONDOWN ) { Window* pWindow = rNEvt.GetWindow(); const MouseEvent* pMEvent = rNEvt.GetMouseEvent(); @@ -376,13 +401,12 @@ class SfxTopViewFrame_Impl public: sal_Bool bActive; Window* pWindow; - const char* pFactoryName; + String aFactoryName; StopButtonTimer_Impl* pStopButtonTimer; SfxTopViewFrame_Impl() : bActive( sal_False ) , pWindow( 0 ) - , pFactoryName( 0 ) , pStopButtonTimer( 0 ) {} }; @@ -392,12 +416,102 @@ static svtools::AsynchronLink* pPendingCloser = 0; SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHidden, const SfxItemSet* pSet ) { Reference < XFrame > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); - Reference < XFrame > xFrame = xDesktop->findFrame( DEFINE_CONST_UNICODE("_blank"), 0 ); - SfxTopFrame *pFrame = Create( xFrame ); - pFrame->pImp->bHidden = bHidden; + SfxTopFrame *pFrame = NULL; + BOOL bNewView = FALSE; + if ( pSet ) + { + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); + bNewView = pItem && pItem->GetValue(); + } + if ( pDoc && !bHidden && !bNewView ) + { + URL aTargetURL; + aTargetURL.Complete = pDoc->GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); + + BOOL bIsBasic = FALSE; + if ( !aTargetURL.Complete.getLength() ) + { + String sFactory = String::CreateFromAscii(pDoc->GetFactory().GetShortName()); + bIsBasic = (sFactory.CompareIgnoreCaseToAscii("sbasic")==COMPARE_EQUAL); + + if (!bIsBasic) + { + String aURL = String::CreateFromAscii("private:factory/"); + aURL += sFactory; + aTargetURL.Complete = aURL; + } + } + + if (bIsBasic) + { + Reference < XFramesSupplier > xSupplier( xDesktop, UNO_QUERY ); + if (xSupplier.is()) + { + Reference < XIndexAccess > xContainer(xSupplier->getFrames(), UNO_QUERY); + if (xContainer.is()) + { + sal_Int32 nCount = xContainer->getCount(); + for (sal_Int32 i=0; i<nCount; ++i) + { + Reference < XFrame > xFrame; + if (!(xContainer->getByIndex(i) >>= xFrame) || !xFrame.is()) + continue; + Reference < XPropertySet > xSet(xFrame, UNO_QUERY); + sal_Bool bIsBacking; + if ( + (xSet.is()) && + (xSet->getPropertyValue(::rtl::OUString::createFromAscii("IsBackingMode"))>>=bIsBacking) && + (bIsBacking) + ) + { + pFrame = Create(xFrame); + break; + } + } + } + } + } + else + { + Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY ); + xTrans->parseStrict( aTargetURL ); + + Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xDesktop, UNO_QUERY ); + Reference < ::com::sun::star::frame::XDispatch > xDisp; + if ( xProv.is() ) + { + Sequence < ::com::sun::star::beans::PropertyValue > aSeq(1); + aSeq[0].Name = ::rtl::OUString::createFromAscii("Model"); + aSeq[0].Value <<= pDoc->GetModel(); + ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii("_default") ); + xDisp = xProv->queryDispatch( aTargetURL, aTargetFrame , 0 ); + if ( xDisp.is() ) + xDisp->dispatch( aTargetURL, aSeq ); + } + + SfxFrameArr_Impl& rArr = *SFX_APP()->Get_Impl()->pTopFrames; + for( USHORT nPos = rArr.Count(); nPos--; ) + { + SfxTopFrame *pF = (SfxTopFrame*) rArr[ nPos ]; + if ( pF->GetCurrentDocument() == pDoc ) + { + pFrame = pF; + break; + } + } + } + } + + if ( !pFrame ) + { + Reference < XFrame > xFrame = xDesktop->findFrame( DEFINE_CONST_UNICODE("_blank"), 0 ); + pFrame = Create( xFrame ); + } + + pFrame->pImp->bHidden = bHidden; Window* pWindow = pFrame->GetTopWindow_Impl(); - if ( pWindow ) + if ( pWindow && pDoc ) { String aTitle = pDoc->GetTitle( SFX_TITLE_DETECT ); aTitle += String::CreateFromAscii( " - " ); @@ -489,7 +603,11 @@ SfxTopFrame::SfxTopFrame( Window* pExternal, sal_Bool bHidden ) } pWindow = new SfxTopWindow_Impl( this ); +/** AS: + Hide this window till the component was realy loaded. Otherwhise it overpaint e.g. the old component hardly + and produce repaint errors. pWindow->Show(); + */ } SfxTopFrame::~SfxTopFrame() @@ -652,6 +770,12 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) // ViewDaten SFX_ITEMSET_ARG( pSet, pViewDataItem, SfxStringItem, SID_USER_DATA, sal_False ); + // ViewOnly + SFX_ITEMSET_ARG( + pSet, pEditItem, SfxBoolItem, SID_VIEWONLY, sal_False); + + if ( pEditItem && pEditItem->GetValue() ) + SetMenuBarOn_Impl( FALSE ); if ( pHidItem ) pImp->bHidden = pHidItem->GetValue(); @@ -844,9 +968,17 @@ String SfxTopViewFrame::UpdateTitle() const SfxObjectFactory &rFact = GetObjectShell()->GetFactory(); if ( rFact.GetFilterContainer()->GetFilterCount() ) - pImp->pFactoryName = rFact.GetShortName(); + { + pImp->aFactoryName = String::CreateFromAscii( rFact.GetShortName() ); + USHORT nSlotId = rFact.GetCreateNewSlotId(); + if ( nSlotId ) + { + pImp->aFactoryName += String::CreateFromAscii("?slot="); + pImp->aFactoryName += String::CreateFromInt32( (sal_Int32) nSlotId ); + } + } else - pImp->pFactoryName = SfxObjectFactory::GetDefaultFactory().GetShortName(); + pImp->aFactoryName = String::CreateFromAscii( SfxObjectFactory::GetDefaultFactory().GetShortName() ); String aTitle = SfxViewFrame::UpdateTitle(); aTitle += String::CreateFromAscii( " - " ); @@ -1125,9 +1257,7 @@ void SfxTopViewFrame::Exec_Impl(SfxRequest &rReq ) String aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); - else if ( pImp->pFactoryName ) - aFactName = String::CreateFromAscii( pImp->pFactoryName ); - else + else if ( !pImp->aFactoryName.Len() ) { DBG_ERROR("Missing argument!"); break; @@ -1135,7 +1265,7 @@ void SfxTopViewFrame::Exec_Impl(SfxRequest &rReq ) SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); String aFact = String::CreateFromAscii("private:factory/"); - aFact += aFactName; + aFact += pImp->aFactoryName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_blank" ) ) ); @@ -1172,7 +1302,8 @@ void SfxTopViewFrame::Exec_Impl(SfxRequest &rReq ) bUI = 2; if ( ( bOther || pDocSh->PrepareClose( bUI ) ) ) { - pDocSh->SetModified( FALSE ); + if ( !bOther ) + pDocSh->SetModified( FALSE ); rReq.Done(); // unbedingt vor Close() rufen! if ( SfxApplication::IsPlugin() && rReq.GetSlot() == SID_BACKTOWEBTOP ) { @@ -1236,10 +1367,10 @@ void SfxTopViewFrame::GetState_Impl( SfxItemSet &rSet ) { case SID_NEWDOCDIRECT : { - if ( pImp->pFactoryName ) + if ( pImp->aFactoryName.Len() ) { String aFact = String::CreateFromAscii("private:factory/"); - aFact += String::CreateFromAscii( pImp->pFactoryName ); + aFact += pImp->aFactoryName; rSet.Put( SfxStringItem( nWhich, aFact ) ); } break; diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src index 9d8021bb4b17..4c7fe4eea016 100644 --- a/sfx2/source/view/view.src +++ b/sfx2/source/view/view.src @@ -2,9 +2,9 @@ * * $RCSfile: view.src,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: cd $ $Date: 2001-10-08 05:27:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,27 +70,28 @@ String STR_NODEFPRINTER TEXT = "Kein Standarddrucker gefunden.\nBitte whlen Sie einen Drucker aus und versuchen Sie es noch einmal." ; TEXT [ English ] = "No default printer found.\nPlease choose a printer and try again." ; TEXT [ norwegian ] = "Ingen standardskriver funnet.\nVelg en skriver og prv igjen." ; - TEXT [ italian ] = "Stampante predefinita non trovata.\nScegliere una stampante e riprovare." ; + TEXT [ italian ] = "Stampante standard non trovata.\nScegliete una stampante e riprovate." ; TEXT [ portuguese_brazilian ] = "Nenhuma impressora padr o encontrada.\nEscolha uma impressora e tente novamente." ; TEXT [ portuguese ] = "Nenhuma impressora padro encontrada.\nEscolha uma impressora e tente novamente." ; - TEXT [ finnish ] = "Oletustulostinta ei ole.\nValitse tulostin ja yrit? uudelleen." ; + TEXT [ finnish ] = "Oletustulostinta ei ole.\nValitse tulostin ja yrit uudelleen." ; TEXT [ danish ] = "Der blev ikke fundet nogen standardprinter.\nVlg venligst en printer og prv igen." ; TEXT [ french ] = "Impossible de dtecter l'imprimante par dfaut.\nSlectionnezr une imprimante et recommencez." ; TEXT [ swedish ] = "Ingen standardskrivare hittades.\nVlj en skrivare och frsk igen." ; - TEXT [ dutch ] = "Geen standaardprinter gevonden.\nKies een printer en probeer nogmaals." ; + TEXT [ dutch ] = "Geen standaardprinter gevonden.\nKies een printer en probeer het nogmaals." ; TEXT [ spanish ] = "No se encontr ninguna impresora predeterminada.\nSeleccione por favor una impresora e intntelo nuevamente." ; TEXT [ english_us ] = "No default printer found.\nPlease choose a printer and try again." ; TEXT[ chinese_simplified ] = "没有找到默认打印机。\n请您选择一个打印机，然后再重试打印。"; - TEXT[ russian ] = " .\n, , ."; + TEXT[ russian ] = " .\n ."; TEXT[ polish ] = "Nie znaleziono drukarki domylnej.\nProsz wybra drukark i sprbowa jeszcze raz."; - TEXT[ japanese ] = "標準ﾌﾟﾘﾝﾀが見つかりませんでした。\nﾌﾟﾘﾝﾀを選択し 再度試みてください。"; + TEXT[ japanese ] = "標準プリンタが見つかりませんでした。\nプリンタを選択し 再度試みてください。"; TEXT[ chinese_traditional ] = "沒有找到默認印表機。\n請選擇一個印表機﹐然後再重試列印。"; TEXT[ language_user1 ] = " "; TEXT[ greek ] = " .\n ."; - TEXT[ korean ] = "기본 프린터를 찾지 못했습니다. \n프린터를 선택한 다음, 재시도하십시오."; + TEXT[ korean ] = "기본 프린터를 찾지 못했습니다. \n프린터를 선택한 다음 다시 시도하십시오."; TEXT[ arabic ] = " . "; TEXT[ turkish ] = "Standart yazc bulunamad.\nBir yazc seip yeniden deneyin."; - TEXT[ catalan ] = "No se encontr ninguna impresora predeterminada.\nSeleccione por favor una impresora e intntelo nuevamente."; + TEXT[ catalan ] = "No s'ha trobat cap impressora per defecte.\\Trieu-ne una i torneu-ho a provar."; + TEXT[ thai ] = "ไม่พบค่าเริ่มต้นเครื่องพิมพ์\nกรุณาเลือกเครื่องพิมพ์และลองอีกครั้ง"; }; String STR_NOSTARTPRINTER { @@ -100,24 +101,25 @@ String STR_NOSTARTPRINTER TEXT [ italian ] = "Impossibile avviare la stampante.\nVerificare la configurazione della stampante." ; TEXT [ portuguese_brazilian ] = "N?o consegui iniciar a impressora.\nVerifique a configura??o da impressora." ; TEXT [ portuguese ] = "Foi impossvel iniciar a impressora.\nPor favor, verifique a configurao da impressora." ; - TEXT [ finnish ] = "Tulostinta ei voi k?ynnist??.\nTarkista tulostimen kokoonpano." ; + TEXT [ finnish ] = "Tulostinta ei voi kynnist.\nTarkista tulostimen mritykset." ; TEXT [ danish ] = "Det var ikke muligt at starte printeren.\nKontroller venligst din printerkonfiguration." ; TEXT [ french ] = "Impossible de dmarrer l'imprimante !\nVrifiez-en la configuration." ; TEXT [ swedish ] = "Det gick inte att starta skrivaren.\nKontrollera skrivarkonfigurationen." ; - TEXT [ dutch ] = "Printer kon niet worden gestart.\nControleer de configuratie van uw printer." ; + TEXT [ dutch ] = "Printer kan niet worden gestart.\nControleer de configuratie van uw printer." ; TEXT [ spanish ] = "No se puede iniciar la impresora.\nPor favor verifique la configuracin de su impresora." ; TEXT [ english_us ] = "Could not start printer.\nPlease check your printer configuration." ; TEXT[ chinese_simplified ] = "无法启动打印机。\n请您检查打印机的配置。"; - TEXT[ russian ] = " .\n, , ."; + TEXT[ russian ] = " .\n ."; TEXT[ polish ] = "Drukarki nie mona byo uruchomi.\nSprawd prosz konfiguracj drukarki."; - TEXT[ japanese ] = "ﾌﾟﾘﾝﾀを起動できませんでした。\nﾌﾟﾘﾝﾀの設定をﾁｪｯｸしてください。"; + TEXT[ japanese ] = "プリンタを起動できませんでした。\nプリンタの設定をチェックしてください。"; TEXT[ chinese_traditional ] = "無法啟動印表機。\n請檢查印表機的配置。"; TEXT[ greek ] = " .\n ."; - TEXT[ korean ] = "프린터가 시작되지 않았습니다.\n프린터구성을 검사하십시오."; + TEXT[ korean ] = "프린터가 시작되지 않았습니다.\n프린터 설정을 검사하십시오."; TEXT[ arabic ] = " . \n ."; TEXT[ turkish ] = "Yazc altrlamad.\nYazc konfigrasyonunu kontrol edin."; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "No se puede iniciar la impresora.\nPor favor verifique la configuracin de su impresora."; + TEXT[ catalan ] = "No es pot iniciar la impressora\nVerifiqueu la seva configuraci."; + TEXT[ thai ] = "ไม่สามารถเริ่มเครื่องพิมพ์ได้\nกรุณาตรวจสอบการกำหนดค่าติดตั้งเครื่องพิมพ์"; }; String STR_PRINTER_NOTAVAIL { @@ -127,24 +129,25 @@ String STR_PRINTER_NOTAVAIL TEXT [ italian ] = "Questo documento era stato formattato in precedenza per la stampante $1. La stampante, per, non esiste.\nUsare la stampante predefinita $2?" ; TEXT [ portuguese_brazilian ] = "Este documento foi formatado anterior para a impressora" ; TEXT [ portuguese ] = "O documento foi formatado para a impressora $1. A impressora no est disponvel.\nUsar a impressora padro $2?" ; - TEXT [ finnish ] = "Asiakirja on muotoiltu tulostinta $1 varten. M??ritetty tulostin ei ole k?ytett?viss?. \nHaluatko k?ytt?? vakiotulostinta $2 ?" ; + TEXT [ finnish ] = "Asiakirja on muotoiltu tulostinta $1 varten. Mritetty tulostin ei ole kytettviss. \nHaluatko kytt vakiotulostinta $2?" ; TEXT [ danish ] = "Dette dokument er formateret til printeren $1. Denne printer er ikke tilgngelig.\nVil du bruge standardprinteren $2?" ; TEXT [ french ] = "Ce document a t format pour l'imprimante $1. L'imprimante n'est pas disponible.\nUtiliser l'imprimante par dfaut $2 ?" ; TEXT [ swedish ] = "Dokumentet har formaterats fr skrivaren $1. Denna skrivare r inte tillgnglig.\nSkall standardskrivaren $2 anvndas?" ; - TEXT [ dutch ] = "Dit document is opgemaakt voor printer $1. Deze printer is niet voorhanden.\nWilt u de standaardprinter $2 gebruiken?" ; + TEXT [ dutch ] = "Dit document is opgemaakt voor printer $1. Deze printer is niet beschikbaar.\nWilt u de standaardprinter $2 gebruiken?" ; TEXT [ spanish ] = "Este documento se ha formateado para la impresora $1, pero esta no est disponible.\nDesea usar la impresora predeterminada $2?" ; TEXT [ english_us ] = "This document has been formatted for the printer $1. The specified printer is not available. \nDo you want to use the standard printer $2 ?" ; TEXT[ chinese_simplified ] = "这个文档格式是专门为打印机 $1 设定的。\n但是这个打印机不存在。您要使用默认打印机 $2 ？"; - TEXT[ russian ] = " $1. .\n $2?"; + TEXT[ russian ] = " $1, .\n $2?"; TEXT[ polish ] = "Dokument zosta sformatowany dla drukarki $1. Drukarki tego typu brak.\nUy drukarki domylnej $2?"; - TEXT[ japanese ] = "ﾄﾞｷｭﾒﾝﾄはﾌﾟﾘﾝﾀ $1用に書式設定されました。ﾌﾟﾘﾝﾀはありません。\n標準ﾌﾟﾘﾝﾀ $2を使用してもよろしいでしょうか?"; + TEXT[ japanese ] = "ドキュメントはプリンタ $1 用に書式設定されました。プリンタはありません。\n標準プリンタ $2 を使用しますか。"; TEXT[ chinese_traditional ] = "這個文件格式是專門為印表機 $1 設定的。\n但是這個印表機不存在。您要使用默認印表機 $2 ？"; TEXT[ greek ] = " $1. \n. "; - TEXT[ korean ] = "이 문서는 프린터$1용으로 포맷되었습니다. 지정된 프린터가 없습니다. \n기본 프린터$2 을 (를) 사용하시겠습니까?"; + TEXT[ korean ] = "이 문서의 형식이 프린터$1용으로 지정되었습니다. 지정된 프린터가 없습니다. \n기본 프린터$2 을 (를) 사용하겠습니까?"; TEXT[ arabic ] = " $1. .\n $2"; TEXT[ turkish ] = "Belge, $1 yazcs iin formatland. Belirtilen yazc bulunamad.\nStandart yazc $2 kullanlsn m?"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Este documento se ha formateado para la impresora $1, pero esta no est disponible.\nDesea usar la impresora predeterminada $2?"; + TEXT[ catalan ] = "Aquest document s'ha formatat per a la impressora $1, per no est disponible.\nVoleu utilitzar la impressora predeterminada $2?"; + TEXT[ thai ] = "จัดรูปแบบเอกสานี้สำหรับเครื่องพิมพ์ $1 แล้ว เครื่องพิมพ์ที่ระบุไม่สามารถใช้งานได้ \nคุณต้องการใช้เครื่องพิมพ์มาตรฐาน $2 หรือไม่?"; }; String STR_MENU_NEWMAIL { @@ -153,24 +156,25 @@ String STR_MENU_NEWMAIL Text [ dutch ] = "Nieuw ~bericht" ; Text [ english_us ] = "New ~Mail" ; Text [ italian ] = "Nuovo ~messaggio" ; - Text [ spanish ] = "Nuevo ~mensaje" ; + Text [ spanish ] = "~Mensaje nuevo" ; Text [ french ] = "Nouveau ~message" ; Text [ swedish ] = "Nytt m~eddelande" ; Text [ danish ] = "Ny meddelelse" ; Text [ portuguese ] = "No~va mensagem" ; Text [ portuguese_brazilian ] = "N~eue Nachricht" ; Text[ chinese_simplified ] = "新建电子邮件(~M)"; - Text[ russian ] = " "; + Text[ russian ] = " . "; Text[ polish ] = "Nowa wiadomo"; - Text[ japanese ] = "新しいﾒｯｾｰｼﾞ(~M)"; + Text[ japanese ] = "新しいメッセージ(~M)"; Text[ chinese_traditional ] = "新電子郵件(~M)"; Text[ greek ] = " "; Text[ korean ] = "새 메일(~M)"; Text[ arabic ] = " "; Text[ turkish ] = "Y~eni ileti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo ~mensaje"; + Text[ catalan ] = "~Correu nou"; Text[ finnish ] = "Uusi ~viesti"; + Text[ thai ] = "เ~มล์ใหม่"; }; String STR_PRINT_OPTIONS { @@ -190,14 +194,15 @@ String STR_PRINT_OPTIONS Text[ chinese_simplified ] = "其他..."; Text[ russian ] = "..."; Text[ polish ] = "Dodatki"; - Text[ japanese ] = "ｵﾌﾟｼｮﾝ..."; + Text[ japanese ] = "オプション..."; Text[ chinese_traditional ] = "其他..."; Text[ greek ] = "..."; Text[ korean ] = "옵션..."; Text[ arabic ] = "..."; Text[ turkish ] = "Seenekler..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones..."; + Text[ catalan ] = "Opcions..."; + Text[ thai ] = "ตัวเลือก..."; }; String STR_PRINT_OPTIONS_TITLE { @@ -207,7 +212,7 @@ String STR_PRINT_OPTIONS_TITLE Text [ italian ] = "Opzioni stampante" ; Text [ portuguese_brazilian ] = "Op??s de Impressora" ; Text [ portuguese ] = "Opes de impresso" ; - Text [ finnish ] = "Tulostimen m??ritykset" ; + Text [ finnish ] = "Tulostimen mritykset" ; Text [ danish ] = "Printerindstillinger" ; Text [ french ] = "Options d'impression" ; Text [ swedish ] = "Skrivaralternativ" ; @@ -217,14 +222,15 @@ String STR_PRINT_OPTIONS_TITLE Text[ chinese_simplified ] = "打印机 其他"; Text[ russian ] = " "; Text[ polish ] = "Opcje drukarki"; - Text[ japanese ] = "ﾌﾟﾘﾝﾀのｵﾌﾟｼｮﾝ"; + Text[ japanese ] = "印刷オプション"; Text[ chinese_traditional ] = "印表機 其他"; Text[ greek ] = " "; Text[ korean ] = "프린터 옵션"; Text[ arabic ] = " "; Text[ turkish ] = "Yazc seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de impresin"; + Text[ catalan ] = "Opcions de la impressora"; + Text[ thai ] = "ตัวเลือกเครื่องพิมพ์"; }; String STR_ERROR_PRINTER_BUSY { @@ -234,7 +240,7 @@ String STR_ERROR_PRINTER_BUSY Text [ italian ] = "stampante occupata" ; Text [ portuguese_brazilian ] = "Impressora ocupada" ; Text [ portuguese ] = "Impressora ocupada" ; - Text [ finnish ] = "Tulostin k?yt?s?" ; + Text [ finnish ] = "Tulostin kytss" ; Text [ danish ] = "Printeren er optaget" ; Text [ french ] = "Imprimante occupe" ; Text [ swedish ] = "Skrivaren r upptagen" ; @@ -242,9 +248,9 @@ String STR_ERROR_PRINTER_BUSY Text [ spanish ] = "Impresora ocupada" ; Text [ english_us ] = "Printer busy" ; Text[ chinese_simplified ] = "打印机忙碌"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Drukarka ju pracuje"; - Text[ japanese ] = "ﾌﾟﾘﾝﾀは起動中です。"; + Text[ japanese ] = "プリンタは起動中です。"; Text[ chinese_traditional ] = "印表機已經運作"; Text[ greek ] = " "; Text[ korean ] = "프린터 이미 작동중"; @@ -252,6 +258,7 @@ String STR_ERROR_PRINTER_BUSY Text[ turkish ] = "Yazc u an kullanlyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Impresora ocupada"; + Text[ thai ] = "เครื่องพิมพ์ไม่ว่าง"; }; String STR_ERROR_PRINT { @@ -269,9 +276,9 @@ String STR_ERROR_PRINT Text [ spanish ] = "Error al imprimir" ; Text [ english_us ] = "Error while printing" ; Text[ chinese_simplified ] = "打印错误"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bd podczas drukowania"; - Text[ japanese ] = "印刷中にｴﾗｰが発生しました。"; + Text[ japanese ] = "印刷中にエラーが発生しました。"; Text[ chinese_traditional ] = "列印錯誤"; Text[ greek ] = " "; Text[ korean ] = "인쇄시 오류 발생"; @@ -279,6 +286,7 @@ String STR_ERROR_PRINT Text[ turkish ] = "Yazdrma hatas"; Text[ language_user1 ] = " "; Text[ catalan ] = "Error al imprimir"; + Text[ thai ] = "ผิดพลาดขณะพิมพ์"; }; String STR_PRINTING { @@ -290,7 +298,7 @@ String STR_PRINTING Text [ portuguese ] = "A imprimir" ; Text [ finnish ] = "Tulostetaan" ; Text [ danish ] = "Udskriver" ; - Text [ french ] = "Impression en cours" ; + Text [ french ] = "Impression" ; Text [ swedish ] = "Skriver ut" ; Text [ dutch ] = "Bezig met afdrukken" ; Text [ spanish ] = "Imprimiendo" ; @@ -305,7 +313,8 @@ String STR_PRINTING Text[ arabic ] = ""; Text[ turkish ] = "Yazdr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imprimiendo"; + Text[ catalan ] = "S'est imprimint"; + Text[ thai ] = "กำลังพิมพ์"; }; String STR_PAGE { @@ -319,20 +328,21 @@ String STR_PAGE Text [ danish ] = "Side " ; Text [ french ] = "Page " ; Text [ swedish ] = "Sida " ; - Text [ dutch ] = "Pagina " ; + Text [ dutch ] = "Pagina" ; Text [ spanish ] = "Pgina " ; Text [ english_us ] = "Page " ; Text[ chinese_simplified ] = "页 "; Text[ russian ] = " "; Text[ polish ] = "Strona "; - Text[ japanese ] = "ﾍﾟｰｼﾞ "; + Text[ japanese ] = "ページ "; Text[ chinese_traditional ] = "頁 "; Text[ greek ] = " "; Text[ korean ] = "페이지 "; Text[ arabic ] = " "; Text[ turkish ] = "Sayfa "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pgina "; + Text[ catalan ] = "Pgina "; + Text[ thai ] = "หน้า "; }; String STR_MDIFRAME_INTERFACE { @@ -352,14 +362,15 @@ String STR_MDIFRAME_INTERFACE Text[ chinese_simplified ] = "MDI-视窗"; Text[ russian ] = " MDI"; Text[ polish ] = "Okno MDI"; - Text[ japanese ] = "MDI ｳｨﾝﾄﾞｳ"; + Text[ japanese ] = "MDI ウィンドウ"; Text[ chinese_traditional ] = "MDI 視窗"; Text[ greek ] = " MDI"; Text[ korean ] = "MDI 창"; Text[ arabic ] = " MDI"; Text[ turkish ] = "MDI penceresi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ventana MDI"; + Text[ catalan ] = "Finestra MDI"; + Text[ thai ] = "หน้าต่าง MDI "; }; String STR_ERROR_SAVE_TEMPLATE { @@ -369,24 +380,25 @@ String STR_ERROR_SAVE_TEMPLATE Text [ italian ] = "Errore durante la scrittura del modello " ; Text [ portuguese_brazilian ] = "Erro ao gravar o modelo " ; Text [ portuguese ] = "Erro ao gravar o modelo " ; - Text [ finnish ] = "On ilmennyt virhe tallennettaessa mallipohjaa" ; + Text [ finnish ] = "On ilmennyt virhe tallennettaessa mallia " ; Text [ danish ] = "Fejl under skrivning af skabelon " ; Text [ french ] = "Erreur lors de l'criture du modle " ; Text [ swedish ] = "Fel vid skrivning av mall " ; - Text [ dutch ] = "Fout bij schrijven van sjabloon " ; + Text [ dutch ] = "Fout bij schrijven van sjabloon" ; Text [ spanish ] = "Error al grabar la plantilla " ; Text [ english_us ] = "Error saving template " ; Text[ chinese_simplified ] = "在写入样式时发生错误 "; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Bd przy zapisywaniu szablonu "; - Text[ japanese ] = "ﾃﾝﾌﾟﾚｰﾄの書き込み時のｴﾗｰ "; + Text[ japanese ] = "テンプレートの書き込み時のエラー "; Text[ chinese_traditional ] = "寫入樣式時發生一個錯誤 "; Text[ greek ] = " "; - Text[ korean ] = "서식 파일 쓰기에서 오류 발생 "; + Text[ korean ] = "서식 파일 저장 중 오류 발생 "; Text[ arabic ] = " "; Text[ turkish ] = "ablon hazrlamada hata "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Error al grabar la plantilla "; + Text[ catalan ] = "S'ha produt un error en desar la plantilla "; + Text[ thai ] = "บันทึกแม่แบบผิดพลาด "; }; String STR_READONLY { @@ -400,8 +412,8 @@ String STR_READONLY Text [ danish ] = "(skrivebeskyttet)" ; Text [ french ] = "(en lecture seule)" ; Text [ swedish ] = "(skrivskyddad)" ; - Text [ dutch ] = "(alleen lezen)" ; - Text [ spanish ] = "(solo lectura)" ; + Text [ dutch ] = "(alleen-lezen)" ; + Text [ spanish ] = "(slo lectura)" ; Text [ english_us ] = " (read-only)" ; Text[ chinese_simplified ] = " (防改写)"; Text[ russian ] = "( )"; @@ -409,17 +421,18 @@ String STR_READONLY Text[ japanese ] = "(読み取り専用)"; Text[ chinese_traditional ] = "(唯讀)"; Text[ greek ] = "( )"; - Text[ korean ] = "(쓰기 보호)"; + Text[ korean ] = " (읽기 전용)"; Text[ arabic ] = "( )"; Text[ turkish ] = "(salt okunur)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "(solo lectura)"; + Text[ catalan ] = "(noms lectura)"; + Text[ thai ] = " (อ่านอย่างเดียว)"; }; String STR_PRINT_NEWORI { Text = "Sie haben die Seitenorientierungseinstellung gendert.\nSollen die genderten Einstellungen in das Dokument\nbernommen werden?" ; Text [ English ] = "You have changed the page orientation.\nWould you like your changes to be saved\nin the document?" ; - Text [ dutch ] = "U heeft de instelling van de pagina-orintatie veranderd.\nWilt u de nieuwe instellingen overnemen in uw document?" ; + Text [ dutch ] = "U heeft de paginaorintatie gewijzigd.\nWilt u de nieuwe instellingen overnemen in uw document?" ; Text [ english_us ] = "The page orientation has been modified.\nShould the new settings be saved \nin the active document?" ; Text [ italian ] = " stata cambiata l'orientazione della pagina.\nTrasferire le impostazioni cambiate nel documento?" ; Text [ spanish ] = "La orientacin de la pgina ha sido modificada.\nDesea aplicar las modificaciones al documento\n actual?" ; @@ -429,17 +442,18 @@ String STR_PRINT_NEWORI Text [ portuguese_brazilian ] = "Sie haben die Seitenorientierungseinstellung ge?ndert.\nSollen die ge?nderten Einstellungen in das Dokument\n?ernommen werden?" ; Text [ portuguese ] = "Voc modificou a orientao da pgina.\nDeseja aplicar as novas definies\nao documento activo?" ; Text[ chinese_simplified ] = "您更改了页面设定。\n这个文档要接收更改的设定吗？"; - Text[ russian ] = " .\n \n ?"; + Text[ russian ] = " .\n \n ?"; Text[ polish ] = "Zmienie ustawienia strony.\nCzy te zmienione ustawienia maj zosta \nzapisane w dokumencie?"; - Text[ japanese ] = "ﾍﾟｰｼﾞ方向の設定が変更されています。\n変更された設定を現在のﾄﾞｷｭﾒﾝﾄに\n適用しますか?"; + Text[ japanese ] = "ページ方向の設定が変更されています。\n変更された設定を現在のドキュメントに\n適用しますか?"; Text[ chinese_traditional ] = "您變更了頁面設定。\n這個文檔採用變更的設定﹖"; Text[ greek ] = " .\n \n ;"; - Text[ korean ] = "페이지 방향설정이 변경되었습니다.\n변경된 설정을 문서에 적용하시겠습니까?"; + Text[ korean ] = "페이지 방향의 설정이 변경되었습니다.\n변경된 설정을 문서에 적용하시겠습니까?"; Text[ arabic ] = " .\n \n Ͽ"; Text[ turkish ] = "Sayfa duru ayarn deitirdiniz.\nDeitirilen ayar\nbelgede kullanlsn m?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "La orientacin de la pgina ha sido modificada.\nDesea aplicar las modificaciones al documento\n actual?"; + Text[ catalan ] = "S'ha modificat l'orientaci de la pgina.\nVoleu aplicar les modificacions al document\n actual?"; Text[ finnish ] = "Sivun suuntaa on muutettu.\nTallennetaanko uudet asetukset \naktiiviseen asiakirjaan?"; + Text[ thai ] = "ดัดแปลงแก้ไขการวางหน้ากระดาษ\nบันทึกการกำหนดใหม่ \nในเอกสารที่ใช้งานอยู่หรือไม่?"; }; String STR_PRINT_NEWSIZE { @@ -449,29 +463,30 @@ String STR_PRINT_NEWSIZE Text [ italian ] = "Sono state modificate le dimensioni della pagina.\nTrasferire le impostazioni cambiate nel documento?" ; Text [ spanish ] = "El tamao de la pgina se ha modificado.\nDesea aplicar las modificaciones al documento\nactual?" ; Text [ french ] = "Le format de la page a chang.\nVoulez-vous appliquer les paramtres modifis\ndans le document ?" ; - Text [ dutch ] = "U heeft het paginaformaat veranderd.\nWilt u deze verandering in uw\ndocument overnemen?" ; + Text [ dutch ] = "U heeft de paginagrootte gewijzigd.\nWilt u de nieuwe instellingen\novernemen in het document?" ; Text [ swedish ] = "Du har ndrat sidstorleken.\nSka de ndrade instllningarna\nvertas till dokumentet?" ; Text [ danish ] = "Sidestrrelsen er blevet ndret.\nSkal ndringerne overtages i dokumentet?" ; Text [ portuguese_brazilian ] = "Sie haben die Seitengr?e ge?ndert.\nSollen die ge?nderten Einstellungen in das\nDokument ?ernommen werden?" ; Text [ portuguese ] = "Voc modificou o tamanho da pgina.\n Deseja aplicar as novas definies \nao documento activo?" ; Text[ chinese_simplified ] = "您已经更改页面大小。\n您的文档要采用这个设定吗？"; - Text[ russian ] = " .\n \n ?"; + Text[ russian ] = " .\n \n ?"; Text[ polish ] = "Zmienie rozmiar strony. \nCzy zmiany maj zosta zapisane \nw aktywnym dokumencie?"; - Text[ japanese ] = "ﾍﾟｰｼﾞ ｻｲｽﾞが変更されています。\n変更された設定を現在のﾄﾞｷｭﾒﾝﾄに\n適用しますか?"; + Text[ japanese ] = "ページ サイズが変更されています。\n変更された設定を現在のドキュメントに\n適用しますか?"; Text[ chinese_traditional ] = "您已經變更了頁面大小。\n讓文件採用這個設定？"; Text[ greek ] = " .\n ;"; - Text[ korean ] = "페이지 크기가 변경되었습니다.\n변경된 설정을 문서에 적용하시겠습니까?"; + Text[ korean ] = "페이지 크기가 변경되었습니다.\n변경된 설정을 문서에 적용하겠습니까?"; Text[ arabic ] = " .\n Ͽ"; Text[ turkish ] = "Sayfa boyutunu deitirdiniz.\nDeitirilen ayarlar\nbelgede kullanlsn m?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El tamao de la pgina se ha modificado.\nDesea aplicar las modificaciones al documento\nactual?"; + Text[ catalan ] = "La mida de la pgina s'ha modificat.\nVoleu aplicar les modificacions al document\nactual?"; Text[ finnish ] = "Sivun kokoa on muutettu.\nTallennetaanko uudet asetukset\naktiiviseen asiakirjaan?"; + Text[ thai ] = "ดัดแปลงแก้ไขขนาดหน้ากระดาษ\nต้องการบันทึกการกำหนดใหม่\nในเอกสารที่ใช้งานอยู่หรือไม่?"; }; String STR_PRINT_NEWORISIZE { Text = "Sie haben die Seitengre und die\nSeitenorientierung gendert. Sollen\ndie genderten Einstellungen in das\nDokument bernommen werden?" ; Text [ English ] = "You have changed the page size. and\nthe page orientation. Would you like\nyour changes to be saved in the document?" ; - Text [ dutch ] = "U heeft het paginaformaat en de\npagina-orintering veranderd. Wilt u\nde veranderingen in het\ndocument overnemen?" ; + Text [ dutch ] = "U heeft de paginagrootte en de\\paginaorintatie gewijzigd. Wilt u\nde nieuwe instellingen overnemen\nin het document?" ; Text [ english_us ] = "The page size and orientation have been modified\n. Would you like to save the new settings in the\nactive document?" ; Text [ italian ] = "Sia le dimensioni della pagina che l'orientamento sono stati cambiati.\nTrasferire le impostazioni\ncambiate nel documento?" ; Text [ spanish ] = "El tamao y orientacin de la pgina se han modificado\n. Desea aplicar las modificaciones al\ndocumento actual?" ; @@ -481,17 +496,18 @@ String STR_PRINT_NEWORISIZE Text [ portuguese_brazilian ] = "Sie haben die Seitengr?e und die\nSeitenorientierung ge?ndert. Sollen\ndie ge?nderten Einstellungen in das\nDokument ?ernommen werden?" ; Text [ portuguese ] = "Voc modificou o tamanho e a orientao da pgina.\n Deseja aplicar as novas definies\nao documento activo?" ; Text[ chinese_simplified ] = "您已经更改页面大小和页面方向。\n您的文档要采用这些更改吗？"; - Text[ russian ] = " \n. \n \n ?"; + Text[ russian ] = " \n. \n \n ?"; Text[ polish ] = "Zmienie rozmiar strony i \norientacj strony. Czy nowe ustawienia \nmaj zosta zapisane \nw aktywnym dokumencie?"; - Text[ japanese ] = "ﾍﾟｰｼﾞ ｻｲｽﾞと\nﾍﾟｰｼﾞ方向が変更されています｡\n変更された設定を現在のﾄﾞｷｭﾒﾝﾄに\n適用しますか?"; + Text[ japanese ] = "ページ サイズと\nページ方向が変更されています｡\n変更された設定を現在のドキュメントに\n適用しますか?"; Text[ chinese_traditional ] = "您已經變更頁面大小和頁面方向。\n您的文件要採用這些變更？"; Text[ greek ] = " \n .\n \n ;"; - Text[ korean ] = "페이지 크기와 \n페이지 방향이 변경되었습니다. 변경된 설정을 문서에 적용하시겠습니까?"; + Text[ korean ] = "페이지 크기와 \n페이지 방향이 변경되었습니다. 변경된 설정을 문서에 적용하시겠습니까?"; Text[ arabic ] = " .\n Ͽ"; Text[ turkish ] = "Sayfa boyutunu ve sayfa duruunu deitirdiniz. Deitirilen\n ayarlar\nbelgede kullanlsn m?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El tamao y orientacin de la pgina se han modificado\n. Desea aplicar las modificaciones al\ndocumento actual?"; + Text[ catalan ] = "La mida i l'orientaci de la pgina s'han modificat\n. Voleu aplicar las modificacions al\ndocument actual?"; Text[ finnish ] = "Sivun kokoa ja suuntaa on muutettu.\nHaluatko tallentaa uudet asetukset\naktiiviseen asiakirjaan?"; + Text[ thai ] = "ดัดแปลงแก้ไขขนาดและการวางแนวหน้ากระดาษ\n. ต้องการบันทึกการกำหนดใหม่ใน\nเอกสารที่ใช้งานอยู่หรือไม่?"; }; String STR_PLUGINVIEW { @@ -521,15 +537,16 @@ String RID_EXPLORERTOOLSTOOLBOX Text[ chinese_simplified ] = "桌面工具栏"; Text[ russian ] = " "; Text[ polish ] = "Pasek narzdzi pulpitu"; - Text[ japanese ] = "ﾃﾞｽｸﾄｯﾌﾟの標準ﾂｰﾙﾊﾞｰ"; + Text[ japanese ] = "デスクトップの標準ツールバー"; Text[ chinese_traditional ] = "桌面工具列"; Text[ greek ] = " Desktop"; Text[ korean ] = "바탕화면 도구모음"; Text[ arabic ] = " "; Text[ turkish ] = "Masast ara ubuu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de herramientas del escritorio"; - Text[ finnish ] = "Ty??d?n ty?alurivi"; + Text[ catalan ] = "Barra d'eines de l'escriptori"; + Text[ finnish ] = "Typydn tykalurivi"; + Text[ thai ] = "แถบเครื่องมือเดสก์ท็อป"; }; String STR_PREVIEW_DOCINFO { @@ -539,7 +556,7 @@ String STR_PREVIEW_DOCINFO Text [ swedish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>Tema:</b><dd>$(THEME)<dt><b>Nyckelord:</b><dd>$(KEYWORDS)<dt><b>Beskrivning:</b><dd>$(TEXT)</dl></font></body></html>" ; Text [ danish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>Emne:</b><dd>$(THEME)<dt><b>Ngleord:</b><dd>$(KEYWORDS)<dt><b>Beskrivelse:</b><dd>$(TEXT)</dl></font></body></html>" ; Text [ italian ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titolo:</b><dd>$(TITEL)<dt><b>Argomento:</b><dd>$(THEME)<dt><b>Parole chiavee:</b><dd>$(KEYWORDS)<dt><b>Beschreibung:</b><dd>$(TEXT)</dl></font></body></html>" ; - Text [ spanish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Ttulo:</b><dd>$(TITULO)<dt><b>Tema:</b><dd>$(THEME)<dt><b>Contraseas:</b><dd>$(KEYWORDS)<dt><b>Descripcin:</b><dd>$(TEXT)</dl></font></body></html>" ; + Text [ spanish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Ttulo:</b><dd>$(TITULO)<dt><b>Asunto:</b><dd>$(THEME)<dt><b>Contraseas:</b><dd>$(KEYWORDS)<dt><b>Descripcin:</b><dd>$(TEXT)</dl></font></body></html>" ; Text [ french ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titre :</b><dd>$(TITEL)<dt><b>Objet :</b><dd>$(THEME)<dt><b>Mots-cls :</b><dd>$(KEYWORDS)<dt><b>Description : </b><dd>$(TEXT)</dl></font></body></html>" ; Text [ dutch ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>Onderwerp:</b><dd>$(THEME)<dt><b>Slütelwoorden:</b><dd>$(KEYWORDS)<dt><b>Beschrijving:</b><dd>$(TEXT)</dl></font></body></html>" ; Text [ portuguese_brazilian ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>Thema:</b><dd>$(THEME)<dt><b>Schlüsselworte:</b><dd>$(KEYWORDS)<dt><b>Beschreibung:</b><dd>$(TEXT)</dl></font></body></html>" ; @@ -547,15 +564,16 @@ String STR_PREVIEW_DOCINFO Text[ chinese_simplified ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>标题:</b><dd>$(TITEL)<dt><b>主题:</b><dd>$(THEME)<dt><b>关键字:</b><dd>$(KEYWORDS)<dt><b>说明:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ russian ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>:</b><dd>$(TITEL)<dt><b>:</b><dd>$(THEME)<dt><b> :</b><dd>$(KEYWORDS)<dt><b>:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ polish ] = "<html><body BGCOLOR=\"#c0c0c0\"><czcionka FACE=\"Arial\"><dl><dt><b>Tytu:</b><dd>$(TITEL)<dt><b>Temat:</b><dd>$(THEME)<dt><b>Sowa kluczowe:</b><dd>$(KEYWORDS)<dt><b>Opis:</b><dd>$(TEXT)</dl></font></body></html>"; - Text[ japanese ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>ﾃｰﾏ:</b><dd>$(THEME)<dt><b>ｷｰﾜｰﾄﾞ:</b><dd>$(KEYWORDS)<dt><b>説明:</b><dd>$(TEXT)</dl></font></body></html>"; + Text[ japanese ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>テーマ:</b><dd>$(THEME)<dt><b>キーワード:</b><dd>$(KEYWORDS)<dt><b>説明:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ chinese_traditional ] = "html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>標題：</b><dd>$(TITEL)<dt><b>主題：</b><dd>$(THEME)<dt><b>關鍵字：</b><dd>$(KEYWORDS)<dt><b>描述：</b><dd>$(TEXT)</dl></font></body></html>"; Text[ greek ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>:</b><dd>$(TITEL)<dt><b>:</b><dd>$(THEME)<dt><b>-:</b><dd>$(KEYWORDS)<dt><b>:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ korean ] = "<html><body BGCOLOR=\"#c0c0c0\"><foFACE=\"Arial\"><dl><dt><b>제목:</b><dd>$(TITEL)<dt><b>주제:</b><dd>$(THEME)<dt><b>키워드:</b><dd>$(KEYWORDS)<dt><b>기술:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ arabic ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Title:</b><dd>$(TITEL)<dt><b>Subject:</b><dd>$(THEME)<dt><b>Keywords:</b><dd>$(KEYWORDS)<dt><b>Description:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ turkish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Titel:</b><dd>$(TITEL)<dt><b>Konu:</b><dd>$(THEME)<dt><b>Anahtar szck:</b><dd>$(KEYWORDS)<dt><b>Tanm:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ language_user1 ] = " "; - Text[ catalan ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Ttulo:</b><dd>$(TITULO)<dt><b>Tema:</b><dd>$(THEME)<dt><b>Contraseas:</b><dd>$(KEYWORDS)<dt><b>Descripcin:</b><dd>$(TEXT)</dl></font></body></html>"; + Text[ catalan ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Title:</b><dd>$(TITEL)<dt><b>Subject:</b><dd>$(THEME)<dt><b>Keywords:</b><dd>$(KEYWORDS)<dt><b>Description:</b><dd>$(TEXT)</dl></font></body></html>"; Text[ finnish ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Otsikko:</b><dd>$(TITEL)<dt><b>Aihe:</b><dd>$(THEME)<dt><b>Avainsanat:</b><dd>$(KEYWORDS)<dt><b>Kuvaus:</b><dd>$(TEXT)</dl></font></body></html>"; + Text[ thai ] = "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>ชื่อเรื่อง:</b><dd>$(TITEL)<dt><b>หัวเรื่อง:</b><dd>$(THEME)<dt><b>คำสำคัญ:</b><dd>$(KEYWORDS)<dt><b>คำอธิบาย:</b><dd>$(TEXT)</dl></font></body></html>"; }; String STR_PREVIEW_NODOCINFO { @@ -567,21 +585,22 @@ String STR_PREVIEW_NODOCINFO Text [ italian ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>nessuna propriet di documento.</B></FONT></P></BODY></HTML>" ; Text [ spanish ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No se encontraron propiedades de documentos.</B></FONT></P></BODY></HTML>" ; Text [ french ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Propriétés de document introuvables.</B></FONT></P></BODY></HTML>" ; - Text [ dutch ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Geen documenteigenschappen voorhanden.</B></FONT></P></BODY></HTML>" ; + Text [ dutch ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Geen documenteigenschappen beschikbaar.</B></FONT></P></BODY></HTML>" ; Text [ portuguese_brazilian ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Keine Dokumenteigenschaften vorhanden.</B></FONT></P></BODY></HTML>" ; Text [ portuguese ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Propriedades do documento no foram encontradas.</B></FONT></P></BODY></HTML>" ; Text[ chinese_simplified ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>文档属性不存在。</B></FONT></P></BODY></HTML>"; Text[ russian ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B> .</B></FONT></P></BODY></HTML>"; Text[ polish ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Brak waciwoci dokumentw.</B></FONT></P></BODY></HTML>"; - Text[ japanese ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>ﾄﾞｷｭﾒﾝﾄの属性はありません。</B></FONT></P></BODY></HTML>"; + Text[ japanese ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>ドキュメントの属性はありません。</B></FONT></P></BODY></HTML>"; Text[ chinese_traditional ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>文件屬性不存在。</B></FONT></P></BODY></HTML>"; Text[ greek ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B> .</B></FONT></P></BODY></HTML>"; - Text[ korean ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>문서 등록정보가 없습니다.</B></FONT></P></BODY></HTML>"; + Text[ korean ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>문서 등록 정보가 없습니다.</B></FONT></P></BODY></HTML>"; Text[ arabic ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No document properties found.</B></FONT></P></BODY></HTML>"; Text[ turkish ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Belge zellikleri bulunamad.</B></FONT></P></BODY></HTML>"; Text[ language_user1 ] = " "; - Text[ catalan ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No se encontraron propiedades de documentos.</B></FONT></P></BODY></HTML>"; - Text[ finnish ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Asiakirjan ominaisuuksia ei l?dy.</B></FONT></P></BODY></HTML>"; + Text[ catalan ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No s'han trobat propietats del document.</B></FONT></P></BODY></HTML>"; + Text[ finnish ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Asiakirjan ominaisuuksia ei lydy.</B></FONT></P></BODY></HTML>"; + Text[ thai ] = "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>ไม่พบคุณสมบัติของเอกสาร</B></FONT></P></BODY></HTML>"; }; String STR_EXPLORERVIEW { @@ -599,15 +618,16 @@ String STR_EXPLORERVIEW Text[ chinese_simplified ] = "资源管理器"; Text[ russian ] = ""; Text[ polish ] = "Eksplorator"; - Text[ japanese ] = "ｴｸｽﾌﾟﾛｰﾗ"; + Text[ japanese ] = "エクスプローラ"; Text[ chinese_traditional ] = "檔案總管"; Text[ greek ] = ""; - Text[ korean ] = "익스플로러"; + Text[ korean ] = "탐색기"; Text[ arabic ] = ""; Text[ turkish ] = "Explorer"; Text[ language_user1 ] = " "; Text[ catalan ] = "Explorador"; Text[ finnish ] = "Resurssienhallinta"; + Text[ thai ] = "ผู้สำรวจ"; }; // ----------------------------------------------------------------------- InfoBox MSG_CANT_CLOSE @@ -618,23 +638,24 @@ InfoBox MSG_CANT_CLOSE Message [ italian ] = "Non possibile chiudere il documento poich\nc' una stampa in corso." ; Message [ spanish ] = "El documento no se puede cerrar por ahora\nya que todava se est imprimiendo." ; Message [ french ] = "Impossible de fermer le document :\nl'imprimante est encore active." ; - Message [ dutch ] = "Het document kan op het moment niet worden gesloten,\ndaar er nog een afdrukopdracht wordt uitgevoerd." ; - Message [ swedish ] = "Dokumentet kan inte stngas fr tillfllet\neftersom ett utskriftsuppdrag fortfarande utfrs." ; - Message [ danish ] = "Det er for tiden ikke muligt at afslutte programmet,\nfordi et udskriftsjob udfres." ; + Message [ dutch ] = "Het document kan momenteel niet worden gesloten\nomdat er nog een afdrukopdracht wordt uitgevoerd." ; + Message [ swedish ] = "Dokumentet kan inte stngas fr tillfllet\neftersom ett utskriftsjobb fortfarande utfrs." ; + Message [ danish ] = "Dokumentet kan i jeblikket ikke lukkes,\nda et udskriftsjob endnu ikke er afsluttet." ; Message [ portuguese_brazilian ] = "Das Dokument kann zur Zeit nicht geschlossen werden,\nda noch ein Druckauftrag l?uft." ; Message [ portuguese ] = "De momento impossvel fechar o documento,\n uma vez que a impressora ainda est activa." ; Message[ chinese_simplified ] = "目前无法关闭这个文件，\n因为正在执行一个打印任务。"; - Message[ russian ] = " ,\n ."; + Message[ russian ] = " ,\n ."; Message[ polish ] = "Dokumentu nie mona na razie zamkn,\nponiewa wykonywane jest polecenie wydruku."; - Message[ japanese ] = "まだ印刷ｼﾞｮﾌﾞの処理中です。\nﾄﾞｷｭﾒﾝﾄを閉じることはできません。"; + Message[ japanese ] = "まだ印刷ジョブの処理中です。\nドキュメントを閉じることはできません。"; Message[ chinese_traditional ] = "正在執行一個列印任務，\n因此無法關閉這個文件。"; Message[ greek ] = " \n ."; - Message[ korean ] = "인쇄작업이 아직 진행중이기 때문에\n문서를 현재 닫을 수 없습니다."; + Message[ korean ] = "인쇄 작업이 아직 진행중이므로\n문서를 지금 닫을 수 없습니다."; Message[ arabic ] = " \n ."; Message[ turkish ] = "Belge, devam eden bir yazdrma ii nedeniyle\nu an kapatlamyor."; Message[ language_user1 ] = " "; - Message[ catalan ] = "El documento no se puede cerrar por ahora\nya que todava se est imprimiendo."; - Message[ finnish ] = "Asiakirjaa ei voida sulkea, koska\ntulostusty on kesken."; + Message[ catalan ] = "El document no es pot tancar ara per ara\nperqu encara s'est imprimint."; + Message[ finnish ] = "Asiakirjaa ei voitu sulkea, koska\ntulostusty on kesken."; + Message[ thai ] = "ไม่สามารถปิดเอกสารได้เพราะ\nงานพิมพ์กำลังดำเนินอยู่"; }; // DLG_PRINTMONITOR ------------------------------------------------------ @@ -654,13 +675,14 @@ InfoBox MSG_CANT_CLOSE TEXT[ chinese_simplified ] = "打印监视器"; \ TEXT[ russian ] = " "; \ TEXT[ polish ] = "Monitor wydruku"; \ - TEXT[ japanese ] = "印刷ﾓﾆﾀｰ"; \ + TEXT[ japanese ] = "印刷モニター"; \ TEXT[ chinese_traditional ] = "列印監視器"; \ TEXT[ greek ] = " "; \ TEXT[ korean ] = "인쇄 모니터"; \ TEXT[ arabic ] = " "; \ TEXT[ turkish ] = "Yazc penceresi"; \ - TEXT[ catalan ] = "Monitor de impresin"; + TEXT[ catalan ] = "Monitor d'impressi"; \ + TEXT[ thai ] = "จอการพิมพ์"; ModelessDialog DLG_PRINTMONITOR { @@ -697,14 +719,15 @@ ModelessDialog DLG_PRINTMONITOR TEXT[ chinese_simplified ] = "的打印设备是"; TEXT[ russian ] = " "; TEXT[ polish ] = "bdzie przedstawiony jako"; - TEXT[ japanese ] = "印刷されるﾌﾟﾘﾝﾀは"; + TEXT[ japanese ] = "印刷されるプリンタは"; TEXT[ chinese_traditional ] = "的列印設備是"; TEXT[ greek ] = " "; - TEXT[ korean ] = "출력될 곳"; + TEXT[ korean ] = "출력 장소"; TEXT[ arabic ] = " "; TEXT[ turkish ] = "ktnn alnd yer"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "se est imprimiendo en"; + TEXT[ catalan ] = "se est imprimint en"; + TEXT[ thai ] = "กำลังพิมพ์บน"; }; FixedText FT_PRINTER { @@ -734,27 +757,28 @@ InfoBox MSG_ERROR_SEND_MAIL MESSAGE = "Fehler beim Versenden der Nachricht. Mgliche Fehler sind ein fehlendes Benutzerkonto oder ein fehlerhaftes Setup.\nBitte berprfen Sie die Einstellungen von %PRODUCTNAME oder die ihres e-mail Programms." ; MESSAGE [ English ] = "Error while sending mail. Possible errors are a missing account or an incorrect setup.\nPlease check your settings within %PRODUCTNAME or within your e-mail client." ; MESSAGE [ norwegian ] = "Feil ved sending av mail." ; - MESSAGE [ italian ] = "Errore durante l'invio del messaggio." ; + MESSAGE [ italian ] = "Errore durante l'invio del messaggio. I possibili errori sono: conto dell'utente errato oppure setup errato.\nVerificate le impostazioni di %PRODUCTNAME oppure il programma di eMail." ; MESSAGE [ portuguese_brazilian ] = "Erro ao enviar correio." ; MESSAGE [ portuguese ] = "Erro ao enviar correio." ; - MESSAGE [ finnish ] = "Virhe s?hk?ostia l?hetett?ess?." ; - MESSAGE [ danish ] = "Fejl ved afsendelse af meddelelsen." ; - MESSAGE [ french ] = "Erreur lors de l'envoi du message." ; - MESSAGE [ swedish ] = "Fel vid sndning av meddelande." ; - MESSAGE [ dutch ] = "Fout bij het verzenden van het bericht." ; - MESSAGE [ spanish ] = "Error al enviar el mensaje." ; - MESSAGE [ english_us ] = "Error sending mail." ; - MESSAGE[ chinese_simplified ] = "在寄发邮件时发生一个错误。"; - MESSAGE[ russian ] = " ."; - MESSAGE[ polish ] = "Bd przy przesyaniu wiadomoci."; - MESSAGE[ japanese ] = "ﾒｯｾｰｼﾞの送信時のｴﾗｰ｡"; - MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。"; + MESSAGE [ finnish ] = "Virhe viesti lhetettess. Syit voivat olla puuttuva kyttjtili tai virheelliset asetukset.\nTarkista %PRODUCTNAMEn tai shkpostiohjelmasi asetukset." ; + MESSAGE [ danish ] = "Fejl ved afsendelse af meddelelsen. Mulige fejl er en manglende brugerkonto eller en forkert opstning.\nKontroller indstillingerne i %PRODUCTNAME eller i dit e-mail-program." ; + MESSAGE [ french ] = "Erreur lors de l'envoi du message. Erreurs possibles : compte d'utilisateur manquant ou Setup erron.\nVrifiez les paramtres de %PRODUCTNAME ou ceux du logiciel de messagerie." ; + MESSAGE [ swedish ] = "Fel vid sndning av meddelande. Mjliga fel r att ett anvndarkonto saknas eller en felaktig installation.\nKontrollera instllningarna i %PRODUCTNAME eller i ditt e-postprogram." ; + MESSAGE [ dutch ] = "Fout bij verzenden van bericht. Mogelijke fouten zijn een ontbrekende gebruikersaccount of een defecte Setup.\nControleer de instellingen van %PRODUCTNAME of die van uw e-mailprogramma." ; + MESSAGE [ spanish ] = "Error al enviar el mensaje. La razn puede ser una cuenta de usuario o una instalacin defectuosa.\nCompruebe la configuracin de %PRODUCTNAME o la de su programa de correo electrnico." ; + MESSAGE [ english_us ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; + MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生一个错误。可能缺少一个用户帐号或者安装程序有错误。\n请您检查 %PRODUCTNAME 的设定或者您的电子邮件程序的设定。"; + MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; + MESSAGE[ polish ] = "Bd w przesyaniu wiadomoci: brak konta uytkownika lub nieprawidowa instalacja.\nNaley sprawdzi ustawienia programu %PRODUCTNAME lub programu poczty elektronicznej."; + MESSAGE[ japanese ] = "メッセージ送信時のエラー。エラーの原因としては、ユーザーアカウントがないか、あるいはセットアップが正しくないかが考えられます。\n%PRODUCTNAME、またはお使いの E-mail プログラムの設定を確認してください。"; + MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。可能缺少一個使用者賬號或安裝有問題。\n請您檢查 %PRODUCTNAME 的設定和您的電子郵件程式的設定。"; MESSAGE[ greek ] = " ."; - MESSAGE[ korean ] = "메시지를 보낼 때 오류 발생"; + MESSAGE[ korean ] = "메시지를 보낼 때 오류가 발생했습니다. 사용자 계정이 없거나\n설치에 오류가 있습니다. %PRODUCTNAME이나 해당 전자 메일 프로그램의 설정이 올바른지 확인하십시오."; MESSAGE[ arabic ] = " "; MESSAGE[ turkish ] = "Posta gnderirken hata olutu."; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "Error al enviar el mensaje."; + MESSAGE[ catalan ] = "S'ha produt un error a l'enviar el missatge."; + MESSAGE[ thai ] = "ส่งเมล์ผิดพลาด"; }; // DLG_MAILDIALOG -------------------------------------------------------- @@ -770,25 +794,26 @@ ErrorBox ERRBOX_SFX_INVALID_MERGEOPT Message [ English ] = "Before sending mail or news messages, you must\nspecify your email address and a SMTP server.\nPlease write your address down in\n\"Extras\\Options\\General...\\User Data\\Email\" and\n\"Extras\\Options\\Internet\\Mail/News\\Message dispatch\".\nThen try again sending this message." ; Message [ english_us ] = "Before sending mail or news messages, you must\nspecify your e-mail address and an SMTP server.\nPlease enter the required settings under \n\"Tools\\Options\\General...\\User Data\\E-Mail\" and\n\"Tools\\Options\\Internet\\Mail/News\\Outgoing Mail\".\nThen try sending this message again." ; Message [ portuguese_brazilian ] = "Um eine Nachricht ?er das Internet zu verschicken,\nwird Ihre Email-Adresse und ein SMTP-Server zum Versand ben?igt.\nBitte tragen Sie diese Einstellungen unter\n\"Extras\\\\Optionen\\\\Allgemein...\\\\Allgemeines\\\\Email\" und\n\"Extras\\\\Optionen\\\\Internet\\\\Mail/News\\\\Nachrichtenversand\" ein,\nbevor Sie erneut eine Nachricht verschicken wollen." ; - Message [ swedish ] = "Fr att ett meddelande skall kunna skickas via Internet,\nbehvs Din e-postadress och en SMTP-server.\nVar vnlig och fr in dessa instllningar under\n\"Verktyg\\Alternativ\\Allmnt...\\Anvndardata\\E-post\" och\n\"Verktyg\\Alternativ\\Internet\\E-post/Nyheter\\Meddelandesndning\"\ninnan Du skickar ett meddelande igen." ; + Message [ swedish ] = "Fr att ett meddelande skall kunna skickas via Internet,\nbehvs din e-postadress och en SMTP-server.\nVar vnlig och fr in dessa instllningar under\n\"Verktyg\\Alternativ\\Allmnt...\\Anvndardata\\E-post\" och\n\"Verktyg\\Alternativ\\Internet\\E-post/Nyheter\\Meddelandesndning\"\ninnan du skickar ett meddelande igen." ; Message [ danish ] = "For at kunne sende en meddelelse over Internet\nkrves din e-mail-adresse og en SMTP-server.\nIndtast disse indstillinger under\n\"Funktioner\\Indstillinger\\Generelt...\\Brugerdata\\E-mail\" og\n\"Funktioner\\Indstillinger\\Internet\\E-mail/Nyheder/Nyhedsafsendelse\",\nfr du igen sender en meddelelse." ; Message [ italian ] = "Per poter inviare un messaggio tramite Internet,\n necessario un indirizzo di eMail e un server SMTP.\nSpecificate queste impostazioni in\n\"Strumenti\\Opzioni\\Generale...\\Dati utente\\eMail\" e in\n\"Strumenti\\Opzioni\\Internet\\Mail/News\\\\Invio messaggi\",\nprima di inviare nuovamente un messaggio." ; Message [ spanish ] = "Para enviar un mensaje a travs de Internet\nse necesitan su direccin de correo electrnico y un servidor SMTP para el envo.\nAntes de enviar el prximo mensaje, introduzca por favor estas informaciones en\n\"Herramientas\\Opciones\\Generales...\\Datos de usuario\\E-mail y en\n\"Herramientas\\Opciones\\Internet\\Correo/Noticias\\Correo saliente\"." ; Message [ french ] = "Pour envoyer un message via Internet \nle programme ncessite une adresse e-mail et un serveur SMTP.\nVeuillez indiquer ces paramtres sous \n\"Outils\\Options\\Gnral...\\Identit\\E-mail\" et \"Outils\\Options\\Internet\\Mail/News\\Envoi de messages\" \n avant de refaire une tentative d'envoi de message." ; - Message [ dutch ] = "Om een bericht via Internet te versturen,\nwordt uw e-mail adres en een SMTP server benodigd.\nVermeld deze onder \n\"Extra\\Opties\\Algemeen...\\Gebruikersgegevens\\E-mail\" en\n\"Extra\\Opties\\Internet\\Mail/Nieuws\\Berichten versturen\",\nvoordat u opnieuw een bericht stuurt." ; + Message [ dutch ] = "Om een bericht via het internet te verzenden,\nis uw e-mailadres en een SMTP server vereist.\nVoer deze onder \n\"Extra\\Opties\\Algemeen...\\Gebruikersgegevens\\E-mail\" en\n\"Extra\\Opties\\Internet\\Mail\\Nieuws\\Berichten verzenden\"\nin voordat u opnieuw een bericht verzendt." ; Message [ portuguese ] = "Para o envio de uma mensagem via Internet so necessrios\\ o seu endereo electrnico e um servidor SMTP. Digite o seu endereo em\n\"Ferramentas\\\\Opes\\\\Geral...\\\\Dados do utilizador\\\\e-mail\" e\n\"Ferramentas\\\\Opes\\\\Internet\\\\Correio/Notcias\"\nantes de reenviar a mensagem." ; - Message[ chinese_simplified ] = "通过国际互联网寄发电子邮件时\n需要您的电子邮件地址和一个SMTP服务器。\n请在寄发电子邮件之前按击菜单\n\"工具\\选项...\\常规\\用户资料\\电子邮件\"\n和\"工具\\选项\\国际互联网\\电子邮件/新闻\"处作相关的设定。"; - Message[ russian ] = " ,\n SMTP .\n, , \n\"\\\\...\\ \\. \" \n\"\\\\\\/\\ \",\n ."; + Message[ chinese_simplified ] = "通过国际互联网寄发电子邮件时\n需要您的电子邮件地址和一个SMTP服务器。\n请在寄发电子邮件之前按击菜单\n\"工具\\选项...\\常规\\使用者数据\\电子邮件\"\n和\"工具\\选项\\国际互联网\\电子邮件/新闻\"处作相关的设定。"; + Message[ russian ] = " ,\n SMTP .\n \n\"\\\\...\\ \\. \" \n\"\\\\\\\\\\ \",\n ."; Message[ polish ] = "Aby wysa wiadomo via Internet,\nwymagany jest twj adres e-mail i serwer SMTP.\nProsz wprowad te ustawienia w \n\"Narzdzia\\\\Opcje\\\\Oglne...\\\\Dane uytkownika\\\\e-mail\" i\n\"Narzdzia\\\\Opcje\\\\Internet\\\\Poczta/Wiadomoci\\\\Wysyanie wiadomoci\",\nzanim ponownie wylesz wiadomo."; - Message[ japanese ] = "ｲﾝﾀｰﾈｯﾄでﾒｯｾｰｼﾞを送信するには、\nE-mail ｱﾄﾞﾚｽとSMTP ｻｰﾊﾞｰが必要です。\nﾒｯｾｰｼﾞを再送信する前に、\nﾂｰﾙ→ｵﾌﾟｼｮﾝ→全般...→ﾕｰｻﾞｰﾃﾞｰﾀ→→E-mail、および\nﾂｰﾙ→ｵﾌﾟｼｮﾝ→ｲﾝﾀｰﾈｯﾄ→ﾒｰﾙ→ﾆｭｰｽ→ﾒｯｾｰｼﾞ送信で、\nこの設定を登録してください。"; + Message[ japanese ] = "インターネットでメッセージを送信するには、\nE-mail アドレスとSMTP サーバーが必要です。\nメッセージを再送信する前に、\nツール→オプション→全般...→ユーザーデータ→E-mail、および\nツール→オプション→インターネット→メール→ニュース→メッセージ送信で、\nこの設定を登録してください。"; Message[ chinese_traditional ] = "透過 Internet 傳送電子郵件\n需要您的電子郵件地址和一個 SMTP 伺服器。\n請在重新傳送電子郵件之前在\n<工具>-<選項>-<一般>-<使用者資料>和<工具>-<選項>-<Internet>-<電子郵/新聞>作相關的設定。"; Message[ greek ] = " Internet\n E-mail SMTP.\n \n\"\\\\...\\ \\E-Mail\" \n\"\\\\Internet\\/\\ \".\n ."; - Message[ korean ] = "인터넷으로 메시지를 보내려면,\nE-Mail 주소와 SMTP 서버가 필요합니다.\n새로 메시지를 다시 보내기 전에\n\"도구\\옵션\\일반...\\사용자 데이터\\E-Mail\"과\n\"도구\\옵션\\인터넷\\메일/뉴스\\메시지 보내기\"에서 이 설정을 입력하십시오."; + Message[ korean ] = "인터넷으로 메시지를 보내려면\n전자 메일 주소와 SMTP 서버가 필요합니다.\n메시지를 다시 보내기 전에\n[도구]-[옵션]-[일반...]-[사용자 데이터]-[전자 메일]과\n[도구]-[옵션]-[인터넷]-[메일]-[뉴스]-[메시지 보내기]에서 이 설정을 지정하십시오."; Message[ arabic ] = " ʡ\n SMTP.\n \n\"//.../ / \" \n\"/// \\ / \"\n ."; Message[ language_user1 ] = " "; Message[ turkish ] = "Internet zerinden ileti gnderebilmek iin nce\n e-posta adresinizi ve bir SMTP sunucusu belirtmeniz gerekiyor.\nleti gndermeden nce bu ayarlar iin,\n\"Aralar\\Seenekler\\Genel...\\Kullanc\\E-Posta\" ve\n\"Aralar\\Seenekler\\Internet\\E-Posta/Haber Grubu\\Giden Posta\" \nalanlarna girin."; - Message[ catalan ] = "Para enviar un mensaje a travs de Internet\nse necesitan su direccin de correo electrnico y un servidor SMTP para el envo.\nAntes de enviar el prximo mensaje, introduzca por favor estas informaciones en\n\"Herramientas\\Opciones\\Generales...\\Datos de usuario\\E-mail y en\n\"Herramientas\\Opciones\\Internet\\Correo/Noticias\\Correo saliente\"."; - Message[ finnish ] = "Ennen kuin voit lhett shkpostia tai uutisryhmsanomia, shkpostiosoite ja SMTP-palvelin\non mritettv.\nMrit asetukset valitsemalla \nTykalut\\Asetukset\\Yleist\\Kyttjtiedot\\Shkposti ja\n\"Tykalut\\Asetukset\\Internet\\Shkposti ja uutisryhmt\\Lhtev posti\".\nYrit lhett viesti uudelleen sen jlkeen, kun olet mrittnyt asetukset."; + Message[ catalan ] = "Per enviar un missatge a travs d'Internet\nes necessita la direcci de correu electrnic i un servidor SMTP per fer l'enviament.\nAbans d'enviar el prxim missatge, introduu aquests parmteres a\n\"Eines\\Opcions\\Generals...\\Dades d'usuari\\Correu electrnic i a\n\"Eines\\Opcions\\Internet\\Correu/Notcies\\Correu sortint\"."; + Message[ finnish ] = "Ennen kuin voit lhett shkpostia tai uutisryhmsanomia, shkpostiosoite ja SMTP-palvelin\non mritettv.\nMrit asetukset valitsemalla \nTykalut\\Asetukset\\Yleiset\\Kyttjtiedot\\Shkposti ja\n\"Tykalut\\Asetukset\\Internet\\Shkposti ja uutisryhmt\\Lhtev posti\".\nYrit lhett viesti uudelleen sen jlkeen, kun olet mrittnyt asetukset."; + Message[ thai ] = "ก่อนส่งเมล์หรือข้อความใหม่, คุณต้อง\nระบุที่อยู่อีเมล์และเซิร์ฟเวอร์ SMTP \nกรุณาใส่การกำหนดที่ต้องการภายใต้ \n\"เครื่องมือ\\ตัวเลือก\\ทั่วไป...\\ข้อมูลผู้ใช้\\อีเมล์\" และ\n\"เครื่องมือ\\ตัวเลือก\\อินเตอร์เน็ต\\เมล์/ข่าวสาร\\เมล์ขาออก\".\nต่อจากนั้นลองส่งข้อความนี้อีกครั้ง"; }; ErrorBox ERRBOX_SFX_NO_OUTBOX { @@ -798,7 +823,7 @@ ErrorBox ERRBOX_SFX_NO_OUTBOX Message [ English ] = "You need an outbox for this aktion.\nPlease create an outbox, before trying again." ; Message [ english_us ] = "To perform this action an outbox is required.\nPlease create an outbox prior to executing this action again." ; Message [ portuguese_brazilian ] = "F? die von Ihnen gew?hlte Aktion wird ein Ausgangskorb ben?igt.\nBitte legen Sie einen Ausgangskorb an, bevor Sie diese Aktion erneut ausf?ren." ; - Message [ swedish ] = "Du behver en utkorg fr tgrden som Du har valt.\nVar vnlig och skapa en utkorg innan Du utfr den hr tgrden igen." ; + Message [ swedish ] = "Du behver en utkorg fr tgrden som du har valt.\nVar vnlig och skapa en utkorg innan du utfr den hr tgrden igen." ; Message [ danish ] = "Du har brug for en udbakke for at kunne udfre denne handling.\nOpret venligst en udbakke, fr du gentager denne handling." ; Message [ italian ] = "Per effettuare l'operazione scelta dall'utente, si necessita della posta in uscita.\nPrima di provare a rieffettuare tale operazione creare una posta in uscita." ; Message [ spanish ] = "Se necesitar una carpeta de salida para ejecutar esta accin.\nPor favor cree una carpeta de salida antes de reiniciar la accin." ; @@ -806,17 +831,18 @@ ErrorBox ERRBOX_SFX_NO_OUTBOX Message [ dutch ] = "Voor de door u verlangde activiteit is een postvak UIT nodig.\nMaak een postvak UIT voordat u deze opdracht opnieuw selecteert." ; Message [ portuguese ] = " necessria uma caixa de envio para executar esta aco.\nCrie primeiro uma caixa de envio e tente novamente." ; Message[ chinese_simplified ] = "执行这个操作的前提是已经建立了一个发件箱。\n请您在建立一个发件箱之后再重新执行这个命令。"; - Message[ russian ] = " \"\".\n , , , \"\"."; + Message[ russian ] = " \"\".\n , \"\"."; Message[ polish ] = "Dla wybranej przez ciebie akcji potrzebna jest skrzynka nadawcza.\nProsz utwrz skrzynk nadawcz, zanim wykonasz ponownie t akcj."; - Message[ japanese ] = "選択したｱｸｼｮﾝの実行には、送信ﾄﾚｲが必要です。\nこのｱｸｼｮﾝを実行しなおす前に、送信ﾄﾚｲを格納します。"; + Message[ japanese ] = "選択したアクションの実行には、送信トレイが必要です。\nこのアクションを実行しなおす前に、送信トレイを格納します。"; Message[ chinese_traditional ] = "執行這個動作要求先配置一個寄件匣。\n請建立一個寄件匣，然后重新執行這個動作。"; Message[ greek ] = " ''\n ? "; - Message[ korean ] = "선택한 작업에는 보낼편지함이 필요합니다. \n이 작업을 재실행하기 전에 보낼편지함을 만드십시오."; + Message[ korean ] = "선택한 작동을 실행하려면 보낼 편지함이 필요합니다. \n이 작동을 다시 실행하기 전에 보낼 편지함을 만드십시오."; Message[ arabic ] = " .\n ʡ ."; Message[ turkish ] = "Setiiniz ilem iin giden kutusu gerekiyor.\nBu ilemi yeniden yrtmeden nce giden kutusunu oluturun."; Message[ language_user1 ] = " "; - Message[ catalan ] = "Se necesitar una carpeta de salida para ejecutar esta accin.\nPor favor cree una carpeta de salida antes de reiniciar la accin."; - Message[ finnish ] = "T?m?n toiminnon suorittamiseen tarvitaan L?htev?t-laatikko.\nLuo L?htev?t-laatikko, ennen kuin suoritat t?m?n toiminnon uudelleen."; + Message[ catalan ] = "Es necessita una carpeta de sortida per executar aquesta acci.\nCreeu una carpeta de sortida abans de reiniciar l'acci."; + Message[ finnish ] = "Tmn toiminnon suorittamiseen tarvitaan Lhtevt-laatikko.\nLuo Lhtevt-laatikko, ennen kuin suoritat tmn toiminnon uudelleen."; + Message[ thai ] = "แสดงว่าการกระทำนี้ต้องการกล่องขาออก\nกรุณาสร้างกล่องขาออกก่อนการกระทำนี้อีกครั้ง"; }; // QueryBoxen ------------------------------------------------------------ QueryBox MSG_QUERY_OPENASTEMPLATE @@ -826,29 +852,30 @@ QueryBox MSG_QUERY_OPENASTEMPLATE /* ### ACHTUNG: Neuer Text in Resource? Das Dokument kann (z.B. aufgrund fehlender Rechte)\nnicht zum Bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? : Das Dokument kann (z.B. aufgrund fehlernder Rechte)\nnicht zum bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? */ /* ### ACHTUNG: Neuer Text in Resource? Das Dokument kann (z.B. aufgrund fehlender Rechte)\nnicht zum Bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? : Das Dokument kann (z.B. aufgrund fehlernder Rechte)\nnicht zum bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? */ /* ### ACHTUNG: Neuer Text in Resource? Das Dokument kann (z.B. aufgrund fehlender Rechte)\nnicht zum Bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? : Das Dokument kann (z.B. aufgrund fehlender Rechte)\nnicht zum Bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden? */ - Message = "Das Dokument kann (z.B. aufgrund fehlender Rechte)\nnicht zum Bearbeiten geffnet werden. Soll es als Vorlage\nfr ein neues Dokument verwendet werden?" ; + Message = "Das Dokument kann nicht (z.B. aufgrund fehlender Rechte) bearbeitet werden. Wollen Sie statt dessen mit einer Kopie weiter arbeiten?" ; Message [ English ] = "Can't open the document for edit, possibly due to\nmissing access rights. Should be used as template\nfor a new document?" ; Message [ portuguese ] = "O documento no pode ser aberto para edio (por ex. devido \n falta de direitos de acesso). Deseja us-lo como modelo\npara abrir um novo documento?" ; - Message [ english_us ] = "Document cannot be opened for editing, possibly due to\nmissing access rights. Do you want to use it as a template\nfor a new document?" ; + Message [ english_us ] = "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?" ; Message [ portuguese_brazilian ] = "Das Dokument kann (z.B. aufgrund fehlernder Rechte)\nnicht zum bearbeiten ge?fnet werden. Soll es als Vorlage\nf? ein neues Dokument verwendet werden?" ; - Message [ swedish ] = "Dokumentet kan inte ppnas fr redigering\n(t ex drfr att rttigheter saknas). Skall det anvndas\n som mall fr ett nytt dokument?" ; + Message [ swedish ] = "Dokumentet kan inte redigeras (t.ex. drfr att rttigheter saknas). Vill du arbeta med en kopia av dokumentet i stllet?" ; Message [ danish ] = "Det er ikke muligt at bne dokumentet til redigering\n(muligvis har du ingen adgangsrettigheder). Skal det\nanvendes som skabelon for et nyt dokument?" ; - Message [ italian ] = "Il documento (ad esempio per la mancanza di diritti)\nnon pu essere aperto per la modifica. Lo si vuole usare come modello \nper un nuovo documento?" ; - Message [ spanish ] = "No es posible abrir el documento \npara la edicin (p.ej. por falta de derechos). Desea usarlo como plantilla \npara un nuevo documento?" ; - Message [ french ] = "Impossible de charger le document en mode d'criture\n(droits d'accs insuffisants). Souhaitez-vous l'utiliser comme\nmodle pour crer un nouveau document ?" ; - Message [ dutch ] = "Het document kan (b.v. vanwege ontbrekende rechten)\nniet geopend worden ter bewerking. Wilt u het als sjabloon\nvoor een nieuw document gebruiken?" ; - Message[ chinese_simplified ] = "这个文件不能被打开编辑(如用户没有使用权)。\n您要将使用这个样式\n来建立一个新文件吗？"; - Message[ russian ] = " \n( - ). \n ?"; + Message [ italian ] = "Impossibile modificare il documento (probabilmente per la mancanza di diritti). Volete provare a modificare una copia del documento?" ; + Message [ spanish ] = "Este documento no se puede editar, posiblemente los derechos de acceso no son suficientes. Desea editar una copia del documento?" ; + Message [ french ] = "Ce document ne peut pas tre dit (droits d'accs insuffisants). Souhaitez-vous poursuivre votre travail avec une copie du document ?" ; + Message [ dutch ] = "Het document kan (bijvoorbeeld vanwege ontbrekende rechten)\nniet geopend worden ter bewerking. Wilt u het als sjabloon\nvoor een nieuw document gebruiken?" ; + Message[ chinese_simplified ] = "这个文件不能被打开编辑(例如没有读取权力)。\n要使用这个样式来建立一个新文件吗？"; + Message[ russian ] = " \n( - ). \n ?"; Message[ polish ] = "Dokumentu nie mona (np. z powodu brakujcych praw)\notworzy do edycji. Czy uy tego dokumentu jako szablonu \nnowego dokumentu?"; - Message[ japanese ] = "ﾄﾞｷｭﾒﾝﾄは(ｱｸｾｽ権なしなどで)\n編集用に開けません。新しいﾄﾞｷｭﾒﾝﾄ用\nﾃﾝﾌﾟﾚｰﾄとして使いますか?"; - Message[ chinese_traditional ] = "無法開啟編輯這個文件(缺少讀取權力)。\n您要使用這個樣式來建立一個新文件？"; + Message[ japanese ] = "アクセスする権利がないなどの理由で、このドキュメントは編集できません。ドキュメントのコピーとして編集しますか。"; + Message[ chinese_traditional ] = "無法開啟編輯這個文件(缺少讀取權力)。您要新建這個文件的複製件？"; Message[ greek ] = " \n (.. ). \n ? "; - Message[ korean ] = "이 문서는 (예를 들어 액세스 권한이 없음으로 인해)\n 편집을 위해 열 수 없습니다. 새 문서를 위한 서식파일로 사용하시겠습니까?"; + Message[ korean ] = "액세스 권한이 없는 이유로 이 문서를 편집할 수 없습니다. 이 문서를 복사하여 편집하시겠습니까?"; Message[ arabic ] = " ( \n ). \n Ͽ"; Message[ turkish ] = "Belge (muhtemelen eriim hakk olmamas nedeniyle)\n dzenleme iin alamyor. Belgeyi yeni bir\nbelge iin ablon olarak kullanmak istiyor musunuz?"; Message[ language_user1 ] = " "; - Message[ catalan ] = "No es posible abrir el documento \npara la edicin (p.ej. por falta de derechos). Desea usarlo como plantilla \npara un nuevo documento?"; - Message[ finnish ] = "Asiakirjaa ei voi avata muokattavaksi, k?ytt?ikeudet\nsaattavat olla puutteelliset. Haluatko k?ytt?? asiakirjaa uuden\nasiakirjan mallipohjana?"; + Message[ catalan ] = "No es pot obrir el document \nper editar-lo (p.e. per falta de drets). Voleu utilitzar-lo com a plantilla \nper un document nou?"; + Message[ finnish ] = "Asiakirjaa ei voi avata muokattavaksi, kyttoikeudet\nsaattavat olla puutteelliset. Haluatko kytt asiakirjaa uuden\nasiakirjan mallina?"; + Message[ thai ] = "ไม่สามารถเปิดเอกสารเพื่อแก้ไขได้ เนื่องจาก\nสิทธิในการเข้าถึงอาจผิดพลาด คุณต้องการใช้มันเป็นแม่แบบ\nสำหรับเอกสารใหม่หรือไม่?"; }; String STR_FRAMESIZE { @@ -858,22 +885,23 @@ String STR_FRAMESIZE Text [ swedish ] = "Ramstorlek" ; Text [ danish ] = "Frame-strrelse" ; Text [ italian ] = "Dimensione frame" ; - Text [ spanish ] = "Tamao del frame" ; + Text [ spanish ] = "Tamao del marco" ; Text [ french ] = "Taille du Frame" ; Text [ dutch ] = "Kadergrootte" ; Text [ portuguese ] = "Tamanho da moldura" ; Text[ chinese_simplified ] = "框对象大小"; Text[ russian ] = " "; Text[ polish ] = "Wielko ramki"; - Text[ japanese ] = "ﾌﾚｰﾑ ｻｲｽﾞ"; + Text[ japanese ] = "フレーム サイズ"; Text[ chinese_traditional ] = "訊框大小"; Text[ greek ] = " Frame"; Text[ korean ] = "프레임 크기"; Text[ arabic ] = " "; Text[ turkish ] = "Frame boyutu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tamao del frame"; + Text[ catalan ] = "Mida del marc"; Text[ finnish ] = "Kehyksen koko"; + Text[ thai ] = "ขนาดกรอบ"; }; String RID_EXTERNALFRAME_TOOLBOX { @@ -891,15 +919,16 @@ String RID_EXTERNALFRAME_TOOLBOX Text[ chinese_simplified ] = "功能栏"; Text[ russian ] = " "; Text[ polish ] = "Pasek funkcji"; - Text[ japanese ] = "ﾌｧﾝｸｼｮﾝ ﾊﾞｰ"; + Text[ japanese ] = "ファンクションバー"; Text[ chinese_traditional ] = "工具列"; Text[ greek ] = " "; Text[ korean ] = "기능 모음"; Text[ arabic ] = " "; Text[ turkish ] = "Ara ubuu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de funciones"; - Text[ finnish ] = "Toimintopalkki"; + Text[ catalan ] = "Barra de funcions"; + Text[ finnish ] = "Toimintorivi"; + Text[ thai ] = "แถบฟังก์ชั่น"; }; ToolBox RID_EXTERNALFRAME_TOOLBOX { @@ -1054,24 +1083,25 @@ String STR_FORWARDMAIL Text[English] = "Per Regel weitergeleitete Nachricht.\nDie Originalnachricht als Anhang." ; Text[ english_us ] = "Message forwarded by a rule.\nThe original message as attachment."; Text[ portuguese ] = "Mensagem transmitida por regra.\nMensagem original como anexo."; - Text[ russian ] = " .\n ."; + Text[ russian ] = " .\n ."; Text[ greek ] = " .\n ."; - Text[ dutch ] = "Per regel doorgegeven bericht.\nHet originele bericht als aanhangsel."; + Text[ dutch ] = "Per regel doorgegeven bericht.\nHet originele bericht als bijlage."; Text[ french ] = "Message transmis par rgle.\nMessage d'origine en tant que fichier joint."; - Text[ spanish ] = "Mensaje transmitido por regla.\nEl mensaje original como anexo."; + Text[ spanish ] = "Mensaje transmitido por regla.\nEl mensaje original como documento adjunto."; Text[ italian ] = "Messaggio inoltrato secondo una regola.\nMessaggio originale come allegato."; Text[ danish ] = "Meddelelse som er blevet videresendt iflge en regel.\nDen oprindelige meddelelse er vedhftet."; Text[ swedish ] = "Meddelande som vidarebefordrats per regel.\nOriginalmeddelandet som bilaga."; Text[ polish ] = "Wiadomo przesana dalej wedug reguy.\nOrygina wiadomoci jako zacznik."; Text[ portuguese_brazilian ] = "Per Regel weitergeleitete Nachricht.\nDie Originalnachricht als Anhang."; - Text[ japanese ] = "ﾙｰﾙで転送されたﾒｯｾｰｼﾞ。\nｵﾘｼﾞﾅﾙのﾒｯｾｰｼﾞは添付として。"; - Text[ korean ] = "규칙에 의해 전달된 메시지. \n원래 메시지는 첨부 형식으로."; + Text[ japanese ] = "ルールで転送されたメッセージ。\nオリジナルのメッセージは添付として。"; + Text[ korean ] = "규칙에 의해 전달된 메시지.\n원본 메시지는 첨부 형식으로"; Text[ chinese_simplified ] = "按常规转寄的电子邮件。\n电子邮件原件作为附件。"; Text[ chinese_traditional ] = "透過規則轉寄的電子郵件。\n源電子郵件當作附加。"; Text[ arabic ] = " .\n ."; Text[ turkish ] = "Kurala gre aktarlan ileti.\nEk olarak zgn ileti."; - Text[ catalan ] = "Mensaje transmitido por regla.\nEl mensaje original como anexo."; - Text[ finnish ] = "Viesti edelleenl?hetettiin s??nn? mukaan.\nAlkuper?inen viesti liitteen?."; + Text[ catalan ] = "Una regla ha fet reenviar el missatge.\nEl missatge original va adjunt."; + Text[ finnish ] = "Viesti edelleenlhetettiin snnn mukaan.\nAlkuperinen viesti liitteen."; + Text[ thai ] = "ส่งต่อข้อความโดยกฎ\nTข้อความต้นฉบับเป็นสิ่งที่แนบมา"; }; @@ -1086,3 +1116,12 @@ String STR_FORWARDMAIL + + + + + + + + + diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 174fa9c4fccf..e2d663ca4a74 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfrm.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: cd $ $Date: 2002-09-24 10:44:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,7 +145,6 @@ using namespace ::com::sun::star::frame; #pragma hdrstop -#include "picklist.hxx" #include "openflag.hxx" #include "objshimp.hxx" #include "viewsh.hxx" @@ -419,19 +418,36 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Wg. Doppeltbelegung in Toolboxen (mit/ohne Ctrl) ist es auch // m"oglich, da\s der Slot zwar enabled ist, aber Ctrl-Click // trotzdem nicht geht! - if( !pSh || !pSh->HasName() || - !(pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )) + if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )) break; - // while switching to ReadOnly mode the storage should - // be reloaded also - /* - SFX_ITEMSET_ARG( - pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, - SID_EDITDOC, sal_False ); - if ( pItem && !pItem->GetValue() ) - break; - */ + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + if ( pItem && pItem->GetValue() ) + { + SfxMedium* pMed = pSh->GetMedium(); + SfxApplication* pApp = SFX_APP(); + SfxAllItemSet aSet( pApp->GetPool() ); + aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); + aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_blank") ) ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); + if ( pReferer ) + aSet.Put( *pReferer ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION, sal_False ); + if ( pVersionItem ) + aSet.Put( *pVersionItem ); + + if( pMed->GetFilter() ) + { + aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); + if ( pOptions ) + aSet.Put( *pOptions ); + } + + GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet ); + return; + } sal_uInt16 nOpenMode; sal_Bool bNeedsReload = sal_False; @@ -461,18 +477,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( pEditItem ) nOpenMode = pEditItem->GetValue() ? SFX_STREAM_READWRITE : SFX_STREAM_READONLY; } - /* the code looks to be useless - * it could not be reached before becouse of just commented code above - * so now it should be commented out also - else - { - // sonst Reaload abschaltbar - HACK(SID_EDITDOC ist hier falsch verwendet) - SFX_REQUEST_ARG(rReq, pReloadItem, SfxBoolItem, SID_EDITDOC, sal_False); - if ( pReloadItem ) - bReload = pReloadItem->GetValue(); - } - */ // doing if( pSh ) @@ -484,11 +488,12 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION, sal_False ); + INetURLObject aMedObj( pMed->GetName() ); if ( ( !bNeedsReload && - ( pMed->GetURLObject().GetProtocol() == INET_PROT_FILE - && pMed->GetURLObject().getFSysPath(INetURLObject::FSYS_DETECT) == aPhysObj.getFSysPath(INetURLObject::FSYS_DETECT) - && !SfxContentHelper::IsYounger( aPhysObj.GetMainURL(), - pMed->GetURLObject().GetMainURL() ) + ( aMedObj.GetProtocol() == INET_PROT_FILE + && aMedObj.getFSysPath(INetURLObject::FSYS_DETECT) == aPhysObj.getFSysPath(INetURLObject::FSYS_DETECT) + && !SfxContentHelper::IsYounger( aPhysObj.GetMainURL( INetURLObject::NO_DECODE ), + aMedObj.GetMainURL( INetURLObject::NO_DECODE ) ) || pMed->IsRemote() ) ) || pVersionItem ) @@ -634,11 +639,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( rReq.GetSlot() == SID_EDITDOC ) bForEdit = !bForEdit; - // ggf. beim ::com::sun::star::sdbcx::User nachfragen - sal_Bool bDo = sal_True; - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, - SID_SILENT, sal_False); - if ( GetFrame()->DocIsModified_Impl() && + // ggf. beim User nachfragen + sal_Bool bDo = GetViewShell()->PrepareClose(); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False); + if ( bDo && GetFrame()->DocIsModified_Impl() && !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) ) { QueryBox aBox( &GetWindow(), ResId(MSG_QUERY_LASTVERSION) ); @@ -687,19 +691,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) TYPE( SfxTopViewFrame ) ); } - MemCache_Impl& rCache = SfxPickList_Impl::Get()->GetMemCache(); - if( !pNoCacheItem || pNoCacheItem->GetValue() ) - { - SfxObjectShell* pSh = xOldObj; - if ( pURLItem ) - pSh = rCache.Find( aURL, String() ); - if( pSh ) - { - pSh->PrepareReload(); - rCache.RemoveObject( pSh ); - } - } - DELETEZ( xOldObj->Get_Impl()->pReloadTimer ); // Medium mit angepa\stem Open-Mode @@ -932,19 +923,16 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { case SID_EDITDOC: { - if ( !pSh || !pSh->HasName() || - !( pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) ) + if ( !pSh || !pSh->HasName() || !( pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) ) rSet.DisableItem( SID_EDITDOC ); else { - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, - SfxBoolItem, SID_EDITDOC, sal_False ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, sal_False ); if ( pItem && !pItem->GetValue() ) rSet.DisableItem( SID_EDITDOC ); else rSet.Put( SfxBoolItem( nWhich, !pSh->IsReadOnly() ) ); } - break; } @@ -1377,7 +1365,10 @@ String SfxViewFrame::UpdateTitle() String aURL; SfxFrame *pFrm = GetFrame(); if ( pObjSh->HasName() ) - aURL = pMedium->GetURLObject().GetURLNoPass(); + { + INetURLObject aTmp( pMedium->GetName() ); + aURL = aTmp.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + } if ( aURL != pImp->aActualURL ) // URL hat sich ge"andert @@ -2856,7 +2847,9 @@ void SfxViewFrame::ExecView_Impl SFX_REQUEST_ARG( rReq, pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); if ( pHiddenItem ) bHidden = pHiddenItem->GetValue(); - SfxFrame* pFrame = SfxTopFrame::Create( GetObjectShell(), GetCurViewId(), bHidden ); + SfxAllItemSet aSet( GetPool() ); + aSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, TRUE ) ); + SfxFrame* pFrame = SfxTopFrame::Create( GetObjectShell(), GetCurViewId(), bHidden, &aSet ); if ( bHidden ) pFrame->GetCurrentViewFrame()->LockObjectShell_Impl( TRUE ); } @@ -3099,7 +3092,7 @@ void SfxViewFrame::SetModalMode( sal_Bool bModal ) BOOL SfxViewFrame::IsInModalMode() const { - return pImp->bModal; + return pImp->bModal || GetFrame()->GetWindow().IsInModalMode(); } void SfxViewFrame::Resize() @@ -3466,12 +3459,17 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) if ( pWork ) { BOOL bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); - pWork->ShowFullScreenMode( bNewFullScreenMode ); - pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL ); - GetFrame()->GetWorkWindow_Impl()->SetFullScreen_Impl( bNewFullScreenMode ); - if ( !pItem ) - rReq.AppendItem( SfxBoolItem( SID_WIN_FULLSCREEN, bNewFullScreenMode ) ); - rReq.Done(); + if ( bNewFullScreenMode != pWork->IsFullScreenMode() ) + { + pWork->ShowFullScreenMode( bNewFullScreenMode ); + pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL ); + GetFrame()->GetWorkWindow_Impl()->SetFullScreen_Impl( bNewFullScreenMode ); + if ( !pItem ) + rReq.AppendItem( SfxBoolItem( SID_WIN_FULLSCREEN, bNewFullScreenMode ) ); + rReq.Done(); + } + else + rReq.Ignore(); } } else diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index de060ad7e0b5..1147e6c0c1ac 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewimp.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mba $ $Date: 2002-10-24 12:23:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,21 +82,9 @@ class SfxAcceleratorManager; class SfxOfficeDispatch; class SfxBaseController; -struct ModelessDialog_Impl -{ - Dialog* pDialog; - USHORT nSlotId; -}; - -typedef ModelessDialog_Impl* ModelessDialogPtr_Impl; -SV_DECL_PTRARR( ModelessDialogPtrArr_Impl, ModelessDialogPtr_Impl, 4, 4 ); - typedef SfxShell* SfxShellPtr_Impl; SV_DECL_PTRARR( SfxShellArr_Impl, SfxShellPtr_Impl, 4, 4 ); -typedef SfxOfficeDispatch* SfxOffDispPtr_Impl; -SV_DECL_PTRARR( SfxOffDispArr_Impl, SfxOffDispPtr_Impl, 4, 4 ); - // struct SfxViewShell_Impl ---------------------------------------------- struct SfxViewShell_Impl @@ -105,7 +93,6 @@ struct SfxViewShell_Impl ::cppu::OInterfaceContainerHelper aInterceptorContainer; BOOL bControllerSet; SfxShellArr_Impl aArr; - ModelessDialogPtrArr_Impl aDialogArr; SbxObjectRef xSelectionObj; SvBorder aBorder; Size aOptimalSize; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index edb61465abea..b907b3a217e9 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewprn.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mba $ $Date: 2002-07-08 07:43:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,10 @@ #include <vcl/sysdep.hxx> #endif +#ifndef _COM_SUN_STAR_VIEW_PRINTABLESTATE_HPP_ +#include <com/sun/star/view/PrintableState.hpp> +#endif + #ifndef _SFXITEMPOOL_HXX //autogen #include <svtools/itempool.hxx> #endif @@ -110,6 +114,8 @@ #include "view.hrc" #include "helpid.hrc" +TYPEINIT1(SfxPrintingHint, SfxHint); + // ----------------------------------------------------------------------- void DisableRanges( PrintDialog& rDlg, SfxPrinter* pPrinter ) @@ -533,11 +539,11 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) rReq.AppendItem( SfxInt16Item( SID_PRINT_COPIES, (INT16) pPrintDlg->GetCopyCount() ) ); if ( pPrinter->IsPrintFileEnabled() ) rReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPrinter->GetPrintFile() ) ); - if ( pPrintDlg->IsRangeEnabled(PRINTDIALOG_SELECTION) ) + if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_SELECTION) ) rReq.AppendItem( SfxBoolItem( SID_SELECTION, TRUE ) ); - else if ( pPrintDlg->IsRangeEnabled(PRINTDIALOG_RANGE) ) + else if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_RANGE) ) rReq.AppendItem( SfxStringItem( SID_PRINT_PAGES, pPrintDlg->GetRangeText() ) ); - else if ( pPrintDlg->IsRangeEnabled(PRINTDIALOG_FROMTO) ) + else if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_FROMTO) ) { // currently this doesn't seem to work -> return values of dialog are always 0 // seems to be encoded as range string like "1-3" @@ -686,6 +692,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) if ( bDontModifyDoc && bOldFlag != pObjSh->IsEnableSetModified() ) pObjSh->EnableSetModified( bOldFlag ); + GetObjectShell()->Broadcast( SfxPrintingHint( -1, pPrintDlg, pPrinter ) ); ErrCode nError = DoPrint( pPrinter, pPrintDlg, bSilent ); if ( nError == PRINTER_OK ) { @@ -842,10 +849,11 @@ void SfxViewShell::LockPrinter( BOOL bLock) //-------------------------------------------------------------------- -USHORT SfxViewShell::Print( SfxProgress &rProgress, PrintDialog * ) +USHORT SfxViewShell::Print( SfxProgress &rProgress, PrintDialog *pDlg ) { SfxObjectShell *pObjShell = GetViewFrame()->GetObjectShell(); SFX_APP()->NotifyEvent(SfxEventHint(SFX_EVENT_PRINTDOC, pObjShell)); + GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_STARTED, pDlg, NULL ) ); return 0; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 1b59691d7c28..243216a57ced 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: mba $ $Date: 2002-10-24 12:23:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -598,28 +598,10 @@ void SfxViewShell::Activate( BOOL bMDI ) { INetURLObject aObject( SvtPathOptions().GetWorkPath() ); aObject.setFinalSlash(); - INetURLObject::SetBaseURL( aObject.GetMainURL() ); + INetURLObject::SetBaseURL( aObject.GetMainURL( INetURLObject::NO_DECODE ) ); } - StarBASIC* pBas = SFX_APP()->GetBasic_Impl(); - if ( pBas ) - { - SFX_APP()->Get_Impl()->pThisDocument = pSh; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface ( pSh->GetModel() , ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Any aComponent; - aComponent <<= xInterface; - SbxVariable *pCompVar = pBas->Find( DEFINE_CONST_UNICODE("ThisComponent"), SbxCLASS_PROPERTY ); - if ( pCompVar ) - { - pCompVar->PutObject( GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aComponent ) ); - } - else - { - SbxObjectRef xUnoObj = GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aComponent ); - xUnoObj->SetFlag( SBX_DONTSTORE ); - pBas->Insert( xUnoObj ); - } - } + SfxObjectShell::SetWorkingDocument( pSh ); } } @@ -1003,15 +985,6 @@ USHORT SfxViewShell::PrepareClose if( GetViewFrame()->IsInModalMode() ) return FALSE; - ModelessDialogPtrArr_Impl& rArr = pImp->aDialogArr; - for ( USHORT nPos=0; rArr.Count(); ) - { - ModelessDialogPtr_Impl pEntry = rArr[nPos]; - rArr.Remove( nPos ); - delete pEntry->pDialog; - delete pEntry; - } - return TRUE; } @@ -1836,44 +1809,6 @@ Reference < XController > SfxViewShell::GetController() return pImp->pController; } -void SfxViewShell::AddModelessDialog( Dialog* pDialog, USHORT nSlotId ) -{ - ModelessDialogPtr_Impl pEntry = new ModelessDialog_Impl; - pEntry->pDialog = pDialog; - pEntry->nSlotId = nSlotId; - pImp->aDialogArr.Insert( pEntry, pImp->aDialogArr.Count() ); - -} - -BOOL SfxViewShell::HasModelessDialog( USHORT nSlotId ) -{ - ModelessDialogPtrArr_Impl& rArr = pImp->aDialogArr; - for ( USHORT nPos=0; nPos<rArr.Count(); nPos++ ) - { - ModelessDialogPtr_Impl pEntry = rArr[nPos]; - if ( pEntry->nSlotId == nSlotId ) - return TRUE; - } - - return FALSE; -} - -void SfxViewShell::RemoveModelessDialog( USHORT nSlotId ) -{ - ModelessDialogPtrArr_Impl& rArr = pImp->aDialogArr; - for ( USHORT nPos=0; nPos<rArr.Count(); nPos++ ) - { - ModelessDialogPtr_Impl pEntry = rArr[nPos]; - if ( pEntry->nSlotId == nSlotId ) - { - rArr.Remove( nPos ); - delete pEntry->pDialog; - delete pEntry; - break; - } - } -} - void SfxViewShell::AddContextMenuInterceptor_Impl( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor ) { pImp->aInterceptorContainer.addInterface( xInterceptor ); @@ -1962,3 +1897,20 @@ BOOL SfxViewShell::GotOwnerShip_Impl() { return pImp->bGotOwnerShip; } + +long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent ) +{ + if ( pImp->pController ) + return pImp->pController->HandleEvent_Impl( rEvent ); + return 0; +} + +BOOL SfxViewShell::HasKeyListeners_Impl() +{ + return pImp->pController ? pImp->pController->HasKeyListeners_Impl() : FALSE; +} + +BOOL SfxViewShell::HasMouseClickListeners_Impl() +{ + return pImp->pController ? pImp->pController->HasMouseClickListeners_Impl() : FALSE; +} diff --git a/sfx2/util/defs/wntmsci7 b/sfx2/util/defs/wntmsci7 index 8b5d926db96b..9d2b13788ffc 100644 --- a/sfx2/util/defs/wntmsci7 +++ b/sfx2/util/defs/wntmsci7 @@ -11316,9 +11316,3 @@ SfxCompare_UString_SfxPropertyDescriptor_Impl ?disposing@HelpStatusListener_Impl@@UAAXABUEventObject@lang@star@sun@com@@@Z
?statusChanged@HelpStatusListener_Impl@@UAAXABUFeatureStateEvent@frame@star@sun@com@@@Z
?queryInterface@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAVXTypeProvider@lang@456@PAVXServiceInfo@9456@PAVXStandaloneDocumentInfo@document@456@@Z
-?Impl_ExistURLInMenu@@YAEPBVPopupMenu@@ABVString@@PAV2@@Z
-?begin@?$list@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@V?$allocator@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@@2@@_STL@@QBE?AU?$_List_iterator@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@U?$_Const_traits@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@@2@@2@XZ
-?distance@_STL@@YAXU?$_List_iterator@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@U?$_Const_traits@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@@2@@1@0AAI@Z
-?end@?$list@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@V?$allocator@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@@2@@_STL@@QBE?AU?$_List_iterator@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@U?$_Const_traits@V?$list@UStringPair@beans@star@sun@com@@V?$allocator@UStringPair@beans@star@sun@com@@@_STL@@@_STL@@@2@@2@XZ
-??0?$Reference@VXDropTargetDropContext@dnd@datatransfer@star@sun@com@@@uno@star@sun@com@@QAE@ABV01234@@Z
-??0DropTargetEvent@dnd@datatransfer@star@sun@com@@QAE@ABU012345@@Z
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index f97b00e2cf5b..f515d672676f 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -2,9 +2,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2002-11-07 12:39:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:29:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -228,6 +228,3 @@ hidspecial HID_CLOSE_WARNING { HelpID = HID_CLOSE_WARNING; }; hidspecial HID_DID_SAVE_PACKED_XML { HelpID = HID_DID_SAVE_PACKED_XML; }; hidspecial HID_HELP_ONHELP { HelpID = HID_HELP_ONHELP; }; hidspecial HID_HELP_TEXT_SELECTION_MODE { HelpID = HID_HELP_TEXT_SELECTION_MODE; }; -hidspecial SID_INSERT_SOUND { HelpID = SID_INSERT_SOUND; }; -hidspecial SID_INSERT_VIDEO { HelpID = SID_INSERT_VIDEO; }; -hidspecial HID_CONFIG_SAVE { HelpID = HID_CONFIG_SAVE; }; diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index 87952302a320..984e9f1818e7 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: obo $ $Date: 2002-10-23 12:51:59 $ +# last change: $Author: hr $ $Date: 2003-03-27 11:29:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,6 +68,7 @@ TARGET=sfx .INCLUDE : $(PRJ)$/util$/makefile.pmk #sfx.hid generieren GEN_HID=TRUE +GEN_HID_OTHER=TRUE # --- Settings ----------------------------------------------------- @@ -76,8 +77,8 @@ GEN_HID=TRUE # --- Allgemein ---------------------------------------------------- LIB1TARGET= $(SLB)$/$(TARGET).lib - -LIB1FILES= $(SLB)$/explorer.lib \ +LIB1FILES= $(SLB)$/appl.lib \ + $(SLB)$/explorer.lib \ $(SLB)$/doc.lib \ $(SLB)$/view.lib \ $(SLB)$/control.lib \ @@ -89,7 +90,6 @@ LIB1FILES= $(SLB)$/explorer.lib \ $(SLB)$/statbar.lib \ $(SLB)$/dialog.lib \ $(SLB)$/bastyp.lib \ - $(SLB)$/appl.lib \ $(SLB)$/config.lib HELPIDFILES=\ @@ -98,7 +98,7 @@ HELPIDFILES=\ .IF "$(GUI)"!="UNX" LIB2TARGET= $(LB)$/$(TARGET).lib -LIB2FILES= $(LB)$/isfx.lib +LIB2FILES= $(LB)$/isfx.lib .ENDIF SHL1TARGET= sfx$(UPD)$(DLLPOSTFIX) @@ -146,13 +146,13 @@ SHL1STDLIBS+=\ .IF "$(GUI)"=="WNT" SHL1STDLIBS+=\ + uwinapi.lib \ advapi32.lib \ shell32.lib \ gdi32.lib \ ole32.lib \ - uuid.lib \ - uwinapi.lib \ - unicows.lib + uuid.lib + .ENDIF @@ -212,8 +212,6 @@ RESLIB1SRSFILES=$(SFXSRSLIST) .INCLUDE : target.mk -ALLTAR : $(SRS)$/hidother.hid - # --- SFX-Filter-Datei --- $(MISC)$/$(SHL1TARGET).flt: makefile.mk @@ -221,15 +219,3 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo Making: $@ @+$(TYPE) sfxwin.flt > $@ -$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid - -$(SRS)$/hidother.hid: hidother.src -.IF "$(GUI)$(CPU)"=="WNTI" -.IF "$(BUILD_SOSL)"=="" - @+echo no hids - @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE) -.ENDIF -.ELSE - @echo nix -.ENDIF # "$(GUI)$(CPU)"=="WNTI" - |