Modified: openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx Wed Nov 20 00:49:46 2013 @@ -19,8 +19,6 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" @@ -35,32 +33,42 @@ using namespace com::sun::star; namespace drawinglayer { - namespace primitive2d - { - ModifiedColorPrimitive2D::ModifiedColorPrimitive2D( - const Primitive2DSequence& rChildren, - const basegfx::BColorModifier& rColorModifier) - : GroupPrimitive2D(rChildren), - maColorModifier(rColorModifier) - { - } - - bool ModifiedColorPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const - { - if(GroupPrimitive2D::operator==(rPrimitive)) - { - const ModifiedColorPrimitive2D& rCompare = (ModifiedColorPrimitive2D&)rPrimitive; - - return (getColorModifier() == rCompare.getColorModifier()); - } + namespace primitive2d + { + ModifiedColorPrimitive2D::ModifiedColorPrimitive2D( + const Primitive2DSequence& rChildren, + const basegfx::BColorModifierSharedPtr& rColorModifier) + : GroupPrimitive2D(rChildren), + maColorModifier(rColorModifier) + { + } + + bool ModifiedColorPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const + { + if(GroupPrimitive2D::operator==(rPrimitive)) + { + const ModifiedColorPrimitive2D& rCompare = (ModifiedColorPrimitive2D&)rPrimitive; + + if(getColorModifier().get() == rCompare.getColorModifier().get()) + { + return true; + } + + if(!getColorModifier().get() || !rCompare.getColorModifier().get()) + { + return false; + } + + return *getColorModifier().get() == *rCompare.getColorModifier().get(); + } - return false; - } + return false; + } - // provide unique ID - ImplPrimitrive2DIDBlock(ModifiedColorPrimitive2D, PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D) + // provide unique ID + ImplPrimitrive2DIDBlock(ModifiedColorPrimitive2D, PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D) - } // end of namespace primitive2d + } // end of namespace primitive2d } // end of namespace drawinglayer //////////////////////////////////////////////////////////////////////////////
Modified: openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/shadowprimitive2d.cxx Wed Nov 20 00:49:46 2013 @@ -77,17 +77,22 @@ namespace drawinglayer { Primitive2DSequence aRetval; - if(getChildren().hasElements()) - { - // create a modifiedColorPrimitive containing the shadow color and the content - const basegfx::BColorModifier aBColorModifier(getShadowColor()); - const Primitive2DReference xRefA(new ModifiedColorPrimitive2D(getChildren(), aBColorModifier)); - const Primitive2DSequence aSequenceB(&xRefA, 1L); - - // build transformed primitiveVector with shadow offset and add to target - const Primitive2DReference xRefB(new TransformPrimitive2D(getShadowTransform(), aSequenceB)); - aRetval = Primitive2DSequence(&xRefB, 1L); - } + if(getChildren().hasElements()) + { + // create a modifiedColorPrimitive containing the shadow color and the content + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_replace( + getShadowColor())); + const Primitive2DReference xRefA( + new ModifiedColorPrimitive2D( + getChildren(), + aBColorModifier)); + const Primitive2DSequence aSequenceB(&xRefA, 1L); + + // build transformed primitiveVector with shadow offset and add to target + const Primitive2DReference xRefB(new TransformPrimitive2D(getShadowTransform(), aSequenceB)); + aRetval = Primitive2DSequence(&xRefB, 1L); + } return aRetval; } Modified: openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx Wed Nov 20 00:49:46 2013 @@ -88,29 +88,53 @@ namespace drawinglayer aTransform *= aForwardTransform; - if(bDefaultTextColor) - { - // emboss/engrave in black, original forced to white - const basegfx::BColorModifier aBColorModifierToGray(basegfx::BColor(0.0)); - const Primitive2DReference xModifiedColor(new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToGray)); - aRetval[0] = Primitive2DReference(new TransformPrimitive2D(aTransform, Primitive2DSequence(&xModifiedColor, 1))); - - // add original, too - const basegfx::BColorModifier aBColorModifierToWhite(basegfx::BColor(1.0)); - aRetval[1] = Primitive2DReference(new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToWhite)); - } - else - { - // emboss/engrave in gray, keep original's color - const basegfx::BColorModifier aBColorModifierToGray(basegfx::BColor(0.75)); // 192 - const Primitive2DReference xModifiedColor(new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToGray)); - aRetval[0] = Primitive2DReference(new TransformPrimitive2D(aTransform, Primitive2DSequence(&xModifiedColor, 1))); - - // add original, too - aRetval[1] = Primitive2DReference(new GroupPrimitive2D(getTextContent())); - } - - break; + if(bDefaultTextColor) + { + // emboss/engrave in black, original forced to white + const basegfx::BColorModifierSharedPtr aBColorModifierToGray( + new basegfx::BColorModifier_replace( + basegfx::BColor(0.0))); + const Primitive2DReference xModifiedColor( + new ModifiedColorPrimitive2D( + getTextContent(), + aBColorModifierToGray)); + + aRetval[0] = Primitive2DReference( + new TransformPrimitive2D( + aTransform, + Primitive2DSequence(&xModifiedColor, 1))); + + // add original, too + const basegfx::BColorModifierSharedPtr aBColorModifierToWhite( + new basegfx::BColorModifier_replace( + basegfx::BColor(1.0))); + + aRetval[1] = Primitive2DReference( + new ModifiedColorPrimitive2D( + getTextContent(), + aBColorModifierToWhite)); + } + else + { + // emboss/engrave in gray, keep original's color + const basegfx::BColorModifierSharedPtr aBColorModifierToGray( + new basegfx::BColorModifier_replace( + basegfx::BColor(0.75))); // 192 + const Primitive2DReference xModifiedColor( + new ModifiedColorPrimitive2D( + getTextContent(), + aBColorModifierToGray)); + + aRetval[0] = Primitive2DReference( + new TransformPrimitive2D( + aTransform, + Primitive2DSequence(&xModifiedColor, 1))); + + // add original, too + aRetval[1] = Primitive2DReference(new GroupPrimitive2D(getTextContent())); + } + + break; } case TEXTEFFECTSTYLE2D_OUTLINE: { @@ -150,9 +174,14 @@ namespace drawinglayer aTransform.set(1, 2, -aDiagonalDistance.getY()); aRetval[7] = Primitive2DReference(new TransformPrimitive2D(aTransform, getTextContent())); - // at last, place original over it, but force to white - const basegfx::BColorModifier aBColorModifierToWhite(basegfx::BColor(1.0, 1.0, 1.0)); - aRetval[8] = Primitive2DReference(new ModifiedColorPrimitive2D(getTextContent(), aBColorModifierToWhite)); + // at last, place original over it, but force to white + const basegfx::BColorModifierSharedPtr aBColorModifierToWhite( + new basegfx::BColorModifier_replace( + basegfx::BColor(1.0, 1.0, 1.0))); + aRetval[8] = Primitive2DReference( + new ModifiedColorPrimitive2D( + getTextContent(), + aBColorModifierToWhite)); break; } Modified: openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx Wed Nov 20 00:49:46 2013 @@ -19,8 +19,6 @@ * *************************************************************/ - - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" @@ -35,32 +33,42 @@ using namespace com::sun::star; namespace drawinglayer { - namespace primitive3d - { - ModifiedColorPrimitive3D::ModifiedColorPrimitive3D( - const Primitive3DSequence& rChildren, - const basegfx::BColorModifier& rColorModifier) - : GroupPrimitive3D(rChildren), - maColorModifier(rColorModifier) - { - } - - bool ModifiedColorPrimitive3D::operator==(const BasePrimitive3D& rPrimitive) const - { - if(GroupPrimitive3D::operator==(rPrimitive)) - { - const ModifiedColorPrimitive3D& rCompare = (ModifiedColorPrimitive3D&)rPrimitive; - - return (maColorModifier == rCompare.maColorModifier); - } + namespace primitive3d + { + ModifiedColorPrimitive3D::ModifiedColorPrimitive3D( + const Primitive3DSequence& rChildren, + const basegfx::BColorModifierSharedPtr& rColorModifier) + : GroupPrimitive3D(rChildren), + maColorModifier(rColorModifier) + { + } + + bool ModifiedColorPrimitive3D::operator==(const BasePrimitive3D& rPrimitive) const + { + if(GroupPrimitive3D::operator==(rPrimitive)) + { + const ModifiedColorPrimitive3D& rCompare = (ModifiedColorPrimitive3D&)rPrimitive; + + if(getColorModifier().get() == rCompare.getColorModifier().get()) + { + return true; + } + + if(!getColorModifier().get() || !rCompare.getColorModifier().get()) + { + return false; + } + + return *getColorModifier().get() == *rCompare.getColorModifier().get(); + } - return false; - } + return false; + } - // provide unique ID - ImplPrimitrive3DIDBlock(ModifiedColorPrimitive3D, PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D) + // provide unique ID + ImplPrimitrive3DIDBlock(ModifiedColorPrimitive3D, PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D) - } // end of namespace primitive3d + } // end of namespace primitive3d } // end of namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// Modified: openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx Wed Nov 20 00:49:46 2013 @@ -251,14 +251,19 @@ namespace drawinglayer const Primitive3DReference xRef(pNewTexturePrimitive3D); aRetval = Primitive3DSequence(&xRef, 1L); - if(::com::sun::star::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) - { - // use modified color primitive to force textures to gray - const basegfx::BColorModifier aBColorModifier(basegfx::BColor(), 0.0, basegfx::BCOLORMODIFYMODE_GRAY); - const Primitive3DReference xRef2(new ModifiedColorPrimitive3D(aRetval, aBColorModifier)); - aRetval = Primitive3DSequence(&xRef2, 1L); - } - } + if(::com::sun::star::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) + { + // use modified color primitive to force textures to gray + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_gray()); + const Primitive3DReference xRef2( + new ModifiedColorPrimitive3D( + aRetval, + aBColorModifier)); + + aRetval = Primitive3DSequence(&xRef2, 1L); + } + } if(0.0 != rFill.getTransparence()) { Modified: openoffice/branches/capstone2013/main/drawinglayer/source/processor2d/vclprocessor2d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Wed Nov 20 00:49:46 2013 @@ -662,7 +662,7 @@ namespace drawinglayer { case GRAPHIC_GDIMETAFILE: { - // metafiles are potentially transparent, cannot optimize´, not done + // metafiles are potentially transparent, cannot optimize, not done break; } case GRAPHIC_BITMAP: @@ -674,9 +674,10 @@ namespace drawinglayer if(nBColorModifierStackCount) { - const basegfx::BColorModifier& rTopmostModifier = maBColorModifierStack.getBColorModifier(nBColorModifierStackCount - 1); + const basegfx::BColorModifierSharedPtr& rTopmostModifier = maBColorModifierStack.getBColorModifier(nBColorModifierStackCount - 1); + const basegfx::BColorModifier_replace* pReplacer = dynamic_cast< const basegfx::BColorModifier_replace* >(rTopmostModifier.get()); - if(basegfx::BCOLORMODIFYMODE_REPLACE == rTopmostModifier.getMode()) + if(pReplacer) { // the bitmap fill is in unified color, so we can replace it with // a single polygon fill. The form of the fill depends on tiling @@ -687,7 +688,7 @@ namespace drawinglayer aLocalPolyPolygon.transform(maCurrentTransformation); mpOutputDevice->SetLineColor(); - mpOutputDevice->SetFillColor(Color(rTopmostModifier.getBColor())); + mpOutputDevice->SetFillColor(Color(pReplacer->getBColor())); mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon); } else @@ -719,7 +720,7 @@ namespace drawinglayer { aTarget.transform(maCurrentTransformation); mpOutputDevice->SetLineColor(); - mpOutputDevice->SetFillColor(Color(rTopmostModifier.getBColor())); + mpOutputDevice->SetFillColor(Color(pReplacer->getBColor())); mpOutputDevice->DrawPolyPolygon(aTarget); } } Modified: openoffice/branches/capstone2013/main/drawinglayer/source/tools/converters.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/source/tools/converters.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/source/tools/converters.cxx (original) +++ openoffice/branches/capstone2013/main/drawinglayer/source/tools/converters.cxx Wed Nov 20 00:49:46 2013 @@ -120,14 +120,12 @@ namespace drawinglayer maContent.Erase(); // embed primitives to paint them black - static basegfx::BColorModifyMode aMode = basegfx::BCOLORMODIFYMODE_REPLACE; const primitive2d::Primitive2DReference xRef( new primitive2d::ModifiedColorPrimitive2D( aSequence, - basegfx::BColorModifier( - basegfx::BColor(0.0, 0.0, 0.0), - 0.5, - aMode))); + basegfx::BColorModifierSharedPtr( + new basegfx::BColorModifier_replace( + basegfx::BColor(0.0, 0.0, 0.0))))); const primitive2d::Primitive2DSequence xSeq(&xRef, 1); // render Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx Wed Nov 20 00:49:46 2013 @@ -373,6 +373,13 @@ 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)); +//IAccessibility2 Implementation 2009----- + 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 ); + String GetFieldTypeNameAtIndex(sal_Int32 nIndex); +//-----IAccessibility2 Implementation 2009 // the paragraph index in the edit engine (guarded by solar mutex) sal_Int32 mnParagraphIndex; @@ -400,6 +407,14 @@ namespace accessibility /// Our listeners (guarded by maMutex) int mnNotifierClientId; + //IAccessibility2 Implementation 2009----- +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; + //virtual sal_Bool IsShapeParaFocusable( ); + //-----IAccessibility2 Implementation 2009 // --> OD 2006-01-11 #i27138# // the paragraph manager, which created this instance - is NULL, if Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/editdata.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/editdata.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/editdata.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/editdata.hxx Wed Nov 20 00:49:46 2013 @@ -363,7 +363,10 @@ 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, +//IAccessibility2 Implementation 2009----- + EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA +//-----IAccessibility2 Implementation 2009 }; struct EENotify Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/editeng.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/editeng.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/editeng.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/editeng.hxx Wed Nov 20 00:49:46 2013 @@ -108,6 +108,9 @@ const sal_uInt8 EditEngineAttribs_OnlyHa #define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04 #define GETATTRIBS_ALL (sal_uInt8)0xFF +//IAccessibility2 Implementation 2009----- +class SdrObject; +//-----IAccessibility2 Implementation 2009 class EDITENG_DLLPUBLIC EditEngine { friend class EditView; @@ -145,6 +148,9 @@ public: void SetUpdateMode( sal_Bool bUpdate ); sal_Bool GetUpdateMode() const; + //IAccessible2 migration fix + void SetUpdateModeForAcc( sal_Bool bUp); + sal_Bool GetUpdateModeForAcc( ) const; void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; @@ -469,7 +475,9 @@ public: static void ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace ); 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 ); - + //IAccessibility2 Implementation 2009----- + virtual SdrObject* GetCurTextObj() { return NULL; } + //-----IAccessibility2 Implementation 2009 /** 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; Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/editrids.hrc URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/editrids.hrc?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/editrids.hrc (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/editrids.hrc Wed Nov 20 00:49:46 2013 @@ -373,8 +373,10 @@ #define RID_STR_WORD (RID_EDIT_START + 313) #define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) #define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) +#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION (RID_EDIT_START + 316) +#define RID_SVXSTR_A11Y_PARAGRAPH_NAME (RID_EDIT_START + 317) -#if 315 > (RID_EDIT_END-RID_EDIT_START) +#if 317 > (RID_EDIT_END-RID_EDIT_START) #error Resource-Ueberlauf in #line, #file #endif Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/editview.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/editview.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/editview.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/editview.hxx Wed Nov 20 00:49:46 2013 @@ -219,6 +219,10 @@ public: sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); + //IAccessibility2 Implementation 2009----- + sal_Bool IsShapeParaFocusable( ) ; + sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,sal_Int32 nIndex); + //-----IAccessibility2 Implementation 2009 void SpellIgnoreWord(); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/splwrap.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/splwrap.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/splwrap.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/splwrap.hxx Wed Nov 20 00:49:46 2013 @@ -39,7 +39,8 @@ namespace com { namespace sun { namespac }}}} class Window; - +//IAccessibility2 Impplementaton 2009----- +class SdrObject; // misc functions --------------------------------------------------------------- void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText ); @@ -61,6 +62,8 @@ private: ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; +//IAccessibility2 Impplementaton 2009----- + SdrObject* mpTextObj; sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen sal_Bool bDialog : 1; // Ist pWin der Svx...Dialog? @@ -151,6 +154,10 @@ protected: virtual void AutoCorrect( const String& rAktStr, const String& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen +//IAccessibility2 Impplementaton 2009----- + void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; } + SdrObject* GetCurTextObj() { return mpTextObj; } +//-----IAccessibility2 Impplementaton 2009 }; #endif Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedhlp.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedhlp.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedhlp.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedhlp.hxx Wed Nov 20 00:49:46 2013 @@ -60,7 +60,17 @@ public: void SetStartValue( sal_uLong n ); void SetEndValue( sal_uLong n ); }; - +//IAccessibility2 Implementation 2009----- +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; } +}; +//-----IAccessibility2 Implementation 2009 /** Helper class for common functionality in edit sources */ class EDITENG_DLLPUBLIC SvxEditSourceHelper @@ -97,7 +107,10 @@ 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_uInt16 nPara, sal_uInt16 nIndex ); + //IAccessibility2 Implementation 2009----- + //static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex ); + static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False ); + //-----IAccessibility2 Implementation 2009 /** Convert point from edit engine to user coordinate space Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedprx.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedprx.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedprx.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedprx.hxx Wed Nov 20 00:49:46 2013 @@ -74,9 +74,12 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; - virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; + //IAccessibility2 Implementation 2009----- + virtual void SetUpdateModeForAcc( sal_Bool bUp); + virtual sal_Bool GetUpdateModeForAcc() const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; + virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; virtual sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const; Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedsrc.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedsrc.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedsrc.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unoedsrc.hxx Wed Nov 20 00:49:46 2013 @@ -219,7 +219,12 @@ public: Index of paragraph to query bullet info on */ virtual EBulletInfo GetBulletInfo( sal_uInt16 nPara ) const = 0; - +//IAccessibility2 Implementation 2009----- + virtual String GetNumStr(sal_uInt16) const { return XubString();}; + //IAccessible2 migration fix + virtual void SetUpdateModeForAcc( sal_Bool ) {}; + virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; }; +//-----IAccessibility2 Implementation 2009 /** Query the bounding rectangle of the given character @param nPara[0 .. n] @@ -331,7 +336,10 @@ public: @return sal_True, if the range has been successfully determined */ - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0; + //-----IAccessibility2 Implementation 2009 /** Query number of lines in the formatted paragraph @@ -542,6 +550,11 @@ public: */ virtual sal_Bool Paste() = 0; +//IAccessibility2 Implementation 2009----- + 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; }; +//-----IAccessibility2 Implementation 2009 }; #endif Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unofored.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unofored.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unofored.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unofored.hxx Wed Nov 20 00:49:46 2013 @@ -72,7 +72,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unoforou.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unoforou.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unoforou.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unoforou.hxx Wed Nov 20 00:49:46 2013 @@ -93,7 +93,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const; Modified: openoffice/branches/capstone2013/main/editeng/inc/editeng/unotext.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/inc/editeng/unotext.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/inc/editeng/unotext.hxx (original) +++ openoffice/branches/capstone2013/main/editeng/inc/editeng/unotext.hxx Wed Nov 20 00:49:46 2013 @@ -218,7 +218,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
