#80913# forbidden rules

11 files changed, 70 insertions, 34 deletions

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 7d1eb8afc66e..8cc5f59a4895 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: format.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -340,6 +340,7 @@ public:
     inline const SwFmtDrop              &GetDrop( BOOL = TRUE ) const;
     inline const SvxScriptSpaceItem     &GetScriptSpace(BOOL = TRUE) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
+    inline const SvxForbiddenRuleItem   &GetForbiddenRule(BOOL = TRUE) const;
 
     // TabellenBox-Attribute    - impl. steht im cellatr.hxx
     inline const SwTblBoxNumFormat      &GetTblBoxNumFmt( BOOL = TRUE ) const;
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index dc63829bc8d4..f736c8dc5227 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globals.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-27 08:59:23 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -303,6 +303,7 @@
 
 #define TP_CHAR_POS                 (RC_GLOBALS_BEGIN +  98)
 #define TP_CHAR_TWOLN               (RC_GLOBALS_BEGIN +  99)
+#define TP_PARA_ASIAN               (RC_GLOBALS_BEGIN +  100)
 
 // Kontext-Menues (Format-Menue) --------------------------------------------
 
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index f96a4852d95b..c9062efd5301 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hintids.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,7 +180,7 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
     RES_PARATR_NUMRULE,                             // 64
     RES_PARATR_SCRIPTSPACE,                         // 65
     RES_PARATR_HANGINGPUNCTUATION,                  // 66
-    RES_PARATR_DUMMY1,                              // 67
+    RES_PARATR_FORBIDDEN_RULES,                     // 67
     RES_PARATR_DUMMY2,                              // 68
     RES_PARATR_DUMMY3,                              // 69
     RES_PARATR_DUMMY4,                              // 70
@@ -482,7 +482,7 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId );
 #define ITEMID_HYPHENZONE   RES_PARATR_HYPHENZONE
 #define ITEMID_SCRIPTSPACE  RES_PARATR_SCRIPTSPACE
 #define ITEMID_HANGINGPUNCTUATION   RES_PARATR_HANGINGPUNCTUATION
-
+#define ITEMID_FORBIDDENRULE    RES_PARATR_FORBIDDEN_RULES
 
 //Defines fuer die ehemaligen GrfAttribute, die jetzt im svx zu finden sind.
 #define ITEMID_GRF_CROP     RES_GRFATR_CROPGRF
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 2b3e81342e59..bb5548a791ec 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paratr.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -269,6 +269,8 @@ inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(BOOL bInP) const
     {   return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); }
 inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(BOOL bInP) const
     {   return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); }
+inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(BOOL bInP) const
+    {   return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
 
 /******************************************************************************
  *  Implementierung der Paragraph-Attribut Methoden vom SwFmt
@@ -298,6 +300,7 @@ inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(BOOL bInP) const
     {   return aSet.GetScriptSpace(bInP) ; }
 inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(BOOL bInP) const
     {   return aSet.GetHangingPunctuation(bInP) ; }
-
+inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(BOOL bInP) const
+    {   return (const SvxForbiddenRuleItem&)aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP); }
 
 #endif
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 11faf7eb934e..af1d69a634ba 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rcid.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@
 #define RC_VIEW                     (RC_BASE + 600)
 #define RC_CHRDLG                   (RC_BASE + 700)
 #define RC_RIBBAR                   (RC_BASE + 720)
-#define RC_GLOBALS                  (RC_BASE + 820)
+#define RC_GLOBALS                  (RC_BASE + 800)
 #define RC_FMTUI                    (RC_BASE + 920)
 #define RC_FRMDLG                   (RC_BASE + 1000)
 #define RC_FLDDLG                   (RC_BASE + 1100)
@@ -157,11 +157,11 @@
 
 //
 #define RC_RIBBAR_BEGIN             RC_RIBBAR
-#define RC_RIBBAR_END               (RC_RIBBAR_BEGIN + 99)
+#define RC_RIBBAR_END               (RC_RIBBAR_BEGIN + 79)
 
 // globale Ressourcen
 #define RC_GLOBALS_BEGIN            RC_GLOBALS
-#define RC_GLOBALS_END              (RC_GLOBALS_BEGIN + 99)
+#define RC_GLOBALS_END              (RC_GLOBALS_BEGIN + 119)
 
 // Format-Vorlagen
 #define RC_FMTUI_BEGIN              RC_FMTUI
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 3c552590483a..c0505b60185d 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swatrset.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -160,6 +160,7 @@ class SvxHyphenZoneItem;
 class SwFmtDrop;
 class SvxScriptSpaceItem;
 class SvxHangingPunctuationItem;
+class SvxForbiddenRuleItem;
 
 // TabellenBox-Attribute
 class SwTblBoxNumFormat;
@@ -337,6 +338,7 @@ public:
     inline const SwFmtDrop              &GetDrop( BOOL = TRUE ) const;
     inline const SvxScriptSpaceItem     &GetScriptSpace(BOOL = TRUE) const;
     inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
+    inline const SvxForbiddenRuleItem   &GetForbiddenRule(BOOL = TRUE) const;
 
     // TabellenBox-Attribute    - impl. steht im cellatr.hxx
     inline const SwTblBoxNumFormat      &GetTblBoxNumFmt( BOOL = TRUE ) const;
@@ -350,6 +352,9 @@ public:
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2000/11/20 09:36:59  jp
+      new para attributes - expand para range
+
       Revision 1.4  2000/11/16 21:29:02  jp
       SwFmt2Lines moved to SVX and renamed
 
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index c5c5669b5df1..4f23620bd1a9 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprnms.hxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: os $ $Date: 2000-11-29 11:35:14 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:18:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -617,6 +617,11 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_ON;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_Z_ORDER;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CONTENT_SECTION;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_HEADER_SECTION;
+
+extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_HANGING_PUNCTUATION;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_CHARACTER_DISTANCE;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_IS_FORBIDDEN_RULES;
+
 #endif
 
 
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 284b0086621f..de0a1534eaea 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: init.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-24 20:51:59 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:20:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,7 +196,9 @@
 #ifndef _UNO_LINGU_HXX
 #include <svx/unolingu.hxx>
 #endif
-
+#ifndef _SVX_FORBIDDENRULEITEM_HXX
+#include <svx/forbiddenruleitem.hxx>
+#endif
 #ifndef _FMTHBSH_HXX //autogen
 #include <fmthbsh.hxx>
 #endif
@@ -500,7 +502,7 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
     { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE },   // RES_PARATR_SCRIPTSPACE
     { SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
 
-    { 0, SFX_ITEM_POOLABLE },                           // RES_PARATR_DUMMY1
+    { SID_ATTR_PARA_FORBIDDEN_RULES, SFX_ITEM_POOLABLE },// RES_PARATR_FORBIDDEN_RULES
     { 0, SFX_ITEM_POOLABLE },                           // RES_PARATR_DUMMY2
     { 0, SFX_ITEM_POOLABLE },                           // RES_PARATR_DUMMY3
     { 0, SFX_ITEM_POOLABLE },                           // RES_PARATR_DUMMY4
@@ -752,8 +754,9 @@ void _InitCore()
     aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] =
                                                 new SvxHangingPunctuationItem;
 
+    aAttrTab[ RES_PARATR_FORBIDDEN_RULES - POOLATTR_BEGIN ] =
+                                                new SvxForbiddenRuleItem( RES_PARATR_FORBIDDEN_RULES );
 // ParaAttr - Dummies
-    aAttrTab[ RES_PARATR_DUMMY1 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_DUMMY1 );
     aAttrTab[ RES_PARATR_DUMMY2 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_DUMMY2 );
     aAttrTab[ RES_PARATR_DUMMY3 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_DUMMY3 );
     aAttrTab[ RES_PARATR_DUMMY4 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_DUMMY4 );
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 11339a80669f..eff0c8715471 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomap.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: os $ $Date: 2000-11-29 11:41:48 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:19:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -583,7 +583,10 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
         { SW_PROP_NAME(UNO_NAME_CHAR_COMBINE_IS_ON),            RES_CHRATR_TWO_LINES,           &::getBooleanCppuType(),    PropertyAttribute::MAYBEVOID, MID_TWOLINES}, \
         { SW_PROP_NAME(UNO_NAME_CHAR_COMBINE_PREFIX),           RES_CHRATR_TWO_LINES,           &::getCppuType((const OUString*)0),     PropertyAttribute::MAYBEVOID, MID_START_BRACKET}, \
         { SW_PROP_NAME(UNO_NAME_CHAR_COMBINE_SUFFIX),           RES_CHRATR_TWO_LINES,           &::getCppuType((const OUString*)0),     PropertyAttribute::MAYBEVOID, MID_END_BRACKET}, \
-        { SW_PROP_NAME(UNO_NAME_CHAR_EMPHASIZE),            RES_CHRATR_EMPHASIS_MARK,           &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_EMPHASIS},
+        { SW_PROP_NAME(UNO_NAME_CHAR_EMPHASIZE),            RES_CHRATR_EMPHASIS_MARK,           &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_EMPHASIS},\
+        { SW_PROP_NAME(UNO_NAME_PARA_IS_HANGING_PUNCTUATION),   RES_PARATR_HANGINGPUNCTUATION,  &::getBooleanCppuType(),    PROPERTY_NONE ,0     },    \
+        { SW_PROP_NAME(UNO_NAME_PARA_IS_CHARACTER_DISTANCE),    RES_PARATR_SCRIPTSPACE,         &::getBooleanCppuType(),    PROPERTY_NONE ,0     },    \
+        { SW_PROP_NAME(UNO_NAME_PARA_IS_FORBIDDEN_RULES),       RES_PARATR_FORBIDDEN_RULES,     &::getBooleanCppuType(),    PROPERTY_NONE ,0     },
 
 #define _BASE_INDEX_PROPERTIES_\
         { SW_PROP_NAME(UNO_NAME_TITLE), WID_IDX_TITLE,  &::getCppuType((const OUString*)0)  , PROPERTY_NONE,     0},\
@@ -774,6 +777,9 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_CHAR_COMBINE_PREFIX),           RES_CHRATR_TWO_LINES,           &::getCppuType((const OUString*)0),     PROPERTY_NONE, MID_START_BRACKET},
                     { SW_PROP_NAME(UNO_NAME_CHAR_COMBINE_SUFFIX),           RES_CHRATR_TWO_LINES,           &::getCppuType((const OUString*)0),     PROPERTY_NONE, MID_END_BRACKET},
                     { SW_PROP_NAME(UNO_NAME_CHAR_EMPHASIZE),            RES_CHRATR_EMPHASIS_MARK,           &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, MID_EMPHASIS},
+                    { SW_PROP_NAME(UNO_NAME_PARA_IS_HANGING_PUNCTUATION),   RES_PARATR_HANGINGPUNCTUATION,  &::getBooleanCppuType(),    PROPERTY_NONE ,0     },
+                    { SW_PROP_NAME(UNO_NAME_PARA_IS_CHARACTER_DISTANCE),    RES_PARATR_SCRIPTSPACE,         &::getBooleanCppuType(),    PROPERTY_NONE ,0     },
+                    { SW_PROP_NAME(UNO_NAME_PARA_IS_FORBIDDEN_RULES),       RES_PARATR_FORBIDDEN_RULES,     &::getBooleanCppuType(),    PROPERTY_NONE ,0     },
                     {0,0,0,0}
                 };
                 aMapArr[nPropertyId] = aParaStyleMap;
diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src
index 6e765ad62612..c6161fddf1c2 100644
--- a/sw/source/ui/chrdlg/paradlg.src
+++ b/sw/source/ui/chrdlg/paradlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paradlg.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2000-10-27 17:40:18 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:13:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,7 +116,6 @@ TabDialog DLG_PARA
                 Text[ turkish ] = "Girinti ve aral�klar";
                 Text[ language_user1 ] = " ";
             };
-#if SUPD>352
             PageItem
             {
                 Identifier = TP_PARA_ALIGN ;
@@ -143,7 +142,6 @@ TabDialog DLG_PARA
                 Text[ turkish ] = "Hizalama";
                 Text[ language_user1 ] = " ";
             };
-#endif
             PageItem
             {
                 Identifier = TP_PARA_EXT ;
@@ -175,6 +173,12 @@ TabDialog DLG_PARA
             };
             PageItem
             {
+                Identifier = TP_PARA_ASIAN;
+                Text = "Asiatische Typographie" ;
+                Text [ ENGLISH ] = "Asian typography" ;
+            };
+            PageItem
+            {
                 Identifier = TP_NUMPARA ;
                 Text = "Nummerierung" ;
                 Text [ ENGLISH ] = "Numbering" ;
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 6830eb535abe..2f4c0cfeb0ad 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pardlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: os $ $Date: 2000-11-29 17:13:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -158,6 +158,11 @@ SwParaDlg::SwParaDlg(Window *pParent,
     else
         RemoveTabPage(TP_PARA_EXT);
 
+    if (!bHtmlMode)
+        AddTabPage(TP_PARA_ASIAN,  SvxAsianTabPage::Create,SvxAsianTabPage::GetRanges);
+    else
+        RemoveTabPage(TP_PARA_ASIAN);
+
     USHORT nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
     BOOL bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
     if(bHtmlMode || !bLRValid)
@@ -264,6 +269,9 @@ void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:32  hr
+    initial import
+
     Revision 1.195  2000/09/18 16:05:14  willem.vandorp
     OpenOffice header added.