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 [9/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/s...
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx Wed Dec 18 13:27:09 2013
@@ -38,10 +38,8 @@
#include "sc.hrc"
#endif
#include "unonames.hxx"
-//IAccessibility2 Implementation 2009-----
#include "detfunc.hxx"
#include "chgtrack.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
@@ -55,11 +53,9 @@
#include <rtl/uuid.h>
#include <comphelper/sequence.hxx>
#include <sfx2/objsh.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
-//-----IAccessibility2 Implementation 2009
#include <float.h>
@@ -234,8 +230,6 @@ sal_Int32
ScAccessibleCellBase::createAccessibleName(void)
throw (uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
- //String sName( ScResId(STR_ACC_CELL_NAME) );
String sAddress;
// Document not needed, because only the cell address, but not the tablename is needed
// always us OOO notation
@@ -244,10 +238,7 @@ sal_Int32
/* #i65103# ZoomText merges cell address and contents, e.g. if value 2 is
contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2".
Simple solution: Append a space character to the cell address. */
- //sName.Append( ' ' );
- //return rtl::OUString(sName);
return rtl::OUString(sAddress);
-//-----IAccessibility2 Implementation 2009
}
//===== XAccessibleValue ================================================
@@ -260,14 +251,11 @@ uno::Any SAL_CALL
IsObjectValid();
uno::Any aAny;
if (mpDoc)
-//IAccessibility2 Implementation 2009-----
- //aAny <<= mpDoc->GetValue(maCellAddress);
{
String valStr;
mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);
aAny <<= rtl::OUString(valStr);
}
-//-----IAccessibility2 Implementation 2009
return aAny;
}
@@ -356,7 +344,6 @@ sal_Bool ScAccessibleCellBase::IsEditabl
bEditable = sal_True;
return bEditable;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL ScAccessibleCellBase::GetNote(void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -657,4 +644,3 @@ sal_Bool ScAccessibleCellBase::IsEditabl
strNote += GetNote();
return strNote;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx Wed Dec 18 13:27:09 2013
@@ -31,12 +31,10 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <com/sun/star/awt/KeyModifier.hpp>
#include <vcl/keycodes.hxx>
-//-----IAccessibility2 Implementation 2009
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -45,18 +43,14 @@
#include <toolkit/helper/convert.hxx>
#include <tools/debug.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <unotools/accessiblerelationsethelper.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
class ScAccessibleDataPilotButton
: public ScAccessibleContextBase
-//IAccessibility2 Implementation 2009-----
, public ::com::sun::star::accessibility::XAccessibleAction
-//-----IAccessibility2 Implementation 2009
{
public:
//===== internal ========================================================
@@ -78,7 +72,6 @@ public:
protected:
virtual ~ScAccessibleDataPilotButton(void);
public:
-//IAccessibility2 Implementation 2009-----
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
@@ -90,7 +83,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire() throw ();
virtual void SAL_CALL release() throw ();
-//-----IAccessibility2 Implementation 2009
///===== XAccessibleComponent ============================================
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -132,10 +124,8 @@ public:
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
///===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
@@ -327,10 +317,8 @@ void ScAccessibleDataPilotControl::GotFo
{
DBG_ASSERT(mpFieldWindow->GetFieldCount() == maChildren.size(), "did not recognize a child count change");
-//IAccessibility2 Implementation 2009-----
if(maChildren.size()==0)
return ;
-//-----IAccessibility2 Implementation 2009
sal_Int32 nIndex(mpFieldWindow->GetSelectedIndex());
uno::Reference < XAccessible > xTempAcc = maChildren[nIndex].xWeakAcc;
if (xTempAcc.is() && maChildren[nIndex].pAcc)
@@ -343,10 +331,8 @@ void ScAccessibleDataPilotControl::LostF
if (mpFieldWindow)
{
DBG_ASSERT(mpFieldWindow->GetFieldCount() == maChildren.size(), "did not recognize a child count change");
-//IAccessibility2 Implementation 2009-----
if(maChildren.size()==0)
return ;
-//-----IAccessibility2 Implementation 2009
sal_Int32 nIndex(mpFieldWindow->GetSelectedIndex());
uno::Reference < XAccessible > xTempAcc = maChildren[nIndex].xWeakAcc;
if (xTempAcc.is() && maChildren[nIndex].pAcc)
@@ -556,11 +542,8 @@ ScAccessibleDataPilotButton::ScAccessibl
::com::sun::star::accessibility::XAccessible>& rxParent,
ScPivotFieldWindow* pFieldWindow,
sal_Int32 nIndex)
-//IAccessibility2 Implementation 2009-----
//change role frome PUSH_BUTTON to BUTTON_MENU
- //: ScAccessibleContextBase(rxParent, AccessibleRole::PUSH_BUTTON),
: ScAccessibleContextBase(rxParent, AccessibleRole::BUTTON_MENU),
-//-----IAccessibility2 Implementation 2009
mpFieldWindow(pFieldWindow),
mnIndex(nIndex)
{
@@ -699,7 +682,6 @@ uno::Reference<XAccessibleStateSet> SAL_
return pStateSet;
}
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet >
SAL_CALL ScAccessibleDataPilotButton::getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException)
{
@@ -715,7 +697,6 @@ uno::Reference<XAccessibleStateSet> SAL_
return xSet;
}
-//-----IAccessibility2 Implementation 2009
///===== XServiceInfo ====================================================
::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void)
@@ -743,10 +724,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScAcces
::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
if (mpFieldWindow)
return mpFieldWindow->GetHelpText();
-//-----IAccessibility2 Implementation 2009
return rtl::OUString();
}
@@ -783,7 +762,6 @@ Rectangle ScAccessibleDataPilotButton::G
else
return Rectangle();
}
-//IAccessibility2 Implementation 2009-----
// -----------------------------------------------------------------------------
// XAccessibleAction
// -----------------------------------------------------------------------------
@@ -845,5 +823,4 @@ void SAL_CALL ScAccessibleDataPilotButto
{
ScAccessibleContextBase::release();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocument.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Wed Dec 18 13:27:09 2013
@@ -70,7 +70,6 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <toolkit/helper/convert.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svx/AccessibleControlShape.hxx>
#include <svx/AccessibleShape.hxx>
#include <svx/ShapeTypeHandler.hxx>
@@ -78,15 +77,12 @@
#include <sfx2/objsh.hxx>
#include <editeng/editview.hxx>
#include <editeng/editeng.hxx>
-//-----IAccessibility2 Implementation 2009
#include <list>
#include <algorithm>
-//IAccessibility2 Implementation 2009-----
#include "AccessibleCell.hxx"
#include "svx/unoapi.hxx"
#include "scmod.hxx"
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::std::for_each;
@@ -259,7 +255,6 @@ public:
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
) throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
throw (::com::sun::star::uno::RuntimeException);
@@ -268,7 +263,6 @@ public:
GetAccessibleCaption (const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& xShape)
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
///===== Internal ========================================================
void SetDrawBroadcaster();
@@ -489,7 +483,6 @@ sal_Bool ScChildrenShapes::ReplaceChild
return bResult;
}
-//IAccessibility2 Implementation 2009-----
::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
{
sal_Int32 count = GetCount();
@@ -527,7 +520,6 @@ ScChildrenShapes::GetAccessibleCaption (
}
return NULL;
}
-//-----IAccessibility2 Implementation 2009
sal_Int32 ScChildrenShapes::GetCount() const
{
SdrPage* pDrawPage = GetDrawPage();
@@ -806,9 +798,7 @@ uno::Reference< XAccessible > ScChildren
std::vector < uno::Reference < drawing::XShape > > aShapes;
FillShapes(aShapes);
-//IAccessibility2 Implementation 2009-----
if(aShapes.size()<=0) return xAccessible;
-//-----IAccessibility2 Implementation 2009
SortedShapes::iterator aItr;
if (FindShape(aShapes[nSelectedChildIndex], aItr))
xAccessible = Get(aItr - maZOrderedShapes.begin());
@@ -953,20 +943,16 @@ sal_Bool ScChildrenShapes::FindSelectedS
}
else
mnShapesSelected = 0;
-//IAccessibility2 Implementation 2009-----
SdrObject *pFocusedObj = NULL;
if( mnShapesSelected == 1 && aShapesList.size() == 1)
{
pFocusedObj = GetSdrObjectFromXShape(aShapesList[0]->xShape);
}
-//-----IAccessibility2 Implementation 2009
ScShapeDataLess aLess;
std::sort(aShapesList.begin(), aShapesList.end(), aLess);
-//IAccessibility2 Implementation 2009-----
SortedShapes vecSelectedShapeAdd;
SortedShapes vecSelectedShapeRemove;
sal_Bool bHasSelect=sal_False;
-//-----IAccessibility2 Implementation 2009
SortedShapes::iterator aXShapesItr(aShapesList.begin());
SortedShapes::const_iterator aXShapesEndItr(aShapesList.end());
SortedShapes::iterator aDataItr(maZOrderedShapes.begin());
@@ -991,18 +977,14 @@ sal_Bool ScChildrenShapes::FindSelectedS
(*aDataItr)->pAccShape->SetState(AccessibleStateType::SELECTED);
(*aDataItr)->pAccShape->ResetState(AccessibleStateType::FOCUSED);
bResult = sal_True;
-//IAccessibility2 Implementation 2009-----
vecSelectedShapeAdd.push_back((*aDataItr));
-//-----IAccessibility2 Implementation 2009
}
aFocusedItr = aDataItr;
}
-//IAccessibility2 Implementation 2009-----
else
{
bHasSelect = sal_True;
}
-//-----IAccessibility2 Implementation 2009
++aDataItr;
++aXShapesItr;
}
@@ -1016,9 +998,7 @@ sal_Bool ScChildrenShapes::FindSelectedS
(*aDataItr)->pAccShape->ResetState(AccessibleStateType::SELECTED);
(*aDataItr)->pAccShape->ResetState(AccessibleStateType::FOCUSED);
bResult = sal_True;
-//IAccessibility2 Implementation 2009-----
vecSelectedShapeRemove.push_back(*aDataItr);
-//-----IAccessibility2 Implementation 2009
}
}
++aDataItr;
@@ -1033,7 +1013,6 @@ sal_Bool ScChildrenShapes::FindSelectedS
else
++aDataItr;
}
-//IAccessibility2 Implementation 2009-----
bool bWinFocus=false;
ScGridWindow* pWin = static_cast<ScGridWindow*>(mpViewShell->GetWindowByPos(meSplitPos));
if (pWin)
@@ -1148,7 +1127,6 @@ sal_Bool ScChildrenShapes::FindSelectedS
aEvent.NewValue <<= xChild;
mpAccessibleDocument->CommitChange(aEvent);
}
-//-----IAccessibility2 Implementation 2009
std::for_each(aShapesList.begin(), aShapesList.end(), Destroy());
return bResult;
@@ -1559,7 +1537,6 @@ void ScAccessibleDocument::Notify( SfxBr
const ScAccGridWinFocusGotHint& rRef = (const ScAccGridWinFocusGotHint&)rHint;
if (rRef.GetNewGridWin() == meSplitPos)
{
-//IAccessibility2 Implementation 2009-----
uno::Reference<XAccessible> xAccessible;
if (mpChildrenShapes)
{
@@ -1584,7 +1561,6 @@ void ScAccessibleDocument::Notify( SfxBr
else
CommitFocusGained();
}
-//-----IAccessibility2 Implementation 2009
}
}
else if (rHint.ISA( SfxSimpleHint ))
@@ -1603,18 +1579,14 @@ void ScAccessibleDocument::Notify( SfxBr
{
mpChildrenShapes = new ScChildrenShapes( this, mpViewShell, meSplitPos );
}
-//IAccessibility2 Implementation 2009-----
//Invoke Init() to rebuild the mpChildrenShapes variable
this->Init();
-//-----IAccessibility2 Implementation 2009
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
CommitChange(aEvent); // all childs changed
-//IAccessibility2 Implementation 2009-----
if (mpAccessibleSpreadsheet)
mpAccessibleSpreadsheet->FireFirstCellFocus();
-//-----IAccessibility2 Implementation 2009
}
else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER)
{
@@ -1625,7 +1597,6 @@ void ScAccessibleDocument::Notify( SfxBr
{
if (mpViewShell && mpViewShell->GetViewData()->HasEditView(meSplitPos))
{
- //IAccessibility2 Implementation 2009------
EditEngine* pEditEng = mpViewShell->GetViewData()->GetEditView(meSplitPos)->GetEditEngine();
if (pEditEng && pEditEng->GetUpdateMode())
{
@@ -1643,7 +1614,6 @@ void ScAccessibleDocument::Notify( SfxBr
mpTempAccEdit->GotFocus();
}
- //------IAccessibility2 Implementation 2009
}
}
else if (rRef.GetId() == SC_HINT_ACC_LEAVEEDITMODE)
@@ -1655,15 +1625,9 @@ void ScAccessibleDocument::Notify( SfxBr
mpTempAccEdit = NULL;
RemoveChild(mxTempAcc, sal_True);
-//IAccessibility2 Implementation 2009-----
- //if (mpAccessibleSpreadsheet)
if (mpAccessibleSpreadsheet && mpViewShell->IsActive())
-//-----IAccessibility2 Implementation 2009
mpAccessibleSpreadsheet->GotFocus();
-//IAccessibility2 Implementation 2009-----
- //else
else if( mpViewShell->IsActive())
-//-----IAccessibility2 Implementation 2009
CommitFocusGained();
}
}
@@ -1724,12 +1688,10 @@ void SAL_CALL ScAccessibleDocument::sele
CommitChange(aEvent);
}
-//IAccessibility2 Implementation 2009-----
if(mpChildrenShapes )
{
mpChildrenShapes->SelectionChanged();
}
-//-----IAccessibility2 Implementation 2009
}
//===== XInterface =====================================================
@@ -1737,7 +1699,6 @@ void SAL_CALL ScAccessibleDocument::sele
uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType )
throw (uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
uno::Any aAnyTmp;
if(rType == ::getCppuType((com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> *)NULL) )
{
@@ -1745,7 +1706,6 @@ uno::Any SAL_CALL ScAccessibleDocument::
aAnyTmp <<= AccFromXShape;
return aAnyTmp;
}
-//-----IAccessibility2 Implementation 2009
uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType));
return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
}
@@ -1897,7 +1857,6 @@ uno::Reference<XAccessibleStateSet> SAL_
return pStateSet;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL
ScAccessibleDocument::getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException)
@@ -1927,7 +1886,6 @@ uno::Reference<XAccessibleStateSet> SAL_
}
return sName;
}
-//-----IAccessibility2 Implementation 2009
///===== XAccessibleSelection ===========================================
void SAL_CALL
@@ -2400,7 +2358,6 @@ rtl::OUString ScAccessibleDocument::GetC
{
return rtl::OUString();
}
-//IAccessibility2 Implementation 2009-----
ScDocument *ScAccessibleDocument::GetDocument() const
{
return mpViewShell ? mpViewShell->GetViewData()->GetDocument() : NULL;
@@ -2554,7 +2511,7 @@ com::sun::star::uno::Sequence< com::sun:
}
else if ( nType == FINDREPLACEFLOWTO )
{
- sal_Bool bSuccess;
+ sal_Bool bSuccess(sal_False);
rAny >>= bSuccess;
if ( bSuccess )
{
@@ -2597,5 +2554,4 @@ sal_Int32 SAL_CALL ScAccessibleDocument:
IsObjectValid();
return SC_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx Wed Dec 18 13:27:09 2013
@@ -45,10 +45,8 @@ ScAccessibleDocumentBase::ScAccessibleDo
ScAccessibleDocumentBase::~ScAccessibleDocumentBase(void)
{
}
-//IAccessibility2 Implementation 2009-----
void ScAccessibleDocumentBase::SwitchViewFireFocus()
{
CommitFocusGained();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx Wed Dec 18 13:27:09 2013
@@ -1899,7 +1899,6 @@ ScShapeChilds* ScAccessibleDocumentPageP
return mpShapeChilds;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString ScAccessibleDocumentPagePreview::getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -1926,7 +1925,6 @@ throw (::com::sun::star::uno::RuntimeExc
return sName;
}
-//-----IAccessibility2 Implementation 2009=======
//UNUSED2009-05 uno::Reference < XAccessible > ScAccessibleDocumentPagePreview::GetCurrentAccessibleTable()
//UNUSED2009-05 {
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx Wed Dec 18 13:27:09 2013
@@ -44,7 +44,6 @@
#include <rtl/uuid.h>
#include <tools/debug.hxx>
#include <svx/AccessibleTextHelper.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <editeng/editview.hxx>
@@ -60,7 +59,6 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
using ::com::sun::star::lang::IndexOutOfBoundsException;
using ::com::sun::star::uno::RuntimeException;
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -81,7 +79,6 @@ ScAccessibleEditObject::ScAccessibleEdit
CreateTextHelper();
SetName(rName);
SetDescription(rDescription);
-//IAccessibility2 Implementation 2009-----
if( meObjectType == CellInEditMode)
{
const ScAccessibleDocument *pAccDoc = const_cast<ScAccessibleDocument*>(static_cast<ScAccessibleDocument*>(rxParent.get())) ;
@@ -97,7 +94,6 @@ ScAccessibleEditObject::ScAccessibleEdit
}
else
m_pScDoc=NULL;
-//-----IAccessibility2 Implementation 2009
}
ScAccessibleEditObject::~ScAccessibleEditObject()
@@ -136,7 +132,6 @@ void ScAccessibleEditObject::GotFocus()
mpTextHelper->SetFocus(sal_True);
}
-//IAccessibility2 Implementation 2009-----
//===== XInterface ==========================================================
com::sun::star::uno::Any SAL_CALL
@@ -162,7 +157,6 @@ void SAL_CALL
{
ScAccessibleContextBase::release ();
}
-//-----IAccessibility2 Implementation 2009
//===== XAccessibleComponent ============================================
uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPoint(
@@ -408,7 +402,6 @@ void ScAccessibleEditObject::CreateTextH
}
}
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground( )
throw (::com::sun::star::uno::RuntimeException)
{
@@ -556,5 +549,4 @@ uno::Reference< XAccessibleRelationSet >
}
return uno::Reference< XAccessibleRelationSet >();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx Wed Dec 18 13:27:09 2013
@@ -50,16 +50,13 @@
#include <tools/debug.hxx>
#include <tools/gen.hxx>
#include <svtools/colorcfg.hxx>
-//IAccessibility2 Implementation 2009-----
#include "scresid.hxx"
#include "sc.hrc"
-//-----IAccessibility2 Implementation 2009
#include <algorithm>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-//IAccessibility2 Implementation 2009-----
bool CompMinCol(const std::pair<sal_uInt16,sal_uInt16> & pc1,const std::pair<sal_uInt16,sal_uInt16> &pc2)
{
return pc1.first < pc2.first;
@@ -255,7 +252,6 @@ sal_Bool ScAccessibleSpreadsheet::CalcSc
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
//===== internal ============================================================
ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
@@ -267,12 +263,10 @@ ScAccessibleSpreadsheet::ScAccessibleSpr
ScAccessibleTableBase (pAccDoc, GetDocument(pViewShell),
ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab))),
mbIsSpreadsheet( sal_True ),
-//IAccessibility2 Implementation 2009-----
m_bFormulaMode(sal_False),
m_bFormulaLastMode(sal_False),
m_pAccFormulaCell(NULL),
m_nMinX(0),m_nMaxX(0),m_nMinY(0),m_nMaxY(0)
-//-----IAccessibility2 Implementation 2009
{
ConstructScAccessibleSpreadsheet( pAccDoc, pViewShell, nTab, eSplitPos );
}
@@ -289,10 +283,6 @@ ScAccessibleSpreadsheet::~ScAccessibleSp
{
if (mpMarkedRanges)
delete mpMarkedRanges;
-//IAccessibility2 Implementation 2009-----
- //if (mpSortedMarkedCells)
- // delete mpSortedMarkedCells;
-//-----IAccessibility2 Implementation 2009
if (mpViewShell)
mpViewShell->RemoveAccessibilityObject(*this);
}
@@ -326,13 +316,11 @@ void ScAccessibleSpreadsheet::ConstructS
mpAccCell = GetAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col());
mpAccCell->acquire();
mpAccCell->Init();
- //IAccessibility2 Implementation 2009-----
ScDocument* pScDoc= GetDocument(mpViewShell);
if (pScDoc)
{
pScDoc->GetName( maActiveCell.Tab(), m_strOldTabName );
}
- //-----IAccessibility2 Implementation 2009
}
}
@@ -355,18 +343,12 @@ void SAL_CALL ScAccessibleSpreadsheet::d
void ScAccessibleSpreadsheet::CompleteSelectionChanged(sal_Bool bNewState)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return ;
}
-//-----IAccessibility2 Implementation 2009
if (mpMarkedRanges)
DELETEZ(mpMarkedRanges);
-//IAccessibility2 Implementation 2009-----
- //if (mpSortedMarkedCells)
- // DELETEZ(mpSortedMarkedCells);
-//-----IAccessibility2 Implementation 2009
mbHasSelection = bNewState;
AccessibleEventObject aEvent;
@@ -395,14 +377,9 @@ void ScAccessibleSpreadsheet::LostFocus(
void ScAccessibleSpreadsheet::GotFocus()
{
-//IAccessibility2 Implementation 2009-----
- //CommitFocusGained();
-//-----IAccessibility2 Implementation 2009
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
-//IAccessibility2 Implementation 2009-----
- //uno::Reference< XAccessible > xNew = mpAccCell;
uno::Reference< XAccessible > xNew;
if (IsFormulaMode())
{
@@ -434,7 +411,6 @@ void ScAccessibleSpreadsheet::GotFocus()
return ;
}
}
-//-----IAccessibility2 Implementation 2009
aEvent.NewValue <<= xNew;
CommitChange(aEvent);
@@ -465,69 +441,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
if (rHint.ISA( SfxSimpleHint ) )
{
const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
- // only notify if child exist, otherwise it is not necessary
-//IAccessibility2 Implementation 2009-----
- //if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
- //{
- // if (mpViewShell)
- // {
- // ScAddress aNewCell = mpViewShell->GetViewData()->GetCurPos();
- // sal_Bool bNewMarked(mpViewShell->GetViewData()->GetMarkData().GetTableSelect(aNewCell.Tab()) &&
- // (mpViewShell->GetViewData()->GetMarkData().IsMarked() ||
- // mpViewShell->GetViewData()->GetMarkData().IsMultiMarked()));
- // sal_Bool bNewCellSelected(isAccessibleSelected(aNewCell.Row(), aNewCell.Col()));
- // if ((bNewMarked != mbHasSelection) ||
- // (!bNewCellSelected && bNewMarked) ||
- // (bNewCellSelected && mbHasSelection))
- // {
- // if (mpMarkedRanges)
- // DELETEZ(mpMarkedRanges);
- // if (mpSortedMarkedCells)
- // DELETEZ(mpSortedMarkedCells);
- // AccessibleEventObject aEvent;
- // aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
- // aEvent.Source = uno::Reference< XAccessibleContext >(this);
-
- // mbHasSelection = bNewMarked;
-
- // CommitChange(aEvent);
- // }
-
- // // active descendant changed event (new cell selected)
- // bool bFireActiveDescChanged = (aNewCell != maActiveCell) &&
- // (aNewCell.Tab() == maActiveCell.Tab()) && IsFocused();
-
- // /* Remember old active cell and set new active cell.
- // #i82409# always update the class members mpAccCell and
- // maActiveCell, even if the sheet is not focused, e.g. when
- // using the name box in the toolbar. */
- // uno::Reference< XAccessible > xOld = mpAccCell;
- // mpAccCell->release();
- // mpAccCell = GetAccessibleCellAt(aNewCell.Row(), aNewCell.Col());
- // mpAccCell->acquire();
- // mpAccCell->Init();
- // uno::Reference< XAccessible > xNew = mpAccCell;
- // maActiveCell = aNewCell;
-
- // // #i14108# fire event only if sheet is focused
- // if( bFireActiveDescChanged )
- // {
- // AccessibleEventObject aEvent;
- // aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
- // aEvent.Source = uno::Reference< XAccessibleContext >(this);
- // aEvent.OldValue <<= xOld;
- // aEvent.NewValue <<= xNew;
- // CommitChange(aEvent);
- // }
- // }
- //}
- //else if ((rRef.GetId() == SC_HINT_DATACHANGED))
- //{
- // if (!mbDelIns)
- // CommitTableModelChange(maRange.aStart.Row(), maRange.aStart.Col(), maRange.aEnd.Row(), maRange.aEnd.Col(), AccessibleTableModelChangeType::UPDATE);
- // else
- // mbDelIns = sal_False;
- //}
if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
{
if (mpViewShell)
@@ -749,7 +662,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
}
}
}
-//-----IAccessibility2 Implementation 2009
// no longer needed, because the document calls the VisAreaChanged method
/* else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
{
@@ -850,7 +762,6 @@ void ScAccessibleSpreadsheet::Notify( Sf
ScAccessibleTableBase::Notify(rBC, rHint);
}
-//IAccessibility2 Implementation 2009-----
void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData)
{
AccessibleEventObject aEvent;
@@ -905,7 +816,6 @@ sal_Bool ScAccessibleSpreadsheet::IsSame
{
return m_LastMarkedRanges == *mpMarkedRanges;
}
-//-----IAccessibility2 Implementation 2009
//===== XAccessibleTable ================================================
uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders( )
@@ -952,12 +862,10 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAc
ScUnoGuard aGuard;
IsObjectValid();
uno::Sequence<sal_Int32> aSequence;
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return aSequence;
}
-//-----IAccessibility2 Implementation 2009
if (mpViewShell && mpViewShell->GetViewData())
{
aSequence.realloc(maRange.aEnd.Row() - maRange.aStart.Row() + 1);
@@ -985,12 +893,10 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAc
ScUnoGuard aGuard;
IsObjectValid();
uno::Sequence<sal_Int32> aSequence;
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return aSequence;
}
-//-----IAccessibility2 Implementation 2009
if (mpViewShell && mpViewShell->GetViewData())
{
aSequence.realloc(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
@@ -1017,12 +923,10 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
{
ScUnoGuard aGuard;
IsObjectValid();
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0))
throw lang::IndexOutOfBoundsException();
@@ -1042,12 +946,10 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
ScUnoGuard aGuard;
IsObjectValid();
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0))
throw lang::IndexOutOfBoundsException();
@@ -1063,7 +965,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
ScAccessibleCell* ScAccessibleSpreadsheet::GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn)
{
ScAccessibleCell* pAccessibleCell = NULL;
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
ScAddress aCellAddress(static_cast<SCCOL>(nColumn), nRow, mpViewShell->GetViewData()->GetTabNo());
@@ -1076,7 +977,6 @@ ScAccessibleCell* ScAccessibleSpreadshee
}
else
{
-//-----IAccessibility2 Implementation 2009
ScAddress aCellAddress(static_cast<SCCOL>(maRange.aStart.Col() + nColumn),
static_cast<SCROW>(maRange.aStart.Row() + nRow), maRange.aStart.Tab());
if ((aCellAddress == maActiveCell) && mpAccCell)
@@ -1095,7 +995,6 @@ uno::Reference< XAccessible > SAL_CALL S
{
ScUnoGuard aGuard;
IsObjectValid();
-//IAccessibility2 Implementation 2009-----
if (!IsFormulaMode())
{
if (nRow > (maRange.aEnd.Row() - maRange.aStart.Row()) ||
@@ -1104,7 +1003,6 @@ uno::Reference< XAccessible > SAL_CALL S
nColumn < 0)
throw lang::IndexOutOfBoundsException();
}
-//-----IAccessibility2 Implementation 2009
uno::Reference<XAccessible> xAccessible;
ScAccessibleCell* pAccessibleCell = GetAccessibleCellAt(nRow, nColumn);
xAccessible = pAccessibleCell;
@@ -1118,13 +1016,11 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee
ScUnoGuard aGuard;
IsObjectValid();
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
ScAddress addr(static_cast<SCCOL>(nColumn), nRow, 0);
return IsScAddrFormulaSel(addr);
}
-//-----IAccessibility2 Implementation 2009
if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0) ||
(nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0))
throw lang::IndexOutOfBoundsException();
@@ -1154,7 +1050,6 @@ uno::Reference< XAccessible > SAL_CALL S
SCsCOL nX;
SCsROW nY;
mpViewShell->GetViewData()->GetPosFromPixel( rPoint.X, rPoint.Y, meSplitPos, nX, nY);
-//IAccessibility2 Implementation 2009-----
try{
xAccessible = getAccessibleCellAt(nY, nX);
}
@@ -1162,7 +1057,6 @@ uno::Reference< XAccessible > SAL_CALL S
{
return NULL;
}
-//-----IAccessibility2 Implementation 2009
}
}
return xAccessible;
@@ -1270,9 +1164,7 @@ void SAL_CALL
IsObjectValid();
if (mpViewShell)
{
-//IAccessibility2 Implementation 2009-----
if (!IsFormulaMode())
-//-----IAccessibility2 Implementation 2009
mpViewShell->Unmark();
}
}
@@ -1285,7 +1177,6 @@ void SAL_CALL
IsObjectValid();
if (mpViewShell)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
ScViewData *pViewData = mpViewShell->GetViewData();
@@ -1295,7 +1186,6 @@ void SAL_CALL
mpViewShell->UpdateRef(MAXCOL, MAXROW, pViewData->GetTabNo());
}
else
-//-----IAccessibility2 Implementation 2009
mpViewShell->SelectAll();
}
}
@@ -1309,21 +1199,17 @@ sal_Int32 SAL_CALL
sal_Int32 nResult(0);
if (mpViewShell)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
nResult = GetRowAll() * GetColAll() ;
}
else
{
-//-----IAccessibility2 Implementation 2009
if (!mpMarkedRanges)
{
mpMarkedRanges = new ScRangeList();
ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData());
-//IAccessibility2 Implementation 2009-----
//aMarkData.MarkToMulti();
-//-----IAccessibility2 Implementation 2009
aMarkData.FillRangeListWithMarks(mpMarkedRanges, sal_False);
}
// is possible, because there shouldn't be overlapped ranges in it
@@ -1341,7 +1227,6 @@ uno::Reference<XAccessible > SAL_CALL
ScUnoGuard aGuard;
IsObjectValid();
uno::Reference < XAccessible > xAccessible;
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
if(CheckChildIndex(nSelectedChildIndex))
@@ -1351,7 +1236,6 @@ uno::Reference<XAccessible > SAL_CALL
}
return xAccessible;
}
-//-----IAccessibility2 Implementation 2009
if (mpViewShell)
{
if (!mpMarkedRanges)
@@ -1361,7 +1245,6 @@ uno::Reference<XAccessible > SAL_CALL
}
if (mpMarkedRanges)
{
-//IAccessibility2 Implementation 2009-----
//if (!mpSortedMarkedCells)
// CreateSortedMarkedCells();
//if (mpSortedMarkedCells)
@@ -1381,7 +1264,6 @@ uno::Reference<XAccessible > SAL_CALL
xAccessible = m_mapSelectionSend[addr];
else
xAccessible = getAccessibleCellAt(addr.Row(), addr.Col());
-//-----IAccessibility2 Implementation 2009
}
}
return xAccessible;
@@ -1402,7 +1284,6 @@ void SAL_CALL
sal_Int32 nCol(getAccessibleColumn(nChildIndex));
sal_Int32 nRow(getAccessibleRow(nChildIndex));
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
if(IsScAddrFormulaSel(
@@ -1413,7 +1294,6 @@ void SAL_CALL
}
return ;
}
-//-----IAccessibility2 Implementation 2009
if (mpViewShell->GetViewData()->GetMarkData().IsCellMarked(static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow)))
SelectCell(nRow, nCol, sal_True);
}
@@ -1421,7 +1301,6 @@ void SAL_CALL
void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Bool bDeselect)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
if (bDeselect)
@@ -1437,7 +1316,6 @@ void ScAccessibleSpreadsheet::SelectCell
}
return ;
}
-//-----IAccessibility2 Implementation 2009
mpViewShell->SetTabNo( maRange.aStart.Tab() );
mpViewShell->DoneBlockMode( sal_True ); // continue selecting
@@ -1445,52 +1323,6 @@ void ScAccessibleSpreadsheet::SelectCell
mpViewShell->SelectionChanged();
}
-//IAccessibility2 Implementation 2009-----
-//void ScAccessibleSpreadsheet::CreateSortedMarkedCells()
-//{
-// mpSortedMarkedCells = new std::vector<ScMyAddress>();
-// mpSortedMarkedCells->reserve(mpMarkedRanges->GetCellCount());
-// ScRange* pRange = mpMarkedRanges->First();
-// while (pRange)
-// {
-// if (pRange->aStart.Tab() != pRange->aEnd.Tab())
-// {
-// if ((maActiveCell.Tab() >= pRange->aStart.Tab()) ||
-// maActiveCell.Tab() <= pRange->aEnd.Tab())
-// {
-// ScRange aRange(*pRange);
-// aRange.aStart.SetTab(maActiveCell.Tab());
-// aRange.aEnd.SetTab(maActiveCell.Tab());
-// AddMarkedRange(aRange);
-// }
-// else
-// {
-// DBG_ERROR("Range of wrong table");
-// }
-// }
-// else if(pRange->aStart.Tab() == maActiveCell.Tab())
-// AddMarkedRange(*pRange);
-// else
-// {
-// DBG_ERROR("Range of wrong table");
-// }
-// pRange = mpMarkedRanges->Next();
-// }
-// std::sort(mpSortedMarkedCells->begin(), mpSortedMarkedCells->end());
-//}
-
-/*void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange)
-{
- for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
- {
- for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
- {
- ScMyAddress aCell(nCol, nRow, maActiveCell.Tab());
- mpSortedMarkedCells->push_back(aCell);
- }
- }
-}*/
-//-----IAccessibility2 Implementation 2009
//===== XServiceInfo ====================================================
@@ -1539,22 +1371,6 @@ void SAL_CALL ScAccessibleSpreadsheet::a
ScUnoGuard aGuard;
IsObjectValid();
ScAccessibleTableBase::addEventListener(xListener);
-
-//IAccessibility2 Implementation 2009-----
-/* if (!mbIsFocusSend)
- {
- mbIsFocusSend = sal_True;
- CommitFocusGained();
-
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
- aEvent.Source = uno::Reference< XAccessibleContext >(this);
- aEvent.NewValue <<= getAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col());
-
- CommitChange(aEvent);
- }
-*/
-//-----IAccessibility2 Implementation 2009
}
//==== internal =========================================================
@@ -1596,12 +1412,10 @@ sal_Bool ScAccessibleSpreadsheet::IsDefu
sal_Bool ScAccessibleSpreadsheet::IsEditable(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool bProtected(sal_False);
if (mpDoc && mpDoc->IsTabProtected(maRange.aStart.Tab()))
bProtected = sal_True;
@@ -1621,12 +1435,10 @@ sal_Bool ScAccessibleSpreadsheet::IsFocu
sal_Bool ScAccessibleSpreadsheet::IsCompleteSheetSelected()
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool bResult(sal_False);
if(mpViewShell)
{
@@ -1677,7 +1489,6 @@ Rectangle ScAccessibleSpreadsheet::GetVi
else
return Rectangle();
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
@@ -1950,4 +1761,3 @@ uno::Reference < XAccessible > ScAccessi
else
return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx Wed Dec 18 13:27:09 2013
@@ -77,7 +77,6 @@ void SAL_CALL ScAccessibleTableBase::dis
uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType )
throw (uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
//uno::Any aAny (ScAccessibleTableBaseImpl::queryInterface(rType));
//return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
uno::Any aRet;
@@ -93,7 +92,6 @@ uno::Any SAL_CALL ScAccessibleTableBase:
return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
}
return aRet;
-//-----IAccessibility2 Implementation 2009
}
void SAL_CALL ScAccessibleTableBase::acquire()
@@ -168,18 +166,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
{
SCROW nEndRow(0);
SCCOL nEndCol(0);
-//IAccessibility2 Implementation 2009-----
mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)->
ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
if (nEndRow > nRow)
nCount = nEndRow - nRow + 1;
- // if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
- // nEndCol, nEndRow, maRange.aStart.Tab()))
- //{
- // if (nEndRow > nRow)
- // nCount = nEndRow - nRow + 1;
- //}
-//-----IAccessibility2 Implementation 2009
}
return nCount;
@@ -203,18 +193,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase
{
SCROW nEndRow(0);
SCCOL nEndCol(0);
-//IAccessibility2 Implementation 2009-----
mpDoc->GetTableByIndex(maRange.aStart.Tab())->GetColumnByIndex(nColumn)->
ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
if (nEndCol > nColumn)
nCount = nEndCol - nColumn + 1;
- // if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
- // nEndCol, nEndRow, maRange.aStart.Tab()))
- //{
- // if (nEndCol > nColumn)
- // nCount = nEndCol - nColumn + 1;
- //}
-//-----IAccessibility2 Implementation 2009
}
return nCount;
@@ -516,7 +498,6 @@ void ScAccessibleTableBase::CommitTableM
CommitChange(aEvent);
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
@@ -537,6 +518,5 @@ sal_Bool SAL_CALL ScAccessibleTableBase:
{
return sal_True;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleText.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleText.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleText.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/Accessibility/AccessibleText.cxx Wed Dec 18 13:27:09 2013
@@ -1058,10 +1058,7 @@ ScDocShell* ScAccessibleCellTextData::Ge
// ============================================================================
-//IAccessibility2 Implementation 2009-----
-//ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin)
ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone)
-//-----IAccessibility2 Implementation 2009
:
mpViewForwarder(NULL),
mpEditViewForwarder(NULL),
@@ -1070,22 +1067,16 @@ ScAccessibleEditObjectTextData::ScAccess
mpForwarder(NULL),
mpWindow(pWin)
{
-//IAccessibility2 Implementation 2009-----
// Solution: If the object is cloned, do NOT add notify hdl.
mbIsCloned = isClone;
- //if (mpEditEngine)
if (mpEditEngine && !mbIsCloned)
-//-----IAccessibility2 Implementation 2009
mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
}
ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
{
-//IAccessibility2 Implementation 2009-----
// Solution: If the object is cloned, do NOT set notify hdl.
- //if (mpEditEngine)
if (mpEditEngine && !mbIsCloned)
-//-----IAccessibility2 Implementation 2009
mpEditEngine->SetNotifyHdl(Link());
if (mpViewForwarder)
delete mpViewForwarder;
@@ -1117,11 +1108,9 @@ void ScAccessibleEditObjectTextData::Not
ScAccessibleTextData* ScAccessibleEditObjectTextData::Clone() const
{
-//IAccessibility2 Implementation 2009-----
// Solution: Add para to indicate the object is cloned
//return new ScAccessibleEditObjectTextData(mpEditView, mpWindow);
return new ScAccessibleEditObjectTextData(mpEditView, mpWindow,sal_True);
-//-----IAccessibility2 Implementation 2009
}
SvxTextForwarder* ScAccessibleEditObjectTextData::GetTextForwarder()
@@ -1130,11 +1119,8 @@ SvxTextForwarder* ScAccessibleEditObject
{
if (!mpEditEngine)
mpEditEngine = mpEditView->GetEditEngine();
-//IAccessibility2 Implementation 2009-----
// Solution: If the object is cloned, do NOT add notify hdl.
- //if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet())
if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet()&&!mbIsCloned)
-//-----IAccessibility2 Implementation 2009
mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
if(!mpForwarder)
mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/app/inputhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/app/inputhdl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/app/inputhdl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/app/inputhdl.cxx Wed Dec 18 13:27:09 2013
@@ -3453,13 +3453,11 @@ void ScInputHandler::NotifyChange( const
else
aCursorPos.Format( aPosStr, SCA_VALID | nFlags, pDoc, aAddrDetails );
}
- //IAccessibility2 Implementation 2009-----
// Disable the accessible VALUE_CHANGE event
sal_Bool bIsSuppressed = pInputWin->IsAccessibilityEventsSuppressed(sal_False);
pInputWin->SetAccessibilityEventsSuppressed(sal_True);
pInputWin->SetPosString(aPosStr);
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
- //-----IAccessibility2 Implementation 2009
pInputWin->SetSumAssignMode();
}
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/dbnamdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/dbnamdlg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/dbnamdlg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/dbnamdlg.cxx Wed Dec 18 13:27:09 2013
@@ -180,11 +180,9 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* p
aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea );
Init();
FreeResource();
- //IAccessibility2 Implementation 2009-----
SynFocusTimer.SetTimeout(150);
SynFocusTimer.SetTimeoutHdl(LINK( this, ScDbNameDlg, FocusToComoboxHdl));
SynFocusTimer.Start();
- //-----IAccessibility2 Implementation 2009
aRbAssign.SetAccessibleRelationMemberOf(&aFlAssign);
}
@@ -721,7 +719,6 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, vo
String aText = aEdAssign.GetText();
if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID )
theCurArea = aTmpRange;
-//IAccessibility2 Implementation 2009-----
if( aText.Len() > 0 && aEdName.GetText().Len() > 0 )
{
aBtnAdd.Enable();
@@ -742,11 +739,9 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, vo
aFTSource.Disable();
aFTOperations.Disable();
}
-//-----IAccessibility2 Implementation 2009
return 0;
}
-//IAccessibility2 Implementation 2009-----
IMPL_LINK( ScDbNameDlg, FocusToComoboxHdl, Timer*, pTi)
{
(void)pTi;
@@ -754,4 +749,3 @@ IMPL_LINK( ScDbNameDlg, FocusToComoboxHd
// aEdName.CallEventListeners( VCLEVENT_CONTROL_GETFOCUS );
return 0;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/scendlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/scendlg.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/scendlg.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/dbgui/scendlg.hrc Wed Dec 18 13:27:09 2013
@@ -51,6 +51,4 @@
#define STR_CREATEDBY 31
#define STR_ON 32
#define STR_EDIT 33
-//IAccessibility2 Implementation 2009-----
#define STR_COLOR 34
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/docshell/docsh.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/docshell/docsh.cxx Wed Dec 18 13:27:09 2013
@@ -121,9 +121,7 @@
#include "docsh.hxx"
#include "docshimp.hxx"
-//IAccessibility2 Implementation 2009-----
#include <sfx2/viewfrm.hxx>
-//-----IAccessibility2 Implementation 2009
#include <rtl/logfile.hxx>
#include <comphelper/processfactory.hxx>
@@ -206,7 +204,7 @@ namespace
static const struct
{
const char * mpFilterName;
- unsigned mnFilterNameLen;
+ size_t mnFilterNameLen;
} szMSFilterNames [] =
{
{ pFilterExcel4, strlen( pFilterExcel4 ) },
@@ -1590,7 +1588,6 @@ sal_Bool __EXPORT ScDocShell::SaveAs( Sf
PrepareSaveGuard aPrepareGuard( *this);
-//IAccessibility2 Implementation 2009-----
aDocument.setDocAccTitle(String());
// SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this, TYPE(SfxTopViewFrame));
SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
@@ -1606,7 +1603,6 @@ sal_Bool __EXPORT ScDocShell::SaveAs( Sf
}
}
}
-//-----IAccessibility2 Implementation 2009
// wait cursor is handled with progress bar
sal_Bool bRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/drawfunc/fudraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/drawfunc/fudraw.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/drawfunc/fudraw.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/drawfunc/fudraw.cxx Wed Dec 18 13:27:09 2013
@@ -354,11 +354,9 @@ sal_Bool __EXPORT FuDraw::KeyInput(const
// changeover to the next object
if(!pView->MarkNextObj( !aCode.IsShift() ))
{
-//IAccessibility2 Implementation 2009-----
//If there is only one object, don't do the UnmarkAlllObj() & MarkNextObj().
if ( pView->GetMarkableObjCount() > 1 && pView->HasMarkableObj() )
{
-//-----IAccessibility2 Implementation 2009
// #97016# No next object: go over open end and
// get first from the other side
pView->UnmarkAllObj();
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCell.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCell.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCell.hxx Wed Dec 18 13:27:09 2013
@@ -32,11 +32,9 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
#include <comphelper/uno3.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleExtendedAttributes_HPP_
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
class ScTabViewShell;
class ScAccessibleDocument;
@@ -51,9 +49,7 @@ typedef cppu::ImplHelper1< ::com::sun::s
class ScAccessibleCell
: public ScAccessibleCellBase,
public accessibility::AccessibleStaticTextBase,
-//IAccessibility2 Implementation 2009-----
public ScAccessibleCellAttributeImpl
-//-----IAccessibility2 Implementation 2009
{
public:
//===== internal ========================================================
@@ -145,14 +141,12 @@ public:
getSupportedServiceNames(void)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
// Override this method to handle cell's ParaIndent attribute specially.
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
private:
ScTabViewShell* mpViewShell;
ScAccessibleDocument* mpAccDoc;
@@ -182,10 +176,8 @@ private:
void AddRelation(const ScRange& rRange,
const sal_uInt16 aRelationType,
::utl::AccessibleRelationSetHelper* pRelationSet);
-//IAccessibility2 Implementation 2009-----
sal_Bool IsFormulaMode();
sal_Bool IsDropdown();
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCellBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCellBase.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCellBase.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleCellBase.hxx Wed Dec 18 13:27:09 2013
@@ -142,7 +142,6 @@ private:
virtual sal_Bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
-//IAccessibility2 Implementation 2009-----
protected:
virtual ::rtl::OUString SAL_CALL GetNote(void)
throw (::com::sun::star::uno::RuntimeException);
@@ -156,7 +155,6 @@ protected:
public:
const ScAddress& GetCellAddress() const { return maCellAddress; }
sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocument.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocument.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocument.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocument.hxx Wed Dec 18 13:27:09 2013
@@ -29,12 +29,9 @@
#include "viewdata.hxx"
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
-//IAccessibility2 Implementation 2009-----
-//#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
-//-----IAccessibility2 Implementation 2009
#include <svx/IAccessibleViewForwarder.hxx>
class ScTabViewShell;
@@ -56,19 +53,15 @@ namespace utl
<code>AccessibleContext</code> service.
*/
-//IAccessibility2 Implementation 2009-----
typedef cppu::ImplHelper3< ::com::sun::star::accessibility::XAccessibleSelection,
::com::sun::star::accessibility::XAccessibleExtendedAttributes,
-//-----IAccessibility2 Implementation 2009
::com::sun::star::view::XSelectionChangeListener >
ScAccessibleDocumentImpl;
class ScAccessibleDocument
: public ScAccessibleDocumentBase,
public ScAccessibleDocumentImpl,
-//IAccessibility2 Implementation 2009-----
public com::sun::star::accessibility::XAccessibleGetAccFlowTo,
-//-----IAccessibility2 Implementation 2009
public accessibility::IAccessibleViewForwarder
{
public:
@@ -135,14 +128,12 @@ public:
getAccessibleStateSet(void)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString SAL_CALL
getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-//-----IAccessibility2 Implementation 2009
///===== XAccessibleSelection ===========================================
virtual void SAL_CALL
@@ -337,7 +328,6 @@ private:
rtl::OUString GetCurrentCellDescription() const;
Rectangle GetVisibleArea_Impl() const;
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence();
public:
ScDocument *GetDocument() const ;
@@ -354,7 +344,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
protected:
void SwitchViewFireFocus();
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentBase.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentBase.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentBase.hxx Wed Dec 18 13:27:09 2013
@@ -37,9 +37,7 @@ public:
ScAccessibleDocumentBase(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent);
-//IAccessibility2 Implementation 2009-----
virtual void SwitchViewFireFocus();
-//-----IAccessibility2 Implementation 2009
protected:
virtual ~ScAccessibleDocumentBase (void);
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx Wed Dec 18 13:27:09 2013
@@ -85,10 +85,8 @@ public:
getAccessibleStateSet(void)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString SAL_CALL getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
///===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleEditObject.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleEditObject.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleEditObject.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleEditObject.hxx Wed Dec 18 13:27:09 2013
@@ -27,10 +27,8 @@
#include "AccessibleContextBase.hxx"
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include "global.hxx"
-//-----IAccessibility2 Implementation 2009
namespace accessibility
{
class AccessibleTextHelper;
@@ -51,9 +49,7 @@ enum EditObjectType
*/
class ScAccessibleEditObject
: public ScAccessibleContextBase,
-//IAccessibility2 Implementation 2009-----
public ::com::sun::star::accessibility::XAccessibleSelection
-//-----IAccessibility2 Implementation 2009
{
public:
//===== internal ========================================================
@@ -78,7 +74,6 @@ public:
virtual void LostFocus();
virtual void GotFocus();
-//IAccessibility2 Implementation 2009-----
///===== XInterface =====================================================
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -88,7 +83,6 @@ public:
virtual void SAL_CALL acquire() throw ();
virtual void SAL_CALL release() throw ();
-//-----IAccessibility2 Implementation 2009
///===== XAccessibleComponent ============================================
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -152,7 +146,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
protected:
/// Return this object's description.
virtual ::rtl::OUString SAL_CALL
@@ -211,7 +204,6 @@ private:
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
void CreateTextHelper();
-//IAccessibility2 Implementation 2009-----
ScDocument *m_pScDoc;
ScAddress m_curCellAddress;
@@ -224,7 +216,6 @@ private:
throw (::com::sun::star::uno::RuntimeException);
sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ;
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx Wed Dec 18 13:27:09 2013
@@ -30,10 +30,8 @@
#include <vector>
-//IAccessibility2 Implementation 2009-----
#include "rangelst.hxx"
#include <map>
-//-----IAccessibility2 Implementation 2009
class ScMyAddress : public ScAddress
{
public:
@@ -243,7 +241,6 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
throw (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) ;
@@ -253,7 +250,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
protected:
/// Return the object's current bounding box relative to the desktop.
@@ -294,7 +290,6 @@ private:
ScDocument* GetDocument(ScTabViewShell* pViewShell);
Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos);
Rectangle GetVisCells(const Rectangle& rVisArea);
-//IAccessibility2 Implementation 2009-----
//void CreateSortedMarkedCells();
//void AddMarkedRange(const ScRange& rRange);
typedef std::vector<ScMyAddress> VEC_MYADDR;
@@ -342,7 +337,6 @@ public:
sal_Bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize);
sal_Bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet);
String m_strOldTabName;
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleTableBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleTableBase.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleTableBase.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleTableBase.hxx Wed Dec 18 13:27:09 2013
@@ -30,9 +30,7 @@
#include "address.hxx"
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
-//-----IAccessibility2 Implementation 2009
#include <cppuhelper/implbase2.hxx>
class ScTabViewShell;
@@ -48,9 +46,7 @@ typedef cppu::ImplHelper2< ::com::sun::s
class ScAccessibleTableBase :
public ScAccessibleContextBase,
-//IAccessibility2 Implementation 2009-----
public ::com::sun::star::accessibility::XAccessibleTableSelection,
-//-----IAccessibility2 Implementation 2009
public ScAccessibleTableBaseImpl
{
public:
@@ -205,7 +201,6 @@ public:
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
-//IAccessibility2 Implementation 2009-----
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
@@ -214,7 +209,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
protected:
/// Return this object's description.
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleText.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleText.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleText.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/AccessibleText.hxx Wed Dec 18 13:27:09 2013
@@ -132,11 +132,9 @@ private:
class ScAccessibleEditObjectTextData : public ScAccessibleTextData
{
public:
-//IAccessibility2 Implementation 2009-----
// Solution: Add a para to indicate whether the object is cloned
//ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin);
ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone=sal_False);
-//-----IAccessibility2 Implementation 2009
virtual ~ScAccessibleEditObjectTextData();
virtual ScAccessibleTextData* Clone() const;
@@ -159,9 +157,7 @@ protected:
EditEngine* mpEditEngine;
SvxEditEngineForwarder* mpForwarder;
Window* mpWindow;
-//IAccessibility2 Implementation 2009-----
sal_Bool mbIsCloned;
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/condfrmt.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/condfrmt.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/condfrmt.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/condfrmt.hrc Wed Dec 18 13:27:09 2013
@@ -59,11 +59,9 @@
#define FL_SEP1 41
#define FL_SEP2 42
-//IAccessibility2 Implementation 2009-----
#define LABEL_FORMARTTING_CONDITIONS 5043
#define LABEL_CONDITIONS 5044
#define LABEL_CONDITION_VALUE 5045
-//-----IAccessibility2 Implementation 2009
#define BTN_OK 31
#define BTN_CANCEL 32
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/content.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/content.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/content.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/content.hxx Wed Dec 18 13:27:09 2013
@@ -34,9 +34,7 @@ class ScNavigatorSettings;
class ScDocument;
class ScDocShell;
class ScAreaLink;
-//IAccessibility2 Implementation 2009-----
class SdrPage;
-//-----IAccessibility2 Implementation 2009
#define SC_CONTENT_ROOT 0
#define SC_CONTENT_TABLE 1
@@ -67,10 +65,8 @@ class ScContentTree : public SvTreeListB
String aHiddenName; // URL zum Laden
String aHiddenTitle; // fuer Anzeige
ScDocument* pHiddenDocument; // temporaer
-//IAccessibility2 Implementation 2009-----
sal_Bool bisInNavigatoeDlg;
String sKeyString;
-//-----IAccessibility2 Implementation 2009
sal_uInt16 pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge
@@ -119,12 +115,10 @@ class ScContentTree : public SvTreeListB
DECL_LINK( ContentDoubleClickHdl, ScContentTree* );
DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* );
-//IAccessibility2 Implementation 2009-----
public:
SvLBoxEntry* pTmpEntry;
bool m_bFirstPaint;
-//-----IAccessibility2 Implementation 2009
protected:
// virtual sal_Bool Drop( const DropEvent& rEvt );
// virtual sal_Bool QueryDrop( DropEvent& rEvt );
@@ -138,21 +132,17 @@ protected:
virtual void Command( const CommandEvent& rCEvt );
virtual void RequestHelp( const HelpEvent& rHEvt );
-//IAccessibility2 Implementation 2009-----
virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&, SvLBoxButtonKind);
-//-----IAccessibility2 Implementation 2009
public:
ScContentTree( Window* pParent, const ResId& rResId );
~ScContentTree();
-//IAccessibility2 Implementation 2009-----
String getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const;
String GetEntryAltText( SvLBoxEntry* pEntry ) const;
String GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
void ObjectFresh( sal_uInt16 nType,SvLBoxEntry* pEntry = NULL);
sal_Bool SetNavigatorDlgFlag(sal_Bool isInNavigatoeDlg){ return bisInNavigatoeDlg=isInNavigatoeDlg;};
-//-----IAccessibility2 Implementation 2009
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void KeyInput( const KeyEvent& rKEvt );
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/dbnamdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/dbnamdlg.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/dbnamdlg.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/dbnamdlg.hxx Wed Dec 18 13:27:09 2013
@@ -100,10 +100,8 @@ private:
ScDBCollection aLocalDbCol;
ScRange theCurArea;
List aRemoveList;
- //IAccessibility2 Implementation 2009-----
Timer SynFocusTimer;
DECL_LINK( FocusToComoboxHdl, Timer* );
- //-----IAccessibility2 Implementation 2009
#ifdef _DBNAMDLG_CXX
private:
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/docsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/docsh.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/docsh.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/docsh.hxx Wed Dec 18 13:27:09 2013
@@ -407,12 +407,10 @@ public:
const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
void SetSolverSaveData( const ScOptSolverSave& rData );
-//IAccessibility2 Implementation 2009-----
virtual void setDocAccTitle( const String& rTitle ) { aDocument.setDocAccTitle( rTitle ); }
virtual const String getDocAccTitle() const { return aDocument.getDocAccTitle(); }
void setDocReadOnly( sal_Bool b){ aDocument.setDocReadOnly(b);}
sal_Bool getDocReadOnly() const { return aDocument.getDocReadOnly(); }
-//-----IAccessibility2 Implementation 2009
//<!--Added by PengYunQuan for Validity Cell Range Picker
sal_Bool AcceptStateUpdate() const;
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/drawview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/drawview.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/drawview.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/drawview.hxx Wed Dec 18 13:27:09 2013
@@ -155,11 +155,9 @@ public:
SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0)
//UNUSED2009-05 void CaptionTextDirection(sal_uInt16 nSlot);
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
-//IAccessibility2 Implementation 2009-----
SdrObject* GetObjectByName(const String& rName);
sal_Bool GetObjectIsMarked( SdrObject * pObject );
sal_Bool SelectCurrentViewObject( const String& rName );
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/filter.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/filter.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/filter.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/filter.hrc Wed Dec 18 13:27:09 2013
@@ -76,10 +76,8 @@
#define ED_CRITERIA_AREA 52
#define RB_CRITERIA_AREA 53
-//IAccessibility2 Implementation 2009-----
#define STR_COPY_AREA_TO 5054
#define RID_FILTER_OPERATOR 5055
#define RID_FILTER_FIELDNAME 5056
#define RID_FILTER_CONDITION 5057
#define RID_FILTER_VALUE 5058
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/gridwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/gridwin.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/gridwin.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/gridwin.hxx Wed Dec 18 13:27:09 2013
@@ -239,9 +239,7 @@ private:
void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr );
sal_Bool HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
-//IAccessibility2 Implementation 2009-----
sal_Bool HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow, ScRange& rScenRange );
-//-----IAccessibility2 Implementation 2009
sal_Bool DropScroll( const Point& rMousePos );
sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt );
@@ -390,9 +388,7 @@ public:
void DoInvertRect( const Rectangle& rPixel );
void CheckNeedsRepaint();
-//IAccessibility2 Implementation 2009-----
virtual void SwitchView();
-//-----IAccessibility2 Implementation 2009
void UpdateDPFromFieldPopupMenu();
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/preview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/preview.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/preview.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/preview.hxx Wed Dec 18 13:27:09 2013
@@ -158,9 +158,7 @@ public:
static void StaticInvalidate();
FmFormView* GetDrawView() { return pDrawView; }
-//IAccessibility2 Implementation 2009-----
virtual void SwitchView();
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/scuitphfedit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/scuitphfedit.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/scuitphfedit.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/scuitphfedit.hxx Wed Dec 18 13:27:09 2013
@@ -91,9 +91,7 @@ private:
sal_uInt16 nWhich;
String aCmdArr[6];
- //IAccessibility2 Implementation 2009-----
DECL_LINK( ObjectSelectHdl, ScEditWindow* );
- //-----IAccessibility2 Implementation 2009
private:
#ifdef _TPHFEDIT_CXX
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tabvwsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tabvwsh.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tabvwsh.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tabvwsh.hxx Wed Dec 18 13:27:09 2013
@@ -161,9 +161,7 @@ private:
sal_Bool bPrintSelected; // for result of SvxPrtQryBox
sal_Bool bReadOnly; // um Status-Aenderungen zu erkennen
-//IAccessibility2 Implementation 2009-----
sal_Bool bIsActive;
-//-----IAccessibility2 Implementation 2009
SbxObject* pScSbxObject;
//UNUSED2008-05 sal_Bool bChartDlgIsEdit; // Datenbereich aendern
@@ -425,11 +423,9 @@ public:
bool ExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
using ScTabView::ShowCursor;
-//IAccessibility2 Implementation 2009-----
sal_Bool IsActive(){ return bIsActive; }
rtl::OUString GetFormula(ScAddress& rAddress);
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & GetForms() const;
-//-----IAccessibility2 Implementation 2009
};
//==================================================================
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tphfedit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tphfedit.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tphfedit.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/tphfedit.hxx Wed Dec 18 13:27:09 2013
@@ -78,9 +78,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;}
- //IAccessibility2 Implementation 2009-----
void SetObjectSelectHdl( const Link& aLink){ aObjectSelectLink = aLink; };
- //-----IAccessibility2 Implementation 2009
protected:
virtual void Paint( const Rectangle& rRec );
virtual void MouseMove( const MouseEvent& rMEvt );
@@ -100,9 +98,7 @@ private:
com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc;
ScAccessibleEditObject* pAcc;
- //IAccessibility2 Implementation 2009-----
Link aObjectSelectLink;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/inc/viewfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/inc/viewfunc.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/inc/viewfunc.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/inc/viewfunc.hxx Wed Dec 18 13:27:09 2013
@@ -251,11 +251,9 @@ public:
ScAutoFormatData* CreateAutoFormatData();
void AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord = sal_True );
-//IAccessibility2 Implementation 2009-----
// void SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool bAddUndo, sal_Bool bIsApi );
-//-----IAccessibility2 Implementation 2009
void Solve( const ScSolveParam& rParam );
void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True );
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/highred.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/highred.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/highred.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/highred.cxx Wed Dec 18 13:27:09 2013
@@ -258,9 +258,7 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle,
aEdAssign.Show();
aRbAssign.Show();
aEdAssign.SetText(aFilterCtr.GetRange());
- //IAccessibility2 Implementation 2009-----
aEdAssign.GrabFocus();
- //-----IAccessibility2 Implementation 2009
ScAnyRefDlg::RefInputStart(&aEdAssign,&aRbAssign);
}
return 0;
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/solveroptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/solveroptions.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/solveroptions.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/miscdlgs/solveroptions.cxx Wed Dec 18 13:27:09 2013
@@ -84,15 +84,12 @@ public:
void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; }
void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; }
- //IAccessibility2 Implementation 2009-----
// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed?
// virtual USHORT IsA() {return SV_ITEM_ID_EXTENDRLBOXSTRING;}
// virtual XubString GetExtendText() const;
- //-----IAccessibility2 Implementation 2009
virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
-//IAccessibility2 Implementation 2009-----
// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed?
/*
XubString ScSolverOptionsString::GetExtendText() const
@@ -110,7 +107,6 @@ XubString ScSolverOptionsString::GetExte
return aNormalStr;
}
*/
-//-----IAccessibility2 Implementation 2009
void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
{