summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx4
-rw-r--r--sw/source/core/inc/docfld.hxx5
-rw-r--r--sw/source/core/inc/doctxm.hxx3
-rw-r--r--sw/source/core/inc/frame.hxx19
-rw-r--r--sw/source/core/inc/rolbck.hxx11
-rw-r--r--sw/source/core/inc/rootfrm.hxx5
-rw-r--r--sw/source/core/inc/swfont.hxx27
-rw-r--r--sw/source/core/inc/tabfrm.hxx61
-rw-r--r--sw/source/core/inc/txtfrm.hxx7
-rw-r--r--sw/source/core/inc/txttypes.hxx1
-rw-r--r--sw/source/core/inc/viewimp.hxx6
11 files changed, 99 insertions, 50 deletions
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 34fcb94b6952..7d26954a150b 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -92,6 +92,10 @@ public:
* paragraph's portions have been processed.
*/
virtual void Finish() = 0;
+ //IAccessibility2 Implementation 2009-----
+ virtual void SetAttrFieldType( sal_uInt16 )
+ { return; }
+ //-----IAccessibility2 Implementation 2009
};
#endif
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 691dc53f4234..7da844b24565 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -80,10 +80,7 @@ public:
_SetGetExpFld( const SwFlyFrmFmt& rFlyFmt, const SwPosition* pPos = 0 );
- sal_Bool operator==( const _SetGetExpFld& rFld ) const
- { return nNode == rFld.nNode && nCntnt == rFld.nCntnt &&
- ( !CNTNT.pTxtFld || !rFld.CNTNT.pTxtFld ||
- CNTNT.pTxtFld == rFld.CNTNT.pTxtFld ); }
+ sal_Bool operator==( const _SetGetExpFld& rFld ) const;
sal_Bool operator<( const _SetGetExpFld& rFld ) const;
const SwTxtFld* GetTxtFld() const
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 6cc70f26606d..7c9f0a23bbe9 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -101,6 +101,9 @@ public:
void Update( const SfxItemSet* pAttr = 0,
const bool _bNewTOX = false ); // Formatieren
void UpdatePageNum(); // Seitennummern einfuegen
+//IAccessibility2 Implementation 2009-----
+ SwTOXSortTabBases* GetTOXSortTabBases() { return &aSortArr; }
+//-----IAccessibility2 Implementation 2009
sal_Bool SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart = sal_True ) const;
};
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 0c6867391d7b..9509bb5b3cf0 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -29,6 +29,11 @@
#include "calbck.hxx" // fuer SwClient
#include <svl/brdcst.hxx>
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/style/TabStop.hpp>
+#include <comphelper/stlunosequence.hxx>
+using namespace ::com::sun::star;
+//-----IAccessibility2 Implementation 2009
class SwLayoutFrm;
class SwRootFrm;
class SwPageFrm;
@@ -292,6 +297,10 @@ class SwFrm: public SwClient, public SfxBroadcaster
//Cache fuer (Umrandungs-)Attribute.
static SwCache *pCache;
+ //IAccessibility2 Implementation 2009-----
+ //Solution:Member to identify if acc table should be disposed
+ sal_Bool bIfAccTableShouldDisposing;
+ //-----IAccessibility2 Implementation 2009
// --> OD 2006-05-10 #i65250#
// frame ID is now in general available - used for layout loop control
@@ -415,6 +424,12 @@ protected:
sal_Bool bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich
//wenn sal_True.
public:
+ //IAccessibility2 Implementation 2009-----
+ virtual uno::Sequence< style::TabStop > GetTabStopInfo( SwTwips )
+ {
+ return uno::Sequence< style::TabStop >();
+ }
+ //-----IAccessibility2 Implementation 2009
sal_Bool bUnUsed2: 1;
protected:
sal_Bool bInfInvalid: 1; //InfoFlags sind Invalid.
@@ -767,6 +782,10 @@ public:
virtual Size ChgSize( const Size& aNewSize );
virtual void Cut() = 0;
+ //IAccessibility2 Implementation 2009-----
+ //Solution:Add a method to change the acc table dispose state.
+ void SetAccTableDispose( sal_Bool bDispose){ bIfAccTableShouldDisposing = bDispose;}
+ //-----IAccessibility2 Implementation 2009
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) = 0;
void ValidateLineNum() { bValidLineNum = sal_True; }
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index a90ef2ee331f..fdbd37979496 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -403,11 +403,14 @@ 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 );
- // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
+ 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 );
- // <--
};
#ifndef ROLBCK_HISTORY_ONLY
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 3371e612ef7e..073bc99a9d6b 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -268,8 +268,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 c54e00ce4b6f..7fafafa3092b 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -126,16 +126,20 @@ public:
#define SW_SCRIPTS 3
class SwFont
-{ // 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 aUnderColor; // color of the underlining
- Color aOverColor; // color of the overlining
- 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)
+{ // 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 aUnderColor; // color of the underlining
+ Color aOverColor; // color of the overlining
+
+ 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
@@ -242,6 +246,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/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 85c87db2c767..3cb3a72aea10 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -33,8 +33,6 @@ class SwAttrSetChg;
class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
{
- // OD 14.03.2003 #i11760# - adjustment, because of method signature change
- //darf mit den Flags spielen.
friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
//Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch.
@@ -44,22 +42,22 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
SwTable* pTable;
sal_Bool bComplete :1; //Eintrage als Repaint ohne das CompletePaint
- //der Basisklasse gesetzt werden muss. Damit
- //sollen unertraegliche Tabellen-Repaints
- //vermieden werden.
+ //der Basisklasse gesetzt werden muss. Damit
+ //sollen unertraegliche Tabellen-Repaints
+ //vermieden werden.
sal_Bool bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
- //des Inhaltes sorgen.
+ //des Inhaltes sorgen.
sal_Bool bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact
sal_Bool bLockBackMove :1; //BackMove-Test hat der Master erledigt.
sal_Bool bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll
- //Zur Optimierung, damit dies nicht im
- //CntntFrm::Grow gerufen werden muss, denn dann
- //wird es ggf. fuer jede Zelle gerufen #47483#
+ //Zur Optimierung, damit dies nicht im
+ //CntntFrm::Grow gerufen werden muss, denn dann
+ //wird es ggf. fuer jede Zelle gerufen #47483#
sal_Bool bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
- //die Cntnts auf jedenfall per Calc() formatiert.
- //es finden keine zusaetzlichen Invalidierungen
- //statt und dieser Weg kann auch kaum garantien
- //geben.
+ //die Cntnts auf jedenfall per Calc() formatiert.
+ //es finden keine zusaetzlichen Invalidierungen
+ //statt und dieser Weg kann auch kaum garantien
+ //geben.
sal_Bool bHasFollowFlowLine :1; // Means that the first line in the follow
// is indented to contain content from a broken
@@ -76,7 +74,6 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// is necessary, in order to let the text
// flow into the FollowFlowLine
sal_Bool bRemoveFollowFlowLinePending :1;
- // --> OD 2004-10-04 #i26945#
sal_Bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen objects
// are considered on the calculation
// for the minimal cell height.
@@ -85,12 +82,10 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// screen object for the preparation
// of the re-calculation of the
// last table row.
- // <--
- // --> OD 2004-10-15 #i26945#
sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
// indicates, if the floating screen objects fits
- // <--
- sal_Bool bDummy4 :1;
+
+ bool mbInRecalcLowerRow : 1;
//Split() spaltet den Frm an der angegebenen Stelle, es wird ein
//Follow erzeugt und aufgebaut und direkt hinter this gepastet.
@@ -98,8 +93,11 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep );
bool Join();
- void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
- SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
+ void _UpdateAttr(
+ const SfxPoolItem*,
+ const SfxPoolItem*, sal_uInt8 &,
+ SwAttrSetChg *pa = 0,
+ SwAttrSetChg *pb = 0 );
virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat );
@@ -168,7 +166,15 @@ public:
sal_Bool IsRemoveFollowFlowLinePending() const { return bRemoveFollowFlowLinePending; }
void SetRemoveFollowFlowLinePending( sal_Bool bNew ) { bRemoveFollowFlowLinePending = bNew; }
- // --> OD 2004-10-04 #i26945#
+ bool IsInRecalcLowerRow() const
+ {
+ return mbInRecalcLowerRow;
+ }
+ void SetInRecalcLowerRow( bool bNew )
+ {
+ mbInRecalcLowerRow = bNew;
+ }
+
sal_Bool IsConsiderObjsForMinCellHeight() const
{
return bConsiderObjsForMinCellHeight;
@@ -177,8 +183,7 @@ public:
{
bConsiderObjsForMinCellHeight = _bNewConsiderObjsForMinCellHeight;
}
- // <--
- // --> OD 2004-10-04 #i26945#
+
sal_Bool DoesObjsFit() const
{
return bObjsDoesFit;
@@ -187,15 +192,16 @@ public:
{
bObjsDoesFit = _bNewObjsDoesFit;
}
- // <--
bool RemoveFollowFlowLine();
//
// End: New stuff for breaking table rows
//
- sal_Bool CalcFlyOffsets( SwTwips& rUpper, long& rLeftOffset,
- long& rRightOffset ) const;
+ sal_Bool CalcFlyOffsets(
+ SwTwips& rUpper,
+ long& rLeftOffset,
+ long& rRightOffset ) const;
SwTwips CalcHeightOfFirstContentLine() const;
@@ -204,12 +210,9 @@ public:
bool IsLayoutSplitAllowed() const;
- // --> collapsing borders FME 2005-05-27 #i29550#
bool IsCollapsingBorders() const;
- // used for collapsing border lines:
sal_uInt16 GetBottomLineSize() const;
- // <-- collapsing
DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm)
};
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 2898b1f6898d..2ac1146afaf9 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -26,7 +26,9 @@
#include <tools/mempool.hxx>
#include <tools/string.hxx>
#include "cntfrm.hxx"
-
+//IAccessibility2 Implementation 2009-----
+#include "com/sun/star/uno/Sequence.hxx"
+//-----IAccessibility2 Implementation 2009
#define STRSIZE(x) (sizeof(x)-1)
class SwCharRange;
@@ -229,6 +231,9 @@ protected:
public:
+ //IAccessibility2 Implementation 2009-----
+ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos );
+ //-----IAccessibility2 Implementation 2009
//public, weil der eine oder andere die Methode rufen darf um das
//Prepare zu sparen - mit Vorsicht zu geniessen!
void Init();
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index bac7ace26668..4f52fdedb9f9 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -51,6 +51,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
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 6f3edf5854ce..bfba5d15b9c8 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -279,6 +279,12 @@ public:
inline void AddAccessibleObj( const SdrObject *pObj );
+ //IAccessibility2 Implementation 2009-----
+ void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
+ void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
+ void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
+ //-----IAccessibility2 Implementation 2009
+
// Invalidate accessible frame's frame's content
void InvalidateAccessibleFrmContent( const SwFrm *pFrm );
generated by cgit (git 2.34.1) at 2024-06-05 17:48:16 +0000