CWS-TOOLING: integrate CWS tl64_DEV300

sw/source/core/doc/docnew.cxx

@@ -186,7 +186,7 @@ void StartGrammarChecking( SwDoc &rDoc, SwRootFrm &rRootFrame )
         // start automatic background checking
         if ( xFPIP.is() && !xGCIterator->isProofreading( xDoc ) )
         {
-            rRootFrame.SetNeedGrammarCheck( false );
+            // rRootFrame.SetNeedGrammarCheck( false );
             rRootFrame.SetGrammarCheckActive( true );
             xGCIterator->startProofreading( xDoc, xFPIP );
         }

sw/source/core/unocore/unoflatpara.cxx

@@ -53,6 +53,7 @@
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
 #include <IGrammarContact.hxx>
+#include <viewopt.hxx>
 
 using namespace ::com::sun::star;
 
@@ -327,6 +328,11 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
         {
             if (mnType != text::TextMarkupType::SPELLCHECK || pCurrentPage->IsInvalidSpelling() )
             {
+                // this method is supposed to return an empty paragraph in case Online Checking is disabled
+                if ( ( mnType == text::TextMarkupType::PROOFREADING || mnType == text::TextMarkupType::SPELLCHECK )
+                    && !pViewShell->GetViewOptions()->IsOnlineSpell() )
+                    return xRet;
+
                 // search for invalid content:
                 SwCntntFrm* pCnt = pCurrentPage->ContainsCntnt();
 

sw/source/ui/lingu/olmenu.cxx

@@ -462,7 +462,6 @@ bGrammarResults(false)
 
     OUString aIgnoreSelection( String( SW_RES( STR_IGNORE_SELECTION ) ) );
     OUString aSpellingAndGrammar = RetrieveLabelFromCommand( C2U(".uno:SpellingAndGrammarDialog") );
-    const lang::Locale aUILocale( Application::GetSettings().GetUILocale() );
     SetItemText( MN_SPELLING, aSpellingAndGrammar );
     USHORT nItemPos = GetItemPos( MN_IGNORE );
     InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos );
@@ -648,7 +647,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
 
     OUString aIgnoreSelection( String( SW_RES( STR_IGNORE_SELECTION ) ) );
     OUString aSpellingAndGrammar = RetrieveLabelFromCommand( C2U(".uno:SpellingAndGrammarDialog") );
-    const lang::Locale aUILocale( Application::GetSettings().GetUILocale() );
     SetItemText( MN_SPELLING, aSpellingAndGrammar );
     USHORT nItemPos = GetItemPos( MN_IGNORE );
     InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos );