diff options
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/shells/drwbassh.cxx | 16 | ||||
| -rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 61 | ||||
| -rw-r--r-- | sw/source/ui/shells/frmsh.cxx | 13 | ||||
| -rw-r--r-- | sw/source/ui/shells/shells.src | 167 | ||||
| -rw-r--r-- | sw/source/ui/shells/slotadd.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/shells/textdrw.cxx | 17 | ||||
| -rw-r--r-- | sw/source/ui/shells/textfld.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 19 | ||||
| -rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 49 |
10 files changed, 268 insertions, 97 deletions
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c39f8c84ac0d..407cf8d8a361 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:37:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -479,7 +479,12 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if ( nId == SID_CUT ) pTransfer->Cut(); else + { + const BOOL bLockedView = rSh.IsViewLocked(); + rSh.LockView( TRUE ); //lock visible section pTransfer->Copy(); + rSh.LockView( bLockedView ); + } break; } return; @@ -568,6 +573,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) DBG_ERROR("falscher Dispatcher"); return; } + rReq.Done(); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 02a3b673c5aa..fe3f03eb4347 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwbassh.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-12-06 09:45:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -683,7 +683,17 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) rSet.DisableItem( nWhich ); else { - rSet.Put(SfxAllEnumItem(nWhich, USHRT_MAX)); + SfxAllEnumItem aEnumItem(nWhich, USHRT_MAX); + const SdrMarkList& rMarkList = pSdrView->GetMarkList(); + //if only one object is selected it can only be vertically + // aligned because it is character bound + if( rMarkList.GetMarkCount() == 1 ) + { + aEnumItem.DisableValue(SID_OBJECT_ALIGN_LEFT); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_CENTER); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_RIGHT); + } + rSet.Put(aEnumItem); } break; case FN_NAME_GROUP : diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 496c6c6c3045..3af24cef05b3 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwtxtex.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2002-12-12 17:13:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,6 +195,9 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _DOC_HXX #include <doc.hxx> #endif @@ -666,43 +669,59 @@ ASK_ESCAPE: case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - if( pOutliner ) - bFlag = pOutliner->IsVertical() == - (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + rSet.DisableItem( nSlotId ); + nSlotId = 0; + } else { - com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) - ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); - - if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) - { - bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; - } + if( pOutliner ) + bFlag = pOutliner->IsVertical() == + (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); else { - bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) + ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); + + if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) + { + bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; + } + else + { + bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + } } } break; case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - if(pOutliner && pOutliner->IsVertical()) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { rSet.DisableItem( nWhich ); nSlotId = 0; } else { - switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + if(pOutliner && pOutliner->IsVertical()) + { + rSet.DisableItem( nWhich ); + nSlotId = 0; + } + else { - case FRMDIR_HORI_LEFT_TOP: - bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + { + case FRMDIR_HORI_LEFT_TOP: + bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; + break; - case FRMDIR_HORI_RIGHT_TOP: - bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + case FRMDIR_HORI_RIGHT_TOP: + bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; + break; + } } } } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 6007393708ee..3249ae159bca 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmsh.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hbrinkm $ $Date: 2002-08-30 08:57:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -867,12 +867,17 @@ SwFrameShell::SwFrameShell(SwView &rView) : { SetName(String::CreateFromAscii("Frame")); SetHelpId(SW_FRAMESHELL); - SwTransferable::CreateSelection( rView.GetWrtShell() ); + + /* #96392# Use this to announce it is the frame shell who creates the + selection. */ + SwTransferable::CreateSelection( rView.GetWrtShell(), (ViewShell *) this ); } SwFrameShell::~SwFrameShell() { - SwTransferable::ClearSelection( GetShell() ); + /* #96392# Only clear the selection if it was this frame shell who created + it. */ + SwTransferable::ClearSelection( GetShell(), (ViewShell *) this ); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 56c92eaf2afc..19ba59fad4e7 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -2,9 +2,9 @@ * * $RCSfile: shells.src,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: os $ $Date: 2002-12-06 14:00:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ InfoBox MSG_NO_RULER Message [ french ] = "Il n'existe pas d'image pour le thme 'Rulers' dans la Gallery." ; Message [ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor." ; Message[ chinese_simplified ] = "在画廊主题'长条形'内无任何图形。"; - Message[ russian ] = " '' ."; + Message[ russian ] = " ' ' ."; Message[ polish ] = "Nie ma adnych grafik w temacie galerii \"Obramowania\""; Message[ japanese ] = "ギャラリテーマの「ルーラー」に、図はありません。"; Message[ chinese_traditional ] = "畫廊主題[長條形]內無任何圖形。"; @@ -87,7 +87,7 @@ InfoBox MSG_NO_RULER Message[ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor."; Message[ chinese_simplified ] = "在画廊主题'长条形'内无任何图形。"; Message[ greek ] = " 'Rulers'."; - Message[ korean ] = "갤러리- 주제 '눈금자'에 그래픽이 없습니다."; + Message[ korean ] = "갤러리 주제 '눈금자'에 그림이 없습니다."; Message[ turkish ] = "'Rulers' galeri konusunda bit elem grafik mevcut deil."; Message[ language_user1 ] = " "; Message[ catalan ] = "No hi ha cap mapa de bits en la galeria de temes 'Rulers'."; @@ -104,7 +104,7 @@ String STR_GRFILTER_OPENERROR Text [ portuguese ] = "Impossvel abrir ficheiro grfico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi avata." ; Text [ danish ] = "Det er ikke muligt at bne grafikfilen" ; - Text [ french ] = "Ouverture du fichier graphique impossible" ; + Text [ french ] = "Impossible d'ouvrir le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte ppnas" ; Text [ dutch ] = "Grafisch bestand kan niet worden geopend" ; Text [ spanish ] = "No es posible abrir el archivo grfico" ; @@ -118,7 +118,7 @@ String STR_GRFILTER_OPENERROR Text[ dutch ] = "Grafisch bestand kan niet worden geopend"; Text[ chinese_simplified ] = "无法打开图形文件"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 파일을 열 수 없습니다."; + Text[ korean ] = "그림 파일을 열 수 없습니다."; Text[ turkish ] = "Grafik dosyas alamyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot obrir el fitxer de grfics"; @@ -134,7 +134,7 @@ String STR_GRFILTER_IOERROR Text [ portuguese ] = "Impossvel ler o ficheiro grfico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ; Text [ danish ] = "Det er ikke muligt at lse grafikfilen" ; - Text [ french ] = "Lecture du fichier graphique impossible" ; + Text [ french ] = "Impossible de lire le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte lsas" ; Text [ dutch ] = "Grafisch bestand is onleesbaar" ; Text [ spanish ] = "No es posible leer el archivo grfico" ; @@ -148,7 +148,7 @@ String STR_GRFILTER_IOERROR Text[ dutch ] = "Grafisch bestand is onleesbaar"; Text[ chinese_simplified ] = "无法读取图形文件"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 파일을 읽을 수 없습니다."; + Text[ korean ] = "그림 파일을 읽을 수 없습니다."; Text[ turkish ] = "Grafik dosyas okunamyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot llegir el fitxer de grfics"; @@ -178,7 +178,7 @@ String STR_GRFILTER_FORMATERROR Text[ dutch ] = "Onbekende grafische-bestandsindeling"; Text[ chinese_simplified ] = "不明的图形格式"; Text[ greek ] = " "; - Text[ korean ] = "알려져 있지 않은 그래픽 서식"; + Text[ korean ] = "알 수 없는 그림 서식"; Text[ turkish ] = "Bilinmeyen grafik format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format d'imatge desconegut"; @@ -298,7 +298,7 @@ String STR_INSERT_GRAPHIC Text[ dutch ] = "Afbeelding invoegen"; Text[ chinese_simplified ] = "插入图形"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 삽입"; + Text[ korean ] = "그림 삽입"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un grfic"; @@ -430,7 +430,7 @@ String STR_REDLINE_DELETED Text [ swedish ] = "Radering" ; Text [ danish ] = "Sletning" ; Text [ italian ] = "Elimina" ; - Text [ spanish ] = "Eliminacin" ; + Text [ spanish ] = "Borrar" ; Text [ french ] = "Suppression" ; Text [ dutch ] = "Gewist" ; Text [ portuguese ] = "Eliminado" ; @@ -461,7 +461,7 @@ String STR_REDLINE_AUTOFMT TEXT[ french ] = "AutoFormat"; TEXT[ swedish ] = "Autoformat"; TEXT[ dutch ] = "AutoOpmaak"; - TEXT[ spanish ] = "AutoFormato"; + TEXT[ spanish ] = "Formateado automtico"; TEXT[ english_us ] = "AutoFormat"; TEXT[ chinese_simplified ] = "自动格式"; TEXT[ russian ] = ""; @@ -489,7 +489,7 @@ String STR_REDLINE_FORMATED Text [ danish ] = "Formateret" ; Text [ italian ] = "Attribuzione" ; Text [ spanish ] = "Formateado" ; - Text [ french ] = "Mise en forme" ; + Text [ french ] = "Formatage" ; Text [ dutch ] = "Opmaak" ; Text [ portuguese ] = "Formatado" ; Text[ chinese_simplified ] = "属性"; @@ -522,7 +522,7 @@ String STR_REDLINE_TABLECHG Text [ dutch ] = "Tabelwijziging" ; Text [ portuguese ] = "Tabela modificada" ; Text[ chinese_simplified ] = "修改表格"; - Text[ russian ] = " "; + Text[ russian ] = " "; Text[ polish ] = "Zmiany w tabelach"; Text[ japanese ] = "テーブルの変更"; Text[ chinese_traditional ] = "修改表格"; @@ -530,7 +530,7 @@ String STR_REDLINE_TABLECHG Text[ dutch ] = "Tabelwijziging"; Text[ chinese_simplified ] = "修改表格"; Text[ greek ] = " "; - Text[ korean ] = "표가 변경되었습니다."; + Text[ korean ] = "표 변경 사항"; Text[ turkish ] = "Tablo deiiklii"; Text[ language_user1 ] = " "; Text[ catalan ] = "Canvis a la taula"; @@ -577,7 +577,7 @@ String STR_REDLINE_TITLE Text[ french ] = "AutoFormat"; Text[ swedish ] = "Autoformat"; Text[ dutch ] = "AutoOpmaak"; - Text[ spanish ] = "AutoFormato"; + Text[ spanish ] = "Formateado automtico"; Text[ english_us ] = "AutoFormat"; Text[ chinese_simplified ] = "自动格式"; Text[ russian ] = ""; @@ -606,7 +606,7 @@ String STR_REDLINE_MSG Text[ french ] = "L'AutoFormat a termin.\nVous pouvez choisir d'en accepter ou rejeter en une seule fois toutes les modifications, ou\n de vous faire afficher toutes les modifications pour les revoir."; Text[ swedish ] = "Autoformatet r frdigt.\nDu kan acceptera eller avbja alla ndringar\neller acceptera eller avbja ndringar en och en."; Text[ dutch ] = "AutoOpmaak voltooid.\nU kunt nu alle wijzigingen accepteren of verwerpen,\nof afzonderlijke wijzigingen accepteren of verwerpen."; - Text[ spanish ] = "El AutoFormato ha concluido.\nAhora puede aceptar o rechazar todos los cambios\na la vez o uno por uno."; + Text[ spanish ] = "El Formateado automtico ha concluido.\nAhora puede aceptar o rechazar todas las modificaciones,\na la vez o una por una."; Text[ english_us ] = "AutoFormat completed.\nYou can accept or reject all changes,\nor accept or reject particular changes."; Text[ chinese_simplified ] = "已经完成自动格式。\n您现在能够接受或拒绝所有的更改，或者\n接受或拒绝单个更改。"; Text[ russian ] = " .\n , ."; @@ -646,7 +646,7 @@ String STR_REDLINE_ACCEPT_ALL Text[ dutch ] = "~Alles accepteren"; Text[ chinese_simplified ] = "全部接受"; Text[ greek ] = " "; - Text[ korean ] = "모두 적용"; + Text[ korean ] = "모두 동의"; Text[ turkish ] = "Tmn kabul et"; Text[ language_user1 ] = " "; Text[ catalan ] = "Accepta-ho tot"; @@ -675,7 +675,7 @@ String STR_REDLINE_REJECT_ALL Text[ dutch ] = "~Alles verwerpen"; Text[ chinese_simplified ] = "全部拒绝"; Text[ greek ] = " "; - Text[ korean ] = "모두 취소"; + Text[ korean ] = "모두 거부"; Text[ turkish ] = "Tmn reddet"; Text[ language_user1 ] = " "; Text[ catalan ] = "Rebutja'ls tots"; @@ -690,7 +690,7 @@ String STR_REDLINE_EDIT Text[ portuguese_brazilian ] = "Review ~Changes"; Text[ portuguese ] = "Editar ~modificaes"; Text[ danish ] = "Rediger ndringer"; - Text[ french ] = "~Revoir les modifications"; + Text[ french ] = "~diter les modifications"; Text[ swedish ] = "Redigera ~ndringar"; Text[ dutch ] = "Wijzigingen ~bewerken"; Text[ spanish ] = "Editar ~modificaciones"; @@ -735,7 +735,7 @@ QueryBox DLG_IMPORT_DBNAME Message[ dutch ] = "Moet de databasenaam als standaarddatabase voor het document worden overgenomen?"; Message[ chinese_simplified ] = "要让文件采用默认的数据库名称？"; Message[ greek ] = " ;"; - Message[ korean ] = "데이터베이스 이름을 문서의 기본 데이터베이스로 사용하겠습니까?"; + Message[ korean ] = "데이터베이스 이름을 문서의 기본 데이터베이스로 사용하시겠습니까?"; Message[ turkish ] = "Veritaban ad, belge iin standart veritaban olarak kullanlsn m?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Voleu utilitzar el nom de la base de dades com a base de dades per defecte per al document?"; @@ -829,6 +829,30 @@ ToolBox RID_TEXT_TOOLBOX MN_TEXT_BACKGROUND MN_TEXT_DIALOGS(TRUE) }; + ItemList[arabic] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[hebrew] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; Scroll = TRUE ; }; String RID_TABLE_TOOLBOX @@ -1124,7 +1148,7 @@ String RID_GRAFIK_TOOLBOX Text[ dutch ] = "Objectbalk afbeeldingen"; Text[ chinese_simplified ] = "图形对象栏"; Text[ greek ] = " "; - Text[ korean ] = "그래픽 개체 모음"; + Text[ korean ] = "그림 개체 모음"; Text[ turkish ] = "Grafik nesne ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes grfics"; @@ -1740,26 +1764,26 @@ String RID_DRAW_TEXT_TOOLBOX { Text = "Textobjektleiste/Grafik" ; Text [ norwegian ] = "Tegne tekstmodus" ; - Text [ italian ] = "Barra degli oggetti di testo" ; + Text [ italian ] = "Barra degli oggetti di testo/immagini" ; Text [ portuguese_brazilian ] = "Modo desenhar texto" ; Text [ portuguese ] = "Barra de objectos de texto" ; Text [ finnish ] = "Tekstin muotoilurivi" ; Text [ danish ] = "Tekstobjektlinje" ; - Text [ french ] = "Barre d'objets de texte" ; - Text [ swedish ] = "Textobjektlist" ; + Text [ french ] = "Barre d'objets de texte/Image" ; + Text [ swedish ] = "Textobjektlist/grafik" ; Text [ dutch ] = "Tekstobjectbalk" ; - Text [ spanish ] = "Barra de objetos de texto" ; + Text [ spanish ] = "Barra de objetos de texto/imgenes" ; Text [ english_us ] = "Text Object Bar/Graphics" ; - Text[ chinese_simplified ] = "文字对象栏"; + Text[ chinese_simplified ] = "文字对象栏/图形"; Text[ russian ] = " "; Text[ polish ] = "Pasek obiektw tekstowych"; - Text[ japanese ] = "テキストオブジェクトバー"; - Text[ chinese_traditional ] = "文字物件列"; + Text[ japanese ] = "テキストオブジェクトバー/図"; + Text[ chinese_traditional ] = "文字物件列/圖形"; Text[ arabic ] = " "; Text[ dutch ] = "Tekstobjectbalk"; - Text[ chinese_simplified ] = "文字对象栏"; + Text[ chinese_simplified ] = "文字对象栏/图形"; Text[ greek ] = " "; - Text[ korean ] = "텍스트 개체 모음"; + Text[ korean ] = "텍스트 개체 모음/그림"; Text[ turkish ] = "Metin nesne ubuu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes de text"; @@ -1813,6 +1837,72 @@ ToolBox RID_DRAW_TEXT_TOOLBOX MN_TEXT_DIALOGS(FALSE) }; + ItemList[arabic] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; + ItemList[hebrew] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; Scroll = TRUE ; }; String RID_NUM_TOOLBOX @@ -1993,7 +2083,7 @@ String STR_SHELLNAME_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "表格"; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2051,7 +2141,7 @@ String STR_SHELLNAME_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfic"; @@ -2209,7 +2299,7 @@ String STR_SHELLNAME_DRAW_TEXT Text [ ENGLISH ] = "Draw text" ; Text [ english_us ] = "Draw text" ; Text [ italian ] = "Testo di disegno" ; - Text [ spanish ] = "Texto de diseo" ; + Text [ spanish ] = "Texto de dibujo" ; Text [ french ] = "Texte dessin" ; Text [ dutch ] = "Tekentekst" ; Text [ swedish ] = "Teckningstext" ; @@ -2284,7 +2374,7 @@ String STR_SWBG_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "图形"; Text[ greek ] = ""; - Text[ korean ] = "그래픽"; + Text[ korean ] = "그림"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Grfics"; @@ -2371,7 +2461,7 @@ String STR_SWBG_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "表格"; Text[ greek ] = ""; - Text[ korean ] = "시트"; + Text[ korean ] = "표"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2578,3 +2668,8 @@ String STR_NAME_GROUP_DIALOG + + + + + diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 561f5e26a318..1d0127cad543 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: slotadd.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #include "uiparam.hxx" #include "cmdid.h" +#include <svtools/globalnameitem.hxx> + + #ifndef _SVT_IMAGEITM_HXX #include <svtools/imageitm.hxx> #endif diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 6656272d43ad..a85e855a8129 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textdrw.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2002-12-02 14:16:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,6 +104,10 @@ #include <poolfmt.hrc> #endif +#ifndef _SV_SOUND_HXX +#include <vcl/sound.hxx> +#endif + #define C2U(cChar) rtl::OUString::createFromAscii(cChar) using namespace ::com::sun::star; using namespace ::rtl; @@ -169,9 +173,12 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( C2U("ButtonType"), aTmp ); - // #105638# OJ - aTmp <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + if ( Sound::IsSoundFile( rURL ) ) + { + // #105638# OJ + aTmp <<= sal_True; + xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + } } if (rSh.IsObjSelected()) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 93a42c0dfcf1..0618319283a5 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textfld.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: os $ $Date: 2002-11-13 09:20:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -751,7 +751,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) case FN_INSERT_FIELD: { SfxViewFrame* pVFrame = GetView().GetViewFrame(); - if (pVFrame->KnowsChildWindow(FN_INSERT_FIELD)) + if(pVFrame->KnowsChildWindow(FN_INSERT_FIELD) && !pVFrame->HasChildWindow(FN_INSERT_FIELD_DATA_ONLY) ) rSet.Put(SfxBoolItem( FN_INSERT_FIELD, pVFrame->HasChildWindow(nWhich))); else rSet.DisableItem(FN_INSERT_FIELD); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 838eb85265be..5fc82e9a1095 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <uiparam.hxx> #endif +#include <svtools/globalnameitem.hxx> #ifndef __RSC //autogen #include <tools/errinf.hxx> @@ -427,8 +428,20 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_PLUGIN: case SID_INSERT_APPLET: case SID_INSERT_FLOATINGFRAME: - rSh.Insert( (SvInPlaceObjectRef*)0, 0, TRUE, nSlot); + { + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SvGlobalName *pName = NULL; + SvGlobalName aName; + if ( pNameItem ) + { + aName = pNameItem->GetValue(); + pName = &aName; + } + + DBG_ASSERT( !pNameItem || nSlot == SID_INSERT_OBJECT, "Superfluous argument!" ); + rSh.Insert( (SvInPlaceObjectRef*)0, pName, TRUE, nSlot); break; + } case SID_INSERT_DIAGRAM: { diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index b3a58c980e51..110578fe22df 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtattr.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,9 @@ #ifndef _SFXITEMITER_HXX #include <svtools/itemiter.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _SFX_BINDINGS_HXX //autogen #include <sfx2/bindings.hxx> #endif @@ -603,7 +606,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) else { SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP, - HINT_END, HINT_END); + HINT_END, HINT_END, 0); rSh.GetAttr(aSet); SwDropCapsDlg *pDlg = new SwDropCapsDlg(GetView().GetWindow(), aSet); if (pDlg->Execute() == RET_OK) @@ -796,25 +799,35 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) case SID_ATTR_PARA_LEFT_TO_RIGHT : case SID_ATTR_PARA_RIGHT_TO_LEFT : { - // is the item set? - if(aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { - SvxFrameDirection eFrmDir = (SvxFrameDirection) - ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); - if (FRMDIR_ENVIRONMENT == eFrmDir) - { - eFrmDir = rSh.IsInRightToLeftText() ? - FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; - } - bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && - FRMDIR_HORI_LEFT_TOP == eFrmDir) || - (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && - FRMDIR_HORI_RIGHT_TOP == eFrmDir); + rSet.DisableItem( nSlot ); + nSlot = 0; } else { - rSet.InvalidateItem(nSlot); - nSlot = 0; + // is the item set? + USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell()); + if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) && + aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + { + SvxFrameDirection eFrmDir = (SvxFrameDirection) + ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); + if (FRMDIR_ENVIRONMENT == eFrmDir) + { + eFrmDir = rSh.IsInRightToLeftText() ? + FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; + } + bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && + FRMDIR_HORI_LEFT_TOP == eFrmDir) || + (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && + FRMDIR_HORI_RIGHT_TOP == eFrmDir); + } + else + { + rSet.InvalidateItem(nSlot); + nSlot = 0; + } } } break; |