diff options
Diffstat (limited to 'sw/source/core/inc')
| -rw-r--r-- | sw/source/core/inc/docfld.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/inc/rolbck.hxx | 9 | ||||
| -rw-r--r-- | sw/source/core/inc/rootfrm.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/inc/swfont.hxx | 19 | ||||
| -rw-r--r-- | sw/source/core/inc/txttypes.hxx | 1 |
5 files changed, 25 insertions, 14 deletions
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index d98b8cd760c1..f922e8557242 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -78,10 +78,7 @@ public: _SetGetExpFld( const SwFlyFrmFmt& rFlyFmt, const SwPosition* pPos = 0 ); - bool operator==( const _SetGetExpFld& rFld ) const - { return nNode == rFld.nNode && nCntnt == rFld.nCntnt && - ( !CNTNT.pTxtFld || !rFld.CNTNT.pTxtFld || - CNTNT.pTxtFld == rFld.CNTNT.pTxtFld ); } + bool operator==( const _SetGetExpFld& rFld ) const; bool operator<( const _SetGetExpFld& rFld ) const; const SwTxtFld* GetTxtFld() const diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 7a30ea88c023..5b47c8658e35 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -392,8 +392,13 @@ public: // helper methods for recording attribute in History // used by Undo classes (Delete/Overwrite/Inserts) - void CopyAttr( SwpHints* pHts, sal_uLong nNodeIdx, xub_StrLen nStart, - xub_StrLen nEnd, bool bFields ); + void CopyAttr( + SwpHints* pHts, + const sal_uLong nNodeIdx, + const xub_StrLen nStart, + const xub_StrLen nEnd, + const bool bCopyFields ); + void CopyFmtAttr( const SfxItemSet& rSet, sal_uLong nNodeIdx ); }; diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index a40d847cb707..32bc02285729 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -276,8 +276,9 @@ public: // next page border const SwPageFrm* GetPageAtPos( const Point& rPt, const Size* pSize = 0, bool bExtend = false ) const; - //Der Crsr moechte die zu selektierenden Bereiche wissen. - void CalcFrmRects( SwShellCrsr&, sal_Bool bIsTblSel ); + void CalcFrmRects( + SwShellCrsr&, + const sal_Bool bIsTblSel ); // Calculates the cells included from the current selection // false: There was no result because of an invalid layout diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 8a4526cfe038..fb3849d9d633 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -123,9 +123,11 @@ public: #define SW_SCRIPTS 3 class SwFont -{ // CJK == Chinese, Japanese, Korean - // CTL == Complex text layout ( Hebrew, Arabic ) +{ + // CJK == Chinese, Japanese, Korean + // CTL == Complex text layout ( Hebrew, Arabic ) SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font + Color* pBackColor; // background color (i.e. at character styles) Color m_aHighlightColor; // highlight color Color aUnderColor; // color of the underlining @@ -147,10 +149,12 @@ class SwFont sal_uInt16 m_nShadowWidth; SvxShadowLocation m_aShadowLocation; - sal_uInt8 nToxCnt; // Zaehlt die Schachtelungstiefe der Tox - sal_uInt8 nRefCnt; // Zaehlt die Schachtelungstiefe der Refs - sal_uInt8 m_nMetaCount; // count META/METAFIELD - sal_uInt8 nActual; // actual font (Latin, CJK or CTL) + sal_uInt8 nToxCnt; // Zaehlt die Schachtelungstiefe der Tox + sal_uInt8 nRefCnt; // Zaehlt die Schachtelungstiefe der Refs + sal_uInt8 m_nMetaCount; // count META/METAFIELD + sal_uInt8 m_nInputFieldCount; // count INPUTFIELD + + sal_uInt8 nActual; // actual font (Latin, CJK or CTL) // Schalter fuer die Font-Extensions sal_Bool bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle @@ -254,6 +258,9 @@ public: inline sal_uInt8 &GetMeta() { return m_nMetaCount; } inline sal_uInt8 GetMeta() const { return m_nMetaCount; } inline bool IsMeta() const { return (0 != m_nMetaCount); } + inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; } + inline sal_uInt8 GetInputField() const { return m_nInputFieldCount; } + inline bool IsInputField() const { return (0 != m_nInputFieldCount); } inline void SetURL( const sal_Bool bURL ); inline sal_Bool IsURL() const { return bURL; } inline void SetGreyWave( const sal_Bool bNew ); diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx index debef5231eec..c835b6bfd7b0 100644 --- a/sw/source/core/inc/txttypes.hxx +++ b/sw/source/core/inc/txttypes.hxx @@ -47,6 +47,7 @@ #define POR_PARA 0x8002 #define POR_URL 0x8003 #define POR_HNG 0x8004 +#define POR_INPUTFLD 0x8005 #define POR_DROP 0x8080 #define POR_TOX 0x8089 |