diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:11:35 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:11:35 +0100 |
| commit | 94d85ef550ad17efba5dec09290d0e8176a8b455 (patch) | |
| tree | 41a1a79c31bd144b9374142c6259d33e2a3f5b89 /svx/source/toolbars/fontworkbar.cxx | |
| parent | 3f4e9b4c3cd9028744ea6ed5e93c41c51a15d229 (diff) | |
removetooltypes01: #i112600# remove tooltypes from svx
Diffstat (limited to 'svx/source/toolbars/fontworkbar.cxx')
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 49a4f62609a9..64367edbc85e 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno; void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Int32 nAlignment = -1; for( i = 0; i < nCount; i++ ) @@ -102,7 +102,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Int32 nCharacterSpacing = -1; for( i = 0; i < nCount; i++ ) @@ -127,7 +127,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Bool bChecked = sal_False; for( i = 0; i < nCount; i++ ) @@ -146,7 +146,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; rtl::OUString aFontWorkShapeType; @@ -258,7 +258,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Bool bFound = sal_False; for(i=0;(i<nCount) && !bFound ; i++) { @@ -526,7 +526,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi { sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue(); FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing ); - USHORT nRet = aDlg.Execute(); + sal_uInt16 nRet = aDlg.Execute(); if( nRet != 0 ) { SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() ); @@ -559,7 +559,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; for( i = 0; i < nCount; i++ ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); |