diff options
Diffstat (limited to 'sc/source/ui/pagedlg')
| -rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 106 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/hfedtdlg.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/hfedtdlg.src | 48 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/pagedlg.src | 26 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 34 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphf.cxx | 22 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 24 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 105 |
8 files changed, 203 insertions, 172 deletions
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 578f488f6529..7b73e7e56599 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -56,16 +56,16 @@ // STATIC DATA --------------------------------------------------------------- // List box positions for print range (PR) -const USHORT SC_AREASDLG_PR_NONE = 0; -const USHORT SC_AREASDLG_PR_ENTIRE = 1; -const USHORT SC_AREASDLG_PR_USER = 2; -const USHORT SC_AREASDLG_PR_SELECT = 3; -const USHORT SC_AREASDLG_PR_OFFSET = 4; +const sal_uInt16 SC_AREASDLG_PR_NONE = 0; +const sal_uInt16 SC_AREASDLG_PR_ENTIRE = 1; +const sal_uInt16 SC_AREASDLG_PR_USER = 2; +const sal_uInt16 SC_AREASDLG_PR_SELECT = 3; +const sal_uInt16 SC_AREASDLG_PR_OFFSET = 4; // List box positions for repeat ranges (RR) -const USHORT SC_AREASDLG_RR_NONE = 0; -const USHORT SC_AREASDLG_RR_USER = 1; -const USHORT SC_AREASDLG_RR_OFFSET = 2; +const sal_uInt16 SC_AREASDLG_RR_NONE = 0; +const sal_uInt16 SC_AREASDLG_RR_USER = 1; +const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; //============================================================================ @@ -89,7 +89,7 @@ void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIs #if 0 // this method is useful when debugging address flags. -static void printAddressFlags(USHORT nFlag) +static void printAddressFlags(sal_uInt16 nFlag) { if ((nFlag & SCA_COL_ABSOLUTE ) == SCA_COL_ABSOLUTE ) printf("SCA_COL_ABSOLUTE \n"); if ((nFlag & SCA_ROW_ABSOLUTE ) == SCA_ROW_ABSOLUTE ) printf("SCA_ROW_ABSOLUTE \n"); @@ -122,18 +122,18 @@ static void printAddressFlags(USHORT nFlag) ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS), // - aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ), + aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ), aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), // - aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ), + aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ), aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), // - aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ), + aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ), aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), // @@ -141,7 +141,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), // - bDlgLostFocus ( FALSE ), + bDlgLostFocus ( false ), pRefInputEdit ( &aEdPrintArea ), pDoc ( NULL ), pViewData ( NULL ), @@ -176,10 +176,10 @@ ScPrintAreasDlg::~ScPrintAreasDlg() // Extra-Data an ListBox-Entries abraeumen ListBox* pLb[3] = { &aLbPrintArea, &aLbRepeatRow, &aLbRepeatCol }; - for ( USHORT i=0; i<3; i++ ) + for ( sal_uInt16 i=0; i<3; i++ ) { - USHORT nCount = pLb[i]->GetEntryCount(); - for ( USHORT j=0; j<nCount; j++ ) + sal_uInt16 nCount = pLb[i]->GetEntryCount(); + for ( sal_uInt16 j=0; j<nCount; j++ ) delete (String*)pLb[i]->GetEntryData(j); } } @@ -187,7 +187,7 @@ ScPrintAreasDlg::~ScPrintAreasDlg() //---------------------------------------------------------------------------- -BOOL ScPrintAreasDlg::Close() +sal_Bool ScPrintAreasDlg::Close() { return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() ); } @@ -195,12 +195,12 @@ BOOL ScPrintAreasDlg::Close() //---------------------------------------------------------------------------- -BOOL ScPrintAreasDlg::IsTableLocked() const +sal_Bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, // bei der Eingabe die Tabelle umzuschalten - return TRUE; + return sal_True; } @@ -230,7 +230,7 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } else { - BOOL bRow = ( &aEdRepeatRow == pRefInputEdit ); + sal_Bool bRow = ( &aEdRepeatRow == pRefInputEdit ); lcl_GetRepeatRangeString(&rRef, pDoc, bRow, aStr); pRefInputEdit->SetRefString( aStr ); } @@ -263,7 +263,7 @@ void ScPrintAreasDlg::AddRefEntry() void ScPrintAreasDlg::Deactivate() { - bDlgLostFocus = TRUE; + bDlgLostFocus = sal_True; } @@ -273,7 +273,7 @@ void ScPrintAreasDlg::SetActive() { if ( bDlgLostFocus ) { - bDlgLostFocus = FALSE; + bDlgLostFocus = false; if ( pRefInputEdit ) { @@ -320,8 +320,8 @@ void ScPrintAreasDlg::Impl_Reset() String aOne; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); - USHORT nRangeCount = pDoc->GetPrintRangeCount( nCurTab ); - for (USHORT i=0; i<nRangeCount; i++) + sal_uInt16 nRangeCount = pDoc->GetPrintRangeCount( nCurTab ); + for (sal_uInt16 i=0; i<nRangeCount; i++) { const ScRange* pPrintRange = pDoc->GetPrintRange( nCurTab, i ); if (pPrintRange) @@ -360,10 +360,10 @@ void ScPrintAreasDlg::Impl_Reset() //---------------------------------------------------------------------------- -BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) +sal_Bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { String aRangeStr = pEd->GetText(); - BOOL bDataChanged = (pEd->GetSavedValue() != aRangeStr); + sal_Bool bDataChanged = (pEd->GetSavedValue() != aRangeStr); if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd ) { @@ -381,18 +381,18 @@ BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) //---------------------------------------------------------------------------- -BOOL ScPrintAreasDlg::Impl_CheckRefStrings() +sal_Bool ScPrintAreasDlg::Impl_CheckRefStrings() { - BOOL bOk = FALSE; + sal_Bool bOk = false; String aStrPrintArea = aEdPrintArea.GetText(); String aStrRepeatRow = aEdRepeatRow.GetText(); String aStrRepeatCol = aEdRepeatCol.GetText(); - BOOL bPrintAreaOk = TRUE; + sal_Bool bPrintAreaOk = sal_True; if ( aStrPrintArea.Len() ) { - const USHORT nValidAddr = SCA_VALID | SCA_VALID_ROW | SCA_VALID_COL; - const USHORT nValidRange = nValidAddr | SCA_VALID_ROW2 | SCA_VALID_COL2; + const sal_uInt16 nValidAddr = SCA_VALID | SCA_VALID_ROW | SCA_VALID_COL; + const sal_uInt16 nValidRange = nValidAddr | SCA_VALID_ROW2 | SCA_VALID_COL2; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); @@ -402,21 +402,21 @@ BOOL ScPrintAreasDlg::Impl_CheckRefStrings() for ( xub_StrLen i = 0; i < nSepCount && bPrintAreaOk; ++i ) { String aOne = aStrPrintArea.GetToken(i, sep); - USHORT nResult = aRange.Parse( aOne, pDoc, eConv ); + sal_uInt16 nResult = aRange.Parse( aOne, pDoc, eConv ); if ((nResult & nValidRange) != nValidRange) { - USHORT nAddrResult = aAddr.Parse( aOne, pDoc, eConv ); + sal_uInt16 nAddrResult = aAddr.Parse( aOne, pDoc, eConv ); if ((nAddrResult & nValidAddr) != nValidAddr) - bPrintAreaOk = FALSE; + bPrintAreaOk = false; } } } - BOOL bRepeatRowOk = (aStrRepeatRow.Len() == 0); + sal_Bool bRepeatRowOk = (aStrRepeatRow.Len() == 0); if ( !bRepeatRowOk ) bRepeatRowOk = lcl_CheckRepeatString(aStrRepeatRow, pDoc, true, NULL); - BOOL bRepeatColOk = (aStrRepeatCol.Len() == 0); + sal_Bool bRepeatColOk = (aStrRepeatCol.Len() == 0); if ( !bRepeatColOk ) bRepeatColOk = lcl_CheckRepeatString(aStrRepeatCol, pDoc, false, NULL); @@ -453,7 +453,7 @@ void ScPrintAreasDlg::Impl_FillLists() //------------------------------------------------------ ScRange aRange; String aStrRange; - BOOL bSimple = TRUE; + sal_Bool bSimple = sal_True; if ( pViewData ) bSimple = (pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE); @@ -465,7 +465,7 @@ void ScPrintAreasDlg::Impl_FillLists() else { ScRangeListRef aList( new ScRangeList ); - pViewData->GetMarkData().FillRangeListWithMarks( aList, FALSE ); + pViewData->GetMarkData().FillRangeListWithMarks( aList, false ); aList->Format( aStrRange, SCR_ABS, pDoc, eConv ); } @@ -529,7 +529,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { if ( Impl_CheckRefStrings() ) { - BOOL bDataChanged = FALSE; + sal_Bool bDataChanged = false; String aStr; SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, aStr ); SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); @@ -540,7 +540,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) //------------------------- // first try the list box, if "Entite sheet" is selected - BOOL bEntireSheet = (aLbPrintArea.GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); + sal_Bool bEntireSheet = (aLbPrintArea.GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet ); bDataChanged = bEntireSheet != pDoc->IsPrintEntireSheet( nCurTab ); @@ -562,7 +562,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) if ( bDataChanged ) { - SetDispatcherLock( FALSE ); + SetDispatcherLock( false ); SwitchToDocument(); GetBindings().GetDispatcher()->Execute( SID_CHANGE_PRINTAREA, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, @@ -610,13 +610,13 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { - USHORT nSelPos = pLb->GetSelectEntryPos(); + sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); Edit* pEd = NULL; // list box positions of specific entries, default to "repeat row/column" list boxes - USHORT nAllSheetPos = SC_AREASDLG_RR_NONE; - USHORT nUserDefPos = SC_AREASDLG_RR_USER; - USHORT nFirstCustomPos = SC_AREASDLG_RR_OFFSET; + sal_uInt16 nAllSheetPos = SC_AREASDLG_RR_NONE; + sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER; + sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; // find edit field for list box, and list box positions if( pLb == &aLbPrintArea ) @@ -652,8 +652,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) ListBox* pLb = NULL; // list box positions of specific entries, default to "repeat row/column" list boxes - USHORT nUserDefPos = SC_AREASDLG_RR_USER; - USHORT nFirstCustomPos = SC_AREASDLG_RR_OFFSET; + sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER; + sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET; if( pEd == &aEdPrintArea ) { @@ -669,16 +669,16 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) return 0; // set list box selection according to edit field - USHORT nEntryCount = pLb->GetEntryCount(); + sal_uInt16 nEntryCount = pLb->GetEntryCount(); String aStrEd( pEd->GetText() ); String aEdUpper = aStrEd; aEdUpper.ToUpperAscii(); if ( (nEntryCount > nFirstCustomPos) && aStrEd.Len() > 0 ) { - BOOL bFound = FALSE; + sal_Bool bFound = false; String* pSymbol = NULL; - USHORT i; + sal_uInt16 i; for ( i=nFirstCustomPos; i<nEntryCount && !bFound; i++ ) { @@ -711,7 +711,7 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) String aStr = rStr; xub_StrLen nLen = aStr.Len(); SCCOLROW nNum = 0; - BOOL bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) ); + sal_Bool bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) ); if ( bStrOk ) { @@ -726,7 +726,7 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal ) { sal_Int32 n = aStr.ToInt32(); - if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) != FALSE ) + if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) != false ) nNum = static_cast<SCCOLROW>(n - 1); } } @@ -893,7 +893,7 @@ void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIs const ScAddress& rStart = pRange->aStart; const ScAddress& rEnd = pRange->aEnd; - const USHORT nFmt = bIsRow ? (SCA_VALID_ROW | SCA_ROW_ABSOLUTE) : (SCA_VALID_COL | SCA_COL_ABSOLUTE); + const sal_uInt16 nFmt = bIsRow ? (SCA_VALID_ROW | SCA_ROW_ABSOLUTE) : (SCA_VALID_COL | SCA_COL_ABSOLUTE); String aTmpStr; rStart.Format(aTmpStr, nFmt, pDoc, eConv); rStr += aTmpStr; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 8ba49db77dfc..798cf65f85bc 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -65,7 +65,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet& rCoreSet, const String& rPageStyle, - USHORT nResIdP ) + sal_uInt16 nResIdP ) : SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet ) { eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType(); @@ -135,7 +135,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, rCoreSet.Get( rCoreSet.GetPool()->GetWhich(SID_ATTR_PAGE) ); - BOOL bRightPage = ( SVX_PAGE_LEFT != + sal_Bool bRightPage = ( SVX_PAGE_LEFT != SvxPageUsage(rPageItem.GetPageUsage()) ); if ( bRightPage ) @@ -147,13 +147,13 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, { // #69193a# respect "shared" setting - BOOL bShareHeader = IS_SHARE_HEADER(rCoreSet); + sal_Bool bShareHeader = IS_SHARE_HEADER(rCoreSet); if ( bShareHeader ) AddTabPage( 1, ScRightHeaderEditPage::Create, NULL ); else AddTabPage( 1, ScLeftHeaderEditPage::Create, NULL ); - BOOL bShareFooter = IS_SHARE_FOOTER(rCoreSet); + sal_Bool bShareFooter = IS_SHARE_FOOTER(rCoreSet); if ( bShareFooter ) AddTabPage( 2, ScRightFooterEditPage::Create, NULL ); else @@ -174,7 +174,7 @@ ScHFEditDlg::~ScHFEditDlg() // ----------------------------------------------------------------------- -void ScHFEditDlg::PageCreated( USHORT /* nId */, SfxTabPage& rPage ) +void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) { // kann ja nur ne ScHFEditPage sein... diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index b82497877763..bcfdef66b613 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -70,13 +70,13 @@ TabDialog RID_SCDLG_HFED_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -102,13 +102,13 @@ TabDialog RID_SCDLG_HFED_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -137,25 +137,25 @@ TabDialog RID_SCDLG_HFEDIT_ALL { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 4 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -181,19 +181,19 @@ TabDialog RID_SCDLG_HFEDIT_SHDR { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 3 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -219,19 +219,19 @@ TabDialog RID_SCDLG_HFEDIT_SFTR { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -257,13 +257,13 @@ TabDialog RID_SCDLG_HFEDIT { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -289,13 +289,13 @@ TabDialog RID_SCDLG_HFEDIT_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -321,13 +321,13 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -353,7 +353,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; }; }; @@ -379,7 +379,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER { Identifier = 1 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -405,7 +405,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -431,7 +431,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER { Identifier = 1 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index d02432d94cd9..0a56d70f966a 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -60,6 +60,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_PRINTAREA { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -74,12 +75,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_PRINTAREA { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 14 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_PRINTAREA { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_PRINTAREA"; Pos = MAP_APPFONT ( 239 , 13 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -93,6 +96,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_REPEATROW { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -105,12 +109,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_REPEATROW { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 43 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_REPEATROW { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATROW"; Pos = MAP_APPFONT ( 239 , 42 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -124,6 +130,7 @@ ModelessDialog RID_SCDLG_AREAS }; ListBox LB_REPEATCOL { + HelpID = "sc:ListBox:RID_SCDLG_AREAS:LB_REPEATCOL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 72 ) ; Size = MAP_APPFONT ( 90 , 60 ) ; @@ -136,12 +143,14 @@ ModelessDialog RID_SCDLG_AREAS }; Edit ED_REPEATCOL { + HelpID = "sc:Edit:RID_SCDLG_AREAS:ED_REPEATCOL"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 72 ) ; Size = MAP_APPFONT ( 131 , 12 ) ; }; ImageButton RB_REPEATCOL { + HelpID = "sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL"; Pos = MAP_APPFONT ( 239 , 71 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -158,6 +167,7 @@ TabPage RID_SCPAGE_TABLE Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox BTN_HEADER { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Column and row headers" ; @@ -165,6 +175,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_GRID { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID"; Pos = MAP_APPFONT ( 12 , 87 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Grid" ; @@ -172,6 +183,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_NOTES { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Comments" ; @@ -179,6 +191,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_OBJECTS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Objects/graphics" ; @@ -186,6 +199,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_CHARTS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS"; Pos = MAP_APPFONT ( 160 , 73 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "Ch~arts" ; @@ -193,6 +207,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_DRAWINGS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS"; Pos = MAP_APPFONT ( 160 , 87 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "~Drawing objects" ; @@ -200,6 +215,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_FORMULAS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS"; Pos = MAP_APPFONT ( 160 , 101 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "~Formulas" ; @@ -207,6 +223,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_NULLVALS { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS"; Pos = MAP_APPFONT ( 160 , 115 ) ; Size = MAP_APPFONT ( 91 , 10 ) ; Text [ en-US ] = "Zero ~values" ; @@ -220,6 +237,7 @@ TabPage RID_SCPAGE_TABLE }; RadioButton BTN_TOPDOWN { + HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Top to bottom, then right" ; @@ -227,6 +245,7 @@ TabPage RID_SCPAGE_TABLE }; RadioButton BTN_LEFTRIGHT { + HelpID = "sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; Text [ en-US ] = "~Left to right, then down" ; @@ -249,6 +268,7 @@ TabPage RID_SCPAGE_TABLE }; CheckBox BTN_PAGENO { + HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO"; Pos = MAP_APPFONT ( 12 , 46 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "First ~page number" ; @@ -256,6 +276,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_PAGENO { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 44 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -280,6 +301,7 @@ TabPage RID_SCPAGE_TABLE }; ListBox LB_SCALEMODE { + HelpID = "sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE"; Border = TRUE; Pos = MAP_APPFONT( 12, 155 ); Size = MAP_APPFONT( 124, 60 ); @@ -293,6 +315,7 @@ TabPage RID_SCPAGE_TABLE }; MetricField ED_SCALEALL { + HelpID = "sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 155 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -309,6 +332,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGEWIDTH { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 144 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -322,6 +346,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGEHEIGHT { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 160 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -335,6 +360,7 @@ TabPage RID_SCPAGE_TABLE }; NumericField ED_SCALEPAGENUM { + HelpID = "sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 155 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; 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; } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 7e536683f4ff..824d64a0e287 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -60,15 +60,15 @@ // class ScHFPage //================================================================== -ScHFPage::ScHFPage( Window* pParent, USHORT nResId, - const SfxItemSet& rSet, USHORT nSetId ) +ScHFPage::ScHFPage( Window* pParent, sal_uInt16 nResId, + const SfxItemSet& rSet, sal_uInt16 nSetId ) : SvxHFPage ( pParent, nResId, rSet, nSetId ), aBtnEdit ( this, ScResId( RID_SCBTN_HFEDIT ) ), aDataSet ( *rSet.GetPool(), ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT, ATTR_PAGE, ATTR_PAGE, 0 ), - nPageUsage ( (USHORT)SVX_PAGE_ALL ), + nPageUsage ( (sal_uInt16)SVX_PAGE_ALL ), pStyleDlg ( NULL ) { SetExchangeSupport(); @@ -101,6 +101,8 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); else aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT ); + + aBtnEdit.SetAccessibleRelationMemberOf(&aFrm); } //------------------------------------------------------------------ @@ -119,9 +121,9 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) //------------------------------------------------------------------ -BOOL ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { - BOOL bResult = SvxHFPage::FillItemSet( rOutSet ); + sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet ); if ( nId == SID_ATTR_PAGE_HEADERSET ) { @@ -141,7 +143,7 @@ BOOL ScHFPage::FillItemSet( SfxItemSet& rOutSet ) void ScHFPage::ActivatePage( const SfxItemSet& rSet ) { - USHORT nPageWhich = GetWhich( SID_ATTR_PAGE ); + sal_uInt16 nPageWhich = GetWhich( SID_ATTR_PAGE ); const SvxPageItem& rPageItem = (const SvxPageItem&) rSet.Get(nPageWhich); @@ -219,7 +221,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) if ( aCntSharedBox.IsEnabled() && !aCntSharedBox.IsChecked() ) { - USHORT nResId = ( nId == SID_ATTR_PAGE_HEADERSET ) + sal_uInt16 nResId = ( nId == SID_ATTR_PAGE_HEADERSET ) ? RID_SCDLG_HFED_HEADER : RID_SCDLG_HFED_FOOTER; @@ -238,7 +240,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) { String aText; SfxSingleTabDialog* pDlg = new SfxSingleTabDialog( this, aDataSet, 42 ); - BOOL bRightPage = aCntSharedBox.IsChecked() + sal_Bool bRightPage = aCntSharedBox.IsChecked() || ( SVX_PAGE_LEFT != SvxPageUsage(nPageUsage) ); if ( nId == SID_ATTR_PAGE_HEADERSET ) @@ -298,7 +300,7 @@ SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) //------------------------------------------------------------------ -USHORT* ScHeaderPage::GetRanges() +sal_uInt16* ScHeaderPage::GetRanges() { return SvxHeaderPage::GetRanges(); } @@ -321,7 +323,7 @@ SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) //------------------------------------------------------------------ -USHORT* ScFooterPage::GetRanges() +sal_uInt16* ScFooterPage::GetRanges() { return SvxHeaderPage::GetRanges(); } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 7769f39bcd30..3a8730b5b09b 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -95,7 +95,7 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo eLocation(eLoc), pAcc(NULL) { - EnableRTL(FALSE); + EnableRTL(false); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); Color aBgColor = rStyleSettings.GetWindowColor(); @@ -107,7 +107,7 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo Size aSize( GetOutputSize() ); aSize.Height() *= 4; - pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE ); + pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ); pEdEngine->SetPaperSize( aSize ); pEdEngine->SetRefDevice( this ); @@ -159,8 +159,8 @@ EditTextObject* ScEditWindow::CreateTextObject() // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck) const SfxItemSet& rEmpty = pEdEngine->GetEmptyItemSet(); - USHORT nParCnt = pEdEngine->GetParagraphCount(); - for (USHORT i=0; i<nParCnt; i++) + sal_uInt16 nParCnt = pEdEngine->GetParagraphCount(); + for (sal_uInt16 i=0; i<nParCnt; i++) pEdEngine->SetParaAttribs( i, rEmpty ); return pEdEngine->CreateTextObject(); @@ -212,7 +212,7 @@ void ScEditWindow::SetCharAttriutes() if ( pDocSh && pViewSh ) { - if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(TRUE); + if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(sal_True); SfxItemSet aSet( pEdView->GetAttribs() ); @@ -230,7 +230,7 @@ void ScEditWindow::SetCharAttriutes() pEdView->SetAttribs( aSet ); } - if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(FALSE); + if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(false); delete pDlg; } } @@ -279,7 +279,7 @@ void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) { - USHORT nKey = rKEvt.GetKeyCode().GetModifier() + sal_uInt16 nKey = rKEvt.GetKeyCode().GetModifier() + rKEvt.GetKeyCode().GetCode(); if ( nKey == KEY_TAB || nKey == KEY_TAB + KEY_SHIFT ) @@ -362,7 +362,7 @@ ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId ) { nSelected=0; aTimer.SetTimeout(600); - SetDropDown( TRUE); + SetDropDown( true); } void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp) @@ -370,7 +370,7 @@ void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp) pPopupMenu=pPopUp; } -USHORT ScExtIButton::GetSelected() +sal_uInt16 ScExtIButton::GetSelected() { return nSelected; } @@ -405,7 +405,7 @@ void ScExtIButton::StartPopup() if(pPopupMenu!=NULL) { - SetPressed( TRUE ); + SetPressed( sal_True ); EndSelection(); Point aPoint(0,0); aPoint.Y()=GetOutputSizePixel().Height(); @@ -416,13 +416,13 @@ void ScExtIButton::StartPopup() { aMLink.Call(this); } - SetPressed( FALSE); + SetPressed( false); } } long ScExtIButton::PreNotify( NotifyEvent& rNEvt ) { - USHORT nSwitch=rNEvt.GetType(); + sal_uInt16 nSwitch=rNEvt.GetType(); if(nSwitch==EVENT_MOUSEBUTTONUP) { MouseButtonUp(*rNEvt.GetMouseEvent()); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 56a37f438717..59d58f2913db 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -71,38 +71,38 @@ sal_Int64 EmptyNumericField::GetValue() const // STATIC DATA ----------------------------------------------------------- -static USHORT pPageTableRanges[] = +static sal_uInt16 pPageTableRanges[] = { ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO, 0 }; -BOOL lcl_PutVObjModeItem( USHORT nWhich, +sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const CheckBox& rBtn ); -BOOL lcl_PutScaleItem( USHORT nWhich, +sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, - USHORT nLBEntry, + sal_uInt16 nLBEntry, const SpinField& rEd, - UINT16 nValue ); + sal_uInt16 nValue ); -BOOL lcl_PutScaleItem2( USHORT nWhich, +sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, - USHORT nLBEntry, + sal_uInt16 nLBEntry, const NumericField& rEd1, const NumericField& rEd2 ); -BOOL lcl_PutBoolItem( USHORT nWhich, +sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, - BOOL bIsChecked, - BOOL bSavedValue ); + sal_Bool bIsChecked, + sal_Bool bSavedValue ); //------------------------------------------------------------------------ @@ -110,9 +110,9 @@ BOOL lcl_PutBoolItem( USHORT nWhich, #define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) #define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) -#define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),TRUE)) +#define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),sal_True)) #define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue() -#define GET_USHORT(sid,set) (USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue() +#define GET_USHORT(sid,set) (sal_uInt16)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue() #define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \ == VOBJ_MODE_SHOW ) @@ -161,6 +161,9 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : aBmpPageDir.SetOutputSizePixel( aBmpSize ); FreeResource(); + + aEdPageNo.SetAccessibleName(aBtnPageNo.GetText()); + aEdPageNo.SetAccessibleRelationLabeledBy(&aBtnPageNo); } // ----------------------------------------------------------------------- @@ -179,7 +182,7 @@ ScTablePage::~ScTablePage() //------------------------------------------------------------------------ -USHORT* ScTablePage::GetRanges() +sal_uInt16* ScTablePage::GetRanges() { return pPageTableRanges; } @@ -195,11 +198,11 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet ) void ScTablePage::Reset( const SfxItemSet& rCoreSet ) { - BOOL bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet ); - USHORT nWhich = 0; + sal_Bool bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet ); + sal_uInt16 nWhich = 0; //----------- - // BOOL-Flags + // sal_Bool-Flags //----------- aBtnNotes .Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) ); aBtnGrid .Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) ); @@ -212,7 +215,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) //------------------ // Erste Druckseite: //------------------ - USHORT nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet); + sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet); aBtnPageNo.Check( nPage != 0 ); aEdPageNo.SetValue( (nPage != 0) ? nPage : 1 ); PageNoHdl( NULL ); @@ -229,20 +232,20 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) //------------ nWhich = GetWhich(SID_SCATTR_PAGE_SCALE); - if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { - USHORT nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); + sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); if( nScale > 0 ) aLbScaleMode.SelectEntryPos( SC_TPTABLE_SCALE_PERCENT ); aEdScaleAll.SetValue( (nScale > 0) ? nScale : 100 ); } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); - if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet.Get( nWhich ) ); - USHORT nWidth = rItem.GetWidth(); - USHORT nHeight = rItem.GetHeight(); + sal_uInt16 nWidth = rItem.GetWidth(); + sal_uInt16 nHeight = rItem.GetHeight(); /* width==0 and height==0 is invalid state, used as "not selected". Dialog shows width=height=1 then. */ @@ -254,9 +257,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES); - if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { - USHORT nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); + sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); if( nPages > 0 ) aLbScaleMode.SelectEntryPos( SC_TPTABLE_SCALE_TO_PAGES ); aEdScalePageNum.SetValue( (nPages > 0) ? nPages : 1 ); @@ -295,14 +298,14 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) // ----------------------------------------------------------------------- -BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) +sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) { const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); - BOOL bDataChanged = FALSE; + sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); + sal_Bool bDataChanged = false; //----------- - // BOOL-Flags + // sal_Bool-Flags //----------- bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES), @@ -338,7 +341,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) //------------------ // Erste Druckseite: //------------------ - BOOL bUseValue = aBtnPageNo.IsChecked(); + sal_Bool bUseValue = aBtnPageNo.IsChecked(); if ( WAS_DEFAULT(nWhichPageNo,rOldSet) && ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue()) @@ -349,12 +352,12 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) } else { - UINT16 nPage = (UINT16)( aBtnPageNo.IsChecked() + sal_uInt16 nPage = (sal_uInt16)( aBtnPageNo.IsChecked() ? aEdPageNo.GetValue() : 0 ); rCoreSet.Put( SfxUInt16Item( nWhichPageNo, nPage ) ); - bDataChanged = TRUE; + bDataChanged = sal_True; } //------------------- @@ -383,7 +386,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALE), rCoreSet, rOldSet, aLbScaleMode, SC_TPTABLE_SCALE_PERCENT, - aEdScaleAll, (UINT16)aEdScaleAll.GetValue() ); + aEdScaleAll, (sal_uInt16)aEdScaleAll.GetValue() ); bDataChanged |= lcl_PutScaleItem2( GetWhich(SID_SCATTR_PAGE_SCALETO), rCoreSet, rOldSet, @@ -393,7 +396,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALETOPAGES), rCoreSet, rOldSet, aLbScaleMode, SC_TPTABLE_SCALE_TO_PAGES, - aEdScalePageNum, (UINT16)aEdScalePageNum.GetValue() ); + aEdScalePageNum, (sal_uInt16)aEdScalePageNum.GetValue() ); return bDataChanged; } @@ -471,13 +474,13 @@ IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG ) // Hilfsfunktionen fuer FillItemSet: //======================================================================== -BOOL lcl_PutBoolItem( USHORT nWhich, +sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, - BOOL bIsChecked, - BOOL bSavedValue ) + sal_Bool bIsChecked, + sal_Bool bSavedValue ) { - BOOL bDataChanged = ( bSavedValue == bIsChecked + sal_Bool bDataChanged = ( bSavedValue == bIsChecked && WAS_DEFAULT(nWhich,rOldSet) ); if ( bDataChanged ) @@ -490,13 +493,13 @@ BOOL lcl_PutBoolItem( USHORT nWhich, //------------------------------------------------------------------------ -BOOL lcl_PutVObjModeItem( USHORT nWhich, +sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const CheckBox& rBtn ) { - BOOL bIsChecked = rBtn.IsChecked(); - BOOL bDataChanged = ( rBtn.GetSavedValue() == bIsChecked + sal_Bool bIsChecked = rBtn.IsChecked(); + sal_Bool bDataChanged = ( rBtn.GetSavedValue() == bIsChecked && WAS_DEFAULT(nWhich,rOldSet) ); if ( bDataChanged ) @@ -511,16 +514,16 @@ BOOL lcl_PutVObjModeItem( USHORT nWhich, //------------------------------------------------------------------------ -BOOL lcl_PutScaleItem( USHORT nWhich, +sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, - USHORT nLBEntry, + sal_uInt16 nLBEntry, const SpinField& rEd, - UINT16 nValue ) + sal_uInt16 nValue ) { - BOOL bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); - BOOL bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || + sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); + sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || (rEd.GetSavedValue() != rEd.GetText()) || !WAS_DEFAULT( nWhich, rOldSet ); @@ -533,18 +536,18 @@ BOOL lcl_PutScaleItem( USHORT nWhich, } -BOOL lcl_PutScaleItem2( USHORT nWhich, +sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, const ListBox& rListBox, - USHORT nLBEntry, + sal_uInt16 nLBEntry, const NumericField& rEd1, const NumericField& rEd2 ) { - UINT16 nValue1 = (UINT16)rEd1.GetValue(); - UINT16 nValue2 = (UINT16)rEd2.GetValue(); - BOOL bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); - BOOL bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || + sal_uInt16 nValue1 = (sal_uInt16)rEd1.GetValue(); + sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue(); + sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); + sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || (rEd1.GetSavedValue() != rEd1.GetText()) || (rEd2.GetSavedValue() != rEd2.GetText()) || !WAS_DEFAULT( nWhich, rOldSet ); |