Ruby dialog

4 files changed, 33 insertions, 11 deletions

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index e96c39141328..c71481ff6edc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -2,7 +2,7 @@
 
     $Workfile:   _textsh.sdi  $
 
-    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/_textsh.sdi,v 1.4 2000-12-21 13:02:28 jp Exp $
+    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/_textsh.sdi,v 1.5 2001-01-10 16:14:47 os Exp $
 
     Beschreibung:   Basis-interfaces fuer Text
 
@@ -195,6 +195,11 @@ interface BaseText : Selection
         ExecMethod = Execute ;
         StateMethod = GetState;
     ]
+    SID_RUBY_DIALOG
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState;
+    ]
     FN_EDIT_HYPERLINK
     [
         ExecMethod = Execute ;
@@ -1224,6 +1229,9 @@ interface BaseText : Selection
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.4  2000/12/21 13:02:28  jp
+    new: transliteration
+
     Revision 1.3  2000/11/13 12:25:09  jp
     character attribute use the method of the BaseShell
 
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 41c2eaf56fca..b76aa66650a0 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodule.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-24 18:02:44 $
+ *  last change: $Author: os $ $Date: 2001-01-10 16:10:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -335,6 +335,9 @@
 #ifndef _BARCFG_HXX
 #include <barcfg.hxx>
 #endif
+#ifndef _SVX_RUBYDLG_HXX_
+#include <svx/rubydialog.hxx>
+#endif
 
 #include <app.hrc>
 
@@ -589,6 +592,7 @@ void SwDLL::RegisterControls()
     SwSyncChildWin::RegisterChildWindow( sal_True, pMod );
     SwInsertIdxMarkWrapper::RegisterChildWindow( sal_False, pMod );
     SwInsertAuthMarkWrapper::RegisterChildWindow( sal_False, pMod );
+    SvxRubyChildWindow::RegisterChildWindow( sal_False, pMod);
 
     SvxGrafRedToolBoxControl::RegisterControl( SID_ATTR_GRAF_RED, pMod );
     SvxGrafGreenToolBoxControl::RegisterControl( SID_ATTR_GRAF_GREEN, pMod );
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 0679df041e20..b66706f41931 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textsh1.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-06 13:36:37 $
+ *  last change: $Author: os $ $Date: 2001-01-10 16:07:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -824,10 +824,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if (!rWrtSh.IsAddMode())
                 rWrtSh.MoveParagraph(-1);
             break;
-
+        case SID_RUBY_DIALOG:
         case SID_HYPERLINK_DIALOG:
         {
-            SfxRequest aReq(SID_HYPERLINK_DIALOG, SFX_CALLMODE_SLOT, SFX_APP()->GetPool());
+            SfxRequest aReq(nSlot, SFX_CALLMODE_SLOT, SFX_APP()->GetPool());
             GetView().GetViewFrame()->ExecuteSlot( aReq);
         }
         break;
@@ -994,9 +994,12 @@ void SwTextShell::GetState( SfxItemSet &rSet )
                 if(!rSh.HasSelection())
                     rSet.DisableItem( nWhich );
             break;
+            case SID_RUBY_DIALOG:
             case SID_HYPERLINK_DIALOG:
-                if(!GetView().GetViewFrame()->HasChildWindow(SID_HYPERLINK_DIALOG)  && rSh.HasReadonlySel())
-                    rSet.DisableItem(SID_HYPERLINK_DIALOG);
+                if(!GetView().GetViewFrame()->HasChildWindow(nWhich)  && rSh.HasReadonlySel())
+                    rSet.DisableItem(nWhich);
+                else
+                    rSet.Put(SfxBoolItem(nWhich, 0 != GetView().GetViewFrame()->GetChildWindow(nWhich)));
             break;
             case FN_EDIT_HYPERLINK:
             {
@@ -1019,6 +1022,9 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/06 13:36:37  jp
+    should changes: don't use IniManager
+
     Revision 1.1.1.1  2000/09/18 17:14:47  hr
     initial import
 
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index e8d9ab560e5c..33f1abdbdce0 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view0.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: tbe $ $Date: 2000-11-10 15:49:54 $
+ *  last change: $Author: os $ $Date: 2001-01-10 16:10:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,6 +149,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
     SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT);
     SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG);
     SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
+    SFX_CHILDWINDOW_REGISTRATION(SID_RUBY_DIALOG);
 
 
         SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, 1);
@@ -178,6 +179,9 @@ view::XSelectionSupplier* SwView::GetUNOObject()
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.5  2000/11/10 15:49:54  tbe
+    removed outcommented basctl include file idetemp.hxx
+
     Revision 1.4  2000/10/23 10:52:34  tbe
     idetemp.hxx include removed