summaryrefslogtreecommitdiffstats
path: root/include/editeng/editeng.hxx
diff options
context:
space:
mode:
authorSteve Yin <steve_y@apache.org>2013-11-26 14:25:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-26 15:27:17 +0000
commitc23ab5eaed57cc3fb5860e26c591c73c5b22687b (patch)
tree7a918b328e80763fa334f59c789cff399f207541 /include/editeng/editeng.hxx
parent-Werror,-Wunused-private-field (diff)
downloadcore-c23ab5eaed57cc3fb5860e26c591c73c5b22687b.tar.gz
core-c23ab5eaed57cc3fb5860e26c591c73c5b22687b.zip
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
Diffstat (limited to 'include/editeng/editeng.hxx')
-rw-r--r--include/editeng/editeng.hxx5
1 files changed, 4 insertions, 1 deletions
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;