diff options
28 files changed, 1 insertions, 353 deletions
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index f48415e518d4..7c815c4a5f92 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -74,8 +74,6 @@ public: AccessibleGridControlHeader* m_pColumnHeaderBar; }; -DBG_NAME( AccessibleGridControl ) - AccessibleGridControl::AccessibleGridControl( const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator, IAccessibleTable& _rTable ) @@ -320,7 +318,7 @@ AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() // ============================================================================ // = AccessibleGridControlAccess // ============================================================================ -DBG_NAME( AccessibleGridControlAccess ) + // ----------------------------------------------------------------------------- AccessibleGridControlAccess::AccessibleGridControlAccess( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) :m_xParent( _rxParent ) diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index c3af90ec5606..32ae873799fc 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -58,8 +58,6 @@ namespace accessibility { using namespace com::sun::star::accessibility::AccessibleStateType; // ============================================================================ -DBG_NAME( AccessibleGridControlBase ) - AccessibleGridControlBase::AccessibleGridControlBase( const Reference< XAccessible >& rxParent, svt::table::IAccessibleTable& rTable, diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index a46a3808f043..1a50289808dd 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -58,8 +58,6 @@ namespace accessibility { // ============================================================================ -DBG_NAME( AccessibleGridControlHeader ) - AccessibleGridControlHeader::AccessibleGridControlHeader( const Reference< XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable, diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 70976a1494eb..02c5806b9f64 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -52,8 +52,6 @@ namespace accessibility { // ============================================================================ -DBG_NAME( AccessibleGridControlTable ) - AccessibleGridControlTable::AccessibleGridControlTable( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 6b034b9e554c..16585e7ee093 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -55,8 +55,6 @@ namespace accessibility { // ============================================================================ -DBG_NAME( AccessibleGridControlTableBase ) - AccessibleGridControlTableBase::AccessibleGridControlTableBase( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 33b03717be01..4dbe052563f2 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -1553,12 +1553,6 @@ void ORowSetNotifier::fire() return m_pImpl->aChangedColumns; } -::std::vector<Any>& ORowSetNotifier::getChangedBookmarks() const -{ - OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!"); - return m_pImpl->aChangedBookmarks; -} - void ORowSetNotifier::firePropertyChange() { OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!"); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 2a931d5af376..c7f8bcef663c 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -416,7 +416,6 @@ namespace dbaccess /** use this one to store the inde of the changed column values */ ::std::vector<sal_Int32>& getChangedColumns() const; - ::std::vector<com::sun::star::uno::Any>& getChangedBookmarks() const; }; diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx index dac131aefc01..e87fb1ac9e84 100644 --- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx +++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx @@ -246,8 +246,6 @@ namespace accessibility /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; - /// Queries the given state on the internal state set - bool HasState( const sal_Int16 nStateId ); /// Sets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this! void SetState( const sal_Int16 nStateId ); /// Unsets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this! @@ -326,29 +324,14 @@ namespace accessibility void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const; void LostPropertyEvent( const ::com::sun::star::uno::Any& rOldValue, const sal_Int16 nEventId ) const; - /** Query the visibility state - - @attention This method does not lock the SolarMutex, - leaving that to the calling code. This is because only - there potential deadlock situations can be resolved. Thus, - make sure SolarMutex is locked when calling this. - - @return the visibility state. Per definition, a defunc object is no longer visible - */ - sal_Bool IsVisible() const; - int getNotifierClientId() const; /// Do we have children? This is the case for image bullets sal_Bool HaveChildren(); - /// Is the underlying object in edit mode - sal_Bool IsActive() const SAL_THROW((::com::sun::star::uno::RuntimeException)); - const Point& GetEEOffset() const; // Get text from forwarder - String GetText( sal_Int32 nIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException)); String GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException)); sal_uInt16 GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException)); diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx index aa470ea65ab3..50ee57e65251 100644 --- a/editeng/inc/editeng/AccessibleImageBullet.hxx +++ b/editeng/inc/editeng/AccessibleImageBullet.hxx @@ -114,15 +114,6 @@ namespace accessibility */ void SetIndexInParent( sal_Int32 nIndex ); - /** Get the current index in the accessibility parent - - @attention This method does not lock the SolarMutex, - leaving that to the calling code. This is because only - there potential deadlock situations can be resolved. Thus, - make sure SolarMutex is locked when calling this. - */ - sal_Int32 GetIndexInParent() const; - /** Set the edit engine offset @attention This method does not lock the SolarMutex, diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx index a84af9700b14..e1a5873ad083 100644 --- a/editeng/inc/editeng/AccessibleParaManager.hxx +++ b/editeng/inc/editeng/AccessibleParaManager.hxx @@ -211,8 +211,6 @@ namespace accessibility void UnSetState( const sal_Int16 nStateId ); /// Set offset to edit engine for all children void SetEEOffset ( const Point& rOffset ); - /// Change edit source on all living children - void SetEditSource ( SvxEditSourceAdapter* pEditSource ); /// Dispose all living children void Dispose (); diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx index 5dbd8a729580..ec93d5dd60bc 100644 --- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx +++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx @@ -265,9 +265,6 @@ namespace accessibility protected: Rectangle GetParagraphBoundingBox() const; - sal_Int32 GetParagraphCount() const; - sal_Int32 GetParagraphIndex() const; - sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; private: diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 7214662f83e7..fb6cab056134 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -502,13 +502,6 @@ namespace accessibility return sal_True; } - String AccessibleEditableTextPara::GetText( sal_Int32 nIndex ) SAL_THROW((uno::RuntimeException)) - { - DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - - return GetTextForwarder().GetText( MakeSelection(nIndex) ); - } - String AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException)) { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); @@ -523,13 +516,6 @@ namespace accessibility return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) ); } - sal_Bool AccessibleEditableTextPara::IsVisible() const - { - DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - - return mpEditSource ? sal_True : sal_False ; - } - SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException)) { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); @@ -653,22 +639,6 @@ namespace accessibility return GetTextForwarder().HaveImageBullet( static_cast< sal_uInt16 >(GetParagraphIndex()) ); } - sal_Bool AccessibleEditableTextPara::IsActive() const SAL_THROW((uno::RuntimeException)) - { - DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - - SvxEditSource& rEditSource = GetEditSource(); - SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder(); - - if( !pViewForwarder ) - return sal_False; - - if( pViewForwarder->IsValid() ) - return sal_False; - else - return sal_True; - } - Rectangle AccessibleEditableTextPara::LogicToPixel( const Rectangle& rRect, const MapMode& rMapMode, SvxViewForwarder& rForwarder ) { // convert to screen coordinates @@ -726,17 +696,6 @@ namespace accessibility FireEvent( nEventId, uno::Any(), rOldValue ); } - bool AccessibleEditableTextPara::HasState( const sal_Int16 nStateId ) - { - DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - - ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - if( pStateSet != NULL ) - return pStateSet->contains(nStateId) ? true : false; - - return false; - } - void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId ) { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 1a4bd5603307..23ec937d240d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -425,13 +425,6 @@ namespace accessibility mnIndexInParent = nIndex; } - sal_Int32 AccessibleImageBullet::GetIndexInParent() const - { - DBG_CHKTHIS( AccessibleImageBullet, NULL ); - - return mnIndexInParent; - } - void AccessibleImageBullet::SetEEOffset( const Point& rOffset ) { DBG_CHKTHIS( AccessibleImageBullet, NULL ); diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 3c9898f85e8c..d7ee0efa56b5 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -301,12 +301,6 @@ namespace accessibility nStateId ) ); } - void AccessibleParaManager::SetEditSource( SvxEditSourceAdapter* pEditSource ) - { - MemFunAdapter< SvxEditSourceAdapter* > aAdapter( &::accessibility::AccessibleEditableTextPara::SetEditSource, pEditSource ); - ::std::for_each( begin(), end(), aAdapter ); - } - // not generic yet, no arguments... class AccessibleParaManager_DisposeChildren : public ::std::unary_function< ::accessibility::AccessibleEditableTextPara&, void > { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index fe5bab90f099..0af51fcef399 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -171,8 +171,6 @@ namespace accessibility AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const; sal_Int32 GetParagraphCount() const; - sal_Int32 GetParagraphIndex() const; - sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; EPosition Index2Internal( sal_Int32 nFlatIndex ) const { @@ -329,26 +327,6 @@ namespace accessibility return mpTextParagraph->GetTextForwarder().GetParagraphCount(); } - sal_Int32 AccessibleStaticTextBase_Impl::GetParagraphIndex() const - { - DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); - - sal_Int32 nIndex = -1; - if( mpTextParagraph ) - nIndex = mpTextParagraph->GetParagraphIndex(); - return nIndex; - } - - sal_Int32 AccessibleStaticTextBase_Impl::GetLineCount( sal_Int32 nParagraph ) const - { - DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); - - sal_Int32 nIndex = 0; - if( mpTextParagraph ) - nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< sal_uInt16 >(nParagraph) ); - return nIndex; - } - sal_Int32 AccessibleStaticTextBase_Impl::Internal2Index( EPosition nEEIndex ) const { sal_Int32 aRes(0); @@ -1028,21 +1006,6 @@ namespace accessibility return mpImpl->GetParagraphBoundingBox(); } - sal_Int32 AccessibleStaticTextBase::GetParagraphIndex() const - { - return mpImpl->GetParagraphIndex(); - } - - sal_Int32 AccessibleStaticTextBase::GetParagraphCount() const - { - return mpImpl->GetParagraphCount(); - } - - sal_Int32 AccessibleStaticTextBase::GetLineCount( sal_Int32 nParagraph ) const - { - return mpImpl->GetLineCount( nParagraph ); - } - } // end of namespace accessibility //------------------------------------------------------------------------ diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx index 37066a003dd5..1e2b6d85d297 100644 --- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx @@ -59,14 +59,6 @@ namespace accessibility { class SVX_DLLPUBLIC AccessibleShapeTreeInfo { public: - /** Deprecated. Don't use this constructor any more. - */ - AccessibleShapeTreeInfo ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleComponent>& rxDocumentWindow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventBroadcaster>& rxBroadcaster); - /** Use this constructor to create an empty object that is filled later with more meaningfull data. */ @@ -86,11 +78,6 @@ public: */ void SetDocumentWindow (const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent>& rxViewWindow); - /** Deprecated. Don't use this method. - */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleComponent> - GetDocumentWindow (void) const; /** Deprecated. Use the correctly named SetModelBroadcaster method instead. diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index f7236d1dc5fa..73c7abc8ff4c 100644 --- a/svx/inc/svx/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx @@ -141,11 +141,6 @@ public: */ void AppendString (const ::rtl::OUString& sString); - /** This method adds for debuging and development the list of all known - properties to the description. Don't use in production code. - */ - void AddPropertyNames (void); - /** Add properties that describe line and border attributes. */ void AddLineProperties (void); @@ -182,11 +177,6 @@ private: SVX_DLLPRIVATE void AddColor (const ::rtl::OUString& sPropertyName, const ::rtl::OUString& sLocalizedName); - /** Add a property value of unknown type to the description string. - */ - SVX_DLLPRIVATE void AddUnknown (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); - /** Add a property value formated as integer to the description string. */ SVX_DLLPRIVATE void AddInteger (const ::rtl::OUString& sPropertyName, diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 8f6354026e00..6ae4bc71f0a0 100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -118,16 +118,6 @@ public: ShapeTypeId GetTypeId (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape) const; - /** Return the service name of a shape with the specified type. - @param aTypeId - Id of the shape type for which to retrieve the service name. - An unknown shape id results in an empty string. - @return - The returned string contains the service name, with which a - shape of the given type can be created. - */ - const ::rtl::OUString& GetServiceName (ShapeTypeId aTypeId) const; - /** Create a new accessible object for the given shape. @param rShapeInfo Bundle of information passed to the new accessible shape. diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index af361abc27ad..6c747284cf31 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -37,21 +37,6 @@ using ::com::sun::star::uno::Reference; namespace accessibility { -AccessibleShapeTreeInfo::AccessibleShapeTreeInfo ( - const Reference<XAccessibleComponent>& rxDocumentWindow, - const Reference<document::XEventBroadcaster>& rxModelBroadcaster) - : mxDocumentWindow (rxDocumentWindow), - mxModelBroadcaster (rxModelBroadcaster), - mpView (NULL), - mpWindow (NULL), - mpViewForwarder (NULL) -{ - // Empty. -} - - - - AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (void) : mpView (NULL), mpWindow (NULL), @@ -112,15 +97,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow ( -uno::Reference<XAccessibleComponent> - AccessibleShapeTreeInfo::GetDocumentWindow (void) const -{ - return mxDocumentWindow; -} - - - - void AccessibleShapeTreeInfo::SetControllerBroadcaster ( const uno::Reference<document::XEventBroadcaster>& rxControllerBroadcaster) { diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 57460bb71972..b051b8bf468f 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -58,21 +58,11 @@ namespace accessibility Clear(); } - void AccessibleTextEventQueue::Append( const SfxHint& rHint ) - { - maEventQueue.push_back( new SfxHint( rHint ) ); - } - void AccessibleTextEventQueue::Append( const SdrHint& rHint ) { maEventQueue.push_back( new SdrHint( rHint ) ); } - void AccessibleTextEventQueue::Append( const SfxSimpleHint& rHint ) - { - maEventQueue.push_back( new SfxSimpleHint( rHint ) ); - } - void AccessibleTextEventQueue::Append( const TextHint& rHint ) { maEventQueue.push_back( new TextHint( rHint ) ); diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index f8564afa47c1..526b672157a0 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx @@ -37,7 +37,6 @@ class SfxHint; class SdrHint; -class SfxSimpleHint; class TextHint; class SvxViewHint; class SvxEditSourceHint; @@ -59,12 +58,8 @@ namespace accessibility ~AccessibleTextEventQueue(); /// Append event to end of queue - void Append( const SfxHint& rHint ); - /// Append event to end of queue void Append( const SdrHint& rHint ); /// Append event to end of queue - void Append( const SfxSimpleHint& rHint ); - /// Append event to end of queue void Append( const TextHint& rHint ); /// Append event to end of queue void Append( const SvxViewHint& rHint ); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 9927424c32ce..d993536db6b4 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -187,22 +187,6 @@ uno::Reference<XAccessible> -uno::Reference<XAccessible> - ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape) - throw (uno::RuntimeException) -{ - ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end(); - for (I = maVisibleChildren.begin(); I != aEnd; ++I) - { - if ( I->mxShape.get() == xShape.get() ) - return I->mxAccessibleShape; - } - return uno::Reference<XAccessible> (); -} - - - - /** Find all shapes among the specified shapes that lie fully or partially inside the visible area. Put those shapes into the cleared cache. The corresponding accessible objects will be created on demand. @@ -773,29 +757,6 @@ void SAL_CALL ChildrenManagerImpl::disposing (void) impl_dispose(); } - - - -// This method is experimental. Use with care. -long int ChildrenManagerImpl::GetChildIndex (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& xChild) const - throw (::com::sun::star::uno::RuntimeException) -{ - ::osl::MutexGuard aGuard (maMutex); - sal_Int32 nCount = maVisibleChildren.size(); - for (sal_Int32 i=0; i < nCount; ++i) - { - // Is this equality comparison valid? - if (maVisibleChildren[i].mxAccessibleShape == xChild) - return i; - } - - return -1; -} - - - - //===== IAccessibleViewForwarderListener ==================================== void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 3716f243ad20..b1cb2a0b4723 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -166,24 +166,6 @@ public: GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex) throw (::com::sun::star::uno::RuntimeException); - /** Return the requested accessible child given a shape. This method - searches the list of descriptors for the one that holds the - association of the given shape to the requested accessible object - and returns that. If no such descriptor is found that is - interpreted so that the specified shape is not visible at the moment. - @param xShape - The shape for which to return the associated accessible object. - @return - Returns a reference to the requested accessible child. The - reference is empty if there is no shape descriptor that - associates the shape with an accessible object. - */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetChild (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException); - /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update process with respect seperate updates of a modified children list @@ -360,17 +342,6 @@ protected: */ virtual void SAL_CALL disposing (void); - /** Experimental: Get the index of the specified accessible object with - respect to the list of children maintained by this object. - - @return - Return the index of the given child or -1 to indicate that the - child is unknown. - */ - long GetChildIndex (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& xChild) const - throw (::com::sun::star::uno::RuntimeException); - void impl_dispose (void); private: diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 8b01c30215d6..4d0dc1d884c2 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -303,16 +303,6 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, -void DescriptionGenerator::AddUnknown (const OUString& /*sPropertyName*/, - const OUString& sLocalizedName) -{ - // uno::Any aValue = mxSet->getPropertyValue (sPropertyName); - msDescription.append (sLocalizedName); -} - - - - void DescriptionGenerator::AddInteger (const OUString& sPropertyName, const OUString& sLocalizedName) { @@ -459,27 +449,6 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, } } - - - -void DescriptionGenerator::AddPropertyNames (void) -{ - if (mxSet.is()) - { - uno::Reference<beans::XPropertySetInfo> xInfo (mxSet->getPropertySetInfo()); - if (xInfo.is()) - { - uno::Sequence<beans::Property> aPropertyList (xInfo->getProperties ()); - for (int i=0; i<aPropertyList.getLength(); i++) - { - msDescription.append (aPropertyList[i].Name); - msDescription.append (sal_Unicode(',')); - } - } - } -} - - } // end of namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 01c8d124870c..8747c5fd6848 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -117,14 +117,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const uno::Reference<drawing::XShape>& -const OUString& ShapeTypeHandler::GetServiceName (ShapeTypeId aTypeId) const -{ - return maShapeTypeDescriptorList[aTypeId].msServiceName; -} - - - - /** This factory method determines the type descriptor for the type of the given shape, then calls the descriptor's create function, and finally initializes the new object. diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx index eef67455a6bb..d957066b58f4 100644 --- a/tools/inc/tools/solarmutex.hxx +++ b/tools/inc/tools/solarmutex.hxx @@ -36,7 +36,6 @@ namespace tools class TOOLS_DLLPUBLIC SolarMutex { public: - static ::osl::SolarMutex* GetSolarMutex(); static void SetSolarMutex( ::osl::SolarMutex* pMutex ); static bool Acquire(); static void Release(); diff --git a/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx index 8bede4e6869a..1b4ca64de455 100644 --- a/tools/source/misc/solarmutex.cxx +++ b/tools/source/misc/solarmutex.cxx @@ -34,11 +34,6 @@ namespace tools { static ::osl::SolarMutex* pSolarMutex = 0; - ::osl::SolarMutex* SolarMutex::GetSolarMutex() - { - return pSolarMutex; - } - void SolarMutex::SetSolarMutex( ::osl::SolarMutex* pMutex ) { pSolarMutex = pMutex; diff --git a/unusedcode.easy b/unusedcode.easy index e44c4272290c..04753dce1624 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1407,8 +1407,6 @@ WP3ResourceFork::getResourcesByType(unsigned int) const WP3StylesListener::insertCell() WP3StylesListener::insertRow() WP3SubDocument::WP3SubDocument(unsigned char*, unsigned int) -WP42DefineColumnsGroup::WP42DefineColumnsGroup(WPXInputStream*, WPXEncryption*, unsigned char) -WP42ExtendedCharacterGroup::WP42ExtendedCharacterGroup(WPXInputStream*, WPXEncryption*, unsigned char) WP42SubDocument::WP42SubDocument(unsigned char*, unsigned int) WP6SubDocument::WP6SubDocument(WPXInputStream*, WPXEncryption*, unsigned int) WPGTextDataHandler::endSubDocument() @@ -1560,31 +1558,7 @@ _ZSortFlys::Remove(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short) _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*) -accessibility::AccessibleEditableTextPara::GetText(int) -accessibility::AccessibleEditableTextPara::HasState(short) -accessibility::AccessibleEditableTextPara::IsActive() const -accessibility::AccessibleEditableTextPara::IsVisible() const -accessibility::AccessibleImageBullet::GetIndexInParent() const -accessibility::AccessibleParaManager::SetEditSource(SvxEditSourceAdapter*) -accessibility::AccessibleShapeTreeInfo::AccessibleShapeTreeInfo(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleComponent> const&, com::sun::star::uno::Reference<com::sun::star::document::XEventBroadcaster> const&) -accessibility::AccessibleShapeTreeInfo::GetDocumentWindow() const -accessibility::AccessibleStaticTextBase::GetLineCount(int) const -accessibility::AccessibleStaticTextBase::GetParagraphCount() const -accessibility::AccessibleStaticTextBase::GetParagraphIndex() const -accessibility::AccessibleTextEventQueue::Append(SfxHint const&) -accessibility::AccessibleTextEventQueue::Append(SfxSimpleHint const&) -accessibility::ChildrenManagerImpl::GetChild(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) -accessibility::ChildrenManagerImpl::GetChildIndex(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) const accessibility::DGColorNameLookUp::~DGColorNameLookUp() -accessibility::DbgName_AccessibleGridControl() -accessibility::DbgName_AccessibleGridControlAccess() -accessibility::DbgName_AccessibleGridControlBase() -accessibility::DbgName_AccessibleGridControlHeader() -accessibility::DbgName_AccessibleGridControlTable() -accessibility::DbgName_AccessibleGridControlTableBase() -accessibility::DescriptionGenerator::AddPropertyNames() -accessibility::DescriptionGenerator::AddUnknown(rtl::OUString const&, rtl::OUString const&) -accessibility::ShapeTypeHandler::GetServiceName(int) const basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) basegfx::B1DRange::B1DRange(basegfx::B1IRange const&) basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&) @@ -2270,7 +2244,6 @@ cppu::OPropertySetHelper::OPropertySetHelper(cppu::OBroadcastHelperVar<cppu::OMu cppu::createFactoryProxy(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> const&) cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&) cppu::invokeStaticComponentFactory(void (*)(), rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&) -dbaccess::ORowSetNotifier::getChangedBookmarks() const dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*) dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*) @@ -3002,7 +2975,6 @@ test::OfficeConnection::tearDown() test::OfficeConnection::~OfficeConnection() test::getTestArgument(rtl::OUString const&, rtl::OUString*) toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*) -tools::SolarMutex::GetSolarMutex() ucbhelper::Content::createDynamicCursor(com::sun::star::uno::Sequence<int> const&, ucbhelper::ResultSetInclude) ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequence<int> const&) ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, ucbhelper::Content&) |