#80913# asian typography page

8 files changed, 42 insertions, 19 deletions

diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 24a4d8657b39..56008105d313 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: attrdlg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:46:06 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:36:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,7 @@
 #include <svx/align.hxx>
 #include <svx/border.hxx>
 #include <svx/backgrnd.hxx>
+#include <svx/paragrph.hxx>
 /*
 #include <sbx.hxx>
 #include <sfxdoc.hxx>
@@ -113,6 +114,7 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame*     pFrame,
     AddTabPage( TP_FONT,        SvxCharNamePage::Create,        0 );
     AddTabPage( TP_FONTEFF,     SvxCharEffectsPage::Create,     0 );
     AddTabPage( TP_ALIGNMENT,   SvxAlignmentTabPage::Create,    0 );
+    AddTabPage( TP_ASIAN,       SvxAsianTabPage::Create,        0 );
     AddTabPage( TP_BORDER,      SvxBorderTabPage::Create,       0 );
     AddTabPage( TP_BACKGROUND,  SvxBackgroundTabPage::Create,   0 );
     AddTabPage( TP_PROTECTION,  ScTabPageProtection::Create,    0 );
diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc
index fd62f85a0219..1c43267fe2db 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: attrdlg.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:44:19 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:32:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,7 @@
 #define TP_BACKGROUND   5
 #define TP_PROTECTION   6
 #define TP_FONTEFF      7
+#define TP_ASIAN        8
 
 //================================================
 // Zellschutz-TabPage:
diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc
index c8d057a7be72..c0d4394d3952 100644
--- a/sc/source/ui/inc/styledlg.hrc
+++ b/sc/source/ui/inc/styledlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: styledlg.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:44:19 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:32:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,4 +69,5 @@
 #define TP_PAGE_FOOTER 10
 #define TP_TABLE       11
 #define TP_FONTEFF     12
+#define TP_ASIAN       13
 
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index e01d72fb0600..0a4a74347125 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textdlgs.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:49:11 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:39:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,7 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) :
     AddTabPage( RID_SVXPAGE_STD_PARAGRAPH, SvxStdParagraphTabPage::Create, 0);
     AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH, SvxParaAlignTabPage::Create, 0);
     //AddTabPage( RID_SVXPAGE_EXT_PARAGRAPH, SvxExtParagraphTabPage::Create, 0);
+    AddTabPage( RID_SVXPAGE_PARA_ASIAN, SvxAsianTabPage::Create,0);
     AddTabPage( RID_SVXPAGE_TABULATOR, SvxTabulatorTabPage::Create, 0);
 }
 
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index 3754c9d36363..d1a6d6f82060 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: attrdlg.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2000-11-29 10:12:31 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:34:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,7 +148,6 @@ TabDialog RID_SCDLG_ATTR
                 Text[ turkish ] = "Yaz�tipi";
                 Text[ language_user1 ] = " ";
             };
-
             PageItem
             {
                 Identifier = TP_FONTEFF ;
@@ -156,7 +155,6 @@ TabDialog RID_SCDLG_ATTR
                 Text = "Schrifteffekt" ;
                 Text [ ENGLISH ] = "Character Extension" ;
             };
-
             PageItem
             {
                 Identifier = TP_ALIGNMENT ;
@@ -187,6 +185,13 @@ TabDialog RID_SCDLG_ATTR
             };
             PageItem
             {
+                Identifier = TP_ASIAN ;
+                PageResID = 263 ;
+                Text = "Asiatische Typographie" ;
+                Text [ ENGLISH ] = "Asian typography" ;
+            };
+            PageItem
+            {
                 Identifier = TP_BORDER ;
                 PageResID = 259 ;
                 Text = "Umrandung" ;
diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src
index a42c75153508..c4f6b80e3d2b 100644
--- a/sc/source/ui/src/textdlgs.src
+++ b/sc/source/ui/src/textdlgs.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textdlgs.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:47:40 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:34:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -272,7 +272,12 @@ TabDialog RID_SCDLG_PARAGRAPH
                 Text[ turkish ] = "Hizalama";
                 Text[ language_user1 ] = " ";
             };
-
+            PageItem
+            {
+                Identifier = RID_SVXPAGE_PARA_ASIAN ;
+                Text = "Asiatische Typographie" ;
+                Text [ ENGLISH ] = "Asian typography" ;
+            };
             PageItem
             {
                 Identifier = RID_SVXPAGE_TABULATOR ;
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 7e5f402915be..a8d7e276a223 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: styledlg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:51:30 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:37:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,7 @@
 #include <svx/chardlg.hxx>
 #include <svx/numfmt.hxx>
 #include <svx/page.hxx>
+#include <svx/paragrph.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/style.hxx>
 
@@ -105,6 +106,7 @@ ScStyleDlg::ScStyleDlg( Window*             pParent,
                 AddTabPage( TP_FONT, &SvxCharNamePage::Create,          &SvxCharNamePage::GetRanges );
                 AddTabPage( TP_FONTEFF, &SvxCharEffectsPage::Create,            &SvxCharEffectsPage::GetRanges );
                 AddTabPage( TP_ALIGNMENT, &SvxAlignmentTabPage::Create, &SvxAlignmentTabPage::GetRanges );
+                AddTabPage( TP_ASIAN, &SvxAsianTabPage::Create,         &SvxAsianTabPage::GetRanges );
                 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create,       &SvxBorderTabPage::GetRanges );
                 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create,   &SvxBackgroundTabPage::GetRanges );
                 AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create,    &ScTabPageProtection::GetRanges );
diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src
index 19c416c92476..2aabd9a408be 100644
--- a/sc/source/ui/styleui/styledlg.src
+++ b/sc/source/ui/styleui/styledlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: styledlg.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-27 08:51:30 $
+ *  last change: $Author: nn $ $Date: 2000-11-30 18:37:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -178,6 +178,12 @@ TabDialog RID_SCDLG_STYLES_PAR
             };
             PageItem
             {
+                Identifier = TP_ASIAN ;
+                Text = "Asiatische Typographie" ;
+                Text [ ENGLISH ] = "Asian typography" ;
+            };
+            PageItem
+            {
                 Identifier = TP_BORDER ;
                 Text = "Umrandung" ;
                 Text [ ENGLISH ] = "Border" ;