summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-11-20 08:41:15 +0000
committerjp <jp@openoffice.org>2000-11-20 08:41:15 +0000
commite8d66dda0880bc9df439f9337372b92694868d92 (patch)
treefe0292c2b001f33365723727cb76fe1efe35def3
parent33f8fa80a55bd4b59cbbdb5268b878c350538cdb (diff)
new para attributes - expand para range
-rw-r--r--sw/inc/format.hxx6
-rw-r--r--sw/inc/hintids.hxx18
-rw-r--r--sw/inc/paratr.hxx32
-rw-r--r--sw/inc/swatrset.hxx13
-rw-r--r--sw/inc/txtatr.hxx5
-rw-r--r--sw/source/core/attr/swatrset.cxx5
-rw-r--r--sw/source/filter/html/css1atr.cxx18
-rw-r--r--sw/source/filter/html/htmlatr.cxx21
-rw-r--r--sw/source/filter/rtf/rtfatr.cxx20
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx18
10 files changed, 124 insertions, 32 deletions
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index dd8a9afaed33..7d1eb8afc66e 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: format.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -338,6 +338,8 @@ public:
inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const;
inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const;
inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const;
+ inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const;
+ inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
// TabellenBox-Attribute - impl. steht im cellatr.hxx
inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index e814d8130d58..f96a4852d95b 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hintids.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -178,7 +178,16 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_DROP, // 62
RES_PARATR_REGISTER, // 63
RES_PARATR_NUMRULE, // 64
- RES_PARATR_DUMMY2, // 65
+ RES_PARATR_SCRIPTSPACE, // 65
+ RES_PARATR_HANGINGPUNCTUATION, // 66
+ RES_PARATR_DUMMY1, // 67
+ RES_PARATR_DUMMY2, // 68
+ RES_PARATR_DUMMY3, // 69
+ RES_PARATR_DUMMY4, // 70
+ RES_PARATR_DUMMY5, // 71
+ RES_PARATR_DUMMY6, // 72
+ RES_PARATR_DUMMY7, // 73
+ RES_PARATR_DUMMY8, // 74
RES_PARATR_END
};
@@ -471,6 +480,9 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId );
#define ITEMID_ORPHANS RES_PARATR_ORPHANS
#define ITEMID_TABSTOP RES_PARATR_TABSTOP
#define ITEMID_HYPHENZONE RES_PARATR_HYPHENZONE
+#define ITEMID_SCRIPTSPACE RES_PARATR_SCRIPTSPACE
+#define ITEMID_HANGINGPUNCTUATION RES_PARATR_HANGINGPUNCTUATION
+
//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 28fd5634e148..2b3e81342e59 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: paratr.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,11 +67,21 @@
#ifndef _SFXSTRITEM_HXX //autogen
#include <svtools/stritem.hxx>
#endif
-#include "hintids.hxx"
-#include "calbck.hxx"
-#include "swatrset.hxx"
-#include "format.hxx"
-#include "swtypes.hxx"
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>
+#endif
+#ifndef _CALBCK_HXX
+#include <calbck.hxx>
+#endif
+#ifndef _SWATRSET_HXX
+#include <swatrset.hxx>
+#endif
+#ifndef _FORMAT_HXX
+#include <format.hxx>
+#endif
+#ifndef _SWTYPES_HXX
+#include <swtypes.hxx>
+#endif
class SwCharFmt;
class International;
@@ -255,6 +265,10 @@ inline const SwFmtDrop &SwAttrSet::GetDrop(BOOL bInP) const
{ return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); }
inline const SwNumRuleItem &SwAttrSet::GetNumRule(BOOL bInP) const
{ return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); }
+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); }
/******************************************************************************
* Implementierung der Paragraph-Attribut Methoden vom SwFmt
@@ -280,6 +294,10 @@ inline const SwFmtDrop &SwFmt::GetDrop(BOOL bInP) const
{ return aSet.GetDrop(bInP); }
inline const SwNumRuleItem &SwFmt::GetNumRule(BOOL bInP) const
{ return aSet.GetNumRule(bInP); }
+inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(BOOL bInP) const
+ { return aSet.GetScriptSpace(bInP) ; }
+inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(BOOL bInP) const
+ { return aSet.GetHangingPunctuation(bInP) ; }
#endif
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index fa4fd0637a3f..3c552590483a 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swatrset.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -158,6 +158,8 @@ class SvxOrphansItem;
class SvxTabStopItem;
class SvxHyphenZoneItem;
class SwFmtDrop;
+class SvxScriptSpaceItem;
+class SvxHangingPunctuationItem;
// TabellenBox-Attribute
class SwTblBoxNumFormat;
@@ -172,6 +174,7 @@ class SwAttrPool : public SfxItemPool
static USHORT* pVersionMap1;
static USHORT* pVersionMap2;
static USHORT* pVersionMap3;
+ static USHORT* pVersionMap4;
SwDoc* pDoc;
@@ -184,6 +187,7 @@ public:
static USHORT* GetVersionMap1() { return pVersionMap1; }
static USHORT* GetVersionMap2() { return pVersionMap2; }
static USHORT* GetVersionMap3() { return pVersionMap3; }
+ static USHORT* GetVersionMap6() { return pVersionMap4; }
};
@@ -331,6 +335,8 @@ public:
inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const;
inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const;
inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const;
+ inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const;
+ inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
// TabellenBox-Attribute - impl. steht im cellatr.hxx
inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
@@ -344,6 +350,9 @@ public:
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.4 2000/11/16 21:29:02 jp
+ SwFmt2Lines moved to SVX and renamed
+
Revision 1.3 2000/11/02 17:26:48 jp
TwoLines as char and not as text attribute
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 846d1ca9a63d..030d1707e2f3 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtatr.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:36:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -220,6 +220,7 @@ public:
class SwTxtUnderline : public SwTxtAttrEnd
{
FontUnderline ePrevUnderline;
+ Color ePrevColor;
public:
SwTxtUnderline( const SvxUnderlineItem& rAttr, xub_StrLen nStart, xub_StrLen nEnd );
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 62c783e17d71..57ccf0263c0a 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swatrset.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:37:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,6 +129,7 @@ SwAttrPool::SwAttrPool( SwDoc* pD )
SetVersionMap( 1, 1, 60, pVersionMap1 );
SetVersionMap( 2, 1, 75, pVersionMap2 );
SetVersionMap( 3, 1, 86, pVersionMap3 );
+ SetVersionMap( 4, 1,121, pVersionMap4 );
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index f4fafd5d6959..f39615098e0a 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: css1atr.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jp $ $Date: 2000-11-01 19:23:14 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:39:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -255,7 +255,7 @@
*/
#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)
-#define ATTRFNTAB_SIZE 121
+#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
#error Attribut-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
#endif
@@ -3419,8 +3419,17 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_HYPHENZONE*/ 0,
/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
+/* RES_PARATR_NUMRULE */ 0, // Dummy:
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
/* RES_PARATR_DUMMY1 */ 0, // Dummy:
/* RES_PARATR_DUMMY2 */ 0, // Dummy:
+/* RES_PARATR_DUMMY3 */ 0, // Dummy:
+/* RES_PARATR_DUMMY4 */ 0, // Dummy:
+/* RES_PARATR_DUMMY5 */ 0, // Dummy:
+/* RES_PARATR_DUMMY6 */ 0, // Dummy:
+/* RES_PARATR_DUMMY7 */ 0, // Dummy:
+/* RES_PARATR_DUMMY8 */ 0, // Dummy:
/* RES_FILL_ORDER */ 0,
/* RES_FRM_SIZE */ 0,
@@ -3485,6 +3494,9 @@ SwAttrFnTab aCSS1AttrFnTab = {
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.3 2000/11/01 19:23:14 jp
+ export of mail graphics removed
+
Revision 1.2 2000/10/20 13:42:31 jp
use correct INetURL-Decode enum
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 998299847fe4..93e724e3dc69 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: htmlatr.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jp $ $Date: 2000-11-13 20:32:39 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:41:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -240,7 +240,7 @@
*/
#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)
-#define ATTRFNTAB_SIZE 121
+#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
#error Attribut-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
#endif
@@ -3017,8 +3017,18 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_PARATR_HYPHENZONE*/ 0,
/* RES_PARATR_DROP */ OutHTML_CSS1Attr,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
+/* RES_PARATR_NUMRULE */ 0, // Dummy:
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
/* RES_PARATR_DUMMY1 */ 0, // Dummy:
/* RES_PARATR_DUMMY2 */ 0, // Dummy:
+/* RES_PARATR_DUMMY3 */ 0, // Dummy:
+/* RES_PARATR_DUMMY4 */ 0, // Dummy:
+/* RES_PARATR_DUMMY5 */ 0, // Dummy:
+/* RES_PARATR_DUMMY6 */ 0, // Dummy:
+/* RES_PARATR_DUMMY7 */ 0, // Dummy:
+/* RES_PARATR_DUMMY8 */ 0, // Dummy:
+
/* RES_FILL_ORDER */ 0,
/* RES_FRM_SIZE */ 0,
@@ -3086,11 +3096,14 @@ SwAttrFnTab aHTMLAttrFnTab = {
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlatr.cxx,v 1.4 2000-11-13 20:32:39 jp Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlatr.cxx,v 1.5 2000-11-20 09:41:15 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.4 2000/11/13 20:32:39 jp
+ remove unused headerfile
+
Revision 1.3 2000/11/01 19:23:14 jp
export of mail graphics removed
diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx
index 406f5b17b16e..9c626d75c89c 100644
--- a/sw/source/filter/rtf/rtfatr.cxx
+++ b/sw/source/filter/rtf/rtfatr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: rtfatr.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2000-11-16 09:57:35 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:37:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -335,7 +335,7 @@
*/
#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)
-#define ATTRFNTAB_SIZE 121
+#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
#error Attribut-Tabelle ist ungueltigt. Wurden neue Hint-IDs zugefuegt ??
#endif
@@ -3318,7 +3318,16 @@ SwAttrFnTab aRTFAttrFnTab = {
/* RES_PARATR_DROP */ 0,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
/* RES_PARATR_NUMRULE */ OutRTF_SwNumRule,
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_DUMMY1 */ 0, // Dummy:
/* RES_PARATR_DUMMY2 */ 0, // Dummy:
+/* RES_PARATR_DUMMY3 */ 0, // Dummy:
+/* RES_PARATR_DUMMY4 */ 0, // Dummy:
+/* RES_PARATR_DUMMY5 */ 0, // Dummy:
+/* RES_PARATR_DUMMY6 */ 0, // Dummy:
+/* RES_PARATR_DUMMY7 */ 0, // Dummy:
+/* RES_PARATR_DUMMY8 */ 0, // Dummy:
/* RES_FILL_ORDER */ 0, // NOT USED!! OutRTF_SwFillOrder,
/* RES_FRM_SIZE */ OutRTF_SwFrmSize,
@@ -3391,11 +3400,14 @@ SwNodeFnTab aRTFNodeFnTab = {
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/rtfatr.cxx,v 1.5 2000-11-16 09:57:35 jp Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/rtfatr.cxx,v 1.6 2000-11-20 09:37:54 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.5 2000/11/16 09:57:35 jp
+ export CJK attributes
+
Revision 1.4 2000/11/13 12:27:20 jp
token definition changed
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index faabe43e41f7..6349f92d3244 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8atr.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2000-11-04 21:49:59 $
+ * last change: $Author: jp $ $Date: 2000-11-20 09:38:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -313,7 +313,7 @@
#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC)
-#define ATTRFNTAB_SIZE 121
+#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
#error "Attribut-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
#endif
@@ -3343,7 +3343,16 @@ SwAttrFnTab aWW8AttrFnTab = {
/* RES_PARATR_DROP */ 0,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
/* RES_PARATR_NUMRULE */ OutWW8_SwNumRuleItem,
+/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy:
+/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_DUMMY1 */ 0, // Dummy:
/* RES_PARATR_DUMMY2 */ 0, // Dummy:
+/* RES_PARATR_DUMMY3 */ 0, // Dummy:
+/* RES_PARATR_DUMMY4 */ 0, // Dummy:
+/* RES_PARATR_DUMMY5 */ 0, // Dummy:
+/* RES_PARATR_DUMMY6 */ 0, // Dummy:
+/* RES_PARATR_DUMMY7 */ 0, // Dummy:
+/* RES_PARATR_DUMMY8 */ 0, // Dummy:
/* RES_FILL_ORDER */ 0, // OutW4W_SwFillOrder,
/* RES_FRM_SIZE */ OutWW8_SwFrmSize,
@@ -3411,6 +3420,9 @@ SwAttrFnTab aWW8AttrFnTab = {
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.2 2000/11/04 21:49:59 er
+ GetMappedFormatstring with LocaleDataWrapper instead of International
+
Revision 1.1.1.1 2000/09/18 17:14:58 hr
initial import