diff options
| -rw-r--r-- | sc/inc/sc.hrc | 10 | ||||
| -rw-r--r-- | sc/sdi/drawsh.sdi | 1 | ||||
| -rw-r--r-- | sc/source/core/data/drwlayer.cxx | 31 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 13 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 50 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/objdraw.src | 92 | ||||
| -rw-r--r-- | sc/source/ui/inc/undotab.hxx | 30 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/strindlg.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/src/scstring.src | 250 | ||||
| -rw-r--r-- | sc/source/ui/undo/undotab.cxx | 96 | ||||
| -rw-r--r-- | sc/source/ui/view/drawview.cxx | 10 | ||||
| -rw-r--r-- | sc/util/hidother.src | 5 |
12 files changed, 409 insertions, 188 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index d02ff3b1f..66a878083 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -2,9 +2,9 @@ * * $RCSfile: sc.hrc,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mh $ $Date: 2001-12-05 10:26:43 $ + * last change: $Author: nn $ $Date: 2001-12-05 21:52:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,6 +292,8 @@ #define HID_CHG_PROTECT ( HID_SC_TOOLBOX_START + 8 ) +#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) + // Hilfe IDs fuer Submenus (max.50) ------------------------------------------ #define HID_SCMENU_EDIT ( HID_SC_MENU_START ) #define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) @@ -553,6 +555,8 @@ #define SID_ENABLE_HYPHENATION (SC_VIEW_START + 87) +#define SID_RENAME_OBJECT (SC_VIEW_START + 88) + // Nachrichten ------------------------------------------------------------- #define FID_INPUTLINE_STATUS (SC_MESSAGE_START) @@ -1246,6 +1250,8 @@ #define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) +#define SCSTR_RENAMEOBJECT (STR_START + 215) + // Navigator - in der Reihenfolge wie SC_CONTENT_... #define SCSTR_CONTENT_ROOT (STR_START + 250) #define SCSTR_CONTENT_TABLE (STR_START + 251) diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index c452294f5..4e96e9522 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -132,6 +132,7 @@ interface TableDraw : Selection SID_HYPERLINK_SETLINK [ ExecMethod = ExecuteHLink; Export = FALSE; ] SID_HYPERLINK_GETLINK [ StateMethod = GetHLinkState; Export = FALSE; ] SID_ENABLE_HYPHENATION [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_RENAME_OBJECT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index d2e8c9392..df9088a2b 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwlayer.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: sj $ $Date: 2001-11-27 10:11:46 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:10:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1345,17 +1345,28 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark ) // static String ScDrawLayer::GetVisibleName( SdrObject* pObj ) { + String aName = pObj->GetName(); if ( pObj->GetObjIdentifier() == OBJ_OLE2 ) { - // For OLE, always use persist name as long as the visible name - // isn't accessible to change (preserve old behavior, otherwise - // there could be duplicate names that can't be changed). - // All OLE objects should appear in Navigator etc., - // so persist name must at least be used if no name is set. + // #95575# For OLE, the user defined name (GetName) is used + // if it's not empty (accepting possibly duplicate names), + // otherwise the persist name is used so every object appears + // in the Navigator at all. - return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); + if ( !aName.Len() ) + aName = static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); } - return pObj->GetName(); + return aName; +} + +inline IsNamedObject( SdrObject* pObj, const String& rName ) +{ + // TRUE if rName is the object's Name or PersistName + // (used to find a named object) + + return ( pObj->GetName() == rName || + ( pObj->GetObjIdentifier() == OBJ_OLE2 && + static_cast<SdrOle2Obj*>(pObj)->GetPersistName() == rName ) ); } SdrObject* ScDrawLayer::GetNamedObject( const String& rName, USHORT nId, USHORT& rFoundTab ) const @@ -1372,7 +1383,7 @@ SdrObject* ScDrawLayer::GetNamedObject( const String& rName, USHORT nId, USHORT& while (pObject) { if ( nId == 0 || pObject->GetObjIdentifier() == nId ) - if ( GetVisibleName( pObject ) == rName ) + if ( IsNamedObject( pObject, rName ) ) { rFoundTab = nTab; return pObject; diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index e671e921a..7881d8bea 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: nn $ $Date: 2001-05-21 11:11:10 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -186,6 +186,15 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen } } + if ( nMarkCount != 1 || + rMarkList.GetMark( 0 )->GetObj()->GetObjIdentifier() != OBJ_OLE2 ) + { + // Only a single object can be renamed. + // Currently only OLE objects (charts and others) are supported, + // Graphics and groups may be added later. + + rSet.DisableItem( SID_RENAME_OBJECT ); + } if ( !nMarkCount ) // nichts selektiert { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 385d07fb9..394cd3269 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh5.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ka $ $Date: 2001-09-06 12:52:28 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,9 +75,11 @@ #include <svx/fmglob.hxx> #include <svx/hlnkitem.hxx> #include <svx/fontwork.hxx> +#include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> #include <svx/xdef.hxx> #include <svx/xftsfit.hxx> +#include <vcl/msgbox.hxx> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -89,6 +91,9 @@ #include "viewdata.hxx" #include "tabvwsh.hxx" #include "docsh.hxx" +#include "strindlg.hxx" +#include "scresid.hxx" +#include "undotab.hxx" #include "sc.hrc" @@ -494,6 +499,47 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } break; + case SID_RENAME_OBJECT: + { + const SdrMarkList& rMarkList = pView->GetMarkList(); + if ( rMarkList.GetMarkCount() == 1 ) + { + SdrObject* pObj = rMarkList.GetMark( 0 )->GetObj(); + if ( pObj->GetObjIdentifier() == OBJ_OLE2 ) + { + // PersistName is used to identify object in Undo + String aPersistName = static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); + + // Currently only OLE objects (charts and others) are supported, + // Graphics and groups may be added later (Undo must be changed then) + + String aOldName = pObj->GetName(); + ScStringInputDlg* pDlg = new ScStringInputDlg( pViewData->GetDialogParent(), + String(ScResId(SCSTR_RENAMEOBJECT)), + String(ScResId(SCSTR_NAME)), + aOldName, nSlotId ); + USHORT nRet = pDlg->Execute(); + if ( nRet == RET_OK ) + { + String aNewName; + pDlg->GetInputString( aNewName ); + if ( aNewName != aOldName ) + { + pObj->SetName( aNewName ); // set new name + + ScDocShell* pDocSh = pViewData->GetDocShell(); + pDocSh->GetUndoManager()->AddUndoAction( + new ScUndoRenameObject( pDocSh, aPersistName, aOldName, aNewName ) ); + + pDocSh->SetDrawModified(); + } + } + delete pDlg; + } + } + } + break; + default: break; } diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 7904fda33..ffe2242ec 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -2,9 +2,9 @@ * * $RCSfile: objdraw.src,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: kz $ $Date: 2001-11-16 22:50:13 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:06:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ Text[ korean ] = "표준(~D)";\ Text[ turkish ] = "Standar~t";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Predeterminado";\ + Text[ catalan ] = "Per ~defecte";\ Text[ finnish ] = "~Oletusarvo";\ }; @@ -157,7 +157,7 @@ Text [ italian ] = "Apice" ; \ Text [ portuguese_brazilian ] = "So~brescrito" ; \ Text [ portuguese ] = "~Superior linha" ; \ - Text [ finnish ] = "~Yl?indeksi" ; \ + Text [ finnish ] = "~Ylindeksi" ; \ Text [ danish ] = "Hvet" ; \ Text [ french ] = "~Exposant" ; \ Text [ swedish ] = "~Upphjt" ; \ @@ -174,7 +174,7 @@ Text[ korean ] = "위 첨자(~S)";\ Text[ turkish ] = "~st simge";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Supern~dice";\ + Text[ catalan ] = "~Superndex";\ };\ MenuItem\ {\ @@ -188,7 +188,7 @@ Text [ portuguese ] = "~Inferior linha" ; \ Text [ finnish ] = "~Alaindeksi" ; \ Text [ danish ] = "Snket" ; \ - Text [ french ] = "~Indice infrieur" ; \ + Text [ french ] = "~Indice" ; \ Text [ swedish ] = "~Nedsnkt" ; \ Text [ dutch ] = "Su~bscript" ; \ Text [ spanish ] = "Su~bndice" ; \ @@ -200,10 +200,10 @@ Text[ chinese_traditional ] = "下標(~U)";\ Text[ arabic ] = "";\ Text[ greek ] = "~";\ - Text[ korean ] = "아래첨자(~U)";\ + Text[ korean ] = "아래 첨자(~U)";\ Text[ turkish ] = "~Alt simge";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Su~bndice";\ + Text[ catalan ] = "S~ubndex";\ };\ };\ };\ @@ -217,7 +217,7 @@ Text[ korean ] = "유형(~S)";\ Text[ turkish ] = "Bi~im";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Est~ilo";\ + Text[ catalan ] = "E~stil";\ };\ MenuItem\ {\ @@ -284,7 +284,7 @@ Text[ korean ] = "양쪽 맞춤(~J)";\ Text[ turkish ] = "~ki yana yasla";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Justificado";\ + Text[ catalan ] = "~Justificat";\ };\ };\ };\ @@ -298,7 +298,7 @@ Text[ korean ] = "맞춤(~A)";\ Text[ turkish ] = "~Hizalama";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Alineacin";\ + Text[ catalan ] = "~Alineaci";\ };\ MenuItem\ {\ @@ -310,7 +310,7 @@ Text [ italian ] = "Interli~nea" ; \ Text [ portuguese_brazilian ] = "~Espa?amento de linha" ; \ Text [ portuguese ] = "~Entrelinhas" ; \ - Text [ finnish ] = "~Riviv?li" ; \ + Text [ finnish ] = "~Rivivli" ; \ Text [ danish ] = "~Linjeafstand" ; \ Text [ french ] = "Inter~ligne" ; \ Text [ swedish ] = "~Radavstnd" ; \ @@ -349,7 +349,7 @@ Text[ korean ] = "행 간격(~L)";\ Text[ turkish ] = "~Satr aral";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Inter~lineado";\ + Text[ catalan ] = "Inter~lineat";\ }; #define MN_DRWTXT \ @@ -386,10 +386,10 @@ Text[ chinese_traditional ] = "文字(~X)...";\ Text[ arabic ] = "~...";\ Text[ greek ] = "~...";\ - Text[ korean ] = "텍스트.(~X)...";\ + Text[ korean ] = "텍스트(~X)...";\ Text[ turkish ] = "~Metin...";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Te~xto...";\ + Text[ catalan ] = "Te~xt...";\ Text[ finnish ] = "Teks~ti";\ }; @@ -405,7 +405,7 @@ Text [ italian ] = "Dimensione ori~ginale" ; \ Text [ portuguese_brazilian ] = "Tamanho real" ; \ Text [ portuguese ] = "Tamanho original" ; \ - Text [ finnish ] = "~Alkuper?inen koko" ; \ + Text [ finnish ] = "~Alkuperinen koko" ; \ Text [ danish ] = "Oprindelig strrelse" ; \ Text [ french ] = "Taille d'origine" ; \ Text [ swedish ] = "Ori~ginalstorlek" ; \ @@ -422,7 +422,16 @@ Text[ korean ] = "기본 크기(~O)";\ Text[ turkish ] = "Gerek ~boyut";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Ta~mao original";\ + Text[ catalan ] = "Mida ~original";\ + }; + +#define MN_RENAME_OBJECT \ + MenuItem\ + {\ + Identifier = SID_RENAME_OBJECT ; \ + HelpId = SID_RENAME_OBJECT ; \ + Text = "Ob~jekt benennen..." ; \ + Text [ ENGLISH ] = "~Name Object..." ; \ }; #define MN_MIRRORSUB \ @@ -436,7 +445,7 @@ Text [ italian ] = "Ri~specchia" ; \ Text [ portuguese_brazilian ] = "~Espelho" ; \ Text [ portuguese ] = "~Reflectir" ; \ - Text [ finnish ] = "~K??nn?" ; \ + Text [ finnish ] = "~Knn" ; \ Text [ danish ] = "Spejl~vend" ; \ Text [ french ] = "~Reflter" ; \ Text [ swedish ] = "Sp~egelvnd" ; \ @@ -474,7 +483,7 @@ Text[ korean ] = "수직(~V)";\ Text[ turkish ] = "~Dikey";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Vertical";\ + Text[ catalan ] = "~Verticalment";\ };\ MenuItem\ {\ @@ -495,7 +504,7 @@ Text [ english_us ] = "~Horizontal" ; \ Text[ chinese_simplified ] = "水平方向(~H)";\ Text[ russian ] = " ";\ - Text[ polish ] = "~Poziomo";\ + Text[ polish ] = "W pionie";\ Text[ japanese ] = "左右反転(~H)";\ Text[ chinese_traditional ] = "水平方向(~H)";\ Text[ arabic ] = "";\ @@ -503,7 +512,7 @@ Text[ korean ] = "수평(~H)";\ Text[ turkish ] = "~Yatay";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Horizontal";\ + Text[ catalan ] = "~Horitzontal";\ };\ };\ };\ @@ -517,7 +526,7 @@ Text[ korean ] = "대칭(~F)";\ Text[ turkish ] = "~Yanst";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Reflejar";\ + Text[ catalan ] = "In~verteix";\ }; #define MN_ARRANGESUB \ @@ -531,7 +540,7 @@ Text [ italian ] = "~Disponi" ; \ Text [ portuguese_brazilian ] = "Organizar" ; \ Text [ portuguese ] = "~Dispoo" ; \ - Text [ finnish ] = "~J?rjest?" ; \ + Text [ finnish ] = "~Jrjest" ; \ Text [ danish ] = "Pl~acering" ; \ Text [ french ] = "~Disposition" ; \ Text [ swedish ] = "Pl~acering" ; \ @@ -557,7 +566,7 @@ Text [ italian ] = "Porta pi ~avanti" ; \ Text [ portuguese_brazilian ] = "Tazer Para Frente" ; \ Text [ portuguese ] = "~Trazer para a frente" ; \ - Text [ finnish ] = "Siirr? ~eteenp?in" ; \ + Text [ finnish ] = "Siirr ~eteenpin" ; \ Text [ danish ] = "F~lyt fremad" ; \ Text [ french ] = "V~ers l'avant" ; \ Text [ swedish ] = "Flytta l~ngre fram" ; \ @@ -574,7 +583,7 @@ Text[ korean ] = "앞으로 가져오기(~F)";\ Text[ turkish ] = "B~ir ne getir";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Traer ms a~delante";\ + Text[ catalan ] = "Porta al ~davant";\ };\ MenuItem\ {\ @@ -587,7 +596,7 @@ Text [ italian ] = "Porta pi indietro" ; \ Text [ portuguese_brazilian ] = "Enviar Para o Fundo" ; \ Text [ portuguese ] = "Enviar para o ~fundo" ; \ - Text [ finnish ] = "Siirr? taakse~p?in" ; \ + Text [ finnish ] = "Siirr taakse~pin" ; \ Text [ danish ] = "Flyt bag~ud" ; \ Text [ french ] = "~Vers l'arrire" ; \ Text [ swedish ] = "Flytta l~ngre bak" ; \ @@ -604,7 +613,7 @@ Text[ korean ] = "뒤로 보내기(~W)";\ Text[ turkish ] = "Bir ~geri gnder";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Enviar hacia a~trs";\ + Text[ catalan ] = "En~via cap enrere";\ };\ MenuItem\ {\ @@ -631,7 +640,7 @@ Text[ korean ] = "배열(~A)";\ Text[ turkish ] = "~Sralama";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Posicin";\ + Text[ catalan ] = "~Organitza";\ }; #define MN_ANCHORSUB \ @@ -675,7 +684,7 @@ Text[ korean ] = "페이지에서(~A)";\ Text[ turkish ] = "Sayfa~da";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "A la ~pgina";\ + Text[ catalan ] = "A la p~gina";\ Text[ finnish ] = "Sivul~le";\ };\ MenuItem\ @@ -700,10 +709,10 @@ Text[ chinese_traditional ] = "在儲存格上(~C)";\ Text[ arabic ] = "";\ Text[ greek ] = " ~";\ - Text[ korean ] = "셀에(~C)";\ + Text[ korean ] = "셀에서(~C)";\ Text[ turkish ] = "Hcre~de";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "A la ~celda";\ + Text[ catalan ] = "A la ~cella";\ Text[ finnish ] = "So~luun";\ };\ };\ @@ -722,7 +731,7 @@ Text[ korean ] = "위치 고정(~C)";\ Text[ turkish ] = "Sa~bitleyici";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "~Anclaje";\ + Text[ catalan ] = "An~cora";\ Text[ finnish ] = "Ank~kuri";\ }; @@ -788,7 +797,7 @@ Text[ korean ] = "맞춤(~L)";\ Text[ turkish ] = "Hiz~alama";\ Text[ language_user1 ] = " ";\ - Text[ catalan ] = "Ali~neacin";\ + Text[ catalan ] = "A~lineaci";\ }; // @@ -822,7 +831,7 @@ String RID_DRAW_OBJECTBAR Text[ korean ] = "그리기 개체 모음"; Text[ turkish ] = "izim nesne ubuu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de objetos de dibujo"; + Text[ catalan ] = "Barra d'objectes de dibuix"; }; ToolBox RID_DRAW_OBJECTBAR { @@ -996,7 +1005,7 @@ String RID_TEXT_TOOLBOX Text[ korean ] = "텍스트 개체 모음"; Text[ turkish ] = "Metin nesne ubuu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Barra de objetos de texto"; + Text[ catalan ] = "Barra d'objectes de text"; }; ToolBox RID_TEXT_TOOLBOX { @@ -1184,7 +1193,7 @@ String RID_GRAPHIC_OBJECTBAR Text[ chinese_traditional ] = "圖形物件列"; Text[ turkish ] = "Toolbar for graphic objects"; Text[ arabic ] = " "; - Text[ catalan ] = "Barra de objetos grficos"; + Text[ catalan ] = "Barra d'objectes grfics"; Text[ finnish ] = "Grafiikkaobjektipalkki"; }; ToolBox RID_GRAPHIC_OBJECTBAR @@ -1446,7 +1455,7 @@ String RID_POPUP_DRAW Text[ korean ] = "그리기 개체를 위한 팝업 메뉴"; Text[ turkish ] = "izim nesneleri iin alan mn"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Men emergente para objetos de dibujo"; + Text[ catalan ] = "Men emergent per a objectes de dibuix"; }; // // Popup-Menue fuer (allgemeine) Zeichenobjekte @@ -1551,6 +1560,7 @@ Menu RID_POPUP_OLE MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB + MN_RENAME_OBJECT //------------------------------ MenuItem { Separator = TRUE ; }; //------------------------------ @@ -1574,6 +1584,7 @@ Menu RID_POPUP_CHART MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB + MN_RENAME_OBJECT MenuItem { Identifier = SID_OPENDLG_MODCHART ; @@ -1600,7 +1611,7 @@ Menu RID_POPUP_CHART Text[ korean ] = "데이터 영역 수정(~M)..."; Text[ turkish ] = "~Veri alann deitir..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar rea de ~datos..."; + Text[ catalan ] = "~Modifica l'rea de dades..."; Text[ finnish ] = "~Muokkaa tietoaluetta..."; }; //------------------------------ @@ -1638,7 +1649,7 @@ String RID_POPUP_DRAWTEXT Text[ korean ] = "텍스트 개체의 팝업 메뉴"; Text[ turkish ] = "Metin nesneleri iin alan mn"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Men emergente para objetos de texto"; + Text[ catalan ] = "Men emergent per a objectes de text"; Text[ finnish ] = "Tekstiobjektien ponnahdusvalikko"; }; @@ -1678,3 +1689,6 @@ Menu RID_POPUP_DRAWTEXT + + + diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 0d02d6d87..b0494a0df 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -2,9 +2,9 @@ * * $RCSfile: undotab.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: er $ $Date: 2001-04-18 12:29:45 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:02:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,6 +87,7 @@ class ScDocShell; class ScDocument; class SdrUndoAction; class ScPrintRangeSaver; +class SdrObject; //---------------------------------------------------------------------------- @@ -448,6 +449,31 @@ private: }; +class ScUndoRenameObject: public ScSimpleUndo +{ +public: + TYPEINFO(); + ScUndoRenameObject( + ScDocShell* pNewDocShell, const String& rPN, + const String& rON, const String& rNN ); + + virtual ~ScUndoRenameObject(); + + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + + virtual String GetComment() const; + +private: + String aPersistName; // to find object (works only for OLE objects) + String aOldName; + String aNewName; + + SdrObject* GetObject(); +}; + #endif diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 1f5b614ed..469978c35 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: strindlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2001-12-05 21:57:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,8 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, // HelpId for Edit different for different uses DBG_ASSERT( nHelpId == FID_TAB_APPEND || nHelpId == FID_TAB_RENAME || - nHelpId == HID_SC_ADD_AUTOFMT || nHelpId == HID_SC_RENAME_AUTOFMT, + nHelpId == HID_SC_ADD_AUTOFMT || nHelpId == HID_SC_RENAME_AUTOFMT || + nHelpId == SID_RENAME_OBJECT, "unknown ID" ); if ( nHelpId == FID_TAB_APPEND ) aEdInput.SetHelpId( HID_SC_APPEND_NAME ); @@ -107,6 +108,8 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aEdInput.SetHelpId( HID_SC_AUTOFMT_NAME ); else if ( nHelpId == HID_SC_RENAME_AUTOFMT ) aEdInput.SetHelpId( HID_SC_REN_AFMT_NAME ); + else if ( nHelpId == SID_RENAME_OBJECT ) + aEdInput.SetHelpId( HID_SC_RENAME_OBJECT ); //------------- FreeResource(); diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index f5ba4f10c..62c2cfda2 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -2,9 +2,9 @@ * * $RCSfile: scstring.src,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:32:18 $ + * last change: $Author: nn $ $Date: 2001-12-05 21:55:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ String SCSTR_APPLICATION Text[ turkish ] = "StarCalc 5.0"; Text[ arabic ] = "%PRODUCTNAME Calc 6.0"; Text[ catalan ] = "%PRODUCTNAME Calc 6.0"; - Text[ finnish ] = "StarCalc 5.0"; + Text[ finnish ] = "%PRODUCTNAME Calc 6.0"; Text[ language_user1 ] = " "; }; String SCSTR_50_APPLICATION @@ -138,7 +138,7 @@ String SCSTR_40_APPLICATION Text [ italian ] = "StarCalc 4.0" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME Calc 4.0" ; Text [ portuguese ] = "StarCalc 4.0" ; - Text [ finnish ] = "StarCalc 4.0" ; + Text [ finnish ] = "StarCalc 4,0" ; Text [ danish ] = "StarCalc 4.0" ; Text [ french ] = "StarCalc 4.0" ; Text [ swedish ] = "StarCalc 4.0" ; @@ -165,7 +165,7 @@ String SCSTR_30_APPLICATION Text [ italian ] = "StarCalc 3.0" ; Text [ portuguese_brazilian ] = "%PRODUCTNAME Calc 3.0" ; Text [ portuguese ] = "StarCalc 3.0" ; - Text [ finnish ] = "StarCalc 3.0" ; + Text [ finnish ] = "StarCalc 3,0" ; Text [ danish ] = "StarCalc 3.0" ; Text [ french ] = "StarCalc 3.0" ; Text [ swedish ] = "StarCalc 3.0" ; @@ -206,8 +206,8 @@ String SCSTR_LONG_SCDOC_NAME Text[ chinese_traditional ] = "%PRODUCTNAME 6.0 工作表"; Text[ turkish ] = "%PRODUCTNAME 5.0 tablosu"; Text[ arabic ] = " %PRODUCTNAME 6.0"; - Text[ catalan ] = "%PRODUCTNAME 6.0 Hoja de clculo"; - Text[ finnish ] = "%PRODUCTNAME 5.0 Spreadsheet"; + Text[ catalan ] = "%PRODUCTNAME 6.0 Fulla de clcul"; + Text[ finnish ] = "%PRODUCTNAME 6,0 -laskentataulukko"; Text[ language_user1 ] = " "; }; String SCSTR_50_LONG_DOCNAME @@ -233,7 +233,7 @@ String SCSTR_50_LONG_DOCNAME Text[ korean ] = "%PRODUCTNAME Calc 5.0 스프레드 시트"; Text[ turkish ] = "%PRODUCTNAME 5.0 tablosu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "%PRODUCTNAME 5.0 Hoja de clculo"; + Text[ catalan ] = "%PRODUCTNAME 5.0 Fulla de clcul"; Text[ finnish ] = "%PRODUCTNAME 5.0 -laskentataulukko"; }; String SCSTR_40_LONG_DOCNAME @@ -259,8 +259,8 @@ String SCSTR_40_LONG_DOCNAME Text[ korean ] = "%PRODUCTNAME 4.0 스프레드시트"; Text[ turkish ] = "StarCalc 4.0 tablosu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "%PRODUCTNAME 4.0 Hoja de clculo"; - Text[ finnish ] = "%PRODUCTNAME 4.0 -laskentataulukko"; + Text[ catalan ] = "%PRODUCTNAME 4.0 Fulla de clcul"; + Text[ finnish ] = "%PRODUCTNAME 4,0 -laskentataulukko"; }; String SCSTR_30_LONG_DOCNAME { @@ -285,7 +285,7 @@ String SCSTR_30_LONG_DOCNAME Text[ korean ] = "StarCalc 3.0 스프레드시트"; Text[ turkish ] = "StarCalc 3.0 tablosu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja de clculo de StarCalc 3.0"; + Text[ catalan ] = "Full de clcul StarCalc 3.0"; Text[ finnish ] = "StarCalc 3.0 -laskentataulukko"; }; String SCSTR_SHORT_SCDOC_NAME @@ -313,7 +313,7 @@ String SCSTR_SHORT_SCDOC_NAME Text[ korean ] = "스프레드시트"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja de clculo"; + Text[ catalan ] = "Full de clcul"; }; String SCSTR_HUMAN_SCDOC_NAME { @@ -340,7 +340,7 @@ String SCSTR_HUMAN_SCDOC_NAME Text[ korean ] = "스프레드시트"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja de clculo"; + Text[ catalan ] = "Full de clcul"; }; String SCSTR_DOCSHELL @@ -368,7 +368,7 @@ String SCSTR_DOCSHELL Text[ korean ] = "시트"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja"; + Text[ catalan ] = "Full"; }; String SCSTR_TABVIEWSHELL @@ -396,7 +396,7 @@ String SCSTR_TABVIEWSHELL Text[ korean ] = "셀"; Text[ turkish ] = "Hcre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Celdas"; + Text[ catalan ] = "Celles"; }; String SCSTR_CELLSHELL @@ -422,7 +422,7 @@ String SCSTR_CELLSHELL Text[ arabic ] = " "; Text[ turkish ] = "Hcre ilevi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones de celda"; + Text[ catalan ] = "Funcions de cella"; Text[ finnish ] = "Solujen funktiot"; }; @@ -449,7 +449,7 @@ String SCSTR_FORMATSHELL Text[ arabic ] = " "; Text[ turkish ] = "Hcre format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formatos de celda"; + Text[ catalan ] = "Formats de les celles"; Text[ finnish ] = "Solujen muodot"; }; @@ -479,7 +479,7 @@ String SCSTR_DRAWSHELL Text[ korean ] = "그래픽 개체"; Text[ turkish ] = "Grafik nesnesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos grficos"; + Text[ catalan ] = "Objectes grfics"; }; String SCSTR_DRAWTEXTSHELL @@ -507,7 +507,7 @@ String SCSTR_DRAWTEXTSHELL Text[ korean ] = "텍스트 개체"; Text[ turkish ] = "Metin nesnesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos de texto"; + Text[ catalan ] = "Objectes de text"; }; String SCSTR_DRAWFORMSHELL @@ -533,7 +533,7 @@ String SCSTR_DRAWFORMSHELL Text[ korean ] = "양식 개체"; Text[ turkish ] = "Form nesnesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos de formulario"; + Text[ catalan ] = "Objectes del formulari"; Text[ finnish ] = "Lomakeobjektit"; }; @@ -559,7 +559,7 @@ String SCSTR_CHARTSHELL Text[ chinese_traditional ] = "圖表物件"; Text[ arabic ] = " "; Text[ turkish ] = "ema nesnesi"; - Text[ catalan ] = "Objetos de diagrama"; + Text[ catalan ] = "Objectes del diagrama"; Text[ finnish ] = "Kaavio-objektit"; }; @@ -586,7 +586,7 @@ String SCSTR_OLEOBJECTSHELL Text[ arabic ] = " OLE"; Text[ turkish ] = "OLE nesnesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos OLE"; + Text[ catalan ] = "Objectes OLE"; Text[ finnish ] = "OLE-objektit"; }; @@ -612,7 +612,7 @@ String SCSTR_GRAPHICSHELL Text[ chinese_traditional ] = "圖形"; Text[ arabic ] = ""; Text[ turkish ] = "Grafik"; - Text[ catalan ] = "Imagen"; + Text[ catalan ] = "Grfics"; Text[ finnish ] = "Kuvat"; }; String SCSTR_PAGEBREAKSHELL @@ -632,13 +632,13 @@ String SCSTR_PAGEBREAKSHELL Text[ polish ] = "Podzia strony"; Text[ portuguese_brazilian ] = "Pagebreak"; Text[ japanese ] = "改ﾍﾟｰｼﾞ"; - Text[ korean ] = "쪽나누기"; + Text[ korean ] = "페이지 나누기"; Text[ chinese_simplified ] = "换页"; Text[ chinese_traditional ] = "換頁"; Text[ arabic ] = " "; Text[ turkish ] = "Sayfa sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de pgina"; + Text[ catalan ] = "Salt de pgina"; Text[ finnish ] = "Sivunvaihto"; }; @@ -667,7 +667,7 @@ String SCSTR_EDITSHELL Text[ korean ] = "텍스트 편집"; Text[ turkish ] = "Metin dzenleme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Edicin de texto"; + Text[ catalan ] = "Edici del text"; }; String SCSTR_PREVIEWSHELL @@ -695,7 +695,7 @@ String SCSTR_PREVIEWSHELL Text[ korean ] = "인쇄 미리보기"; Text[ turkish ] = "Bask nizleme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Presentacin preliminar"; + Text[ catalan ] = "Exemple d'impressi"; }; String SCSTR_PIVOTSHELL @@ -720,10 +720,10 @@ String SCSTR_PIVOTSHELL Text[ chinese_traditional ] = "資料助理工作表"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "데이터파일럿 표"; + Text[ korean ] = "데이터 파일럿 표"; Text[ turkish ] = "Veri pilotu tablosu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tablas del piloto de datos"; + Text[ catalan ] = "Taules del DataPilot"; }; String SCSTR_AUDITSHELL @@ -750,7 +750,7 @@ String SCSTR_AUDITSHELL Text[ korean ] = "추적 채우기 모드"; Text[ turkish ] = "Dedektif doldurma kipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modo Detective de relleno"; + Text[ catalan ] = "Mode d'emplenament Detective"; Text[ finnish ] = "Havainnoiva tytttila"; }; @@ -782,7 +782,7 @@ String STR_ROWHEIGHT Text[ korean ] = "높이"; Text[ turkish ] = "Ykseklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura"; + Text[ catalan ] = "Alada"; }; String STR_OPT_ROWHEIGHT { @@ -809,7 +809,7 @@ String STR_OPT_ROWHEIGHT Text[ korean ] = "추가"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aadir"; + Text[ catalan ] = "Afegeix"; }; String STR_ROWHEIGHT_TITLE { @@ -837,7 +837,7 @@ String STR_ROWHEIGHT_TITLE Text[ korean ] = "행 높이"; Text[ turkish ] = "Satr ykseklii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura de fila"; + Text[ catalan ] = "Alada de la fila"; }; String STR_OPT_ROWHEIGHT_TITLE { @@ -865,7 +865,7 @@ String STR_OPT_ROWHEIGHT_TITLE Text[ korean ] = "최적의 행 높이"; Text[ turkish ] = "Optimum satr ykseklii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura de fila ptima"; + Text[ catalan ] = "Alada ptima de la fila"; }; String STR_COLWIDTH { @@ -892,7 +892,7 @@ String STR_COLWIDTH Text[ korean ] = "너비"; Text[ turkish ] = "Genilik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho"; + Text[ catalan ] = "Amplada"; }; String STR_OPT_COLWIDTH { @@ -919,7 +919,7 @@ String STR_OPT_COLWIDTH Text[ korean ] = "추가"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aadir"; + Text[ catalan ] = "Afegeix"; }; String STR_COLWIDTH_TITLE { @@ -946,7 +946,7 @@ String STR_COLWIDTH_TITLE Text[ korean ] = "열 너비"; Text[ turkish ] = "Stun genilii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna"; + Text[ catalan ] = "Amplada de la columna"; }; String STR_OPT_COLWIDTH_TITLE { @@ -973,7 +973,7 @@ String STR_OPT_COLWIDTH_TITLE Text[ korean ] = "최적의 열 너비"; Text[ turkish ] = "Optimum stun genilii"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna ptimo"; + Text[ catalan ] = "Amplada ptima de la columna"; }; String SCSTR_UNDEFINED { @@ -1000,7 +1000,7 @@ String SCSTR_UNDEFINED Text[ korean ] = "- 정의되지 않음 -"; Text[ turkish ] = "- tanmlanmam -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- no definido -"; + Text[ catalan ] = "- no definit -"; }; String SCSTR_NONE { @@ -1027,7 +1027,7 @@ String SCSTR_NONE Text[ korean ] = "- 없음 -"; Text[ turkish ] = "- yok -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- ninguno -"; + Text[ catalan ] = "- cap -"; }; String SCSTR_EMPTY { @@ -1054,7 +1054,7 @@ String SCSTR_EMPTY Text[ korean ] = "- 비었음 -"; Text[ turkish ] = "- bo -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- vaco -"; + Text[ catalan ] = "- buit -"; }; String SCSTR_NOTEMPTY { @@ -1081,7 +1081,7 @@ String SCSTR_NOTEMPTY Text[ korean ] = "- 비어있지 않음 -"; Text[ turkish ] = "- bo deil -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- no vaco -"; + Text[ catalan ] = "- no buit -"; }; String SCSTR_NEWTABLE { @@ -1108,7 +1108,7 @@ String SCSTR_NEWTABLE Text[ korean ] = "- 새 시트 -"; Text[ turkish ] = "- yeni tablo -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- nueva hoja -"; + Text[ catalan ] = "- full nou -"; }; String SCSTR_ALL { @@ -1135,7 +1135,7 @@ String SCSTR_ALL Text[ korean ] = "- 모두 -"; Text[ turkish ] = "- tm -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- todo -"; + Text[ catalan ] = "- tot -"; }; String SCSTR_STDFILTER { @@ -1160,7 +1160,7 @@ String SCSTR_STDFILTER Text[ korean ] = "- 표준 -"; Text[ turkish ] = "- Standart -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- Estndar -"; + Text[ catalan ] = "- Estndard -"; Text[ finnish ] = "- Vakio -"; }; String SCSTR_TOP10FILTER @@ -1186,7 +1186,7 @@ String SCSTR_TOP10FILTER Text[ korean ] = "- 상위 10 -"; Text[ turkish ] = "- Top 10 -"; Text[ language_user1 ] = " "; - Text[ catalan ] = "- Los 10 primeros -"; + Text[ catalan ] = "- Top 10 -"; Text[ finnish ] = "- Top 10 -"; }; String SCSTR_NONAME @@ -1214,7 +1214,7 @@ String SCSTR_NONAME Text[ korean ] = "이름없음"; Text[ turkish ] = "bilinmeyen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre"; + Text[ catalan ] = "sense nom"; }; String SCSTR_COLUMN { @@ -1295,7 +1295,7 @@ String SCSTR_NEW Text[ korean ] = "새로(~N)"; Text[ turkish ] = "~Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; }; String SCSTR_ADD { @@ -1323,7 +1323,7 @@ String SCSTR_ADD Text[ korean ] = "추가(~A)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Aadir"; + Text[ catalan ] = "~Afegeix"; }; String SCSTR_REMOVE { @@ -1351,7 +1351,7 @@ String SCSTR_REMOVE Text[ korean ] = "삭제(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; }; String SCSTR_CANCEL { @@ -1378,7 +1378,7 @@ String SCSTR_CANCEL Text[ korean ] = "취소(~L)"; Text[ turkish ] = "~ptal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Can~celar"; + Text[ catalan ] = "cance~lla"; }; String SCSTR_MODIFY { @@ -1406,7 +1406,7 @@ String SCSTR_MODIFY Text[ korean ] = "수정(~Y)"; Text[ turkish ] = "~Deitir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modificar"; + Text[ catalan ] = "Modif~ica"; }; @@ -1432,10 +1432,10 @@ String SCSTR_SHOWTABLE Text[ chinese_traditional ] = "顯示工作表"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "시트 보이기"; + Text[ korean ] = "시트 표시"; Text[ turkish ] = "Tabloyu grntle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar hoja"; + Text[ catalan ] = "Mostra el full"; }; String SCSTR_HIDDENTABLES { @@ -1462,7 +1462,7 @@ String SCSTR_HIDDENTABLES Text[ korean ] = "숨겨진 시트"; Text[ turkish ] = "Gizlenmi tablolar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hojas ocultas"; + Text[ catalan ] = "Fulls ocults"; }; String SCSTR_SELECTDB { @@ -1490,7 +1490,7 @@ String SCSTR_SELECTDB Text[ korean ] = "데이터베이스 영역 선택"; Text[ turkish ] = "Veritaban araln se"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccionar rea de base de datos"; + Text[ catalan ] = "Seleccioneu l'rea de la base de dades"; }; String SCSTR_AREAS { @@ -1514,10 +1514,10 @@ String SCSTR_AREAS Text[ chinese_traditional ] = "區域"; Text[ arabic ] = ""; Text[ greek ] = "~"; - Text[ korean ] = "구역"; + Text[ korean ] = "영역"; Text[ turkish ] = "Aralklar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "reas"; + Text[ catalan ] = "rees"; }; String SCSTR_TABLE { @@ -1544,7 +1544,7 @@ String SCSTR_TABLE Text[ korean ] = "시트"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hoja"; + Text[ catalan ] = "Full"; }; String SCSTR_NAME { @@ -1571,7 +1571,7 @@ String SCSTR_NAME Text[ korean ] = "이름"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; }; String SCSTR_INSTABLE { @@ -1599,7 +1599,7 @@ String SCSTR_INSTABLE Text[ korean ] = "시트 삽입"; Text[ turkish ] = "Tablo ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar hoja"; + Text[ catalan ] = "Insereix un full"; }; String SCSTR_APDTABLE { @@ -1624,10 +1624,10 @@ String SCSTR_APDTABLE Text[ chinese_traditional ] = "附加工作表"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "테이블 첨부"; + Text[ korean ] = "시트 추가"; Text[ turkish ] = "Tablo ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Adjuntar hoja"; + Text[ catalan ] = "Afegeix un full"; }; String SCSTR_RENAMETAB { @@ -1652,9 +1652,14 @@ String SCSTR_RENAMETAB Text[ korean ] = "시트 이름 바꾸기"; Text[ turkish ] = "Tabloyu yeniden adlandr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre a hoja"; + Text[ catalan ] = "Reanomena el full"; Text[ finnish ] = "Nime lomake uudelleen"; }; +String SCSTR_RENAMEOBJECT +{ + Text = "Objekt benennen" ; + Text [ ENGLISH ] = "Name Object" ; +}; String STR_INSERTGRAPHIC { /* ### ACHTUNG: Neuer Text in Resource? Grafik einfgen : Grafik einfgen */ @@ -1681,7 +1686,7 @@ String STR_INSERTGRAPHIC Text[ korean ] = "그래픽 삽입"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar imagen"; + Text[ catalan ] = "Insereix grfics"; }; // Attribute @@ -1711,7 +1716,7 @@ String SCSTR_HOR_JUSTIFY_LEFT Text[ korean ] = "왼쪽 맞춤"; Text[ turkish ] = "Sola hizala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alinear a la izquierda"; + Text[ catalan ] = "Alinea a l'esquerra"; }; String SCSTR_HOR_JUSTIFY_CENTER { @@ -1738,7 +1743,7 @@ String SCSTR_HOR_JUSTIFY_CENTER Text[ korean ] = "수평으로 가운데"; Text[ turkish ] = "Yatay ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado horizontal"; + Text[ catalan ] = "Centrat horitzontalment"; }; String SCSTR_HOR_JUSTIFY_RIGHT { @@ -1765,7 +1770,7 @@ String SCSTR_HOR_JUSTIFY_RIGHT Text[ korean ] = "오른쪽 맞춤"; Text[ turkish ] = "Saa hizala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alinear a la derecha"; + Text[ catalan ] = "Alinea a la dreta"; }; String SCSTR_HOR_JUSTIFY_BLOCK { @@ -1792,7 +1797,7 @@ String SCSTR_HOR_JUSTIFY_BLOCK Text[ korean ] = "양쪽 맞춤"; Text[ turkish ] = "ki yana yasla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Justificado"; + Text[ catalan ] = "Justifica"; }; String SCSTR_HOR_JUSTIFY_REPEAT { @@ -1819,7 +1824,7 @@ String SCSTR_HOR_JUSTIFY_REPEAT Text[ korean ] = "맞춤 반복"; Text[ turkish ] = "Hizalamay yinele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Repetir alineacin"; + Text[ catalan ] = "Repeteix l'alineaci"; }; String SCSTR_HOR_JUSTIFY_STANDARD { @@ -1846,7 +1851,7 @@ String SCSTR_HOR_JUSTIFY_STANDARD Text[ greek ] = ": "; Text[ korean ] = "기본 수평 맞춤"; Text[ turkish ] = "Standart yatay hizalama"; - Text[ catalan ] = "Alineacin horizontal preterminada"; + Text[ catalan ] = "Alineaci horitzontal per defecte"; }; String SCSTR_VER_JUSTIFY_TOP { @@ -1873,7 +1878,7 @@ String SCSTR_VER_JUSTIFY_TOP Text[ korean ] = "위에 맞춤"; Text[ turkish ] = "Yukar hizala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin hacia arriba"; + Text[ catalan ] = "Alinea a la part superior"; }; String SCSTR_VER_JUSTIFY_CENTER { @@ -1900,7 +1905,7 @@ String SCSTR_VER_JUSTIFY_CENTER Text[ korean ] = "수직으로 가운데"; Text[ turkish ] = "Dikey ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado vertical"; + Text[ catalan ] = "Centrat verticalment"; }; String SCSTR_VER_JUSTIFY_BOTTOM { @@ -1927,7 +1932,7 @@ String SCSTR_VER_JUSTIFY_BOTTOM Text[ korean ] = "아래에 맞춤"; Text[ turkish ] = "Aa hizala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin hacia abajo"; + Text[ catalan ] = "Alinea a la part inferior"; }; String SCSTR_VER_JUSTIFY_STANDARD { @@ -1954,7 +1959,7 @@ String SCSTR_VER_JUSTIFY_STANDARD Text[ korean ] = "기본 수직 맞춤"; Text[ turkish ] = "Standart dikey hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineacin vertical predeterminada"; + Text[ catalan ] = "Alineaci vertical per defecte"; }; String SCSTR_ORIENTATION_TOPBOTTOM { @@ -1981,7 +1986,7 @@ String SCSTR_ORIENTATION_TOPBOTTOM Text[ korean ] = "위에서 아래로"; Text[ turkish ] = "Yukardan aa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "De arriba hacia abajo"; + Text[ catalan ] = "De dalt a baix"; }; String SCSTR_ORIENTATION_BOTTOMTOP { @@ -2008,7 +2013,7 @@ String SCSTR_ORIENTATION_BOTTOMTOP Text[ korean ] = "아래서 위로"; Text[ turkish ] = "Aadan yukarya"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desde abajo hacia arriba"; + Text[ catalan ] = "De baix a dalt"; }; String SCSTR_ORIENTATION_STANDARD { @@ -2020,7 +2025,7 @@ String SCSTR_ORIENTATION_STANDARD Text [ portuguese ] = "Orientao padro" ; Text [ finnish ] = "Oletussuunta" ; Text [ danish ] = "Standard skriveretning" ; - Text [ french ] = "Sens d'criture par dfaut" ; + Text [ french ] = "Orientation par dfaut" ; Text [ swedish ] = "Standardorientering" ; Text [ dutch ] = "Standaard afdrukrichting" ; Text [ spanish ] = "Orientacin predeterminada" ; @@ -2035,7 +2040,7 @@ String SCSTR_ORIENTATION_STANDARD Text[ korean ] = "기본 쓰기방향"; Text[ turkish ] = "Standart metin yn"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Orientacin predeterminada"; + Text[ catalan ] = "Orientaci per defecte"; }; String SCSTR_PROTECTDOC @@ -2064,7 +2069,7 @@ String SCSTR_PROTECTDOC Text[ korean ] = "문서 보호"; Text[ turkish ] = "Belgeyi koru"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Proteger documento"; + Text[ catalan ] = "Protegeix el document"; }; String SCSTR_UNPROTECTDOC { @@ -2088,10 +2093,10 @@ String SCSTR_UNPROTECTDOC Text[ chinese_traditional ] = "取消物件保護"; Text[ arabic ] = " "; Text[ greek ] = " "; - Text[ korean ] = "문서보호 해제"; + Text[ korean ] = "문서 보호 해제"; Text[ turkish ] = "Belge korumasn kaldr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desproteger documento"; + Text[ catalan ] = "Desprotegeix el document"; }; String SCSTR_PROTECTTAB { @@ -2117,7 +2122,7 @@ String SCSTR_PROTECTTAB Text[ korean ] = "시트 보호"; Text[ turkish ] = "Tabloyu koru"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Proteger hoja"; + Text[ catalan ] = "Protegeix el full"; Text[ finnish ] = "Suojaa lomake"; }; String SCSTR_UNPROTECTTAB @@ -2143,7 +2148,7 @@ String SCSTR_UNPROTECTTAB Text[ korean ] = "시트 보호 해제"; Text[ turkish ] = "Tablo korumasn kaldr"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desproteger hoja"; + Text[ catalan ] = "Desprotegeix el full"; Text[ finnish ] = "Poista lomakkeen suojaus"; }; String SCSTR_CHG_PROTECT @@ -2169,8 +2174,8 @@ String SCSTR_CHG_PROTECT Text[ korean ] = "기록 보호"; Text[ turkish ] = "Protect trace"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Protect trace"; - Text[ finnish ] = "Aufzeichnung schtzen"; + Text[ catalan ] = "Protegeix el rastreig"; + Text[ finnish ] = "~Suojaa tietueet"; }; String SCSTR_CHG_UNPROTECT { @@ -2195,8 +2200,8 @@ String SCSTR_CHG_UNPROTECT Text[ korean ] = "기록 보호 취소"; Text[ turkish ] = "Unprotect trace"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Unprotect trace"; - Text[ finnish ] = "Aufzeichnungsschutz aufheben"; + Text[ catalan ] = "Desprotegeix el rastreig"; + Text[ finnish ] = "Poista tietueiden suojaus"; }; String SCSTR_PASSWORD { @@ -2223,7 +2228,7 @@ String SCSTR_PASSWORD Text[ korean ] = "패스워드:"; Text[ turkish ] = "ifre:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contrasea:"; + Text[ catalan ] = "Contrasenya:"; }; String SCSTR_PASSWORDOPT { @@ -2250,7 +2255,7 @@ String SCSTR_PASSWORDOPT Text[ korean ] = "패스워드 (옵션):"; Text[ turkish ] = "ifre (istee bal):"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contrasea (opcional):"; + Text[ catalan ] = "Contrasenya (opcional):"; }; String SCSTR_WRONGPASSWORD @@ -2278,7 +2283,7 @@ String SCSTR_WRONGPASSWORD Text[ korean ] = "틀린 패스워드"; Text[ turkish ] = "ifre yanl"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contrasea incorrecta"; + Text[ catalan ] = "Contrasenya incorrecta"; }; String SCSTR_END @@ -2306,7 +2311,7 @@ String SCSTR_END Text[ korean ] = "종료(~E)"; Text[ turkish ] = "~Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fin"; + Text[ catalan ] = "~Fi"; }; String SCSTR_STAT_PRINT @@ -2334,7 +2339,7 @@ String SCSTR_STAT_PRINT Text[ korean ] = "인쇄..."; Text[ turkish ] = "Yazdr..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imprimiendo..."; + Text[ catalan ] = "S'est imprimint..."; }; String SCSTR_UNKNOWN @@ -2362,7 +2367,7 @@ String SCSTR_UNKNOWN Text[ korean ] = "알려져있지 않음"; Text[ turkish ] = "Bilinmiyor"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desconocido"; + Text[ catalan ] = "Desconegut"; }; String SCSTR_CHAR_ATTRS @@ -2390,7 +2395,7 @@ String SCSTR_CHAR_ATTRS Text[ korean ] = "글꼴 속성"; Text[ turkish ] = "Yaztipi znitelikleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Atributos de caracteres"; + Text[ catalan ] = "Atributs de la lletra"; }; @@ -2417,10 +2422,10 @@ String SCSTR_CLPBRD_CLEAR Text[ chinese_traditional ] = "在剪貼簿內留存大量資料。\n您要讓其他的應用程序也使用這些資料？"; Text[ arabic ] = " .\n "; Text[ greek ] = " .\n ;"; - Text[ korean ] = "사용자는 클립보드에 많은 양의 데이터를 저장하였습니다.\n클립보드의 내용을 다른 응용프로그램에서도 사용가능하게 하겠습니까?"; + Text[ korean ] = "사용자는 클립보드에 많은 양의 데이터를 저장하였습니다.\n클립보드의 내용을 다른 응용 프로그램에서도 사용가능하게 하겠습니까?"; Text[ turkish ] = "Panoya byk miktarda veri aktardnz.\nPano ieriini baka uygulamalarda kullanmak istiyor musunuz?"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ha copiado una gran cantidad de datos en el portapapeles.\nDesea que el contenido del portapapeles est disponible para otras aplicaciones?"; + Text[ catalan ] = "Heu desat una gran quantitat de dades al porta-retalls.\nVoleu que el contingut del porta-retalls quedi disponible per a altres aplicacions?"; }; String SCSTR_CFG_APP @@ -2446,7 +2451,7 @@ String SCSTR_CFG_APP Text[ korean ] = "시스템 옵션"; Text[ turkish ] = "Sistem seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones del sistema"; + Text[ catalan ] = "Opcions del sistema"; Text[ finnish ] = "Jrjestelmasetukset"; }; @@ -2473,7 +2478,7 @@ String SCSTR_CFG_DOC Text[ korean ] = "문서 옵션"; Text[ turkish ] = "Belge seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones del documento"; + Text[ catalan ] = "Opcions del document"; Text[ finnish ] = "Asiakirja-asetukset"; }; @@ -2500,7 +2505,7 @@ String SCSTR_CFG_VIEW Text[ korean ] = "보기 옵션"; Text[ turkish ] = "Grnm seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de visualizacin"; + Text[ catalan ] = "Opcions de visualitzaci"; Text[ finnish ] = "Nyttasetukset"; }; @@ -2527,7 +2532,7 @@ String SCSTR_CFG_INPUT Text[ korean ] = "입력 옵션"; Text[ turkish ] = "Giri seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de entrada"; + Text[ catalan ] = "Opcions d'entrada"; Text[ finnish ] = "Syttasetukset"; }; @@ -2554,7 +2559,7 @@ String SCSTR_CFG_SPELLCHECK Text[ korean ] = "맞춤법 옵션"; Text[ turkish ] = "Yazm seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de ortografa"; + Text[ catalan ] = "Opcions de la verificaci ortogrfica"; Text[ finnish ] = "Oikeinkirjoituksen asetukset"; }; @@ -2581,7 +2586,7 @@ String SCSTR_CFG_PRINT Text[ korean ] = "인쇄 옵션"; Text[ turkish ] = "Yazdrma seenekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de impresin"; + Text[ catalan ] = "Opcions d'impressi"; Text[ finnish ] = "Tulostusasetukset"; }; @@ -2608,7 +2613,7 @@ String SCSTR_CFG_NAVIPI Text[ korean ] = "네비게이터 설정"; Text[ turkish ] = "Navigatr ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configuracin del Navegador"; + Text[ catalan ] = "Parmetres del navegador"; Text[ finnish ] = "Navigaattorin asetukset"; }; @@ -2635,7 +2640,7 @@ String SCSTR_MINIMUM Text[ korean ] = "최소(~M)"; Text[ turkish ] = "A~sgari"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mnimo"; + Text[ catalan ] = "~Mnim"; Text[ finnish ] = "~Vhintn"; }; String SCSTR_MAXIMUM @@ -2661,7 +2666,7 @@ String SCSTR_MAXIMUM Text[ korean ] = "최대(~M)"; Text[ turkish ] = "A~zami"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mximo"; + Text[ catalan ] = "~Mxim"; Text[ finnish ] = "~Enintn"; }; String SCSTR_VALUE @@ -2717,7 +2722,7 @@ String SCSTR_CHARSET_USER Text[ turkish ] = "Ansi;Mac;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sistema"; - Text[ finnish ] = "Ansi;Mac;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System"; + Text[ finnish ] = "Jrjestelm"; }; String SCSTR_COLUMN_USER @@ -2744,7 +2749,7 @@ String SCSTR_COLUMN_USER Text[ korean ] = "표준;텍스트;날짜(DMY);날짜(MDY);날짜(YMD);미국 영어;숨기기"; Text[ turkish ] = "Standart;Metin;Tarih (GAY);Tarih (AGY);Tarih(YAG);ngilizce (ABD);gizle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estndar;Texto;Fecha (DMA);Fecha (MDA);Fecha (AMD);Ingls (US);Ocultar"; + Text[ catalan ] = "Estndard;Text;Data (DMA);Data (MDA);Data (AMD);Angls (US);Ocultar"; Text[ finnish ] = "Vakio;Teksti;Pivmr (PKV);Pivmr (KPV);Pivmr (VKP);Englanti (USA);Piilota"; }; @@ -2767,13 +2772,13 @@ String SCSTR_FIELDSEP Text[ russian ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{}\t32"; Text[ polish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{Pusty}\t32"; Text[ japanese ] = ",\t44\t;\t59\t:\t58\t{ﾀﾌﾞ}\t9\t{空白}\t32"; - Text[ chinese_traditional ] = ",\t44\t;\t59\t:\t58\t{製表符}\t9\t{空缺}\t32"; + Text[ chinese_traditional ] = ",\t44\t;\t59\t:\t58\t{定位鍵}\t9\t{空缺}\t32"; Text[ arabic ] = ",\t44\t;\t59\t:\t58\t{ }\t9\t{}\t32"; Text[ greek ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{}\t32"; Text[ korean ] = ",\t44\t;\t59\t:\t58\t{탭}\t9\t{공백}\t32"; Text[ language_user1 ] = " "; Text[ turkish ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{Boluk}\t32"; - Text[ catalan ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{vaco}\t32"; + Text[ catalan ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{buit}\t32"; }; String SCSTR_TEXTSEP @@ -2801,10 +2806,10 @@ String SCSTR_FORMULA_AUTOCORRECTION Text[ chinese_traditional ] = "%PRODUCTNAME Calc 發現輸入的公式含有一個錯誤。\n您接受下面的修改建議？\n\n"; Text[ arabic ] = "%PRODUCTNAME Calc .\n \n\n"; Text[ greek ] = " %PRODUCTNAME Calc .\n ;\n\n"; - Text[ korean ] = "%PRODUCTNAME Calc가 입력된 수식에서 오류를 찾아냈습니다.\n다음의 제안된 수정을 적용하시겠습니까?\n\n"; + Text[ korean ] = "%PRODUCTNAME Calc가 입력된 수식에서 오류가 발견되었습니다.\n다음의 제안된 수정을 적용하겠습니까?\n\n"; Text[ turkish ] = "%PRODUCTNAME Calc, girilen formlde bir hata buldu.\nAada nerilen dzeltmeyi kabul etmek istiyor musunuz?\n\n"; Text[ language_user1 ] = " "; - Text[ catalan ] = "%PRODUCTNAME Calc encontr un error en la frmula dada.\nDesea aceptar la correccin sugerida abajo?\n\n"; + Text[ catalan ] = "%PRODUCTNAME Calc ha trobat un error en la frmula.\nVols acceptar la proposta de correcci?\n\n"; Text[ finnish ] = "%PRODUCTNAME Calc havaitsi virheen annetussa kaavassa.\nHyvksytk ehdotetun korjauksen?\n\n"; }; @@ -2837,7 +2842,7 @@ String SCSTR_GRFILTER_OPENERROR Text[ korean ] = "그래픽 파일을 열 수 없습니다."; Text[ turkish ] = "Grafik dosyas alamyor"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No es posible abrir el archivo grfico"; + Text[ catalan ] = "No es pot obrir el fitxer grfic"; }; String SCSTR_GRFILTER_IOERROR { @@ -2866,7 +2871,7 @@ String SCSTR_GRFILTER_IOERROR Text[ korean ] = "그래픽 파일을 읽을 수 없습니다."; Text[ turkish ] = "Grafik dosyas okunamyor"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No es posible leer el archivo grfico"; + Text[ catalan ] = "No es pot llegir el fitxer grfic"; }; String SCSTR_GRFILTER_FORMATERROR { @@ -2895,7 +2900,7 @@ String SCSTR_GRFILTER_FORMATERROR Text[ korean ] = "알수없는 그래픽 서식"; Text[ turkish ] = "Bilinmeyen grafik dosyas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato de imagen desconocido"; + Text[ catalan ] = "El format de la imatge s desconegut"; }; String SCSTR_GRFILTER_VERSIONERROR { @@ -2924,7 +2929,7 @@ String SCSTR_GRFILTER_VERSIONERROR Text[ korean ] = "이 그래픽 파일 버전은 지원되지 않습니다."; Text[ turkish ] = "Bu grafik dosyas srm desteklenmiyor"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se soporta la versin del archivo grfico"; + Text[ catalan ] = "Aquesta versi del fitxer grfic no s soportada"; }; String SCSTR_GRFILTER_FILTERERROR { @@ -2953,7 +2958,7 @@ String SCSTR_GRFILTER_FILTERERROR Text[ korean ] = "그래픽 필터를 찾지 못했습니다."; Text[ turkish ] = "Grafik filtresi bulunamad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se encontr el filtro de imagen"; + Text[ catalan ] = "No s'ha trobat el filtre d'imatge"; }; String SCSTR_GRFILTER_TOOBIG { @@ -2973,16 +2978,16 @@ String SCSTR_GRFILTER_TOOBIG Text[ chinese_simplified ] = "没有足够的内存用于插入图形"; Text[ russian ] = " "; Text[ polish ] = "Za mao pamici do wstawienia grafiki"; - Text[ japanese ] = "ｸﾞﾗｯﾌｨｯｸの挿入に十分なﾒﾓﾘ空き容量がありません。"; + Text[ japanese ] = "ｸﾞﾗｯﾌｨｯｸの挿入に必要なﾃﾞｨｽｸ空き容量が足りません。"; Text[ chinese_traditional ] = "記憶體不足，無法插入圖形"; Text[ arabic ] = " "; Text[ dutch ] = "Niet genoeg vrij geheugen om de afbeelding in te voegen"; Text[ chinese_simplified ] = "没有足够的内存用于插入图形"; Text[ greek ] = " ."; - Text[ korean ] = "그래픽을 삽입하기 위한 메모리가 부족합니다."; + Text[ korean ] = "메모리가 부족하여 그래픽을 삽입할 수 없습니다."; Text[ turkish ] = "Grafiin eklenmesi iin yeterli bellek yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No hay suficiente memoria para insertar la imagen"; + Text[ catalan ] = "No hi ha prou memria per a insertar la imatge"; }; String SCSTR_UNDO_GRAFFILTER { @@ -3006,7 +3011,7 @@ String SCSTR_UNDO_GRAFFILTER Text[ chinese_traditional ] = "圖形過濾器"; Text[ arabic ] = " "; Text[ turkish ] = "Grafik filtresi"; - Text[ catalan ] = "Filtro de imagen"; + Text[ catalan ] = "Filtre d'imatge"; Text[ finnish ] = "Grafiikkasuodatin"; }; @@ -3025,3 +3030,6 @@ String SCSTR_UNDO_GRAFFILTER + + + diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 32a5b00de..7f43f76c1 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undotab.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2001-04-18 12:24:01 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:03:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,13 @@ #include "printfun.hxx" #include "chgtrack.hxx" +// for ScUndoRenameObject - might me moved to another file later +#include <svx/svditer.hxx> +#include <svx/svdoole2.hxx> +#include <svx/svdpage.hxx> +#include "drwlayer.hxx" +#include "scresid.hxx" + extern BOOL bDrawIsInUndo; //! irgendwo als Member !!! using namespace com::sun::star; @@ -113,6 +120,7 @@ TYPEINIT1(ScUndoShowHideTab, SfxUndoAction); TYPEINIT1(ScUndoProtect, SfxUndoAction); TYPEINIT1(ScUndoPrintRange, SfxUndoAction); TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction); +TYPEINIT1(ScUndoRenameObject, SfxUndoAction); // ----------------------------------------------------------------------- @@ -1398,5 +1406,89 @@ BOOL __EXPORT ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& rTarget) const } +//--------------------------------------------------------------------------------- +// +// rename object +// (move to different file?) +// + +ScUndoRenameObject::ScUndoRenameObject( ScDocShell* pNewDocShell, const String& rPN, + const String& rON, const String& rNN ) : + ScSimpleUndo( pNewDocShell ), + aPersistName( rPN ), + aOldName ( rON ), + aNewName ( rNN ) +{ +} + +ScUndoRenameObject::~ScUndoRenameObject() +{ +} + +String ScUndoRenameObject::GetComment() const +{ + // string resource shared with title for dialog + return String( ScResId(SCSTR_RENAMEOBJECT) ); +} + +SdrObject* ScUndoRenameObject::GetObject() +{ + ScDocument* pDoc = pDocShell->GetDocument(); + ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); + if ( pDrawLayer ) + { + USHORT nCount = pDrawLayer->GetPageCount(); + for (USHORT nTab=0; nTab<nCount; nTab++) + { + SdrPage* pPage = pDrawLayer->GetPage(nTab); + DBG_ASSERT(pPage,"Page ?"); + + SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS ); + SdrObject* pObject = aIter.Next(); + while (pObject) + { + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && + ((SdrOle2Obj*)pObject)->GetPersistName() == aPersistName ) + { + return pObject; + } + + pObject = aIter.Next(); + } + } + } + DBG_ERROR("Object not found"); + return NULL; +} + +void ScUndoRenameObject::Undo() +{ + BeginUndo(); + SdrObject* pObj = GetObject(); + if ( pObj ) + pObj->SetName( aOldName ); + EndUndo(); +} + +void ScUndoRenameObject::Redo() +{ + BeginRedo(); + SdrObject* pObj = GetObject(); + if ( pObj ) + pObj->SetName( aNewName ); + EndRedo(); +} + +void ScUndoRenameObject::Repeat(SfxRepeatTarget& rTarget) +{ +} + +BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& rTarget) const +{ + return FALSE; +} + + + diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 4ff742295..1cd0c7010 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawview.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: nn $ $Date: 2001-10-05 14:33:02 $ + * last change: $Author: nn $ $Date: 2001-12-05 22:09:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,6 +261,7 @@ void ScDrawView::InvalidateAttribs() rBindings.Invalidate( SID_ANCHOR_TOGGLE ); rBindings.Invalidate( SID_ORIGINALSIZE ); + rBindings.Invalidate( SID_RENAME_OBJECT ); rBindings.Invalidate( SID_ATTR_TRANSFORM ); @@ -725,13 +726,16 @@ BOOL ScDrawView::SelectObject( const String& rName ) String ScDrawView::GetSelectedChartName() const { + // used for modifying a chart's data area - PersistName must always be used + // (as in ScDocument::FindChartData and UpdateChartArea) + const SdrMarkList& rMarkList = GetMarkList(); if (rMarkList.GetMarkCount() == 1) { SdrObject* pObj = rMarkList.GetMark(0)->GetObj(); if (pObj->GetObjIdentifier() == OBJ_OLE2) if ( pDoc->IsChart(pObj) ) - return ScDrawLayer::GetVisibleName( pObj ); + return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); } return EMPTY_STRING; // nichts gefunden diff --git a/sc/util/hidother.src b/sc/util/hidother.src index 52f37eeeb..e61686834 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -2,9 +2,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: nn $ $Date: 2001-06-27 15:06:29 $ + * last change: $Author: nn $ $Date: 2001-12-05 21:56:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,6 +120,7 @@ hidspecial HID_PASSWD_TABLE { HelpID = HID_PASSWD_TABLE; }; hidspecial HID_PASSWD_DOC { HelpID = HID_PASSWD_DOC; }; hidspecial HID_CHG_PROTECT { HelpID = HID_CHG_PROTECT; }; hidspecial HID_SCDLG_LINKAREAURL { HelpID = HID_SCDLG_LINKAREAURL; }; +hidspecial HID_SC_RENAME_OBJECT { HelpID = HID_SC_RENAME_OBJECT; }; // 2. Seite Funktionsautopilot: nur als Unique-IDs |