diff options
Diffstat (limited to 'sc/source/ui/pagedlg/scuitphfedit.cxx')
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 3d57d39bbe17..dd47ce988480 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -69,19 +69,19 @@ // STATIC DATA ----------------------------------------------------------- -static USHORT pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT, +static sal_uInt16 pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT, SID_SCATTR_PAGE_HEADERRIGHT, 0 }; -static USHORT pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT, +static sal_uInt16 pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT, SID_SCATTR_PAGE_FOOTERRIGHT, 0 }; -static USHORT pPageLeftHeaderRanges[] = { SID_SCATTR_PAGE_HEADERLEFT, +static sal_uInt16 pPageLeftHeaderRanges[] = { SID_SCATTR_PAGE_HEADERLEFT, SID_SCATTR_PAGE_HEADERLEFT, 0 }; -static USHORT pPageLeftFooterRanges[] = { SID_SCATTR_PAGE_FOOTERLEFT, +static sal_uInt16 pPageLeftFooterRanges[] = { SID_SCATTR_PAGE_FOOTERLEFT, SID_SCATTR_PAGE_FOOTERLEFT, 0 }; @@ -94,9 +94,9 @@ static ScEditWindow* pActiveEdWnd = NULL; // ScHFEditPage::ScHFEditPage( Window* pParent, - USHORT nResId, + sal_uInt16 nResId, const SfxItemSet& rCoreAttrs, - USHORT nWhichId, + sal_uInt16 nWhichId, bool bHeader ) : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ), @@ -208,7 +208,7 @@ void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) // ----------------------------------------------------------------------- -BOOL ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = aWndLeft .CreateTextObject(); @@ -224,7 +224,7 @@ BOOL ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) rCoreSet.Put( aItem ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- @@ -336,7 +336,7 @@ void ScHFEditPage::InitPreDefinedList() void ScHFEditPage::InsertToDefinedList() { - USHORT nCount = maLbDefined.GetEntryCount(); + sal_uInt16 nCount = maLbDefined.GetEntryCount(); if(nCount == eEntryCount) { String aCustomizedEntry(ScGlobal::GetRscString( STR_HF_CUSTOMIZED ) ); @@ -347,7 +347,7 @@ void ScHFEditPage::InsertToDefinedList() void ScHFEditPage::RemoveFromDefinedList() { - USHORT nCount = maLbDefined.GetEntryCount(); + sal_uInt16 nCount = maLbDefined.GetEntryCount(); if(nCount > eEntryCount ) maLbDefined.RemoveEntry( nCount-1); } @@ -374,8 +374,8 @@ void ScHFEditPage::SetSelectDefinedList() bool bFound = false; - USHORT i; - USHORT nCount = maLbDefined.GetEntryCount(); + sal_uInt16 i; + sal_uInt16 nCount = maLbDefined.GetEntryCount(); for(i = 0; i < nCount && !bFound; i++) { switch(static_cast<ScHFEntryId>(i)) @@ -542,7 +542,7 @@ void ScHFEditPage::SetSelectDefinedList() if(eSelectEntry == eEntryCount) InsertToDefinedList(); - maLbDefined.SelectEntryPos( sal::static_int_cast<USHORT>( eSelectEntry ) ); + maLbDefined.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eSelectEntry ) ); } bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj) @@ -925,7 +925,7 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& // ----------------------------------------------------------------------- -USHORT* ScRightHeaderEditPage::GetRanges() +sal_uInt16* ScRightHeaderEditPage::GetRanges() { return pPageRightHeaderRanges; } // ----------------------------------------------------------------------- @@ -945,7 +945,7 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r // ----------------------------------------------------------------------- -USHORT* ScLeftHeaderEditPage::GetRanges() +sal_uInt16* ScLeftHeaderEditPage::GetRanges() { return pPageLeftHeaderRanges; } // ----------------------------------------------------------------------- @@ -964,7 +964,7 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& // ----------------------------------------------------------------------- -USHORT* ScRightFooterEditPage::GetRanges() +sal_uInt16* ScRightFooterEditPage::GetRanges() { return pPageRightFooterRanges; } // ----------------------------------------------------------------------- @@ -983,7 +983,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r // ----------------------------------------------------------------------- -USHORT* ScLeftFooterEditPage::GetRanges() +sal_uInt16* ScLeftFooterEditPage::GetRanges() { return pPageLeftFooterRanges; } // ----------------------------------------------------------------------- |