Task #80425#: new tabpages

5 files changed, 89 insertions, 26 deletions

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 3d54169f382d..dc63829bc8d4 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globals.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: jp $ $Date: 2000-11-27 08:59:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -301,6 +301,9 @@
 #define TP_BUSINESS_DATA            (RC_GLOBALS_BEGIN +  96)
 #define TP_SECTION_FTNENDNOTES      (RC_GLOBALS_BEGIN +  97)
 
+#define TP_CHAR_POS                 (RC_GLOBALS_BEGIN +  98)
+#define TP_CHAR_TWOLN               (RC_GLOBALS_BEGIN +  99)
+
 // Kontext-Menues (Format-Menue) --------------------------------------------
 
 #define MN_OBJECTMENU_TEXT          (RC_GLOBALS_BEGIN + 1)
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 44f3bd661c85..9ebfca698c5d 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-20 13:46:39 $
+ *  last change: $Author: jp $ $Date: 2000-11-27 08:58:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -170,8 +170,11 @@ SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet,
     }
 
     //OS: Unter OS/2 darf die erste TabPage nie per RemoveTabPage entfernt werden
-    AddTabPage(TP_CHAR_STD, SvxCharStdPage::Create, 0);
-    AddTabPage(TP_CHAR_EXT, SvxCharExtPage::Create, 0);
+    AddTabPage(TP_CHAR_STD, SvxCharNamePage::Create, 0);
+    AddTabPage(TP_CHAR_EXT, SvxCharEffectsPage::Create, 0);
+    AddTabPage(TP_CHAR_POS, SvxCharPositionPage::Create, 0);
+    AddTabPage(TP_CHAR_TWOLN, SvxCharTwoLinesPage::Create, 0);
+
     AddTabPage(TP_CHAR_URL, SwCharURLPage::Create, 0);
     AddTabPage(TP_BACKGROUND,SvxBackgroundTabPage::Create,  0);
     if(bIsDrwTxtMode)
@@ -201,14 +204,14 @@ void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
     switch( nId )
     {
         case TP_CHAR_STD:
-            ((SvxCharStdPage&)rPage).SetFontList( *( (SvxFontListItem*)
+            ((SvxCharNamePage&)rPage).SetFontList( *( (SvxFontListItem*)
                ( rView.GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ) );
             break;
         case TP_CHAR_EXT:
             if(bIsDrwTxtMode)
-                ((SvxCharExtPage&)rPage).DisableControls(DISABLE_CASEMAP);
+                ((SvxCharEffectsPage&)rPage).DisableControls(DISABLE_CASEMAP);
             else
-                ((SvxCharExtPage&)rPage).EnableFlash();
+                ((SvxCharEffectsPage&)rPage).EnableFlash();
             break;
     }
 }
@@ -426,6 +429,9 @@ IMPL_LINK( SwCharURLPage, EventHdl, PushButton *, EMPTYARG )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/10/20 13:46:39  jp
+    use correct INetURL-Decode enum
+
     Revision 1.1.1.1  2000/09/18 17:14:32  hr
     initial import
 
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index 62d9779c9fa1..3e491b6ad561 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.src,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: kz $ $Date: 2000-11-09 12:52:34 $
+ *  last change: $Author: jp $ $Date: 2000-11-27 08:58:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,6 +149,20 @@ TabDialog DLG_CHAR
             };
             PageItem
             {
+                Identifier = TP_CHAR_POS ;
+                PageResID = TP_CHAR_POS ;
+                Text = "Position" ;
+                Text [ ENGLISH ] = "Position" ;
+            };
+            PageItem
+            {
+                Identifier = TP_CHAR_TWOLN ;
+                PageResID = TP_CHAR_TWOLN;
+                Text = "Asiatisches Layout" ;
+                Text [ ENGLISH ] = "Asian layout" ;
+            };
+            PageItem
+            {
                 Identifier = TP_CHAR_URL ;
                 Text = "Hyperlink" ;
                 Text [ ENGLISH ] = "Hyperlink" ;
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 05ab186722a9..370ac445ac3c 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tmpdlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:37 $
+ *  last change: $Author: jp $ $Date: 2000-11-27 08:58:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,10 +233,14 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
         // Zeichenvorlagen
         case SFX_STYLE_FAMILY_CHAR:
         {
-            AddTabPage(TP_CHAR_STD,     SvxCharStdPage::Create,
-                                        SvxCharStdPage::GetRanges );
-            AddTabPage(TP_CHAR_EXT,     SvxCharExtPage::Create,
-                                        SvxCharExtPage::GetRanges );
+            AddTabPage(TP_CHAR_STD,     SvxCharNamePage::Create,
+                                        SvxCharNamePage::GetRanges );
+            AddTabPage(TP_CHAR_EXT,     SvxCharEffectsPage::Create,
+                                        SvxCharEffectsPage::GetRanges );
+            AddTabPage(TP_CHAR_POS,     SvxCharPositionPage::Create,
+                                        SvxCharPositionPage::GetRanges );
+            AddTabPage(TP_CHAR_TWOLN,   SvxCharTwoLinesPage::Create,
+                                        SvxCharTwoLinesPage::GetRanges );
             AddTabPage(TP_BACKGROUND,   SvxBackgroundTabPage::Create,
                                         SvxBackgroundTabPage::GetRanges );
             break;
@@ -252,10 +256,14 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
             AddTabPage(TP_PARA_EXT,     SvxExtParagraphTabPage::Create,
                                         SvxExtParagraphTabPage::GetRanges );
 
-            AddTabPage(TP_CHAR_STD,     SvxCharStdPage::Create,
-                                        SvxCharStdPage::GetRanges );
-            AddTabPage(TP_CHAR_EXT,     SvxCharExtPage::Create,
-                                        SvxCharExtPage::GetRanges );
+            AddTabPage(TP_CHAR_STD,     SvxCharNamePage::Create,
+                                        SvxCharNamePage::GetRanges );
+            AddTabPage(TP_CHAR_EXT,     SvxCharEffectsPage::Create,
+                                        SvxCharEffectsPage::GetRanges );
+            AddTabPage(TP_CHAR_POS,     SvxCharPositionPage::Create,
+                                        SvxCharPositionPage::GetRanges );
+            AddTabPage(TP_CHAR_TWOLN,   SvxCharTwoLinesPage::Create,
+                                        SvxCharTwoLinesPage::GetRanges );
 
             AddTabPage(TP_TABULATOR,    SvxTabulatorTabPage::Create,
                                         SvxTabulatorTabPage::GetRanges );
@@ -283,6 +291,7 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
                     RemoveTabPage(TP_PARA_EXT);
                 RemoveTabPage(TP_TABULATOR);
                 RemoveTabPage(TP_NUMPARA);
+                RemoveTabPage(TP_CHAR_TWOLN);
                 if(!(nHtmlMode & HTMLMODE_FULL_STYLES))
                 {
                     RemoveTabPage(TP_BACKGROUND);
@@ -452,15 +461,15 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
                 SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()->
                     GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) );
 
-                ((SvxCharStdPage&)rPage).SetFontList(aFontListItem);
+                ((SvxCharNamePage&)rPage).SetFontList(aFontListItem);
 
                 if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON ))
-                    ((SvxCharStdPage&)rPage).EnableRelativeMode();
+                    ((SvxCharNamePage&)rPage).EnableRelativeMode();
             }
             break;
 
         case TP_CHAR_EXT:
-            ((SvxCharExtPage&)rPage).EnableFlash();
+            ((SvxCharEffectsPage&)rPage).EnableFlash();
             break;
 
         case TP_PARA_STD:
@@ -586,6 +595,9 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:37  hr
+    initial import
+
     Revision 1.88  2000/09/18 16:05:31  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src
index 72ce8bf207d4..709e4531683f 100644
--- a/sw/source/ui/fmtui/tmpdlg.src
+++ b/sw/source/ui/fmtui/tmpdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tmpdlg.src,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2000-11-27 08:19:59 $
+ *  last change: $Author: jp $ $Date: 2000-11-27 08:58:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,6 +146,20 @@ TabDialog DLG_TEMPLATE_1
             };
             PageItem
             {
+                Identifier = TP_CHAR_POS ;
+                PageResID = TP_CHAR_POS ;
+                Text = "Position" ;
+                Text [ ENGLISH ] = "Position" ;
+            };
+            PageItem
+            {
+                Identifier = TP_CHAR_TWOLN ;
+                PageResID = TP_CHAR_TWOLN;
+                Text = "Asiatisches Layout" ;
+                Text [ ENGLISH ] = "Asian layout" ;
+            };
+            PageItem
+            {
                 Identifier = TP_BACKGROUND ;
                 Text = "Hintergrund" ;
                 Text [ ENGLISH ] = "Background" ;
@@ -350,6 +364,20 @@ TabDialog DLG_TEMPLATE_2
             };
             PageItem
             {
+                Identifier = TP_CHAR_POS ;
+                PageResID = TP_CHAR_POS ;
+                Text = "Position" ;
+                Text [ ENGLISH ] = "Position" ;
+            };
+            PageItem
+            {
+                Identifier = TP_CHAR_TWOLN ;
+                PageResID = TP_CHAR_TWOLN;
+                Text = "Asiatisches Layout" ;
+                Text [ ENGLISH ] = "Asian layout" ;
+            };
+            PageItem
+            {
                 Identifier = TP_NUMPARA ;
                 Text = "Nummerierung" ;
                 Text [ ENGLISH ] = "Numbering" ;