summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/PostItMgr.hxx2
-rw-r--r--sw/inc/accmap.hxx7
-rw-r--r--sw/inc/dbgoutsw.hxx42
-rw-r--r--sw/inc/doc.hxx6
-rw-r--r--sw/inc/fmtcol.hxx2
-rw-r--r--sw/inc/ndole.hxx4
-rw-r--r--sw/inc/pam.hxx2
-rw-r--r--sw/inc/swatrset.hxx3
-rw-r--r--sw/inc/swtypes.hxx3
-rw-r--r--sw/inc/viewsh.hxx11
10 files changed, 54 insertions, 28 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 33f73b1ba932..88251c0576cd 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -38,9 +38,11 @@
#include <svx/outlobj.hxx>
#include <tools/string.hxx>
#include <tools/link.hxx>
+#include <tools/debug.hxx>
#include <swrect.hxx>
#include <unotools/configitem.hxx>
#include <com/sun/star/util/SearchOptions.hpp>
+#include <com/sun/star/uno/Any.hxx>
class SwWrtShell;
class SwDoc;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 56f089059bf5..ba18cf599872 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -136,6 +136,9 @@ public:
#define ACC_STATE_OPAQUE 0x02
// pseudo states for events
+// --> OD 2009-01-07 #i88069# - pseudo state for event TEXT_ATTRIBUTE_CHANGED
+#define ACC_STATE_TEXT_ATTRIBUTE_CHANGED 0x0200
+// <--
// --> OD 2005-12-12 #i27301# - pseudo state for event TEXT_SELECTION_CHANGED
#define ACC_STATE_TEXT_SELECTION_CHANGED 0x0100
// <--
@@ -282,6 +285,10 @@ public:
void InvalidateContent( const SwFrm *pFrm );
+ // --> OD 2009-01-06 #i88069#
+ void InvalidateAttr( const SwTxtFrm& rTxtFrm );
+ // <--
+
void InvalidateCursorPosition( const SwFrm *pFrm );
void InvalidateFocus();
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 55d3b2496e32..329c81b7fb38 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -66,28 +66,28 @@ class SwTxtFmtColl;
extern bool bDbgOutStdErr;
extern bool bDbgOutPrintAttrSet;
-const char * dbg_out(const void * pVoid);
-const char * dbg_out(const String & aStr);
-const char * dbg_out(const SwRect & rRect);
-const char * dbg_out(const SwFrmFmt & rFrmFmt);
-const char * dbg_out(const SwNode & rNode);
-const char * dbg_out(const SwTxtAttr & rAttr);
-const char * dbg_out(const SwpHints &rHints);
-const char * dbg_out(const SfxPoolItem & rItem);
-const char * dbg_out(const SfxPoolItem * pItem);
-const char * dbg_out(const SfxItemSet & rSet);
-const char * dbg_out(SwNodes & rNodes);
+SW_DLLPUBLIC const char * dbg_out(const void * pVoid);
+SW_DLLPUBLIC const char * dbg_out(const String & aStr);
+SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
+SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
+SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr);
+SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints);
+SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
+SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
+SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet);
+SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes);
// const char * dbg_out(SwOutlineNodes & rNodes);
-const char * dbg_out(const SwPosition & rPos);
-const char * dbg_out(const SwPaM & rPam);
-const char * dbg_out(const SwNodeNum & rNum);
-const char * dbg_out(const SwUndo & rUndo);
-const char * dbg_out(const SwUndos & rUndos);
-const char * dbg_out(const SwRewriter & rRewriter);
-const char * dbg_out(const SwNumRule & rRule);
-const char * dbg_out(const SwTxtFmtColl & rFmt);
-const char * dbg_out(const SwFrmFmts & rFrmFmts);
-const char * dbg_out(const SwNumRuleTbl & rTbl);
+SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
+SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
+SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
+SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
+SW_DLLPUBLIC const char * dbg_out(const SwUndos & rUndos);
+SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
+SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
+SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
+SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts);
+SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl);
template<typename tKey, typename tMember, typename fHashFunction>
String lcl_dbg_out(const std::hash_map<tKey, tMember, fHashFunction> & rMap)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index da5c9c70d3f1..8fe60d0fb8c7 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -303,7 +303,7 @@ class SW_DLLPUBLIC SwDoc :
// die Objecte
SwNodes aNodes; // Inhalt des Dokumentes
SwNodes aUndoNodes; // Inhalt fuer das Undo
- SwAttrPool aAttrPool; // der Attribut Pool
+ SwAttrPool* mpAttrPool; // der Attribut Pool
SwPageDescs aPageDescs; // PageDescriptoren
Link aOle2Link; // OLE 2.0-Benachrichtigung
/* @@@MAINTAINABILITY-HORROR@@@
@@ -1782,8 +1782,8 @@ public:
const sal_uInt16 nId, const String& rCharacterStyle, SdrObject& rObj );
// erfrage den Attribut Pool
- const SwAttrPool& GetAttrPool() const { return aAttrPool; }
- SwAttrPool& GetAttrPool() { return aAttrPool; }
+ const SwAttrPool& GetAttrPool() const { return *mpAttrPool; }
+ SwAttrPool& GetAttrPool() { return *mpAttrPool; }
// suche ueber das Layout eine EditShell und ggfs. eine ViewShell
SwEditShell* GetEditShell( ViewShell** ppSh = 0 ) const;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 7dcb6720d593..d06a64cf9bfd 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -116,7 +116,7 @@ public:
void SetAttrOutlineLevel( int );
int GetAttrOutlineLevel() const;
int GetAssignedOutlineStyleLevel() const;
- inline const bool IsAssignedToListLevelOfOutlineStyle() const
+ inline bool IsAssignedToListLevelOfOutlineStyle() const
{
return mbAssignedToOutlineStyle;
}
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 41dde811bc40..49e0e724f10c 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -149,6 +149,10 @@ public:
void CheckFileLink_Impl();
+ // --> OD 2009-03-05 #i99665#
+ bool IsChart() const;
+ // <--
+
#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
const String& GetChartTblName() const { return sChartTblName; }
void SetChartTblName( const String& rNm ) { sChartTblName = rNm; }
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index b568a474cd7c..8b5af17f820c 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -257,6 +257,8 @@ public:
static BOOL Overlap(const SwPaM & a, const SwPaM & b);
+ static BOOL LessThan(const SwPaM & a, const SwPaM & b);
+
DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
String GetTxt() const;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index a800d1b1b649..3042f1def0c9 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -162,6 +162,9 @@ class SwAttrPool : public SfxItemPool
public:
SwAttrPool( SwDoc* pDoc );
+protected:
+ virtual ~SwAttrPool();
+public:
SwDoc* GetDoc() { return pDoc; }
const SwDoc* GetDoc() const { return pDoc; }
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b424afb64bae..209db3974697 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -187,9 +187,6 @@ extern ResMgr* pSwResMgr; // steht in swapp0.cxx
#define SW_RES(i) ResId(i,*pSwResMgr)
#define SW_RESSTR(i) UniString(ResId(i,*pSwResMgr))
-#define DDE_AVAILABLE
-
-
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker();
::com::sun::star::uno::Reference<
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 060bcb2a9e3d..d73db5d79e0b 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -564,6 +564,17 @@ public:
*/
void InvalidateAccessibleParaTextSelection();
+ /** invalidate attributes for paragraphs
+
+ OD 2009-01-06 #i88069#
+
+ @author OD
+
+ @param rTxtFrm
+ input parameter - paragraph frame, whose attributes have changed
+ */
+ void InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
+
ViewShell( ViewShell&, Window *pWin = 0, OutputDevice *pOut = 0,
long nFlags = 0 );
ViewShell( SwDoc& rDoc, Window *pWin,
generated by cgit (git 2.34.1) at 2025-05-19 03:24:07 +0000