diff options
Diffstat (limited to 'framework/source/uielement/fontmenucontroller.cxx')
| -rwxr-xr-x[-rw-r--r--] | framework/source/uielement/fontmenucontroller.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 3e9df2b5ae46..c09950565e0a 100644..100755 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -114,7 +114,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont { vector<rtl::OUString> aVector; aVector.reserve(rFontNameSeq.getLength()); - for ( USHORT i = 0; i < rFontNameSeq.getLength(); i++ ) + for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ ) { aVector.push_back(MnemonicGenerator::EraseAllMnemonicChars(pFontNameArray[i])); } @@ -195,12 +195,12 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw ( if ( m_xPopupMenu.is() ) { // find new font name and set check mark! - USHORT nChecked = 0; - USHORT nItemCount = m_xPopupMenu->getItemCount(); + sal_uInt16 nChecked = 0; + sal_uInt16 nItemCount = m_xPopupMenu->getItemCount(); rtl::OUString aEmpty; - for( USHORT i = 0; i < nItemCount; i++ ) + for( sal_uInt16 i = 0; i < nItemCount; i++ ) { - USHORT nItemId = m_xPopupMenu->getItemId( i ); + sal_uInt16 nItemId = m_xPopupMenu->getItemId( i ); if ( m_xPopupMenu->isItemChecked( nItemId ) ) nChecked = nItemId; |