CWS-TOOLING: integrate CWS tl56_DEV300

8 files changed, 25 insertions, 18 deletions

diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index da84ab31d7c6..0fa2063e1d72 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star {
     namespace linguistic2 {
         class XDictionaryList;
         class XLinguServiceManager;
-        class XGrammarCheckingIterator;
+        class XProofreadingIterator;
     }
     namespace frame {
         class XTerminateListener;
@@ -69,7 +69,7 @@ class SwLinguServiceEventListener :
     com::sun::star::uno::Reference<
         com::sun::star::linguistic2::XLinguServiceManager >     xLngSvcMgr;
     com::sun::star::uno::Reference<
-        com::sun::star::linguistic2::XGrammarCheckingIterator > xGCIterator;
+        com::sun::star::linguistic2::XProofreadingIterator >    xGCIterator;
 
     // disallow use of copy-constructor and assignment operator
     SwLinguServiceEventListener(const SwLinguServiceEventListener &);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b03fbadaa681..dcc17451454f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -106,7 +106,7 @@ class SwList;
 #include <svx/numitem.hxx>
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/linguistic2/XGrammarCheckingIterator.hpp>
+#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 
 #include <hash_map>
 #include <stringhash.hxx>
@@ -317,7 +317,7 @@ class SwDoc :
     SvStringsDtor aPatternNms;          // Array fuer die Namen der Dokument-Vorlagen
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
         xXForms;                        // container with XForms models
-    mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XGrammarCheckingIterator > m_xGCIterator;
+    mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
 
     // -------------------------------------------------------------------
     // die Pointer
@@ -2074,7 +2074,7 @@ public:
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
         getXForms() const;
 
-    com::sun::star::uno::Reference< com::sun::star::linguistic2::XGrammarCheckingIterator > GetGCIterator() const;
+    com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const;
 
     /// is this an XForms document?
     bool isXForms() const;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c3bdb302c75d..771e8bfcc8f3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -41,7 +41,7 @@
 #include <itabenum.hxx>
 #include <swdbdata.hxx>
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
-#include <com/sun/star/linguistic2/GrammarCheckingResult.hpp>
+#include <com/sun/star/linguistic2/ProofreadingResult.hpp>
 #include <fldupde.hxx>
 #include <tblenum.hxx>
 
@@ -735,6 +735,8 @@ public:
     // spells on a sentence basis - the SpellPortions are needed
     // returns false if no error could be found
     bool SpellSentence(::svx::SpellPortions& rToFill, bool bIsGrammarCheck );
+    // make SpellIter start with the current sentence when called next time
+    void PutSpellingToSentenceStart();
     //applies a changed sentence
     void ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bIsGrammarCheck);
 
@@ -748,12 +750,13 @@ public:
             GetCorrection( const Point* pPt, SwRect& rSelectRect );
 
 
-    bool GetGrammarCorrection( ::com::sun::star::linguistic2::GrammarCheckingResult /*out*/ &rResult,
+    bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult,
             sal_Int32 /*out*/ &rErrorPosInText,
             sal_Int32 /*out*/ &rErrorIndexInResult,
             ::com::sun::star::uno::Sequence< rtl::OUString > /*out*/ &rSuggestions,
             const Point* pPt, SwRect& rSelectRect );
 
+    void IgnoreGrammarErrorAt( SwPaM& rErrorPosition );
     void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnde );
 
     // returne zum Namen die im Doc gesetzte Referenz
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index a60ea9893d89..f709c95038f0 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -431,6 +431,7 @@
 #define HID_MD_COPY_TO_CLIPBOARD    (HID_BASE + 673)
 #define HID_MD_GLOS_IMPORT          (HID_BASE + 674)
 #define HID_SMARTTAG_MAIN           (HID_BASE + 675)    // SMARTTAGS
+#define HID_LINGU_IGNORE_SELECTION  (HID_BASE + 676)    // grammar check context menu
 
 // Weiter Help-IDs **********************************************************
 
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 259e9f3a9e24..7b1b90cce3b2 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -302,7 +302,7 @@
 #define WID_PAGE_COUNT                          1100
 #define WID_LINE_COUNT                          1101
 #define WID_IS_CONSTANT_SPELLCHECK              1102
-#define WID_IS_HIDE_SPELL_MARKS                 1103
+#define WID_IS_HIDE_SPELL_MARKS                 1103    /* deprecated #i91949 */
 
 #define WID_LAYOUT_SIZE                         1104
 #define WID_DOC_DIALOG_LIBRARIES                1105
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 80f277baef91..b49ccfaa0952 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -750,7 +750,7 @@ enum SwPropNameIds
 /* 0696 */  UNO_NAME_PAGE_COUNT,
 /* 0697 */  UNO_NAME_LINE_COUNT,
 /* 0698 */  UNO_NAME_IS_CONSTANT_SPELLCHECK,
-/* 0699 */  UNO_NAME_IS_HIDE_SPELL_MARKS,
+/* 0699 */  UNO_NAME_IS_HIDE_SPELL_MARKS,       // deprecated #i91949
 // <--
 /* 0700 */  UNO_NAME_IS_FIELD_USED,
 /* 0701 */  UNO_NAME_IS_FIELD_DISPLAYED,
diff --git a/sw/inc/unotextmarkup.hxx b/sw/inc/unotextmarkup.hxx
index 3dba9316a692..84d22e1b7a72 100644
--- a/sw/inc/unotextmarkup.hxx
+++ b/sw/inc/unotextmarkup.hxx
@@ -32,7 +32,9 @@
 #define _UNOTEXTMARKUP_HXX
 
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/text/XTextMarkup.hpp>
+#include <com/sun/star/text/XMultiTextMarkup.hpp>
 #include <calbck.hxx>
 #include <modeltoviewhelper.hxx>
 
@@ -49,18 +51,24 @@ class SfxPoolItem;
 /** Implementation of the css::text::XTextMarkup interface
  */
 class SwXTextMarkup:
-    public ::cppu::WeakImplHelper1<
-        ::com::sun::star::text::XTextMarkup >,
+    public ::cppu::WeakImplHelper2
+    <
+        ::com::sun::star::text::XTextMarkup,
+        ::com::sun::star::text::XMultiTextMarkup
+    >,
     public SwClient
 {
 public:
     SwXTextMarkup( SwTxtNode& rTxtNode, const ModelToViewHelper::ConversionMap* pConversionMap );
     virtual ~SwXTextMarkup();
 
-    // ::com::sun::star::smarttags::XTextMarkup:
+    // ::com::sun::star::text::XTextMarkup:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException);
 
+    // ::com::sun::star::text::XMultiTextMarkup:
+    virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
     //SwClient
     virtual void        Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index be1488c36cd8..d650d90cf08e 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -71,7 +71,7 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_1_SYNCHRONIZE   0x01000000L
 #define VIEWOPT_1_GRIDVISIBLE   0x02000000L
 #define VIEWOPT_1_ONLINESPELL   0x04000000L
-#define VIEWOPT_1_HIDESPELL     0x08000000L
+//#define VIEWOPT_1_HIDESPELL     0x08000000L   /* removed #i91949 */
 #define VIEWOPT_1_RESERVED1     0x10000000L
 #define VIEWOPT_1_VIEWMETACHARS 0x20000000L
 #define VIEWOPT_1_PAGEBACK      0x40000000L
@@ -333,11 +333,6 @@ public:
     inline void SetOnlineSpell( BOOL b )
         { (b != 0) ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); }
 
-    inline BOOL IsHideSpell() const
-        { return nCoreOptions & VIEWOPT_1_HIDESPELL ? TRUE : FALSE; }
-    inline void SetHideSpell( BOOL b )
-        { (b != 0) ? (nCoreOptions |= VIEWOPT_1_HIDESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_HIDESPELL); }
-
     inline BOOL IsViewMetaChars() const
         { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? TRUE : FALSE; }
     inline void SetViewMetaChars( BOOL b)