diff options
Diffstat (limited to 'cui/source/tabpages/numfmt.cxx')
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 572 |
1 files changed, 286 insertions, 286 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 1fe6de438dc0..efc287f000a4 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -79,16 +79,16 @@ static USHORT pRanges[] = }; /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreview +#* Klasse: SvxNumberPreview #* -#* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl +#* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl #* -#* Input: Fenster, Resource-ID +#* Input: Fenster, Resource-ID #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -106,16 +106,16 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId } /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreview +#* Klasse: SvxNumberPreview #* -#* Funktion: Destruktor der Klasse SvxNumberPreviewImpl +#* Funktion: Destruktor der Klasse SvxNumberPreviewImpl #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -124,16 +124,16 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl() } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreviewImpl +#* Klasse: SvxNumberPreviewImpl #* -#* Funktion: Funktion fuer das Aendern des Preview- Strings +#* Funktion: Funktion fuer das Aendern des Preview- Strings #* -#* Input: String, Farbe +#* Input: String, Farbe #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -149,24 +149,24 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr, } /************************************************************************* -#* Methode: Paint Datum:02.10.97 +#* Methode: Paint Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberPreviewImpl +#* Klasse: SvxNumberPreviewImpl #* -#* Funktion: Funktion fuer das neu zeichnen des Fensters. +#* Funktion: Funktion fuer das neu zeichnen des Fensters. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberPreviewImpl::Paint( const Rectangle& ) { - Font aDrawFont = GetFont(); - Size aSzWnd = GetOutputSizePixel(); - Point aPosText = Point( (aSzWnd.Width() - GetTextWidth( aPrevStr )) /2, + Font aDrawFont = GetFont(); + Size aSzWnd = GetOutputSizePixel(); + Point aPosText = Point( (aSzWnd.Width() - GetTextWidth( aPrevStr )) /2, (aSzWnd.Height() - GetTextHeight())/2 ); aDrawFont.SetColor( aPrevCol ); @@ -225,11 +225,11 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) // class SvxNumberFormatTabPage ------------------------------------------ #define REMOVE_DONTKNOW() \ - if ( !aFtLanguage.IsEnabled() ) \ - { \ - aFtLanguage .Enable(); \ - aLbLanguage .Enable(); \ - aLbLanguage .SelectLanguage( pNumFmtShell->GetCurLanguage() ); \ + if ( !aFtLanguage.IsEnabled() ) \ + { \ + aFtLanguage .Enable(); \ + aLbLanguage .Enable(); \ + aLbLanguage .SelectLanguage( pNumFmtShell->GetCurLanguage() ); \ } #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) @@ -248,16 +248,16 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) #define THIS_CUI_RES CUI_RES #endif /* !ENABLE_LAYOUT */ -SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, - const SfxItemSet& rCoreAttrs ) +SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, + const SfxItemSet& rCoreAttrs ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ), aFtCategory ( this, CUI_RES( FT_CATEGORY ) ), - aLbCategory ( this, CUI_RES( LB_CATEGORY ) ), - aFtFormat ( this, CUI_RES( FT_FORMAT ) ), - aLbCurrency ( this, CUI_RES( LB_CURRENCY) ), - aLbFormat ( this, CUI_RES( LB_FORMAT ) ), + aLbCategory ( this, CUI_RES( LB_CATEGORY ) ), + aFtFormat ( this, CUI_RES( FT_FORMAT ) ), + aLbCurrency ( this, CUI_RES( LB_CURRENCY) ), + aLbFormat ( this, CUI_RES( LB_FORMAT ) ), aFtLanguage ( this, CUI_RES( FT_LANGUAGE ) ), aLbLanguage ( this, CUI_RES( LB_LANGUAGE ), FALSE ), aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ), @@ -268,15 +268,15 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, aBtnNegRed ( this, CUI_RES( BTN_NEGRED ) ), aBtnThousand ( this, CUI_RES( BTN_THOUSAND ) ), aFlOptions ( this, CUI_RES( FL_OPTIONS ) ), - + aFtEdFormat ( this, CUI_RES( FT_EDFORMAT ) ), - aEdFormat ( this, CUI_RES( ED_FORMAT ) ), + aEdFormat ( this, CUI_RES( ED_FORMAT ) ), aIbAdd ( this, CUI_RES( IB_ADD ) ), aIbInfo ( this, CUI_RES( IB_INFO ) ), aIbRemove ( this, CUI_RES( IB_REMOVE ) ), aFtComment ( this, CUI_RES( FT_COMMENT ) ), aEdComment ( this, CUI_RES( ED_COMMENT ) ), - + #if ENABLE_LAYOUT aWndPreview ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ), #else @@ -285,7 +285,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent, pNumItem ( NULL ), pNumFmtShell ( NULL ), nInitFormat ( ULONG_MAX ), - + sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)), pLastActivWindow( NULL ) { @@ -307,33 +307,33 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { - ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); - ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); + ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); + ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); bNumItemFlag=TRUE; bOneAreaFlag=FALSE; nCatHeight=aLbCategory.GetSizePixel().Height(); - nCurFormatY =aLbFormat.GetPosPixel().Y(); + nCurFormatY =aLbFormat.GetPosPixel().Y(); nCurFormatHeight=aLbFormat.GetSizePixel().Height(); - nStdFormatY =aLbCurrency.GetPosPixel().Y(); + nStdFormatY =aLbCurrency.GetPosPixel().Y(); nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight; - aIbAdd. SetModeImage( aIconList.GetImage( IID_ADD ) ); - aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST ); + aIbAdd. SetModeImage( aIconList.GetImage( IID_ADD ) ); + aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST ); - aIbRemove. SetModeImage( aIconList.GetImage( IID_REMOVE ) ); - aIbRemove. SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST ); + aIbRemove. SetModeImage( aIconList.GetImage( IID_REMOVE ) ); + aIbRemove. SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST ); - aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); - aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); + aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); + aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); aIbAdd.Enable(FALSE ); aIbRemove.Enable(FALSE ); aIbInfo.Enable(FALSE ); - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen aEdComment.Hide(); @@ -344,29 +344,29 @@ void SvxNumberFormatTabPage::Init_Impl() // Handler verbinden Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl ); - aLbCategory .SetSelectHdl( aLink ); - aLbFormat .SetSelectHdl( aLink ); - aLbLanguage .SetSelectHdl( aLink ); - aLbCurrency .SetSelectHdl( aLink ); + aLbCategory .SetSelectHdl( aLink ); + aLbFormat .SetSelectHdl( aLink ); + aLbLanguage .SetSelectHdl( aLink ); + aLbCurrency .SetSelectHdl( aLink ); aCbSourceFormat .SetClickHdl( aLink ); aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl ); - aEdDecimals .SetModifyHdl( aLink ); - aEdLeadZeroes .SetModifyHdl( aLink ); - aBtnNegRed .SetClickHdl( aLink ); - aBtnThousand .SetClickHdl( aLink ); - aLbFormat .SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); - aEdFormat .SetModifyHdl( HDL( EditHdl_Impl ) ); + aEdDecimals .SetModifyHdl( aLink ); + aEdLeadZeroes .SetModifyHdl( aLink ); + aBtnNegRed .SetClickHdl( aLink ); + aBtnThousand .SetClickHdl( aLink ); + aLbFormat .SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); + aEdFormat .SetModifyHdl( HDL( EditHdl_Impl ) ); aIbAdd.SetClickHdl( HDL( ClickHdl_Impl ) ); aIbRemove.SetClickHdl( HDL( ClickHdl_Impl ) ); aIbInfo.SetClickHdl( HDL( ClickHdl_Impl ) ); aLink = LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl); - aEdComment .SetLoseFocusHdl( aLink); - aResetWinTimer .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl)); - aResetWinTimer .SetTimeout( 10); + aEdComment .SetLoseFocusHdl( aLink); + aResetWinTimer .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl)); + aResetWinTimer .SetTimeout( 10); // Sprachen-ListBox initialisieren @@ -384,16 +384,16 @@ void SvxNumberFormatTabPage::Init_Impl() } /************************************************************************* -#* Methode: GetRanges Datum:02.10.97 +#* Methode: GetRanges Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Liefert Bereichsangaben zurueck. +#* Funktion: Liefert Bereichsangaben zurueck. #* -#* Input: --- +#* Input: --- #* -#* Output: Bereich +#* Output: Bereich #* #************************************************************************/ @@ -404,20 +404,20 @@ USHORT* SvxNumberFormatTabPage::GetRanges() /************************************************************************* -#* Methode: Create Datum:02.10.97 +#* Methode: Create Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Erzeugt eine neue Zahlenformat- Seite. +#* Funktion: Erzeugt eine neue Zahlenformat- Seite. #* -#* Input: Fenster, SfxItemSet +#* Input: Fenster, SfxItemSet #* -#* Output: neue TabPage +#* Output: neue TabPage #* #************************************************************************/ -SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, +SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxNumberFormatTabPage( pParent, rAttrSet ) ); @@ -425,34 +425,34 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, /************************************************************************* -#* Methode: Reset Datum:02.10.97 +#* Methode: Reset Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Die Attribute des Dialogs werden mit Hilfe -#* des Itemsets neu eingestellt. +#* Funktion: Die Attribute des Dialogs werden mit Hilfe +#* des Itemsets neu eingestellt. #* -#* Input: SfxItemSet +#* Input: SfxItemSet #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) { - const SfxUInt32Item* pValFmtAttr = NULL; - const SfxPoolItem* pItem = NULL; + const SfxUInt32Item* pValFmtAttr = NULL; + const SfxPoolItem* pItem = NULL; const SfxBoolItem* pAutoEntryAttr = NULL; - USHORT nCatLbSelPos = 0; - USHORT nFmtLbSelPos = 0; - LanguageType eLangType = LANGUAGE_DONTKNOW; - SvxDelStrgs aFmtEntryList; - SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; - double nValDouble = 0; - String aValString; - SfxItemState eState = SFX_ITEM_DONTCARE; + USHORT nCatLbSelPos = 0; + USHORT nFmtLbSelPos = 0; + LanguageType eLangType = LANGUAGE_DONTKNOW; + SvxDelStrgs aFmtEntryList; + SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; + double nValDouble = 0; + String aValString; + SfxItemState eState = SFX_ITEM_DONTCARE; eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),TRUE,&pItem); @@ -546,7 +546,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) aValString = pNumItem->GetValueString(); break; case SVX_VALUE_TYPE_NUMBER: - // #50441# string may be set in addition to the value + // #50441# string may be set in addition to the value aValString = pNumItem->GetValueString(); nValDouble = pNumItem->GetValueDouble(); break; @@ -558,11 +558,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // nun sind alle Informationen fuer die Formatierer-Shell beisammen: if ( pNumFmtShell ) - delete pNumFmtShell; // ggF. alte Shell loeschen (==Reset) + delete pNumFmtShell; // ggF. alte Shell loeschen (==Reset) - nInitFormat = ( pValFmtAttr ) // Init-Key merken - ? pValFmtAttr->GetValue() // (fuer FillItemSet()) - : ULONG_MAX; // == DONT_KNOW + nInitFormat = ( pValFmtAttr ) // Init-Key merken + ? pValFmtAttr->GetValue() // (fuer FillItemSet()) + : ULONG_MAX; // == DONT_KNOW if ( eValType == SVX_VALUE_TYPE_STRING ) @@ -621,13 +621,13 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) //! This spoils everything because it rematches currency formats based on //! the selected aLbCurrency entry instead of the current format. //! Besides that everything seems to be initialized by now, so why call it? -// SelFormatHdl_Impl( &aLbCategory ); +// SelFormatHdl_Impl( &aLbCategory ); if ( pValFmtAttr ) { EditHdl_Impl( &aEdFormat ); // UpdateOptions_Impl() als Seiteneffekt } - else // DONT_KNOW + else // DONT_KNOW { // Kategoriewechsel und direkte Eingabe sind moeglich, sonst nix: Obstructing(); @@ -643,50 +643,50 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } /************************************************************************* -#* Methode: Obstructing Datum:02.10.97 +#* Methode: Obstructing Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel -#* und direkter Eingabe. +#* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel +#* und direkter Eingabe. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::Obstructing() { - aLbFormat .SetNoSelection(); - aLbLanguage .SetNoSelection(); - aFtLanguage .Disable(); - aLbLanguage .Disable(); + aLbFormat .SetNoSelection(); + aLbLanguage .SetNoSelection(); + aFtLanguage .Disable(); + aLbLanguage .Disable(); aIbAdd.Enable(FALSE ); aIbRemove.Enable(FALSE ); aIbInfo.Enable(FALSE ); - aBtnNegRed .Disable(); - aBtnThousand .Disable(); - aFtLeadZeroes .Disable(); - aFtDecimals .Disable(); - aEdLeadZeroes .Disable(); - aEdDecimals .Disable(); - aFlOptions .Disable(); - aEdDecimals .SetText( String() ); - aEdLeadZeroes .SetText( String() ); - aBtnNegRed .Check( FALSE ); - aBtnThousand .Check( FALSE ); + aBtnNegRed .Disable(); + aBtnThousand .Disable(); + aFtLeadZeroes .Disable(); + aFtDecimals .Disable(); + aEdLeadZeroes .Disable(); + aEdDecimals .Disable(); + aFlOptions .Disable(); + aEdDecimals .SetText( String() ); + aEdLeadZeroes .SetText( String() ); + aBtnNegRed .Check( FALSE ); + aBtnThousand .Check( FALSE ); aWndPreview .NotifyChange( String() ); - aLbCategory .SelectEntryPos( 0 ); - aEdFormat .SetText( String() ); - aFtComment .SetText( String() ); - aEdComment .SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aLbCategory .SelectEntryPos( 0 ); + aEdFormat .SetText( String() ); + aFtComment .SetText( String() ); + aEdComment .SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen - aEdFormat .GrabFocus(); + aEdFormat .GrabFocus(); } @@ -725,16 +725,16 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() /************************************************************************* -#* Methode: HideLanguage Datum:14.05.98 +#* Methode: HideLanguage Datum:14.05.98 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Versteckt die Spracheinstellung: +#* Funktion: Versteckt die Spracheinstellung: #* -#* Input: BOOL nFlag +#* Input: BOOL nFlag #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -758,18 +758,18 @@ void SvxNumberFormatTabPage::HideLanguage(BOOL nFlag) } /************************************************************************* -#* Methode: FillItemSet Datum:02.10.97 +#* Methode: FillItemSet Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Stellt die Attribute im ItemSet ein, -#* sowie in der DocShell den numItem, wenn -#* bNumItemFlag nicht gesetzt ist. +#* Funktion: Stellt die Attribute im ItemSet ein, +#* sowie in der DocShell den numItem, wenn +#* bNumItemFlag nicht gesetzt ist. #* -#* Input: SfxItemSet +#* Input: SfxItemSet #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -779,12 +779,12 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if ( bDataChanged ) { const SfxItemSet& rMyItemSet = GetItemSet(); - USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); + USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); SfxItemState eItemState = rMyItemSet.GetItemState( nWhich, FALSE ); // OK chosen - Is format code input entered already taken over? // If not, simulate Add. Upon syntax error ignore input and prevent Put. - String aFormat = aEdFormat.GetText(); + String aFormat = aEdFormat.GetText(); sal_uInt32 nCurKey = pNumFmtShell->GetCurNumFmtKey(); if ( aIbAdd.IsEnabled() || pNumFmtShell->IsTmpCurrencyFormat(aFormat) ) @@ -824,7 +824,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if ( nDelCount > 0 ) { - sal_uInt32* pDelArr = new sal_uInt32[nDelCount]; + sal_uInt32* pDelArr = new sal_uInt32[nDelCount]; pNumFmtShell->GetUpdateData( pDelArr, nDelCount ); pNumItem->SetDelFormatArray( pDelArr, nDelCount ); @@ -835,7 +835,7 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) } else { - SfxObjectShell* pDocSh = SfxObjectShell::Current(); + SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -881,7 +881,7 @@ int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { const ULONG nCurKey = pNumFmtShell->GetCurNumFmtKey(); const USHORT nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); - SfxItemState eItemState = GetItemSet().GetItemState( nWhich, FALSE ); + SfxItemState eItemState = GetItemSet().GetItemState( nWhich, FALSE ); if ( (nInitFormat == nCurKey) && (SFX_ITEM_DEFAULT == eItemState) ) _pSet->ClearItem( nWhich ); @@ -904,13 +904,13 @@ void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem ) void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) { - String* pEntry; - String aTmpString; - String aTmpCatString; - Font aFont=aLbCategory.GetFont(); - USHORT i = 0; - short nTmpCatPos; - short aPrivCat; + String* pEntry; + String aTmpString; + String aTmpCatString; + Font aFont=aLbCategory.GetFont(); + USHORT i = 0; + short nTmpCatPos; + short aPrivCat; aLbFormat.Clear(); aLbFormat.SetUpdateMode( FALSE ); @@ -932,7 +932,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) { case CAT_ALL: case CAT_TEXT: - case CAT_NUMBER: i=1; + case CAT_NUMBER: i=1; pEntry=rEntries[0]; if(pEntry!=NULL) { @@ -945,7 +945,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) } break; - default: break; + default: break; } if(pNumFmtShell!=NULL) @@ -973,16 +973,16 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: DeleteEntryList_Impl Datum:02.10.97 +#* Methode: DeleteEntryList_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Loescht eine SvStrings- Liste +#* Funktion: Loescht eine SvStrings- Liste #* -#* Input: String-liste +#* Input: String-liste #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -994,32 +994,32 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: UpdateOptions_Impl Datum:02.10.97 +#* Methode: UpdateOptions_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Stellt je nach eingestelltem Format die Options- -#* attribute neu ein. +#* Funktion: Stellt je nach eingestelltem Format die Options- +#* attribute neu ein. #* -#* Input: Flag, ob sich die Kategorie geaendert hat. +#* Input: Flag, ob sich die Kategorie geaendert hat. #* -#* Output: --- +#* Output: --- #* #***?********************************************************************/ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*/ ) { - SvxDelStrgs aEntryList; - String theFormat = aEdFormat.GetText(); - USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); - USHORT nCategory = nCurCategory; - USHORT nDecimals = 0; - USHORT nZeroes = 0; - BOOL bNegRed = FALSE; - BOOL bThousand = FALSE; - short nTmpCatPos; - USHORT nCurrencyPos =aLbCurrency.GetSelectEntryPos(); + SvxDelStrgs aEntryList; + String theFormat = aEdFormat.GetText(); + USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); + USHORT nCategory = nCurCategory; + USHORT nDecimals = 0; + USHORT nZeroes = 0; + BOOL bNegRed = FALSE; + BOOL bThousand = FALSE; + short nTmpCatPos; + USHORT nCurrencyPos =aLbCurrency.GetSelectEntryPos(); if(bOneAreaFlag) { @@ -1088,12 +1088,12 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE* aBtnNegRed.Enable(); aBtnThousand.Enable(); /* - aEdDecimals .SetValue( nDecimals ); + aEdDecimals .SetValue( nDecimals ); aEdLeadZeroes.SetValue( nZeroes ); */ - aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); + aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) ); - aBtnNegRed .Check( bNegRed ); + aBtnNegRed .Check( bNegRed ); aBtnThousand .Check( bThousand ); break; @@ -1106,46 +1106,46 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE* case CAT_SCIENTIFIC: case CAT_FRACTION: default: - aFlOptions .Disable(); - aFtDecimals .Disable(); - aEdDecimals .Disable(); - aFtLeadZeroes .Disable(); - aEdLeadZeroes .Disable(); - aBtnNegRed .Disable(); - aBtnThousand .Disable(); - aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) ); - aEdLeadZeroes .SetText( UniString::CreateFromInt32( 0 ) ); - aBtnNegRed .Check( FALSE ); - aBtnThousand .Check( FALSE ); + aFlOptions .Disable(); + aFtDecimals .Disable(); + aEdDecimals .Disable(); + aFtLeadZeroes .Disable(); + aEdLeadZeroes .Disable(); + aBtnNegRed .Disable(); + aBtnThousand .Disable(); + aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) ); + aEdLeadZeroes .SetText( UniString::CreateFromInt32( 0 ) ); + aBtnNegRed .Check( FALSE ); + aBtnThousand .Check( FALSE ); } } /************************************************************************* -#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 +#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Aktualisiert die Format- Listbox und zusaetzlich -#* wird abhaengig vom bUpdateEdit- Flag der String -#* in der Editbox geaendert. +#* Funktion: Aktualisiert die Format- Listbox und zusaetzlich +#* wird abhaengig vom bUpdateEdit- Flag der String +#* in der Editbox geaendert. #* -#* Input: Flags fuer Kategorie und Editbox +#* Input: Flags fuer Kategorie und Editbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl ( - USHORT bCat, // Category oder Land/Sprache ListBox? - BOOL bUpdateEdit // Format-Edit aktualisieren? + USHORT bCat, // Category oder Land/Sprache ListBox? + BOOL bUpdateEdit // Format-Edit aktualisieren? ) { - SvxDelStrgs aEntryList; - short nFmtLbSelPos = 0; - short nTmpCatPos; + SvxDelStrgs aEntryList; + short nFmtLbSelPos = 0; + short nTmpCatPos; if(bOneAreaFlag) { @@ -1253,18 +1253,18 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl /************************************************************************* -#* Handle: DoubleClickHdl_Impl Datum:02.10.97 +#* Handle: DoubleClickHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Bei einem Doppelklick in die Format- Listbox -#* wird der Wert uebernommen und der OK-Button -#* ausgeloest +#* Funktion: Bei einem Doppelklick in die Format- Listbox +#* wird der Wert uebernommen und der OK-Button +#* ausgeloest #* -#* Input: Pointer auf Listbox +#* Input: Pointer auf Listbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1291,18 +1291,18 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) /************************************************************************* -#* Methode: SelFormatHdl_Impl Datum:02.10.97 +#* Methode: SelFormatHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie -#* oder das Format aendert. Dem entsprechend werden die -#* Einstellungen geaendert. +#* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie +#* oder das Format aendert. Dem entsprechend werden die +#* Einstellungen geaendert. #* -#* Input: Pointer auf Listbox +#* Input: Pointer auf Listbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1330,7 +1330,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) pLb = &aLbFormat; // continue with the current format selected } - short nTmpCatPos; + short nTmpCatPos; if(bOneAreaFlag) { @@ -1353,12 +1353,12 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // Format-ListBox ---------------------------------------------------- if ( (SvxFontListBox *)pLb == &aLbFormat ) { - USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); - String aFormat = aLbFormat.GetSelectEntry(); - String aComment; - SvxDelStrgs aEntryList; + USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); + String aFormat = aLbFormat.GetSelectEntry(); + String aComment; + SvxDelStrgs aEntryList; - short nFmtLbSelPos = nSelPos; + short nFmtLbSelPos = nSelPos; aFormat=pNumFmtShell->GetFormat4Entry(nSelPos); aComment=pNumFmtShell->GetComment4Entry(nSelPos); @@ -1431,25 +1431,25 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) /************************************************************************* -#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 +#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button -#* wird diese Funktion aufgerufen und die Zahlenformat- -#* Liste den entsprechend geaendert. +#* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button +#* wird diese Funktion aufgerufen und die Zahlenformat- +#* Liste den entsprechend geaendert. #* -#* Input: Toolbox- Button +#* Input: Toolbox- Button #* -#* Output: --- +#* Output: --- #* #************************************************************************/ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) { - BOOL bAdded = FALSE; - BOOL bDeleted = FALSE; + BOOL bAdded = FALSE; + BOOL bDeleted = FALSE; ULONG nReturn = 0; const ULONG nReturnChanged = 0x1; // THE boolean return value const ULONG nReturnAdded = 0x2; // temp: format added @@ -1458,12 +1458,12 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) if(pIB==&aIbAdd) { // Also called from FillItemSet() if a temporary currency format has // to be added, not only if the Add button is enabled. - String aFormat = aEdFormat.GetText(); - SvxDelStrgs aEntryList; - SvxDelStrgs a2EntryList; - USHORT nCatLbSelPos = 0; - short nFmtLbSelPos = SELPOS_NONE; - xub_StrLen nErrPos=0; + String aFormat = aEdFormat.GetText(); + SvxDelStrgs aEntryList; + SvxDelStrgs a2EntryList; + USHORT nCatLbSelPos = 0; + short nFmtLbSelPos = SELPOS_NONE; + xub_StrLen nErrPos=0; pNumFmtShell->SetCurCurrencyEntry(NULL); bAdded = pNumFmtShell->AddFormat( aFormat, nErrPos, @@ -1504,7 +1504,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) if ( bAdded && (nFmtLbSelPos != SELPOS_NONE) ) { // Alles klar - if(bOneAreaFlag) //@@ ??? + if(bOneAreaFlag) //@@ ??? SetCategory(0); else SetCategory(nCatLbSelPos ); @@ -1524,7 +1524,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) aEdFormat.SetText( aFormat ); //aEdComment.SetText(String()); //@@ ??? - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen ChangePreviewText( (USHORT)nFmtLbSelPos ); } @@ -1540,10 +1540,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) } else if(pIB==&aIbRemove) { - String aFormat = aEdFormat.GetText(); - SvxDelStrgs aEntryList; - USHORT nCatLbSelPos = 0; - short nFmtLbSelPos = SELPOS_NONE; + String aFormat = aEdFormat.GetText(); + SvxDelStrgs aEntryList; + USHORT nCatLbSelPos = 0; + short nFmtLbSelPos = SELPOS_NONE; bDeleted = pNumFmtShell->RemoveFormat( aFormat, nCatLbSelPos, @@ -1555,14 +1555,14 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) { if(nFmtLbSelPos>=0 && nFmtLbSelPos<aEntryList.Count()) { - aFormat = *aEntryList[nFmtLbSelPos]; + aFormat = *aEntryList[nFmtLbSelPos]; } FillFormatListBox_Impl( aEntryList ); if ( nFmtLbSelPos != SELPOS_NONE ) { - if(bOneAreaFlag) //@@ ??? + if(bOneAreaFlag) //@@ ??? SetCategory(0); else SetCategory(nCatLbSelPos ); @@ -1602,17 +1602,17 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) /************************************************************************* -#* Methode: EditHdl_Impl Datum:02.10.97 +#* Methode: EditHdl_Impl Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, -#* so wird die Vorschau aktualisiert und +#* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, +#* so wird die Vorschau aktualisiert und #* -#* Input: Pointer auf Editbox +#* Input: Pointer auf Editbox #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1676,16 +1676,16 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1696,15 +1696,15 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) || ((CheckBox*) pOptCtrl == &aBtnNegRed) || ((CheckBox*) pOptCtrl == &aBtnThousand) ) { - String aFormat; - BOOL bThousand = aBtnThousand.IsEnabled() + String aFormat; + BOOL bThousand = aBtnThousand.IsEnabled() && aBtnThousand.IsChecked(); - BOOL bNegRed = aBtnNegRed.IsEnabled() + BOOL bNegRed = aBtnNegRed.IsEnabled() && aBtnNegRed.IsChecked(); - USHORT nPrecision = (aEdDecimals.IsEnabled()) + USHORT nPrecision = (aEdDecimals.IsEnabled()) ? (USHORT)aEdDecimals.GetValue() : (USHORT)0; - USHORT nLeadZeroes = (aEdLeadZeroes.IsEnabled()) + USHORT nLeadZeroes = (aEdLeadZeroes.IsEnabled()) ? (USHORT)aEdLeadZeroes.GetValue() : (USHORT)0; @@ -1743,16 +1743,16 @@ IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG) /************************************************************************* -#* Methode: LostFocusHdl_Impl Datum:30.10.97 +#* Methode: LostFocusHdl_Impl Datum:30.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1766,10 +1766,10 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) aFtComment.Show(); if(!aIbAdd.IsEnabled()) { - USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); + USHORT nSelPos = (USHORT) aLbFormat.GetSelectEntryPos(); pNumFmtShell->SetComment4Entry(nSelPos, aEdComment.GetText()); - aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert + aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen } } @@ -1777,16 +1777,16 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange Datum:02.10.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. +#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. #* -#* Input: Options- Controls +#* Input: Options- Controls #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1796,24 +1796,24 @@ String SvxNumberFormatTabPage::GetExpColorString( double nVal = 0; switch (nTmpCatPos) { - case CAT_CURRENCY: nVal=SVX_NUMVAL_CURRENCY; break; + case CAT_CURRENCY: nVal=SVX_NUMVAL_CURRENCY; break; case CAT_SCIENTIFIC: case CAT_FRACTION: - case CAT_NUMBER: nVal=SVX_NUMVAL_STANDARD; break; + case CAT_NUMBER: nVal=SVX_NUMVAL_STANDARD; break; - case CAT_PERCENT: nVal=SVX_NUMVAL_PERCENT; break; + case CAT_PERCENT: nVal=SVX_NUMVAL_PERCENT; break; - case CAT_ALL: nVal=SVX_NUMVAL_STANDARD; break; + case CAT_ALL: nVal=SVX_NUMVAL_STANDARD; break; - case CAT_TIME: nVal=SVX_NUMVAL_TIME; break; - case CAT_DATE: nVal=SVX_NUMVAL_DATE; break; + case CAT_TIME: nVal=SVX_NUMVAL_TIME; break; + case CAT_DATE: nVal=SVX_NUMVAL_DATE; break; - case CAT_BOOLEAN: nVal=SVX_NUMVAL_BOOLEAN; break; + case CAT_BOOLEAN: nVal=SVX_NUMVAL_BOOLEAN; break; case CAT_USERDEFINED: case CAT_TEXT: - default: nVal=0;break; + default: nVal=0;break; } String aPreviewString; @@ -1854,16 +1854,16 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) return SfxTabPage::PreNotify( rNEvt ); } /************************************************************************* -#* Methode: SetOkHdl Datum:01.11.97 +#* Methode: SetOkHdl Datum:01.11.97 #*------------------------------------------------------------------------ #* -#* Klasse: SvxNumberFormatTabPage +#* Klasse: SvxNumberFormatTabPage #* -#* Funktion: Setzt den OkHandler neu. +#* Funktion: Setzt den OkHandler neu. #* -#* Input: Neuer OkHandler +#* Input: Neuer OkHandler #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1874,11 +1874,11 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler ) void SvxNumberFormatTabPage::FillCurrencyBox() { - SvStringsDtor aList; + SvStringsDtor aList; NfShCurrencyEntries rEntries; - XubString* pEntry = NULL; - USHORT nPos=0; - USHORT nSelPos=0; + XubString* pEntry = NULL; + USHORT nPos=0; + USHORT nSelPos=0; pNumFmtShell->GetCurrencySymbols( aList, &nSelPos); @@ -1892,7 +1892,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox() void SvxNumberFormatTabPage::SetCategory(USHORT nPos) { - USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); + USHORT nCurCategory = aLbCategory.GetSelectEntryPos(); Point aPos=aLbFormat.GetPosPixel(); Size aSize=aLbFormat.GetSizePixel(); USHORT nTmpCatPos; |