diff options
Diffstat (limited to 'svx/source/accessibility')
| -rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 56 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 4 | ||||
| -rwxr-xr-x | svx/source/accessibility/AccessibleShape.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 6 | ||||
| -rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4 | ||||
| -rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 20 | ||||
| -rwxr-xr-x | svx/source/accessibility/makefile.mk | 68 |
7 files changed, 46 insertions, 114 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 1c342f5dbfba..92633a105323 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -105,23 +105,23 @@ namespace accessibility SfxBroadcaster& GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); } // SvxTextForwarder - USHORT GetParagraphCount() const { return 1; } - USHORT GetTextLen( USHORT /*nParagraph*/ ) const { return 0; } + sal_uInt16 GetParagraphCount() const { return 1; } + sal_uInt16 GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; } String GetText( const ESelection& /*rSel*/ ) const { return String(); } - SfxItemSet GetAttribs( const ESelection& /*rSel*/, BOOL /*bOnlyHardAttrib*/ = 0 ) const + SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const { // AW: Very dangerous: The former implementation used a SfxItemPool created on the // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using // a deleted Pool by design. return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool()); } - SfxItemSet GetParaAttribs( USHORT /*nPara*/ ) const { return GetAttribs(ESelection()); } - void SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rSet*/ ) {} + SfxItemSet GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); } + void SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {} void RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){} - void GetPortions( USHORT /*nPara*/, SvUShorts& /*rList*/ ) const {} + void GetPortions( sal_uInt16 /*nPara*/, SvUShorts& /*rList*/ ) const {} - USHORT GetItemState( const ESelection& /*rSel*/, USHORT /*nWhich*/ ) const { return 0; } - USHORT GetItemState( USHORT /*nPara*/, USHORT /*nWhich*/ ) const { return 0; } + sal_uInt16 GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; } + sal_uInt16 GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; } SfxItemPool* GetPool() const { return NULL; } @@ -133,35 +133,35 @@ namespace accessibility const SfxItemSet * GetEmptyItemSetPtr() { return 0; } void AppendParagraph() {} - xub_StrLen AppendTextPortion( USHORT /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; } + xub_StrLen AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; } //XTextCopy void CopyText(const SvxTextForwarder& ){} - XubString CalcFieldValue( const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) + XubString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) { return XubString(); } - void FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen ) {;} + void FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;} - BOOL IsValid() const { return sal_True; } + sal_Bool IsValid() const { return sal_True; } void SetNotifyHdl( const Link& ) {} - LanguageType GetLanguage( USHORT, USHORT ) const { return LANGUAGE_DONTKNOW; } - USHORT GetFieldCount( USHORT ) const { return 0; } - EFieldInfo GetFieldInfo( USHORT, USHORT ) const { return EFieldInfo(); } - EBulletInfo GetBulletInfo( USHORT ) const { return EBulletInfo(); } - Rectangle GetCharBounds( USHORT, USHORT ) const { return Rectangle(); } - Rectangle GetParaBounds( USHORT ) const { return Rectangle(); } + LanguageType GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; } + sal_uInt16 GetFieldCount( sal_uInt16 ) const { return 0; } + EFieldInfo GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); } + EBulletInfo GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); } + Rectangle GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); } + Rectangle GetParaBounds( sal_uInt16 ) const { return Rectangle(); } MapMode GetMapMode() const { return MapMode(); } OutputDevice* GetRefDevice() const { return NULL; } - sal_Bool GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const { return sal_False; } - sal_Bool GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const { return sal_False; } - sal_Bool GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const { return sal_False; } - USHORT GetLineCount( USHORT nPara ) const { return nPara == 0 ? 1 : 0; } - USHORT GetLineLen( USHORT, USHORT ) const { return 0; } - void GetLineBoundaries( /*out*/USHORT & rStart, /*out*/USHORT & rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const { rStart = rEnd = 0; } - USHORT GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const { return 0; } + sal_Bool GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; } + sal_Bool GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; } + sal_Bool GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; } + sal_uInt16 GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; } + sal_uInt16 GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; } + void GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const { rStart = rEnd = 0; } + sal_uInt16 GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const { return 0; } // the following two methods would, strictly speaking, require // a switch to a real EditSource, too. Fortunately, the @@ -173,9 +173,9 @@ namespace accessibility // shapes). sal_Bool Delete( const ESelection& ) { return sal_False; } sal_Bool InsertText( const String&, const ESelection& ) { return sal_False; } - sal_Bool QuickFormatDoc( BOOL ) { return sal_True; } - sal_Int16 GetDepth( USHORT ) const { return -1; } - sal_Bool SetDepth( USHORT, sal_Int16 ) { return sal_True; } + sal_Bool QuickFormatDoc( sal_Bool ) { return sal_True; } + sal_Int16 GetDepth( sal_uInt16 ) const { return -1; } + sal_Bool SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; } Rectangle GetVisArea() const { return Rectangle(); } Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; } diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 82c522e1b0ff..76d9ae56dfba 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -179,7 +179,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) Window* pTabPage = mpFrameSel->GetParent(); sal_Int32 nChildren = pTabPage->GetChildCount(); for( nIdx = 0; nIdx < nChildren; ++nIdx ) - if( pTabPage->GetChild( static_cast< USHORT >( nIdx ) ) == mpFrameSel ) + if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel ) break; } else @@ -619,7 +619,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) aEvent.FocusFlags = 0; if(bGetFocus) { - USHORT nFocusFlags = mpFrameSel->GetGetFocusFlags(); + sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags(); if(nFocusFlags&GETFOCUS_TAB) aEvent.FocusFlags |= AwtFocusChangeReason::TAB; if(nFocusFlags&GETFOCUS_CURSOR) diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 4c1869f6997a..0d255ed5933f 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -254,7 +254,7 @@ void AccessibleShape::UpdateStates (void) // XXX fix_me this has to be done with an extra interface later on if ( m_pShape && maShapeTreeInfo.GetSdrView() ) { - bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE; + bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True; } if (bShapeIsSelected) diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 25bed87a23ad..4b3d2eab45fd 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -576,7 +576,7 @@ namespace accessibility DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); } - USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 ); + sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 ); // notify all affected paragraphs (TODO: may be suboptimal, // since some paragraphs might stay selected) @@ -861,7 +861,7 @@ namespace accessibility DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX, "AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow"); - aTmpBB = rCacheTF.GetParaBounds( static_cast< USHORT >( nCurrPara ) ); + aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) ); // convert to screen coordinates aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF ); @@ -1723,7 +1723,7 @@ namespace accessibility DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX, "AccessibleTextHelper_Impl::getAccessibleAt: index value overflow"); - Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< USHORT > (nChild) ) ); + Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) ); if( aParaBounds.IsInside( aLogPoint ) ) return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() ); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0119e7c71cbf..5ffd4e9cd45a 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -558,7 +558,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) throw (::com::sun::star::uno::RuntimeException) { svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -568,7 +568,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index c1509eacc843..c0e49e4f78b1 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -100,9 +100,9 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc:: ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - const USHORT nItemId = sal::static_int_cast<USHORT>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); + const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); - if( USHORT(-1) != nItemId ) + if( sal_uInt16(-1) != nItemId ) { if ( !m_pTable ) m_pTable = new SvxShowCharSetAcc(this); @@ -249,7 +249,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() // - SvxShowCharSetItem - // ---------------- -SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos ) : +SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) : mrParent( rParent ) ,mnId( _nPos ) ,m_pItem(NULL) @@ -333,7 +333,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException) { return m_pParent && m_pParent->getCharSetControl()->IsSelected( - sal::static_int_cast<USHORT>(nAccessibleChildIndex)); + sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex)); } // ----------------------------------------------------------------------------- // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) @@ -385,7 +385,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce OExternalLockGuard aGuard( this ); ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< USHORT >( i ) ); + SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< sal_uInt16 >( i ) ); if( pItem ) { @@ -483,10 +483,10 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - const USHORT nItemId = sal::static_int_cast<USHORT>( + const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>( m_pParent->getCharSetControl()->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); - if( USHORT(-1) != nItemId ) + if( sal_uInt16(-1) != nItemId ) { SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( nItemId ); xRet = pItem->GetAccessible(); @@ -590,7 +590,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In OExternalLockGuard aGuard( this ); ensureAlive(); ::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( - sal::static_int_cast<USHORT>(getAccessibleIndex(nRow,nColumn) )); + sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) )); if ( !pItem ) throw IndexOutOfBoundsException(); return pItem->GetAccessible(); @@ -622,14 +622,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<USHORT>(nChildIndex)); + return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<USHORT>(nChildIndex)); + return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } // ----------------------------------------------------------------------------- diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk deleted file mode 100755 index 9ac9cff08a1d..000000000000 --- a/svx/source/accessibility/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=accessibility -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/charmapacc.obj \ - $(SLO)$/svxrectctaccessiblecontext.obj \ - $(SLO)$/GraphCtlAccessibleContext.obj \ - $(SLO)$/ChildrenManager.obj \ - $(SLO)$/ChildrenManagerImpl.obj \ - $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleShape.obj \ - $(SLO)$/AccessibleGraphicShape.obj \ - $(SLO)$/AccessibleOLEShape.obj \ - $(SLO)$/AccessibleShapeInfo.obj \ - $(SLO)$/AccessibleShapeTreeInfo.obj \ - $(SLO)$/AccessibleTextHelper.obj \ - $(SLO)$/AccessibleEmptyEditSource.obj \ - $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/ShapeTypeHandler.obj \ - $(SLO)$/SvxShapeTypes.obj \ - $(SLO)$/AccessibleControlShape.obj \ - $(SLO)$/DGColorNameLookUp.obj \ - $(SLO)$/AccessibleFrameSelector.obj - -SRS2NAME = accessibility -SRC2FILES = accessibility.src - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - |