Integrate branch of IAccessible2

WaE: Reorder initializations to prevent compiler warnings.

(cherry picked from commit c05431aa92fa2c7c7258418a6ecd651b5c26d982)

WaE: unname unused variable to prevent compiler warnings.

(cherry picked from commit 2259256a390c4b6f83cfb5dbe4a65df5032aee47)

Conflicts:
editeng/source/accessibility/AccessibleEditableTextPara.cxx

ad61537527a74670af266feb9e4d26d2d654daf7
66044902b8d94fc15d4c30270e6cc419fb7d3565

Change-Id: I3ec9798f2c7d854824722c0cf44b62128b4f4cb4

13 files changed, 108 insertions, 20 deletions

diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index df6458bedfca..d6f7d6fbcb2c 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -343,6 +343,11 @@ namespace accessibility
         /// Check whether 0<=nStart<=n and 0<=nEnd<=n
         void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException));
 
+        void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
+        sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward);
+        // get overlapped field, extend return string. Only extend forward for now
+        sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment );
+        OUString GetFieldTypeNameAtIndex(sal_Int32 nIndex);
         // the paragraph index in the edit engine (guarded by solar mutex)
         sal_Int32   mnParagraphIndex;
 
@@ -370,6 +375,11 @@ namespace accessibility
 
         /// Our listeners (guarded by maMutex)
         int mnNotifierClientId;
+public:
+        void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref)
+        { m_xAccInfo = ref ;}
+private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo;
 
         // Text paragraphs should provide FLOWS_TO and FLOWS_FROM relations (#i27138#)
         // the paragraph manager, which created this instance - is NULL, if
diff --git a/include/editeng/AccessibleSvxFindReplaceDialog.hxx b/include/editeng/AccessibleSvxFindReplaceDialog.hxx
new file mode 100644
index 000000000000..0c2688f7f52e
--- /dev/null
+++ b/include/editeng/AccessibleSvxFindReplaceDialog.hxx
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <toolkit/awt/vclxwindows.hxx>
+
+class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent
+{
+public:
+    VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow);
+    virtual ~VCLXAccessibleSvxFindReplaceDialog();
+    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+
+class VCLXSvxFindReplaceDialog : public VCLXDialog
+{
+public:
+    VCLXSvxFindReplaceDialog(Window* pSplDlg)
+    {
+        SetWindow(pSplDlg);
+    }
+    virtual ~VCLXSvxFindReplaceDialog()
+    {};
+private:
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleContext >  CreateAccessibleContext()
+    {
+        return new VCLXAccessibleSvxFindReplaceDialog(this);
+    }
+};
+#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 0fc666c1f05e..6c2158b2f4ec 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -350,7 +350,8 @@ enum EENotifyType
     EE_NOTIFY_INPUT_START,
 
     /// Denotes the end of a high-level action triggered by a key press
-    EE_NOTIFY_INPUT_END
+    EE_NOTIFY_INPUT_END,
+    EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA
 };
 
 struct EENotify
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index ab04d9e344c8..77b9d532310e 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -120,6 +120,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHard = 2;     /// returns only attributes
 #define GETATTRIBS_CHARATTRIBS  (sal_uInt8)0x04
 #define GETATTRIBS_ALL          (sal_uInt8)0xFF
 
+class SdrObject;
 class EDITENG_DLLPUBLIC EditEngine
 {
     friend class EditView;
@@ -196,6 +197,8 @@ public:
 
     void            SetUpdateMode( sal_Bool bUpdate );
     sal_Bool            GetUpdateMode() const;
+    void                    SetUpdateModeForAcc( sal_Bool bUp);
+    sal_Bool                GetUpdateModeForAcc( ) const;
 
     void            SetBackgroundColor( const Color& rColor );
     Color           GetBackgroundColor() const;
@@ -500,7 +503,7 @@ public:
     static SvxFont  CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
     static sal_Bool     IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
     static sal_Bool     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
-
+    virtual SdrObject* GetCurTextObj() { return NULL; }
     /** sets a link that is called at the beginning of a drag operation at an edit view */
     void            SetBeginDropHdl( const Link& rLink );
     Link            GetBeginDropHdl() const;
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index 04ec3b6eccc7..89212c2d2fd4 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -382,14 +382,13 @@
 #define RID_SVXITEMS_JUSTMETHOD_AUTO            (RID_EDIT_START + 326)
 #define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE      (RID_EDIT_START + 327)
 
-#if 327 > (RID_EDIT_END-RID_EDIT_START)
+#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION   (RID_EDIT_START + 328)
+#define RID_SVXSTR_A11Y_PARAGRAPH_NAME          (RID_EDIT_START + 329)
+
+#if 329 > (RID_EDIT_END-RID_EDIT_START)
 #error Resource-Ueberlauf in #line, #file
 #endif
 
-
-
 #endif
 
-// ******************************************************************* EOF
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 988857c72e9f..71339dea89c9 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -199,8 +199,10 @@ public:
 
     void            TransliterateText( sal_Int32 nTransliterationMode );
 
-    sal_Bool            IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
-    sal_Bool            IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool        IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool        IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool        IsShapeParaFocusable();
+    sal_Bool        WrongSpelledBreakPara(sal_Int32 nPara, sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex);
     void            ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 
     void                InsertField( const SvxFieldItem& rFld );
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 29e42ef1a0bb..754c4d0187a2 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 {
 }}}}
 
 class Window;
-
+class SdrObject;
 // misc functions ---------------------------------------------------------------
 
 void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( OUString &rOldText, const OUString &rNewText );
@@ -55,6 +55,7 @@ private:
         ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XHyphenator >    xHyph;
+    SdrObject*  mpTextObj;
     sal_uInt16  nOldLang;        // Set Language, only call SetLanguage on changes
     sal_Bool    bOtherCntnt : 1; // set => Check special sections initially
     sal_Bool    bDialog     : 1; // Is pWin the Svx...Dialog?
@@ -144,6 +145,8 @@ protected:
     virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr );
     virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen
 
+    void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; }
+    SdrObject* GetCurTextObj() { return mpTextObj; }
 };
 
 #endif
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 699ce727a55f..8f70e2fc11a6 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -53,7 +53,15 @@ public:
     sal_Int32   GetStartValue() const;
     sal_Int32   GetEndValue() const;
 };
-
+class SvxEditSourceHintEndPara :public SvxEditSourceHint
+{
+public:
+    TYPEINFO();
+    SvxEditSourceHintEndPara( sal_uInt32 nId )
+        :SvxEditSourceHint(nId) {}
+    SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
+        :SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
+};
 /** Helper class for common functionality in edit sources
  */
 class EDITENG_DLLPUBLIC SvxEditSourceHelper
@@ -92,7 +100,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex );
+     static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False);
 
     /** Convert point from edit engine to user coordinate space
 
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index fc4a7e59f48d..dde5c06afd20 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -69,11 +69,13 @@ public:
     virtual OutputDevice*   GetRefDevice() const;
     virtual sal_Bool        GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool        GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const;
-    virtual sal_uInt16          GetLineCount( sal_Int32 nPara ) const;
-    virtual sal_uInt16          GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
+    virtual sal_uInt16      GetLineCount( sal_Int32 nPara ) const;
+    virtual sal_uInt16      GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const;
+    virtual void            SetUpdateModeForAcc( sal_Bool bUp);
+    virtual sal_Bool        GetUpdateModeForAcc() const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;
-    virtual sal_uInt16          GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16      GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
 
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool        InsertText( const OUString&, const ESelection& );
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 6a43a778b468..d99f532eec4e 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -210,6 +210,10 @@ public:
      */
     virtual EBulletInfo     GetBulletInfo( sal_Int32 nPara ) const = 0;
 
+    virtual OUString        GetNumStr(sal_uInt16) const { return OUString(); }
+    virtual void            SetUpdateModeForAcc(sal_Bool) {}
+    virtual sal_Bool        GetUpdateModeForAcc() const { return sal_True; }
+
     /** Query the bounding rectangle of the given character
 
         @param nPara[0 .. n]
@@ -321,7 +325,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const = 0;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0;
 
     /** Query number of lines in the formatted paragraph
 
@@ -532,6 +536,9 @@ public:
      */
     virtual sal_Bool Paste() = 0;
 
+    virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
+    virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
+    virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; };
 };
 
 #endif
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 1179c1b41e47..69f5f3f69db5 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -68,7 +68,7 @@ public:
     virtual OutputDevice*   GetRefDevice() const;
     virtual sal_Bool        GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool        GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16          GetLineCount( sal_Int32 nPara ) const;
     virtual sal_uInt16          GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 0568ea30dd95..b882be93a6e7 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -89,7 +89,7 @@ public:
     virtual OutputDevice*   GetRefDevice() const;
     virtual sal_Bool        GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool        GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16          GetLineCount( sal_Int32 nPara ) const;
     virtual sal_uInt16          GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nPara, sal_uInt16 nLine ) const;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index a508981bcf53..f776f921bf8f 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -215,7 +215,7 @@ public:
     virtual OutputDevice*   GetRefDevice() const;
     virtual sal_Bool        GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool        GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_Bool        GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
     virtual sal_uInt16      GetLineCount( sal_Int32 nPara ) const;
     virtual sal_uInt16      GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;