You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [21/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/...
Modified: openoffice/branches/ooxml-osba/main/svtools/source/misc/embedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/misc/embedhlp.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/misc/embedhlp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/misc/embedhlp.cxx Wed Dec 18 13:27:09 2013
@@ -34,14 +34,12 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XCoordinateSystem.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XChartType.hpp>
-//-----IAccessibility2 Implementation 2009
#include <tools/globname.hxx>
#include <sot/clsids.hxx>
#include <com/sun/star/util/XModifyListener.hpp>
@@ -944,7 +942,6 @@ sal_Bool EmbeddedObjectRef::IsChart() co
return sal_False;
}
-//IAccessibility2 Implementation 2009-----
// MT: Only used for getting accessible attributes, which are not localized
rtl::OUString EmbeddedObjectRef::GetChartType()
{
@@ -1038,7 +1035,6 @@ rtl::OUString EmbeddedObjectRef::GetChar
}
return Style;
}
-//-----IAccessibility2 Implementation 2009
// #i104867#
sal_uInt32 EmbeddedObjectRef::getGraphicVersion() const
Modified: openoffice/branches/ooxml-osba/main/svtools/source/table/cellvalueconversion.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/table/cellvalueconversion.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/table/cellvalueconversion.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/table/cellvalueconversion.cxx Wed Dec 18 13:27:09 2013
@@ -426,7 +426,7 @@ namespace svt
::rtl::OStringBuffer message( "lcl_getValueNormalizer: unsupported type '" );
message.append( ::rtl::OUStringToOString( sTypeName, RTL_TEXTENCODING_ASCII_US ) );
message.append( "'!" );
- OSL_ENSURE( false, message.makeStringAndClear() );
+ OSL_ENSURE( false, message.getStr() );
#endif
}
io_data.aNormalizers[ sTypeName ] = o_formatter;
Modified: openoffice/branches/ooxml-osba/main/svtools/source/uno/wizard/unowizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svtools/source/uno/wizard/unowizard.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svtools/source/uno/wizard/unowizard.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svtools/source/uno/wizard/unowizard.cxx Wed Dec 18 13:27:09 2013
@@ -217,7 +217,7 @@ namespace svt { namespace uno
static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ ::rtl::OUString aTmp( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
INetURLObject aHID( aTmp );
if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
aBuffer.appendAscii( INET_HID_SCHEME );
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleControlShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleControlShape.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleControlShape.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleControlShape.hxx Wed Dec 18 13:27:09 2013
@@ -63,10 +63,8 @@ public:
const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessibleControlShape( );
- //IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL GetControlModel( ) { return m_xControlModel;} ;
AccessibleControlShape* SAL_CALL GetLabeledByControlShape();
- //-----IAccessibility2 Implementation 2009
protected:
//--- XAccessible ----------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException);
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleGraphicShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleGraphicShape.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleGraphicShape.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleGraphicShape.hxx Wed Dec 18 13:27:09 2013
@@ -91,7 +91,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
protected:
/// Create a name string that contains the accessible name.
virtual ::rtl::OUString
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleOLEShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleOLEShape.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleOLEShape.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleOLEShape.hxx Wed Dec 18 13:27:09 2013
@@ -99,10 +99,8 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL
getTypes (void)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
// ====== XAccessibleExtendedAttributes =====================================
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-//-----IAccessibility2 Implementation 2009
protected:
/// Create a name string that contains the accessible name.
virtual ::rtl::OUString
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleShape.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleShape.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleShape.hxx Wed Dec 18 13:27:09 2013
@@ -37,7 +37,6 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <svx/AccessibleTextHelper.hxx>
#include "svx/svxdllapi.h"
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESELECTION_HPP_
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#endif
@@ -59,7 +58,6 @@
#ifndef INCLUDED_COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEHYPERLINK_HPP
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
#include "ChildrenManager.hxx"
@@ -98,12 +96,10 @@ class IAccessibleParent;
class SVX_DLLPUBLIC AccessibleShape
: public AccessibleContextBase,
public AccessibleComponentBase,
- //IAccessibility2 Implementation 2009-----
public ::com::sun::star::accessibility::XAccessibleSelection,
public ::com::sun::star::accessibility::XAccessibleExtendedAttributes,
public ::com::sun::star::accessibility::XAccessibleGroupPosition,
public com::sun::star::accessibility::XAccessibleHypertext,
- //-----IAccessibility2 Implementation 2009
public IAccessibleViewForwarderListener,
public ::com::sun::star::document::XEventListener,
public ::com::sun::star::lang::XUnoTunnel
@@ -129,7 +125,6 @@ public:
AccessibleShape (
const AccessibleShapeInfo& rShapeInfo,
const AccessibleShapeTreeInfo& rShapeTreeInfo);
- //IAccessibility2 Implementation 2009-----
AccessibleShape (
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const AccessibleShapeTreeInfo& rShapeTreeInfo, sal_Int32 nIndex = -1);
//Solution: Overwrite the object's current name.
@@ -178,7 +173,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject )
throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
/** The destructor releases its children manager and text engine if
still existent. These are responsible to send appropriate events.
*/
@@ -483,14 +477,12 @@ protected:
virtual ::rtl::OUString
CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString
GetFullAccessibleName(AccessibleShape *shape)
throw (::com::sun::star::uno::RuntimeException);
virtual::rtl::OUString GetStyle();
void UpdateDocumentAllSelState(::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet);
- //-----IAccessibility2 Implementation 2009
/** Update the <const>OPAQUE</const> and <const>SELECTED</const> state.
*/
virtual void UpdateStates (void);
@@ -504,10 +496,8 @@ private:
SVX_DLLPRIVATE explicit AccessibleShape (const AccessibleShape&);
/// Don't use the assignment operator. Do we need this?
SVX_DLLPRIVATE AccessibleShape& operator= (const AccessibleShape&);
- //IAccessibility2 Implementation 2009-----
//Solution:Old accessible name
::rtl::OUString aAccName;
- //-----IAccessibility2 Implementation 2009
/** Call this method when the title, name, or description of the mxShape
member (may) have been changed.
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleTableShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleTableShape.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleTableShape.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/AccessibleTableShape.hxx Wed Dec 18 13:27:09 2013
@@ -34,11 +34,9 @@
#include <cppuhelper/implbase2.hxx>
#include <svx/AccessibleShape.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#include <cppuhelper/compbase5.hxx>
-//-----IAccessibility2 Implementation 2009
#include <boost/noncopyable.hpp>
@@ -49,10 +47,8 @@ namespace sdr { namespace table {
namespace accessibility
{
class AccessibleTableShapeImpl;
- //IAccessibility2 Implementation 2009
class AccessibleCell;
- //IAccessibility2 Implementation 2009-----
/*typedef ::cppu::ImplInheritanceHelper2< AccessibleShape,
::com::sun::star::accessibility::XAccessibleSelection,
::com::sun::star::accessibility::XAccessibleTable
@@ -61,7 +57,6 @@ namespace accessibility
::com::sun::star::accessibility::XAccessibleTable,
::com::sun::star::view::XSelectionChangeListener
> AccessibleTableShape_Base;
- //-----IAccessibility2 Implementation 2009
/** @descr
*/
class AccessibleTableShape : boost::noncopyable, public AccessibleTableShape_Base, public ::com::sun::star::accessibility::XAccessibleTableSelection
@@ -115,7 +110,6 @@ public:
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException );
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleTableSelection ============================================
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
@@ -125,7 +119,6 @@ public:
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
- //-----IAccessibility2 Implementation 2009
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
@@ -142,7 +135,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
sal_Int32 mnPreviousSelectionCount;
using AccessibleShape::disposing;
- //IAccessibility2 Implementation 2009-----
friend class AccessibleTableHeaderShape;
void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
@@ -154,7 +146,6 @@ public:
sal_Bool ResetStateDirectly (sal_Int16 aState);
// Get the currently active cell which is text editing
AccessibleCell* GetActiveAccessibleCell();
- //-----IAccessibility2 Implementation 2009
protected:
virtual ::rtl::OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException);
@@ -167,12 +158,9 @@ protected:
private:
rtl::Reference< AccessibleTableShapeImpl > mxImpl;
- //IAccessibility2 Implementation 2009-----
sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
- //-----IAccessibility2 Implementation 2009
};
-//IAccessibility2 Implementation 2009-----
typedef ::cppu::WeakImplHelper5<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleComponent,
@@ -252,7 +240,6 @@ private:
sal_Bool mbRow;
rtl::Reference< AccessibleTableShape > mpTable;
};
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/ChildrenManager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/ChildrenManager.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/ChildrenManager.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/ChildrenManager.hxx Wed Dec 18 13:27:09 2013
@@ -130,10 +130,8 @@ public:
GetChild (long nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetChild (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape (long nIndex) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
/** Update the child manager. Take care of a modified set of children
and modified visible area. This method can optimize the update
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx Wed Dec 18 13:27:09 2013
@@ -31,7 +31,6 @@ namespace EnhancedCustomShapeTypeNames
SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& );
SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT );
- //IAccessibility2 Implementation 2009
rtl::OUString GetAccName( const rtl::OUString& );
}
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/IAccessibleParent.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/IAccessibleParent.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/IAccessibleParent.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/IAccessibleParent.hxx Wed Dec 18 13:27:09 2013
@@ -27,11 +27,9 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <sal/types.h>
-//IAccessibility2 Implementation 2009-----
#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX
#include "AccessibleControlShape.hxx"
#endif
-//-----IAccessibility2 Implementation 2009
namespace accessibility {
class AccessibleShape;
@@ -88,7 +86,6 @@ public:
const long _nIndex,
const AccessibleShapeTreeInfo& _rShapeTreeInfo
) throw (::com::sun::star::uno::RuntimeException) = 0;
- //IAccessibility2 Implementation 2009-----
//Add this method to support Form Controls
virtual AccessibleControlShape* GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet*)
@@ -99,7 +96,6 @@ public:
::com::sun::star::drawing::XShape>&)
throw (::com::sun::star::uno::RuntimeException){return NULL;};
virtual sal_Bool IsDocumentSelAll(){ return sal_False; }
- //-----IAccessibility2 Implementation 2009
};
} // end of namespace accessibility
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/ctredlin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/ctredlin.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/ctredlin.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/ctredlin.hxx Wed Dec 18 13:27:09 2013
@@ -299,9 +299,7 @@ public:
void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true );
- //IAccessibility2 Implementation 2009-----
void SetAccessibleRelationMemberOf( Window* pWindow);
- //-----IAccessibility2 Implementation 2009
// } Methoden fuer Calc
};
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/dialogs.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/dialogs.hrc Wed Dec 18 13:27:09 2013
@@ -48,13 +48,11 @@
#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173)
#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311)
#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250)
-//IAccessibility2 Implementation 2009-----
#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_START + 251)
#define RID_SVXSTR_GALLERY_THEMEITEMS (RID_SVX_START + 252)
#define RID_SVXSTR_GALLERY_THEMENAME (RID_SVX_START + 253)
#define RID_SVXSTR_GALLERY_FILESFOUND (RID_SVX_START + 254)
#define RID_SVXSTR_GALLERY_PREVIEW (RID_SVX_START + 255)
-//-----IAccessibility2 Implementation 2009
// factory IDs of tabpages implemented in CUI
#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242)
@@ -951,9 +949,7 @@
#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3)
#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4)
-//IAccessibility2 Implementation 2009-----
#define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178)
-//-----IAccessibility2 Implementation 2009
#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190)
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/dlgctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/dlgctrl.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/dlgctrl.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/dlgctrl.hxx Wed Dec 18 13:27:09 2013
@@ -78,8 +78,7 @@ typedef sal_uInt16 CTL_STATE;
#define CS_NOVERT 2 // no vertikal input information is used
class SvxRectCtlAccessibleContext;
-class SvxPixelCtlAccessible; // IAccessibility2 implementation 2009
-
+class SvxPixelCtlAccessible;
class SVX_DLLPUBLIC SvxRectCtl : public Control
{
private:
@@ -215,11 +214,9 @@ protected:
Size aRectSize;
sal_uInt16* pPixel;
sal_Bool bPaintable;
- // IAccessibility2 implementation 2009. ------
//Solution:Add member identifying position
Point aFocusPosition;
Rectangle implCalFocusRect( const Point& aPosition );
- // ------ IAccessibility2 implementation 2009.
void ChangePixel( sal_uInt16 nPixel );
public:
@@ -245,7 +242,6 @@ public:
void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
void Reset();
- // IAccessibility2 implementation 2009. ------
SvxPixelCtlAccessible* m_pAccess;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -263,7 +259,6 @@ public:
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void GetFocus();
virtual void LoseFocus();
- // ------ IAccessibility2 implementation 2009.
};
/*************************************************************************
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/sdr/table/tablecontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/sdr/table/tablecontroller.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/sdr/table/tablecontroller.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/sdr/table/tablecontroller.hxx Wed Dec 18 13:27:09 2013
@@ -102,7 +102,6 @@ public:
SVX_DLLPRIVATE void onTableModified();
-//IAccessibility2 Implementation 2009-----
sal_Bool selectRow( sal_Int32 row );
sal_Bool selectColumn( sal_Int32 column );
sal_Bool deselectRow( sal_Int32 row );
@@ -114,7 +113,6 @@ public:
::sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); }
//declare event notification method
void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos );
-//-----IAccessibility2 Implementation 2009
private:
SvxTableController(SvxTableController &); // not defined
void operator =(SvxTableController &); // not defined
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/srchdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/srchdlg.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/srchdlg.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/srchdlg.hxx Wed Dec 18 13:27:09 2013
@@ -155,19 +155,15 @@ public:
PushButton& GetReplaceBtn() { return aReplaceBtn; }
sal_Int32 GetTransliterationFlags() const;
-//IAccessibility2 Impplementaton 2009-----
void SetDocWin( Window* pDocWin ) { mpDocWin = pDocWin; }
Window* GetDocWin() { return mpDocWin; }
void SetSrchFlag( sal_Bool bSuccess = sal_False ) { mbSuccess = bSuccess; }
sal_Bool GetSrchFlag() { return mbSuccess; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
GetComponentInterface( sal_Bool bCreate );
-//-----IAccessibility2 Impplementaton 2009
private:
-//IAccessibility2 Impplementaton 2009-----
Window* mpDocWin;
sal_Bool mbSuccess;
-//-----IAccessibility2 Impplementaton 2009
FixedText aSearchText;
ComboBox aSearchLB;
ListBox aSearchTmplLB;
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmodel.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmodel.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmodel.hxx Wed Dec 18 13:27:09 2013
@@ -84,9 +84,7 @@ namespace comphelper{
class IEmbeddedHelper;
}
-//IAccessibility2 Implementation 2009-----
class ImageMap;
-//-----IAccessibility2 Implementation 2009
namespace sfx2{
class LinkManager;
@@ -728,10 +726,8 @@ public:
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
- //IAccessibility2 Implementation 2009-----
virtual ImageMap* GetImageMapForObject(SdrObject*){return NULL;};
virtual sal_Int32 GetHyperlinkCount(SdrObject*){return 0;}
- //-----IAccessibility2 Implementation 2009
/** enables (true) or disables (false) recording of undo actions
If undo actions are added while undo is disabled, they are deleted.
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmrkv.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmrkv.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmrkv.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdmrkv.hxx Wed Dec 18 13:27:09 2013
@@ -511,9 +511,7 @@ public:
// Endpunkt der Spiegelachse
const Point& GetRef2() const { return aRef1; }
void SetRef2(const Point& rPt);
-//IAccessibility2 Implementation 2009-----
void UnmarkObj(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
};
////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoashp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoashp.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoashp.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoashp.hxx Wed Dec 18 13:27:09 2013
@@ -259,9 +259,7 @@ public:
using SdrTextObj::NbcSetOutlinerParaObject;
- //IAccessibility2 Implementation 2009-----
::rtl::OUString GetCustomShapeName();
- //-----IAccessibility2 Implementation 2009
};
#endif //_SVDOASHP_HXX
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdobj.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdobj.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdobj.hxx Wed Dec 18 13:27:09 2013
@@ -452,9 +452,6 @@ protected:
SdrObjUserCall* pUserCall;
SdrObjPlusData* pPlusData; // Broadcaster, UserData, Konnektoren, ... (Das ist der Bitsack)
-//IAccessibility2 Implementation 2009-----
- SdrObject* pCaptionObj;
-//-----IAccessibility2 Implementation 2009
sal_uInt32 nOrdNum; // Rangnummer des Obj in der Liste
/** Position in the navigation order. SAL_MAX_UINT32 when not used.
@@ -1131,9 +1128,6 @@ public:
// #121917#
virtual bool HasText() const;
-//IAccessibility2 Implementation 2009-----
- const SdrObject* GetCaptionObj() const;
-//-----IAccessibility2 Implementation 2009
protected:
void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxUnoShape );
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoole2.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoole2.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoole2.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdoole2.hxx Wed Dec 18 13:27:09 2013
@@ -84,9 +84,7 @@ protected:
void Init();
public:
-//IAccessibility2 Implementation 2009-----
String GetStyleString();
-//-----IAccessibility2 Implementation 2009
TYPEINFO();
SdrOle2Obj(FASTBOOL bFrame_=sal_False);
Modified: openoffice/branches/ooxml-osba/main/svx/inc/svx/svdstr.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/inc/svx/svdstr.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/inc/svx/svdstr.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svx/inc/svx/svdstr.hrc Wed Dec 18 13:27:09 2013
@@ -181,7 +181,6 @@
#define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143)
#define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144)
-//IAccessibility2 Implementation 2009-----
#define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145)
#define STR_ObjNamePluralFONTWORK (STR_ObjNameBegin+146)
@@ -191,7 +190,6 @@
#define STR_ObjNameEnd (STR_ObjNamePluralGRAFSVG)
-//-----IAccessibility2 Implementation 2009
#define STR_EditBegin (STR_ObjNameEnd+1)
#define STR_EditWithCopy (STR_EditBegin + 0)
#define STR_EditPosSize (STR_EditBegin + 1)
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleControlShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleControlShape.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleControlShape.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleControlShape.cxx Wed Dec 18 13:27:09 2013
@@ -44,7 +44,6 @@
#include <svx/svdpagv.hxx>
#include "svx/svdstr.hrc"
#include <algorithm>
-//IAccessibility2 Implementation 2009-----
#ifndef _COMPHELPER_PROPERTY_HXX_
#include <comphelper/property.hxx>
#endif
@@ -60,7 +59,6 @@
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::comphelper;
using namespace ::accessibility;
using namespace ::com::sun::star::accessibility;
@@ -94,14 +92,12 @@ namespace
static ::rtl::OUString s_sLabelPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
return s_sLabelPropertyLabel;
}
- //IAccessibility2 Implementation 2009-----
//................................................................
const ::rtl::OUString& lcl_getLabelControlPropertyName( )
{
static ::rtl::OUString s_sLabelControlPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "LabelControl" ) );
return s_sLabelControlPropertyLabel;
}
- //-----IAccessibility2 Implementation 2009
//................................................................
// return the property which should be used as AccessibleName
const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
@@ -661,7 +657,6 @@ Reference< XAccessibleRelationSet > SAL_
{
// TODO
// return AccessibleShape::getAccessibleRelationSet( );
- //IAccessibility2 Implementation 2009-----
utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
ensureControlModelAccess();
AccessibleControlShape* pCtlAccShape = GetLabeledByControlShape();
@@ -682,14 +677,12 @@ Reference< XAccessibleRelationSet > SAL_
}
Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
return xSet;
- //-----IAccessibility2 Implementation 2009
}
//--------------------------------------------------------------------
::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException)
{
ensureControlModelAccess();
- //IAccessibility2 Implementation 2009-----
::rtl::OUString sName;
if ( getAccessibleRole() != AccessibleRole::SHAPE
&& getAccessibleRole() != AccessibleRole::RADIO_BUTTON )
@@ -710,7 +703,6 @@ Reference< XAccessibleRelationSet > SAL_
sName = AccessibleShape::CreateAccessibleName();
}
}
- //-----IAccessibility2 Implementation 2009
// now that somebody first asked us for our name, ensure that we are listening to name changes on the model
m_bListeningForName = ensureListeningState( m_bListeningForName, sal_True, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
@@ -972,7 +964,6 @@ void SAL_CALL AccessibleControlShape::el
{
// not interested in
}
-//IAccessibility2 Implementation 2009-----
AccessibleControlShape* SAL_CALL AccessibleControlShape::GetLabeledByControlShape( )
{
if(m_xControlModel.is())
@@ -993,4 +984,3 @@ AccessibleControlShape* SAL_CALL Accessi
}
return NULL;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleFrameSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleFrameSelector.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleFrameSelector.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleFrameSelector.cxx Wed Dec 18 13:27:09 2013
@@ -191,9 +191,7 @@ sal_Int32 AccFrameSelector::getAccessibl
sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException)
{
// return AccessibleRole::OPTION_PANE;
- //IAccessibility2 Implementation 2009-----
return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX;
- //-----IAccessibility2 Implementation 2009
}
// ----------------------------------------------------------------------------
@@ -238,7 +236,6 @@ Reference< XAccessibleRelationSet > AccF
// pHelper->AddRelation(aLabelRelation);
// }
//}
- //IAccessibility2 Implementation 2009-----
if(meBorder == FRAMEBORDER_NONE)
{
//add the label relation
@@ -261,7 +258,6 @@ Reference< XAccessibleRelationSet > AccF
pHelper->AddRelation(aMemberOfRelation);
}
}
- //-----IAccessibility2 Implementation 2009
return xRet;
}
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleGraphicShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleGraphicShape.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleGraphicShape.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleGraphicShape.cxx Wed Dec 18 13:27:09 2013
@@ -61,10 +61,8 @@ AccessibleGraphicShape::~AccessibleGraph
::rtl::OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
if(m_pShape)
return m_pShape->GetTitle();
-//-----IAccessibility2 Implementation 2009
return AccessibleShape::getAccessibleDescription ();
}
@@ -210,18 +208,14 @@ uno::Sequence<uno::Type> SAL_CALL
AccessibleGraphicShape::CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
//Solution: Don't use the same information for accessible name and accessible description.
- //return CreateAccessibleName ();
::rtl::OUString sDesc;
if(m_pShape)
sDesc = m_pShape->GetTitle();
if(sDesc.getLength() > 0)
return sDesc;
return CreateAccessibleBaseName();
-//-----IAccessibility2 Implementation 2009
}
-//IAccessibility2 Implementation 2009-----
// Return this object's role.
sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -230,10 +224,8 @@ sal_Int16 SAL_CALL AccessibleGraphicShap
if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL )
return AccessibleRole::IMAGE_MAP;
else
- //return AccessibleRole::SHAPE;
return AccessibleShape::getAccessibleRole();
return nAccessibleRole;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleOLEShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleOLEShape.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleOLEShape.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleOLEShape.cxx Wed Dec 18 13:27:09 2013
@@ -29,9 +29,7 @@
#include <svx/ShapeTypeHandler.hxx>
#include <svx/SvxShapeTypes.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svx/svdoole2.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace accessibility;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -181,7 +179,6 @@ uno::Sequence<uno::Type> SAL_CALL
return aTypeList;
}
-//IAccessibility2 Implementation 2009-----
//===== XAccessibleExtendedAttributes ========================================================
uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
@@ -198,7 +195,6 @@ uno::Any SAL_CALL AccessibleOLEShape::ge
strRet <<= style;
return strRet;
}
-//-----IAccessibility2 Implementation 2009
/// Set this object's name if is different to the current name.
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleShape.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleShape.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleShape.cxx Wed Dec 18 13:27:09 2013
@@ -31,11 +31,9 @@
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLETEXTTYPE_HPP_
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_STATE_TYPE_HPP_
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#endif
@@ -66,7 +64,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <svx/svdview.hxx>
#include "AccessibleEmptyEditSource.hxx"
-//IAccessibility2 Implementation 2009-----
#include <svx/svdpage.hxx>
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -74,20 +71,15 @@
#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
#include <unotools/accessiblerelationsethelper.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-//IAccessibility2 Implementation 2009-----
using ::com::sun::star::lang::IndexOutOfBoundsException;
using ::com::sun::star::uno::RuntimeException;
-//-----IAccessibility2 Implementation 2009
using ::com::sun::star::uno::Reference;
using ::rtl::OUString;
-//IAccessibility2 Implementation 2009-----
#include <algorithm>
// #include <Accessiblehyperlink.hxx>
-//-----IAccessibility2 Implementation 2009
namespace accessibility {
namespace {
@@ -128,9 +120,7 @@ OUString GetOptionalProperty (
AccessibleShape::AccessibleShape (
const AccessibleShapeInfo& rShapeInfo,
const AccessibleShapeTreeInfo& rShapeTreeInfo)
- //IAccessibility2 Implementation 2009-----
: AccessibleContextBase (rShapeInfo.mxParent,AccessibleRole::SHAPE),
- //-----IAccessibility2 Implementation 2009
mpChildrenManager(NULL),
mxShape (rShapeInfo.mxShape),
maShapeTreeInfo (rShapeTreeInfo),
@@ -142,7 +132,6 @@ AccessibleShape::AccessibleShape (
m_pShape = GetSdrObjectFromXShape(mxShape);
UpdateNameAndDescription();
}
-//IAccessibility2 Implementation 2009-----
AccessibleShape::AccessibleShape (
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& rxShape,
@@ -161,7 +150,6 @@ AccessibleShape::AccessibleShape (
{
m_pShape = GetSdrObjectFromXShape(mxShape);
}
-//-----IAccessibility2 Implementation 2009
AccessibleShape::~AccessibleShape (void)
{
if (mpChildrenManager != NULL)
@@ -297,13 +285,11 @@ void AccessibleShape::UpdateStates (void
else
pStateSet->RemoveState (AccessibleStateType::SELECTED);
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString AccessibleShape::GetStyle()
{
return ShapeTypeHandler::CreateAccessibleBaseName( mxShape );
}
-//-----IAccessibility2 Implementation 2009
bool AccessibleShape::operator== (const AccessibleShape& rShape)
{
return this==&rShape;
@@ -365,7 +351,6 @@ sal_Bool AccessibleShape::GetState (sal_
else
return AccessibleContextBase::GetState (aState);
}
-//IAccessibility2 Implementation 2009-----
// Solution: OverWrite the parent's getAccessibleName method
::rtl::OUString SAL_CALL AccessibleShape::getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -386,7 +371,6 @@ sal_Bool AccessibleShape::GetState (sal_
else
return OUString( RTL_CONSTASCII_USTRINGPARAM( " " ));
}
-//-----IAccessibility2 Implementation 2009
//===== XAccessibleContext ==================================================
/** The children of this shape come from two sources: The children from
@@ -446,45 +430,31 @@ uno::Reference<XAccessible> SAL_CALL
return xChild;
}
-//IAccessibility2 Implementation 2009-----
uno::Reference<XAccessibleRelationSet> SAL_CALL
- AccessibleShape::getAccessibleRelationSet (void)
+ AccessibleShape::getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ::osl::MutexGuard aGuard (maMutex);
- ::utl::AccessibleRelationSetHelper* pRelationSet =
- new utl::AccessibleRelationSetHelper;
- SdrObject* pCaptionSdr = const_cast < SdrObject* > ( m_pShape->GetCaptionObj() ) ;
- if(pCaptionSdr!=NULL)
- {
- uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
- uno::Reference<drawing::XShape> xCaptionShape ( pCaptionSdr->getUnoShape(),uno::UNO_QUERY);
- if(xCaptionShape.is())
- {
- aSequence[0] = mpParent->GetAccessibleCaption(xCaptionShape);
- pRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
- }
- }
- else
- {
- //this mxshape is the captioned shape, only for sw
- if(mpParent->GetAccessibleCaption(mxShape).get())
+ ::osl::MutexGuard aGuard (maMutex);
+ ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
+
+ //this mxshape is the captioned shape, only for sw
+ if (pRelationSet != NULL)
+ {
+ uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+ aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
+ if(aSequence[0].get())
{
- uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
- aSequence[0] = mpParent->GetAccessibleCaption(mxShape);
- pRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
+ pRelationSet->AddRelation(
+ AccessibleRelation( AccessibleRelationType::DESCRIBED_BY, aSequence ) );
}
- }
- if (pRelationSet != NULL)
- {
return uno::Reference<XAccessibleRelationSet> (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
else
+ {
return uno::Reference<XAccessibleRelationSet>(NULL);
- return uno::Reference<XAccessibleRelationSet>();
+ }
}
-//-----IAccessibility2 Implementation 2009
/** Return a copy of the state set.
Possible states are:
@@ -501,8 +471,6 @@ uno::Reference<XAccessibleStateSet> SAL_
if (rBHelper.bDisposed || mpText == NULL)
// Return a minimal state set that only contains the DEFUNC state.
- //IAccessibility2 Implementation 2009-----
- //xStateSet = AccessibleContextBase::getAccessibleStateSet ();
{
xStateSet = AccessibleContextBase::getAccessibleStateSet ();
::utl::AccessibleStateSetHelper* pStateSet =
@@ -534,7 +502,6 @@ uno::Reference<XAccessibleStateSet> SAL_
}
xStateSet = Reference<XAccessibleStateSet>(
new ::utl::AccessibleStateSetHelper (*pStateSet));
- //-----IAccessibility2 Implementation 2009
}else
{
::utl::AccessibleStateSetHelper* pStateSet =
@@ -550,7 +517,6 @@ uno::Reference<XAccessibleStateSet> SAL_
else
pStateSet->RemoveState (AccessibleStateType::FOCUSED);
}
- //IAccessibility2 Implementation 2009-----
//Solution:Just when the document is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE
::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
if( xTempAcc.is() )
@@ -577,16 +543,13 @@ uno::Reference<XAccessibleStateSet> SAL_
}
}
}
- //-----IAccessibility2 Implementation 2009
// Create a copy of the state set that may be modified by the
// caller without affecting the current state set.
xStateSet = Reference<XAccessibleStateSet>(
new ::utl::AccessibleStateSetHelper (*pStateSet));
}
}
-//IAccessibility2 Implementation 2009-----
UpdateDocumentAllSelState(xStateSet);
-//-----IAccessibility2 Implementation 2009
return xStateSet;
}
@@ -864,7 +827,6 @@ sal_Int32 SAL_CALL AccessibleShape::getB
uno::Any aColor;
aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillColor"));
aColor >>= nColor;
- //IAccessibility2 Implementation 2009-----
aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillTransparence"));
short nTrans=0;
aColor >>= nTrans;
@@ -879,7 +841,6 @@ sal_Int32 SAL_CALL AccessibleShape::getB
crBk.SetTransparency(sal_uInt8(nTrans));
}
nColor = crBk.GetColor();
- //-----IAccessibility2 Implementation 2009
}
}
catch (::com::sun::star::beans::UnknownPropertyException)
@@ -938,18 +899,14 @@ com::sun::star::uno::Any SAL_CALL
aReturn = ::cppu::queryInterface (rType,
static_cast<XAccessibleComponent*>(this),
static_cast<XAccessibleExtendedComponent*>(this),
- //IAccessibility2 Implementation 2009-----
static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this),
static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this),
- //-----IAccessibility2 Implementation 2009
static_cast<lang::XEventListener*>(this),
static_cast<document::XEventListener*>(this),
static_cast<lang::XUnoTunnel*>(this),
- //IAccessibility2 Implementation 2009-----
static_cast<XAccessibleGroupPosition*>(this),
static_cast<XAccessibleHypertext*>(this)
- //-----IAccessibility2 Implementation 2009
);
return aReturn;
}
@@ -973,7 +930,6 @@ void SAL_CALL
{
AccessibleContextBase::release ();
}
-//IAccessibility2 Implementation 2009-----
//
//===== XAccessibleSelection ============================================
//
@@ -1093,7 +1049,6 @@ uno::Any SAL_CALL AccessibleShape::getEx
strRet <<= style;
return strRet;
}
-//-----IAccessibility2 Implementation 2009
//===== XServiceInfo ========================================================
::rtl::OUString SAL_CALL
@@ -1328,7 +1283,6 @@ void AccessibleShape::ViewForwarderChang
throw (::com::sun::star::uno::RuntimeException)
{
//OUString sName (CreateAccessibleBaseName());
-//IAccessibility2 Implementation 2009-----
OUString sName;
sName = GetFullAccessibleName(this);
return sName;
@@ -1423,7 +1377,6 @@ void AccessibleShape::ViewForwarderChang
aAccName = sName;
return sName;
}
-//-----IAccessibility2 Implementation 2009
::rtl::OUString
AccessibleShape::CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -1595,7 +1548,6 @@ void AccessibleShape::UpdateNameAndDescr
{
}
}
-//IAccessibility2 Implementation 2009-----
// Return this object's role.
sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -1712,10 +1664,8 @@ throw (uno::RuntimeException)
for(sal_Int32 i = 0 ; i < nObj ; ++i)
{
SdrObject *pSubObj = pGrpList->GetObj(i);
- //IAccessibility2 Implementation 2009-----
if (pSubObj &&
xParentContext->getAccessibleChild(i)->getAccessibleContext()->getAccessibleRole() != AccessibleRole::GROUP_BOX)
- //-----IAccessibility2 Implementation 2009
{
vXShapes.push_back( GetXShapeForSdrObject(pSubObj) );
}
@@ -1840,5 +1790,4 @@ sal_Bool SAL_CALL AccessibleShape::setSe
}
sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return sal_True;}
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleTextHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleTextHelper.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleTextHelper.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/AccessibleTextHelper.cxx Wed Dec 18 13:27:09 2013
@@ -50,7 +50,6 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/svapp.hxx>
-//IAccessibility2 Implementation 2009-----
//add TEXT_SELECTION_CHANGED event
#ifndef _TEXTDATA_HXX
#include <svtools/textdata.hxx>
@@ -58,7 +57,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
// Project-local header
@@ -76,10 +74,8 @@
#include "editeng/AccessibleEditableTextPara.hxx"
#include <svx/svdmodel.hxx>
#include <svx/svdpntv.hxx>
-//IAccessibility2 Implementation 2009-----
#include "../table/cell.hxx"
#include "../table/accessiblecell.hxx"
-//-----IAccessibility2 Implementation 2009
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
@@ -89,7 +85,6 @@ using namespace ::com::sun::star::access
namespace accessibility
{
-//IAccessibility2 Implementation 2009-----
Window* GetCurrentEditorWnd()
{
Window* pWin = NULL;
@@ -104,7 +99,6 @@ namespace accessibility
}
return pWin;
}
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
@@ -512,7 +506,6 @@ namespace accessibility
{
if( bHaveFocus )
{
- //IAccessibility2 Implementation 2009-----
if( mxFrontEnd.is() )
{
AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
@@ -525,7 +518,6 @@ namespace accessibility
pAccTable->SetStateDirectly(AccessibleStateType::FOCUSED);
}
}
- //-----IAccessibility2 Implementation 2009
DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" );
}
else
@@ -597,7 +589,6 @@ namespace accessibility
if( !pViewForwarder )
return sal_False;
- //IAccessibility2 Implementation 2009-----
if( mxFrontEnd.is() )
{
AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
@@ -608,7 +599,6 @@ namespace accessibility
return xCell->IsTextEditActive();
}
}
- //-----IAccessibility2 Implementation 2009
if( pViewForwarder->IsValid() )
return sal_True;
else
@@ -927,12 +917,7 @@ namespace accessibility
// convert to screen coordinates
aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
- //IAccessibility2 Implementation 2009-----
- /*
- if( aParaBB.IsOver( aViewArea ) )
- {
- */
- //-----IAccessibility2 Implementation 2009
+
// at least partially visible
if( bFirstChild )
{
@@ -953,23 +938,6 @@ namespace accessibility
mxFrontEnd, GetEditSource(), nCurrPara ).first ),
AccessibleEventId::CHILD );
}
- //IAccessibility2 Implementation 2009-----
- /*
- }
- else
- {
- // not or no longer visible
- if( maParaManager.IsReferencable( nCurrPara ) )
- {
- if( bBroadcastEvents )
- LostPropertyEvent( uno::makeAny( maParaManager.GetChild( nCurrPara ).first.get().getRef() ),
- AccessibleEventId::CHILD );
-
- // clear reference
- maParaManager.Release( nCurrPara );
- }
- }*/
- //-----IAccessibility2 Implementation 2009
}
}
catch( const uno::Exception& )
@@ -1448,12 +1416,10 @@ namespace accessibility
{
case HINT_BEGEDIT:
{
- //IAccessibility2 Implementation 2009-----
if(!IsActive())
{
break;
}
-//-----IAccessibility2 Implementation 2009
// change children state
maParaManager.SetActive();
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManager.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManager.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManager.cxx Wed Dec 18 13:27:09 2013
@@ -86,7 +86,6 @@ long ChildrenManager::GetChildCount (voi
return mpImpl->GetChild (nIndex);
}
-//IAccessibility2 Implementation 2009-----
Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -101,7 +100,6 @@ Reference<XAccessible> ChildrenManager::
OSL_ASSERT (mpImpl != NULL);
return mpImpl->GetChildShape(nIndex);
}
-//-----IAccessibility2 Implementation 2009
void ChildrenManager::Update (bool bCreateNewObjectsOnDemand)
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.cxx Wed Dec 18 13:27:09 2013
@@ -37,7 +37,6 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
#include <svx/SvxShapeTypes.hxx>
#endif
@@ -48,7 +47,6 @@
#ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -128,7 +126,6 @@ long ChildrenManagerImpl::GetChildCount
}
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex)
throw (::com::sun::star::uno::RuntimeException)
@@ -142,7 +139,6 @@ long ChildrenManagerImpl::GetChildCount
}
return uno::Reference< drawing::XShape > ();
}
-//-----IAccessibility2 Implementation 2009
/** Return the requested accessible child object. Create it if it is not
yet in the cache.
@@ -155,8 +151,8 @@ uno::Reference<XAccessible>
// Check wether the given index is valid.
if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii(
- "no accessible child with index ") + nIndex,
+ ::rtl::OUString::createFromAscii( "no accessible child with index ")
+ + ::rtl::OUString::valueOf( nIndex, 10),
mxParent);
return GetChild (maVisibleChildren[nIndex],nIndex);
@@ -896,7 +892,6 @@ sal_Bool ChildrenManagerImpl::ReplaceChi
return bResult;
}
-//IAccessibility2 Implementation 2009-----
// Add the impl method for IAccessibleParent interface
AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
{
@@ -925,7 +920,6 @@ uno::Reference<XAccessible>
}
return uno::Reference<XAccessible> ();
}
-//-----IAccessibility2 Implementation 2009
/** Update the <const>SELECTED</const> and the <const>FOCUSED</const> state
of all visible children. Maybe this should be changed to all children.
@@ -958,21 +952,18 @@ void ChildrenManagerImpl::UpdateSelectio
// Remember the current and new focused shape.
AccessibleShape* pCurrentlyFocusedShape = NULL;
AccessibleShape* pNewFocusedShape = NULL;
-//IAccessibility2 Implementation 2009-----
typedef std::pair< AccessibleShape* , sal_Bool > PAIR_SHAPE;//sal_Bool Selected,UnSelected.
typedef std::vector< PAIR_SHAPE > VEC_SHAPE;
VEC_SHAPE vecSelect;
int nAddSelect=0;
int nRemoveSelect=0;
sal_Bool bHasSelectedShape=sal_False;
-//-----IAccessibility2 Implementation 2009
ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL)
{
- //IAccessibility2 Implementation 2009-----
short nRole = pAccessibleShape->getAccessibleRole();
bool bDrawShape = (
nRole == AccessibleRole::GRAPHIC ||
@@ -981,7 +972,6 @@ void ChildrenManagerImpl::UpdateSelectio
nRole == AccessibleRole::IMAGE_MAP ||
nRole == AccessibleRole::TABLE_CELL ||
nRole == AccessibleRole::TABLE );
-//-----IAccessibility2 Implementation 2009
bool bShapeIsSelected = false;
// Look up the shape in the (single or multi-) selection.
@@ -1008,8 +998,6 @@ void ChildrenManagerImpl::UpdateSelectio
// Set or reset the SELECTED state.
if (bShapeIsSelected)
- //IAccessibility2 Implementation 2009-----
- //pAccessibleShape->SetState (AccessibleStateType::SELECTED);
{
if (pAccessibleShape->SetState (AccessibleStateType::SELECTED))
{
@@ -1025,7 +1013,6 @@ void ChildrenManagerImpl::UpdateSelectio
}
}
else
- //pAccessibleShape->ResetState (AccessibleStateType::SELECTED);
{
if(pAccessibleShape->ResetState (AccessibleStateType::SELECTED))
{
@@ -1036,13 +1023,11 @@ void ChildrenManagerImpl::UpdateSelectio
}
}
}
-//-----IAccessibility2 Implementation 2009
// Does the shape have the current selection?
if (pAccessibleShape->GetState (AccessibleStateType::FOCUSED))
pCurrentlyFocusedShape = pAccessibleShape;
}
}
-//IAccessibility2 Implementation 2009-----
/*
// Check if the frame we are in is currently active. If not then make
// sure to not send a FOCUSED state change.
@@ -1062,19 +1047,14 @@ void ChildrenManagerImpl::UpdateSelectio
{
bShapeActive =true;
}
-//-----IAccessibility2 Implementation 2009
// Move focus from current to newly focused shape.
if (pCurrentlyFocusedShape != pNewFocusedShape)
{
if (pCurrentlyFocusedShape != NULL)
pCurrentlyFocusedShape->ResetState (AccessibleStateType::FOCUSED);
- //IAccessibility2 Implementation 2009-----
- //if (pNewFocusedShape != NULL)
- //-----IAccessibility2 Implementation 2009
if (pNewFocusedShape != NULL && bShapeActive)
pNewFocusedShape->SetState (AccessibleStateType::FOCUSED);
}
-//IAccessibility2 Implementation 2009-----
if (nAddSelect >= 10 )//fire selection within
{
@@ -1119,7 +1099,6 @@ void ChildrenManagerImpl::UpdateSelectio
mrContext.CommitChange(AccessibleEventId::SELECTION_CHANGED_REMOVE,anyShape,uno::Any());
}
}
-//-----IAccessibility2 Implementation 2009
// Remember whether there is a shape that now has the focus.
mpFocusedShape = pNewFocusedShape;
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.hxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/ChildrenManagerImpl.hxx Wed Dec 18 13:27:09 2013
@@ -126,11 +126,9 @@ public:
*/
long GetChildCount (void) const throw ();
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape> GetChildShape(long nIndex)
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
/** Return the requested accessible child or throw and
IndexOutOfBoundsException if the given index is invalid.
@param nIndex
@@ -303,7 +301,6 @@ public:
const long _nIndex,
const AccessibleShapeTreeInfo& _rShapeTreeInfo
) throw (::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
// Add the impl method for IAccessibleParent interface
virtual AccessibleControlShape* GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
@@ -313,7 +310,6 @@ public:
GetAccessibleCaption (const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& xShape)
throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
protected:
/** This list holds the descriptors of all currently visible shapes and
associated accessible object.
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/ShapeTypeHandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/ShapeTypeHandler.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/ShapeTypeHandler.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/ShapeTypeHandler.cxx Wed Dec 18 13:27:09 2013
@@ -32,11 +32,9 @@
#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svx/unoshape.hxx>
#include <svx/svdoashp.hxx>
#include "svx/unoapi.hxx"
-//-----IAccessibility2 Implementation 2009
#include "svx/svdstr.hrc"
@@ -315,7 +313,6 @@ long ShapeTypeHandler::GetSlotId (const
case DRAWING_RECTANGLE:
nResourceId = STR_ObjNameSingulRECT;
break;
- //IAccessibility2 Implementation 2009-----
case DRAWING_CUSTOM:
{
nResourceId = STR_ObjNameSingulCUSTOMSHAPE;
@@ -345,7 +342,6 @@ long ShapeTypeHandler::GetSlotId (const
}
break;
}
- //-----IAccessibility2 Implementation 2009
case DRAWING_TEXT:
nResourceId = STR_ObjNameSingulTEXT;
break;
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/charmapacc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/charmapacc.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/charmapacc.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/charmapacc.cxx Wed Dec 18 13:27:09 2013
@@ -166,25 +166,6 @@ Reference< XAccessible > SAL_CALL SvxSho
// -----------------------------------------------------------------------------
::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
-/* const Point aOutPos( mpParent->GetPosPixel() );
- Size aOutSize( mpParent->GetOutputSizePixel() );
- if ( mpParent->getScrollBar()->IsVisible() )
- {
- const Size aScrollBar = mpParent->getScrollBar()->GetOutputSizePixel();
- aOutSize.Width() -= aScrollBar.Width();
- aOutSize.Height() -= aScrollBar.Height();
- }
-
- awt::Rectangle aRet;
-
- aRet.X = aOutPos.X();
- aRet.Y = aOutPos.Y();
- aRet.Width = aOutSize.Width();
- aRet.Height = aOutSize.Height();
-
- return aRet;
-*/
::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 );
Window* pWindow = mpParent;
if ( pWindow )
@@ -201,7 +182,6 @@ Reference< XAccessible > SAL_CALL SvxSho
}
}
return aBounds;
- //-----IAccessibility2 Implementation 2009
}
// -----------------------------------------------------------------------------
sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (RuntimeException)
@@ -365,7 +345,6 @@ void SvxShowCharSetAcc::implSelect( sal_
// -----------------------------------------------------------------------------
::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
const Point aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() );
Size aOutSize( m_pParent->getCharSetControl()->GetOutputSizePixel());
if ( m_pParent->getCharSetControl()->getScrollBar()->IsVisible() )
@@ -373,7 +352,6 @@ void SvxShowCharSetAcc::implSelect( sal_
const Size aScrollBar = m_pParent->getCharSetControl()->getScrollBar()->GetOutputSizePixel();
aOutSize.Width() -= aScrollBar.Width();
//aOutSize.Height() -= aScrollBar.Height();
- //-----IAccessibility2 Implementation 2009
}
awt::Rectangle aRet;
@@ -715,10 +693,7 @@ uno::Reference< accessibility::XAccessib
sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
throw (uno::RuntimeException)
{
- //return accessibility::AccessibleRole::LABEL;
-//IAccessibility2 Implementation 2009-----
return accessibility::AccessibleRole::TABLE_CELL;
-//-----IAccessibility2 Implementation 2009
}
// -----------------------------------------------------------------------------
@@ -733,30 +708,17 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc
sal_Unicode c = mpParent->maText.GetChar(0);
char buf[16] = "0x0000";
sal_Unicode c_Shifted = c;
-//IAccessibility2 Implementation 2009-----
-/*
- for( int i = 0; i < 4; ++i )
- {
- char h = (char)(c_Shifted & 0x0F);
- buf[5-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
- c_Shifted >>= 4;
- }
-*/
int tmp_len = 4;
if(c_Shifted>0xFFFF) tmp_len = 8;
for( int i = 0; i < tmp_len; ++i )
{
char h = c_Shifted & 0x0F;
- //buf[9-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
buf[tmp_len+1-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
c_Shifted >>= 4;
}
-//-----IAccessibility2 Implementation 2009
if( c < 256 )
snprintf( buf+6, 10, " (%d)", c );
- //IAccessibility2 Implementation 2009-----
sDescription.AppendAscii(" ");
- //-----IAccessibility2 Implementation 2009
sDescription.AppendAscii(buf);
return sDescription;
@@ -802,7 +764,6 @@ uno::Reference< accessibility::XAccessib
if( mpParent )
{
- //IAccessibility2 Implementation 2009-----
if(mpParent->mrParent.IsEnabled())
{
pStateSet->AddState( accessibility::AccessibleStateType::ENABLED );
@@ -810,7 +771,6 @@ uno::Reference< accessibility::XAccessib
pStateSet->AddState( accessibility::AccessibleStateType::SELECTABLE );
pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
}
- //-----IAccessibility2 Implementation 2009
// SELECTED
if( mpParent->mrParent.GetSelectIndexId() == mpParent->mnId )
@@ -819,12 +779,10 @@ uno::Reference< accessibility::XAccessib
pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
}
if ( mpParent->mnId >= mpParent->mrParent.FirstInView() && mpParent->mnId <= mpParent->mrParent.LastInView() )
- //IAccessibility2 Implementation 2009-----
{
pStateSet->AddState( AccessibleStateType::VISIBLE );
pStateSet->AddState( AccessibleStateType::SHOWING );
}
- //-----IAccessibility2 Implementation 2009
pStateSet->AddState( AccessibleStateType::TRANSIENT );
}
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx Wed Dec 18 13:27:09 2013
@@ -1123,9 +1123,7 @@ uno::Reference< XAccessibleStateSet > SA
{
pStateSetHelper->AddState( AccessibleStateType::SELECTED );
}
- //IAccessibility2 Implementation 2009-----
if (mrParentWindow->GetBitmapPixel(sal_uInt16(mnIndexInParent)))
- //-----IAccessibility2 Implementation 2009
{
pStateSetHelper->AddState( AccessibleStateType::CHECKED );
}
Modified: openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx Wed Dec 18 13:27:09 2013
@@ -46,14 +46,12 @@
#include <svx/dlgctrl.hxx>
#include <svx/dialmgr.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#endif
#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
#include <unotools/accessiblerelationsethelper.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::cppu;
using namespace ::osl;
@@ -61,9 +59,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-//IAccessibility2 Implementation 2009-----
using namespace ::com::sun::star::lang;
-//-----IAccessibility2 Implementation 2009
#define MAX_NUM_OF_CHILDS 9
#define NOCHILDSELECTED -1
@@ -364,19 +360,14 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleC
sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException )
{
-//IAccessibility2 Implementation 2009-----
//return AccessibleRole::GROUP_BOX;
return AccessibleRole::PANEL;
-//-----IAccessibility2 Implementation 2009
}
::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
- //IAccessibility2 Implementation 2009-----
- //return msDescription;
return msDescription +::rtl::OUString::createFromAscii(" Please use arrow key to selection.");
- //-----IAccessibility2 Implementation 2009
}
::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException )
@@ -390,8 +381,6 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleC
*/
Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException )
{
-//IAccessibility2 Implementation 2009-----
- //return Reference< XAccessibleRelationSet >();
utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
Window* pWindow = mpRepr;
@@ -414,16 +403,13 @@ Reference< XAccessibleRelationSet > SAL_
}
}
return xSet;
- //-----IAccessibility2 Implementation 2009
}
-//IAccessibility2 Implementation 2009-----
//Solution:Add the event handling method
void SvxRectCtlAccessibleContext::FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew)
{
const Reference< XInterface > xSource( *this );
CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
}
-//-----IAccessibility2 Implementation 2009
Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -431,10 +417,8 @@ Reference< XAccessibleStateSet > SAL_CAL
if( IsAlive() )
{
-//IAccessibility2 Implementation 2009-----
pStateSetHelper->AddState( AccessibleStateType::ENABLED );
// pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
-//-----IAccessibility2 Implementation 2009
pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
if( mpRepr->HasFocus() )
pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
@@ -683,7 +667,6 @@ void SvxRectCtlAccessibleContext::checkC
// in our case only for the first (0) _selected_ child this is a valid request
throw lang::IndexOutOfBoundsException();
}
-// IAccessibility2 implementation 2009. ------
void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -750,7 +733,6 @@ void SvxRectCtlAccessibleContext::select
// no guard -> is done in next selectChild
selectChild( PointToIndex( eButton, mbAngleMode ) , bFireFocus);
}
-// ------ IAccessibility2 implementation 2009.
void SvxRectCtlAccessibleContext::setName( const ::rtl::OUString& rName )
{
Any aPreVal, aPostVal;
@@ -1056,7 +1038,6 @@ sal_Int16 SAL_CALL SvxRectCtlChildAccess
Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException )
{
//return Reference< XAccessibleRelationSet >();
- //IAccessibility2 Implementation 2009-----
utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
if( mxParent.is() )
@@ -1068,7 +1049,6 @@ Reference<XAccessibleRelationSet> SAL_CA
}
return xSet;
- //-----IAccessibility2 Implementation 2009
}
Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
@@ -1177,7 +1157,6 @@ Any SAL_CALL SvxRectCtlChildAccessibleCo
return aRet;
}
-//IAccessibility2 Implementation 2009-----
// -----------------------------------------------------------------------------
// XAccessibleAction
// -----------------------------------------------------------------------------
@@ -1228,7 +1207,6 @@ Reference< XAccessibleKeyBinding > SvxRe
return Reference< XAccessibleKeyBinding >();
}
-//-----IAccessibility2 Implementation 2009
//===== XServiceInfo ========================================================
@@ -1326,7 +1304,6 @@ Rectangle SvxRectCtlChildAccessibleConte
return *mpBoundingBox;
}
-// IAccessibility2 implementation 2009. ------
void SvxRectCtlChildAccessibleContext::setStateChecked( sal_Bool bChecked, sal_Bool bFireFocus )
{
if( mbIsChecked != bChecked )
@@ -1358,4 +1335,3 @@ void SvxRectCtlChildAccessibleContext::F
aNew <<= AccessibleStateType::FOCUSED;
CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) );
}
-// ------ IAccessibility2 implementation 2009.
Modified: openoffice/branches/ooxml-osba/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx Wed Dec 18 13:27:09 2013
@@ -314,7 +314,6 @@ rtl::OUString EnhancedCustomShapeTypeNam
? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
: rtl::OUString();
}
-//IAccessibility2 Implementation 2009-----
typedef std::hash_map< const char*, const char*, std::hash<const char*>, TCheck> TypeACCNameHashMap;
static TypeACCNameHashMap* pACCHashMap = NULL;
struct ACCNameTypeTable
@@ -560,4 +559,3 @@ rtl::OUString EnhancedCustomShapeTypeNam
sRetValue = rtl::OUString::createFromAscii( (*aHashIter).second );
return sRetValue;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/svx/source/dialog/_bmpmask.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/dialog/_bmpmask.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/dialog/_bmpmask.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/dialog/_bmpmask.cxx Wed Dec 18 13:27:09 2013
@@ -137,9 +137,7 @@ void MaskSet::Select()
void MaskSet::GetFocus()
{
- //IAccessibility2 Implementation 2009-----
ValueSet::GetFocus();
- //-----IAccessibility2 Implementation 2009
SelectItem( 1 );
pSvxBmpMask->onSelect( this );
}
@@ -330,13 +328,11 @@ IMPL_LINK( MaskData, CbxTransHdl, CheckB
IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
{
- //IAccessibility2 Implementation 2009-----
// MT: bFireFox as API parameter is ugly, find better solution????
pMask->pQSet1->SelectItem( pLb == &( pMask->aLbColor1 ) ? 1 : 0 /* , false */ );
pMask->pQSet2->SelectItem( pLb == &( pMask->aLbColor2 ) ? 1 : 0 /* , false */ );
pMask->pQSet3->SelectItem( pLb == &( pMask->aLbColor3 ) ? 1 : 0 /* , false */ );
pMask->pQSet4->SelectItem( pLb == &( pMask->aLbColor4 ) ? 1 : 0 /* , false */ );
- //-----IAccessibility2 Implementation 2009
return 0;
}
@@ -483,57 +479,48 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBi
pQSet1->SetColCount( 1 );
pQSet1->SetLineCount( 1 );
// pQSet1->SetExtraSpacing( 1 );
- //-----IAccessibility2 Implementation 2009
String sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE));
String sColorPaletteN;
sColorPaletteN = sColorPalette;
sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
//pQSet1->InsertItem( 1, aPipetteColor );
pQSet1->InsertItem( 1, aPipetteColor, sColorPaletteN);
- //IAccessibility2 Implementation 2009-----
pQSet1->SelectItem( 1 );
pQSet2->SetStyle( pQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet2->SetColCount( 1 );
pQSet2->SetLineCount( 1 );
// pQSet2->SetExtraSpacing( 1 );
- //IAccessibility2 Implementation 2009-----
sColorPaletteN = sColorPalette;
sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
//pQSet2->InsertItem( 1, aPipetteColor );
pQSet2->InsertItem( 1, aPipetteColor, sColorPaletteN);
- //-----IAccessibility2 Implementation 2009
pQSet2->SelectItem( 0 );
pQSet3->SetStyle( pQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet3->SetColCount( 1 );
pQSet3->SetLineCount( 1 );
// pQSet3->SetExtraSpacing( 1 );
- //IAccessibility2 Implementation 2009-----
sColorPaletteN = sColorPalette;
sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
pQSet3->InsertItem( 1, aPipetteColor, sColorPaletteN);
//pQSet3->InsertItem( 1, aPipetteColor );
- //-----IAccessibility2 Implementation 2009
pQSet3->SelectItem( 0 );
pQSet4->SetStyle( pQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER );
pQSet4->SetColCount( 1 );
pQSet4->SetLineCount( 1 );
// pQSet4->SetExtraSpacing( 1 );
- //IAccessibility2 Implementation 2009-----
sColorPaletteN = sColorPalette;
sColorPaletteN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
pQSet4->InsertItem( 1, aPipetteColor, sColorPaletteN);
//pQSet4->InsertItem( 1, aPipetteColor );
- //-----IAccessibility2 Implementation 2009
pQSet4->SelectItem( 0 );
pQSet1->Show();
pQSet2->Show();
pQSet3->Show();
pQSet4->Show();
- //IAccessibility2 Implementation 2009-----
aCbx1.SetAccessibleRelationMemberOf( &aGrpQ );
pQSet1->SetAccessibleRelationMemberOf( &aGrpQ );
aSp1.SetAccessibleRelationMemberOf( &aGrpQ );
@@ -569,7 +556,6 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBi
aLbColorTrans.SetAccessibleRelationLabeledBy( &aCbxTrans );
aLbColorTrans.SetAccessibleRelationMemberOf( &aGrpQ );
aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ );
- //-----IAccessibility2 Implementation 2009
}
//-------------------------------------------------------------------------
@@ -1300,7 +1286,6 @@ void SvxBmpMask::SetAccessibleNames (voi
sSourceColorN = sSourceColor;
sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
aCbx4.SetAccessibleName (sSourceColorN);
- //IAccessibility2 Implementation 2009-----
// set the accessible name for valueset
String sColorPalette (BMP_RESID( RID_SVXDLG_BMPMASK_STR_PALETTE));
String sColorPaletteN;
@@ -1346,5 +1331,4 @@ void SvxBmpMask::SetAccessibleNames (voi
sReplaceWithN = sReplaceWith;
sReplaceWithN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
aLbColor4.SetAccessibleName (sReplaceWithN);
- //-----IAccessibility2 Implementation 2009
}
Modified: openoffice/branches/ooxml-osba/main/svx/source/dialog/bmpmask.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/dialog/bmpmask.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/dialog/bmpmask.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/dialog/bmpmask.hrc Wed Dec 18 13:27:09 2013
@@ -23,11 +23,9 @@
#define RID_SVXDLG_BMPMASK (RID_SVX_BMPMASK_START)
#define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1)
#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2)
-/*IAccessibility2 Implementation 2009-----*/
#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4)
#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5)
-/*-----IAccessibility2 Implementation 2009*/
#define GRP_Q 1
#define CTR_PIPETTE 1
#define CBX_1 1
Modified: openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.cxx (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.cxx Wed Dec 18 13:27:09 2013
@@ -1345,7 +1345,6 @@ void SvxTPFilter::Disable( bool bChild)
Enable( false, bChild );
}
-//IAccessibility2 Implementation 2009-----
void SvxTPFilter::SetAccessibleRelationMemberOf( Window* pWin )
{
aCbDate.SetAccessibleRelationMemberOf(pWin);
@@ -1366,7 +1365,6 @@ void SvxTPFilter::SetAccessibleRelationM
aCbComment.SetAccessibleRelationMemberOf(pWin);
aEdComment.SetAccessibleRelationMemberOf(pWin);
}
-//-----IAccessibility2 Implementation 2009
IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF)
{
Modified: openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.hrc (original)
+++ openoffice/branches/ooxml-osba/main/svx/source/dialog/ctredlin.hrc Wed Dec 18 13:27:09 2013
@@ -63,11 +63,9 @@
#define STR_TITLE4 4
#define STR_TITLE5 5
-//IAccessibility2 Implementation 2009-----
#define STR_DATE_COMBOX 6
#define STR_DATE_SPIN 7
#define STR_DATE_SPIN1 8
#define STR_DATE_TIME_SPIN 9
#define STR_DATE_TIME_SPIN1 10
#define STR_TREE 11
-//-----IAccessibility2 Implementation 2009