summaryrefslogtreecommitdiff
path: root/sc/source/ui/Accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/Accessibility')
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx7
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx35
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx7
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx60
5 files changed, 46 insertions, 75 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 313675fa43f0..8774ef74f86d 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AccessibleContextBase.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.33.32.1 $
*
* This file is part of OpenOffice.org.
*
@@ -584,16 +584,6 @@ void ScAccessibleContextBase::ChangeName()
CommitChange(aEvent);
}
-void ScAccessibleContextBase::CommitDefunc() const
-{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::STATE_CHANGED;
- aEvent.Source = uno::Reference< XAccessibleContext >(const_cast<ScAccessibleContextBase*>(this));
- aEvent.NewValue <<= AccessibleStateType::DEFUNC;
-
- CommitChange(aEvent);
-}
-
void ScAccessibleContextBase::CommitFocusGained() const
{
AccessibleEventObject aEvent;
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index df3aca81117d..8d141f0fe753 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AccessibleCsvControl.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.22.32.2 $
*
* This file is part of OpenOffice.org.
*
@@ -300,11 +300,6 @@ void ScAccessibleCsvControl::implDispose()
}
}
-Point ScAccessibleCsvControl::implGetRelPos( const Point& rPos ) const
-{
- return rPos - implGetControl().GetWindowExtentsRelative( NULL ).TopLeft();
-}
-
Point ScAccessibleCsvControl::implGetAbsPos( const Point& rPos ) const
{
return rPos + implGetControl().GetWindowExtentsRelative( NULL ).TopLeft();
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index db566a1aadb5..5df7f4eeeeca 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AccessibleDocumentPagePreview.cxx,v $
- * $Revision: 1.38 $
+ * $Revision: 1.38.32.2 $
*
* This file is part of OpenOffice.org.
*
@@ -740,7 +740,8 @@ private:
::accessibility::AccessibleShape* GetAccShape(const ScShapeChild& rShape) const;
::accessibility::AccessibleShape* GetAccShape(const ScShapeChildVec& rShapes, sal_Int32 nIndex) const;
void FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode, sal_uInt8 nRangeId);
- sal_Bool FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const;
+//UNUSED2008-05 sal_Bool FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const;
+
// void AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID);
// void RemoveShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID);
SdrPage* GetDrawPage() const;
@@ -1205,21 +1206,21 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode&
}
}
-sal_Bool ScShapeChilds::FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const
-{
- sal_Bool bResult(sal_False);
- ScShapeChild aShape;
- aShape.mxShape = xShape;
- rItr = std::lower_bound(rShapes.begin(), rShapes.end(), aShape, ScShapeChildLess());
- if (rItr->mxShape.get() == xShape.get())
- bResult = sal_True; // if the shape is found
-
-/*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted)
- ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape);
- DBG_ASSERT(rItr == aDebugItr, "wrong Shape found");
-#endif*/
- return bResult;
-}
+//UNUSED2008-05 sal_Bool ScShapeChilds::FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const
+//UNUSED2008-05 {
+//UNUSED2008-05 sal_Bool bResult(sal_False);
+//UNUSED2008-05 ScShapeChild aShape;
+//UNUSED2008-05 aShape.mxShape = xShape;
+//UNUSED2008-05 rItr = std::lower_bound(rShapes.begin(), rShapes.end(), aShape, ScShapeChildLess());
+//UNUSED2008-05 if (rItr->mxShape.get() == xShape.get())
+//UNUSED2008-05 bResult = sal_True; // if the shape is found
+//UNUSED2008-05
+//UNUSED2008-05 /*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted)
+//UNUSED2008-05 ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape);
+//UNUSED2008-05 DBG_ASSERT(rItr == aDebugItr, "wrong Shape found");
+//UNUSED2008-05 #endif*/
+//UNUSED2008-05 return bResult;
+//UNUSED2008-05 }
/*void ScShapeChilds::AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID)
{
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 13b09ae4d956..692472fe635a 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AccessiblePreviewCell.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.32.1 $
*
* This file is part of OpenOffice.org.
*
@@ -299,11 +299,6 @@ sal_Bool ScAccessiblePreviewCell::IsOpaque(
return bOpaque;
}
-sal_Bool ScAccessiblePreviewCell::IsSelected(const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
-{
- return sal_False;
-}
-
void ScAccessiblePreviewCell::CreateTextHelper()
{
if (!mpTextHelper)
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 3109462f5626..18470475cebf 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AccessibleText.cxx,v $
- * $Revision: 1.44 $
+ * $Revision: 1.42.32.3 $
*
* This file is part of OpenOffice.org.
*
@@ -284,7 +284,6 @@ public:
void SetInvalid();
Rectangle GetVisRect() const;
- void FillTableInfo() const;
// clips the VisArea and calculates with the negativ coordinates
Rectangle CorrectVisArea(const Rectangle& rVisArea) const;
@@ -376,15 +375,6 @@ Rectangle ScPreviewViewForwarder::GetVisRect() const
return Rectangle();
}
-void ScPreviewViewForwarder::FillTableInfo() const
-{
- if ( mpViewShell && !mpTableInfo )
- {
- mpTableInfo = new ScPreviewTableInfo;
- mpViewShell->GetLocationData().GetTableInfo( GetVisRect(), *mpTableInfo );
- }
-}
-
Rectangle ScPreviewViewForwarder::CorrectVisArea(const Rectangle& rVisArea) const
{
Rectangle aVisArea(rVisArea);
@@ -1312,18 +1302,18 @@ SvxViewForwarder* ScAccessiblePreviewCellTextData::GetViewForwarder()
return mpViewForwarder;
}
-IMPL_LINK(ScAccessiblePreviewCellTextData, NotifyHdl, EENotify*, aNotify)
-{
- if( aNotify )
- {
- ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify);
-
- if( aHint.get() )
- GetBroadcaster().Broadcast( *aHint.get() );
- }
-
- return 0;
-}
+//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewCellTextData, NotifyHdl, EENotify*, aNotify)
+//UNUSED2008-05 {
+//UNUSED2008-05 if( aNotify )
+//UNUSED2008-05 {
+//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify);
+//UNUSED2008-05
+//UNUSED2008-05 if( aHint.get() )
+//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() );
+//UNUSED2008-05 }
+//UNUSED2008-05
+//UNUSED2008-05 return 0;
+//UNUSED2008-05 }
ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewShell)
{
@@ -1440,18 +1430,18 @@ SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder()
return mpViewForwarder;
}
-IMPL_LINK(ScAccessiblePreviewHeaderCellTextData, NotifyHdl, EENotify*, aNotify)
-{
- if( aNotify )
- {
- ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify);
-
- if( aHint.get() )
- GetBroadcaster().Broadcast( *aHint.get() );
- }
-
- return 0;
-}
+//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewHeaderCellTextData, NotifyHdl, EENotify*, aNotify)
+//UNUSED2008-05 {
+//UNUSED2008-05 if( aNotify )
+//UNUSED2008-05 {
+//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify);
+//UNUSED2008-05
+//UNUSED2008-05 if( aHint.get() )
+//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() );
+//UNUSED2008-05 }
+//UNUSED2008-05
+//UNUSED2008-05 return 0;
+//UNUSED2008-05 }
ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* pViewShell)
{