diff options
Diffstat (limited to 'cui/source/tabpages')
84 files changed, 2271 insertions, 2269 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 91dd75b57d83..6e7511dbfd52 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.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 diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index f58e9ac221bc..1a38c86bd451 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -1,7 +1,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 @@ -74,7 +74,7 @@ // image list for ValueSets: #define IL_LOCK_BMPS 1100 -#define IL_LOCK_BMPS_HC 1101 +#define IL_LOCK_BMPS_HC 1101 #define IID_BOTTOMLOCK 1 #define IID_TOPLOCK 2 #define IID_CELLLOCK 3 diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src index d7d267991073..efe36314904e 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 10797c780615..e1ddae065a1c 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.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 @@ -87,8 +87,8 @@ static ::com::sun::star::uno::Reference< OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet), - aLanguageFT( this, CUI_RES(FT_LANG )), - aLanguageLB( this, CUI_RES(LB_LANG )) + aLanguageFT( this, CUI_RES(FT_LANG )), + aLanguageLB( this, CUI_RES(LB_LANG )) { BOOL bShowSWOptions = FALSE; BOOL bOpenSmartTagOptions = FALSE; @@ -133,14 +133,14 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : AddTabPage(RID_OFAPAGE_AUTOCORR_REPLACE, OfaAutocorrReplacePage::Create, 0); AddTabPage(RID_OFAPAGE_AUTOCORR_EXCEPT, OfaAutocorrExceptPage::Create, 0); - AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, OfaQuoteTabPage::Create, 0); + AddTabPage(RID_OFAPAGE_AUTOCORR_QUOTE, OfaQuoteTabPage::Create, 0); // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType //! will be set to LANGUAGE_DONTKNOW sal_Int16 nLangList = LANG_LIST_WESTERN; - - if( SvtLanguageOptions().IsCTLFontEnabled() ) + + if( SvtLanguageOptions().IsCTLFontEnabled() ) nLangList |= LANG_LIST_CTL; aLanguageLB.SetLanguageList( nLangList, TRUE, TRUE ); aLanguageLB.SelectLanguage( LANGUAGE_NONE ); @@ -202,7 +202,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) //alte Einstellungen speichern und neu fuellen if(eNewLang != eLastDialogLanguage) { - USHORT nPageId = GetCurPageId(); + USHORT nPageId = GetCurPageId(); if(RID_OFAPAGE_AUTOCORR_REPLACE == nPageId) ((OfaAutocorrReplacePage*)GetTabPage( nPageId ))->SetLanguage(eNewLang); else if(RID_OFAPAGE_AUTOCORR_EXCEPT == nPageId) @@ -217,15 +217,15 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS )), + aCheckLB (this, CUI_RES(CLB_SETTINGS )), - sInput (CUI_RES(ST_USE_REPLACE )), + sInput (CUI_RES(ST_USE_REPLACE )), sDoubleCaps (CUI_RES(ST_CPTL_STT_WORD )), sStartCap (CUI_RES(ST_CPTL_STT_SENT )), sBoldUnderline (CUI_RES(ST_BOLD_UNDER )), sURL (CUI_RES(ST_DETECT_URL )), sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )), - sDash (CUI_RES(ST_DASH )), + sDash (CUI_RES(ST_DASH )), sAccidentalCaps (CUI_RES(ST_CORRECT_ACCIDENTAL_CAPS_LOCK)) { FreeResource(); @@ -247,7 +247,7 @@ OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrOptionsPage(pParent, rSet); @@ -263,13 +263,13 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) long nFlags = pAutoCorrect->GetFlags(); USHORT nPos = 0; - pAutoCorrect->SetAutoCorrFlag(Autocorrect, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(Autocorrect, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CptlSttWrd, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, aCheckLB.IsChecked(nPos++)); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); @@ -285,7 +285,7 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) /* -----------------23.11.98 16:15------------------- * * --------------------------------------------------*/ -void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE); } @@ -333,8 +333,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) struct ImpUserData { - String *pString; - Font* pFont; + String *pString; + Font* pFont; ImpUserData(String* pText, Font* pFnt) { pString = pText; pFont = pFnt;} @@ -343,28 +343,28 @@ struct ImpUserData /*********************************************************************/ /* */ -/* Dialog fuer Prozenteinstellung */ +/* Dialog fuer Prozenteinstellung */ /* */ /*********************************************************************/ class OfaAutoFmtPrcntSet : public ModalDialog { - OKButton aOKPB; - CancelButton aCancelPB; - FixedLine aPrcntFL; - MetricField aPrcntMF; + OKButton aOKPB; + CancelButton aCancelPB; + FixedLine aPrcntFL; + MetricField aPrcntMF; public: OfaAutoFmtPrcntSet(Window* pParent) : ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)), - aOKPB(this, CUI_RES(BT_OK)), - aCancelPB(this, CUI_RES(BT_CANCEL)), - aPrcntFL(this, CUI_RES(FL_PRCNT)), - aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN)) + aOKPB(this, CUI_RES(BT_OK)), + aCancelPB(this, CUI_RES(BT_CANCEL)), + aPrcntFL(this, CUI_RES(FL_PRCNT)), + aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN)) { FreeResource(); } - MetricField& GetPrcntFld(){return aPrcntMF;} + MetricField& GetPrcntFld(){return aPrcntMF;} }; @@ -432,13 +432,13 @@ void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, USHORT /* /*********************************************************************/ /* */ -/* TabPage Autoformat anwenden */ +/* TabPage Autoformat anwenden */ /* */ /*********************************************************************/ -#define CBCOL_FIRST 0 -#define CBCOL_SECOND 1 -#define CBCOL_BOTH 2 +#define CBCOL_FIRST 0 +#define CBCOL_SECOND 1 +#define CBCOL_BOTH 2 enum OfaAutoFmtOptions { @@ -465,32 +465,32 @@ enum OfaAutoFmtOptions OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS)), - aEditPB (this, CUI_RES(PB_EDIT)), - aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)), - aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)), - sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), - sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), - sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), - sUserStyle (CUI_RES( ST_USER_STYLE )), - sBullet (CUI_RES( ST_BULLET )), - sBoldUnder (CUI_RES( ST_BOLD_UNDER )), - sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), + aCheckLB (this, CUI_RES(CLB_SETTINGS)), + aEditPB (this, CUI_RES(PB_EDIT)), + aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)), + aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)), + sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), + sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), + sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), + sUserStyle (CUI_RES( ST_USER_STYLE )), + sBullet (CUI_RES( ST_BULLET )), + sBoldUnder (CUI_RES( ST_BOLD_UNDER )), + sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), sCorrectCapsLock (CUI_RES( ST_CORRECT_ACCIDENTAL_CAPS_LOCK)), - sDetectURL (CUI_RES( ST_DETECT_URL )), - sDash (CUI_RES( ST_DASH )), - sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), - sNum (CUI_RES( STR_NUM )), - sBorder (CUI_RES( STR_BORDER )), - sTable (CUI_RES( STR_TABLE )), - sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)), - sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)), + sDetectURL (CUI_RES( ST_DETECT_URL )), + sDash (CUI_RES( ST_DASH )), + sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), + sNum (CUI_RES( STR_NUM )), + sBorder (CUI_RES( STR_BORDER )), + sTable (CUI_RES( STR_TABLE )), + sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)), + sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)), sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)), - nPercent ( 50 ), + nPercent ( 50 ), pCheckButtonData( NULL ) { @@ -525,7 +525,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, /* */ /*********************************************************************/ -SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; @@ -535,16 +535,16 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, USHORT nCol) aCheckLB.SetCheckButtonData( pCheckButtonData ); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! String sEmpty; if (nCol == CBCOL_SECOND) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (nCol == CBCOL_FIRST) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) ); @@ -698,7 +698,7 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) /* -----------------23.11.98 16:15------------------- * * --------------------------------------------------*/ -void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) +void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE); } @@ -719,47 +719,47 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) // Die folgenden Eintraege muessen in der selben Reihenfolge, wie im // OfaAutoFmtOptions-enum eingefuegt werden! - aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); + aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sNoDblSpaces, CBCOL_SECOND)); aCheckLB.GetModel()->Insert(CreateEntry(sCorrectCapsLock, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND)); - aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); - - aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); - aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect)); - aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd ); - aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) ); - aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc ); - aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); - aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl ); - aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) ); - aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) ); + aCheckLB.GetModel()->Insert(CreateEntry(sNum, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sBorder, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sTable, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sReplaceTemplates, CBCOL_SECOND)); + aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); + aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); + + aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); + aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_SECOND, 0 != (nFlags & Autocorrect)); + aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_FIRST, pOpt->bCptlSttWrd ); + aCheckLB.CheckEntryPos( CORR_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttWrd) ); + aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_FIRST, pOpt->bCptlSttSntnc ); + aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); + aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl ); + aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) ); + aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) ); aCheckLB.CheckEntryPos( CORRECT_CAPS_LOCK, CBCOL_SECOND, 0 != (nFlags & CorrectCapsLock) ); - aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); - aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); - aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); - aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); - aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); - aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd ); - aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); - aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); - aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); - aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); - aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); + aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); + aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); + aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); + aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); + aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); + aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd ); + aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); + aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); + aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); + aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); + aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); aBulletFont = pOpt->aBulletFont; sBulletChar = pOpt->cBullet; @@ -773,7 +773,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) pUserData = new ImpUserData(&sMargin, 0); aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData ); - aCheckLB.CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); + aCheckLB.CheckEntryPos( APPLY_NUMBERING, CBCOL_SECOND, pOpt->bSetNumRule ); aByInputBulletFont = pOpt->aByInputBulletFont; sByInputBulletChar = pOpt->cByInputBullet; @@ -781,9 +781,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.SetUserData( APPLY_NUMBERING , pUserData2 ); aCheckLB.CheckEntryPos( MERGE_SINGLE_LINE_PARA, CBCOL_FIRST, pOpt->bRightMargin ); - aCheckLB.CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder ); - aCheckLB.CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); - aCheckLB.CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); + aCheckLB.CheckEntryPos( INSERT_BORDER, CBCOL_SECOND, pOpt->bSetBorder ); + aCheckLB.CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); + aCheckLB.CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); aCheckLB.SetUpdateMode(TRUE); } @@ -972,9 +972,9 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) * --------------------------------------------------*/ struct DoubleString { - String sShort; - String sLong; - void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext + String sShort; + String sLong; + void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext }; typedef DoubleString* DoubleStringPtr; SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4) @@ -1004,10 +1004,10 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet), aTextOnlyCB( this, CUI_RES(CB_TEXT_ONLY )), aShortFT ( this, CUI_RES(FT_SHORT )), - aShortED ( this, CUI_RES(ED_SHORT )), - aReplaceFT( this, CUI_RES(FT_REPLACE )), - aReplaceED( this, CUI_RES(ED_REPLACE )), - aReplaceTLB( this, CUI_RES(TLB_REPLACE )), + aShortED ( this, CUI_RES(ED_SHORT )), + aReplaceFT( this, CUI_RES(FT_REPLACE )), + aReplaceED( this, CUI_RES(ED_REPLACE )), + aReplaceTLB( this, CUI_RES(TLB_REPLACE )), aNewReplacePB( this, CUI_RES(PB_NEW_REPLACE )), aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )), sModify(CUI_RES(STR_MODIFY)), @@ -1061,7 +1061,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, +SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrReplacePage(pParent, rSet); @@ -1069,7 +1069,7 @@ SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, /* -----------------20.11.98 13:26------------------- * * --------------------------------------------------*/ -void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); @@ -1597,18 +1597,18 @@ void lcl_ClearTable(StringsTable& rTable) OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet), - aAbbrevFL (this, CUI_RES(FL_ABBREV )), - aAbbrevED (this, CUI_RES(ED_ABBREV )), - aAbbrevLB (this, CUI_RES(LB_ABBREV )), - aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )), - aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )), - aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )), - aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )), - aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )), - aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )), + aAbbrevFL (this, CUI_RES(FL_ABBREV )), + aAbbrevED (this, CUI_RES(ED_ABBREV )), + aAbbrevLB (this, CUI_RES(LB_ABBREV )), + aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )), + aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )), + aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )), + aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )), + aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )), + aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )), aNewDoublePB (this, CUI_RES(PB_NEWDOUBLECAPS)), - aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)), - aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )), + aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)), + aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )), eLang(eLastDialogLanguage) { FreeResource(); @@ -1647,7 +1647,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage() --------------------------------------------------*/ -SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrExceptPage(pParent, rSet); @@ -1655,7 +1655,7 @@ SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, /* -----------------20.11.98 13:26------------------- * * --------------------------------------------------*/ -void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) +void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); @@ -1883,8 +1883,8 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); RefillReplaceBoxes(TRUE, eLang, eLang); - aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst )); - aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst )); + aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst )); + aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst )); aAutoAbbrevCB.SaveValue(); aAutoCapsCB.SaveValue(); } @@ -1948,7 +1948,7 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { -// BOOL bSame = pEdt->GetText() == ->GetSelectEntry(); +// BOOL bSame = pEdt->GetText() == ->GetSelectEntry(); const String& sEntry = pEdt->GetText(); BOOL bEntryLen = 0!= sEntry.Len(); if(pEdt == &aAbbrevED) @@ -1999,26 +1999,26 @@ enum OfaQuoteOptions REPLACE_1ST }; -SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) +SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) { SvLBoxEntry* pEntry = new SvLBoxEntry; - + if ( !pCheckButtonData ) { pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB ); aSwCheckLB.SetCheckButtonData( pCheckButtonData ); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! String sEmpty; if (nCol == CBCOL_SECOND) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (nCol == CBCOL_FIRST) - pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte else pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); @@ -2029,15 +2029,15 @@ SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet), - aCheckLB (this, CUI_RES(CLB_SETTINGS )), - aSwCheckLB (this, CUI_RES(CLB_SETTINGS )), - sHeader1 (CUI_RES( STR_HEADER1 )), - sHeader2 (CUI_RES( STR_HEADER2 )), - sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), - sOrdinal (CUI_RES( ST_ORDINAL )), + aCheckLB (this, CUI_RES(CLB_SETTINGS )), + aSwCheckLB (this, CUI_RES(CLB_SETTINGS )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), + sOrdinal (CUI_RES( ST_ORDINAL )), pCheckButtonData ( NULL ), - aSingleFL (this, CUI_RES(FL_SINGLE )), + aSingleFL (this, CUI_RES(FL_SINGLE )), aSingleTypoCB (this, CUI_RES(CB_SGL_TYPO )), aSglStartQuoteFT (this, CUI_RES(FT_SGL_STARTQUOTE )), aSglStartQuotePB (this, CUI_RES(PB_SGL_STARTQUOTE )), @@ -2053,7 +2053,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aStartQuotePB (this, CUI_RES(PB_STARTQUOTE )), aDblStartExFT (this, CUI_RES(FT_DBSTEX )), aEndQuoteFT (this, CUI_RES(FT_ENDQUOTE )), - aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )), + aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )), aDblEndExFT (this, CUI_RES(FT_DBECEX )), aDblStandardPB (this, CUI_RES(PB_DBL_STD )), @@ -2063,7 +2063,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : sStandard(CUI_RES(ST_STANDARD)) { FreeResource(); - + BOOL bShowSWOptions = FALSE; aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); @@ -2079,7 +2079,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : { 3, 0, 20, 40 }; - + aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); @@ -2096,12 +2096,12 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aSwCheckLB.HideTable( ); } - aStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); aSglStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aSglEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); - aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); - aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); + aSglEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); + aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); + aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); } /*-----------------03.07.97 13:17------------------- @@ -2114,7 +2114,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() /*-----------------03.07.97 13:17------------------- --------------------------------------------------*/ -SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, +SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaQuoteTabPage(pParent, rAttrSet); @@ -2131,8 +2131,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) if ( aCheckLB.IsVisible( ) ) { USHORT nPos = 0; - pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); } BOOL bModified = FALSE; @@ -2153,8 +2153,8 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND)); } - pAutoCorrect->SetAutoCorrFlag(ChgQuotes, aTypoCB.IsChecked()); - pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, aSingleTypoCB.IsChecked()); + pAutoCorrect->SetAutoCorrFlag(ChgQuotes, aTypoCB.IsChecked()); + pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, aSingleTypoCB.IsChecked()); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); if(cStartQuote != pAutoCorrect->GetStartDoubleQuote()) { @@ -2215,10 +2215,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aSwCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace, CBCOL_BOTH )); aSwCheckLB.GetModel()->Insert(CreateEntry(sOrdinal, CBCOL_BOTH )); - aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST, pOpt->bAddNonBrkSpace ); - aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) ); - aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); - aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST, pOpt->bAddNonBrkSpace ); + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); aSwCheckLB.SetUpdateMode( TRUE ); } @@ -2231,7 +2231,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry( sNonBrkSpace ); aCheckLB.InsertEntry( sOrdinal ); - + USHORT nPos = 0; aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); @@ -2240,10 +2240,10 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) } // Initialize the quote stuffs - aTypoCB .Check(0 != (nFlags & ChgQuotes)); - aSingleTypoCB .Check(0 != (nFlags & ChgSglQuotes)); - aTypoCB .SaveValue(); - aSingleTypoCB .SaveValue(); + aTypoCB .Check(0 != (nFlags & ChgQuotes)); + aSingleTypoCB .Check(0 != (nFlags & ChgSglQuotes)); + aTypoCB .SaveValue(); + aSingleTypoCB .SaveValue(); cStartQuote = pAutoCorrect->GetStartDoubleQuote(); cEndQuote = pAutoCorrect->GetEndDoubleQuote(); @@ -2260,7 +2260,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) /*-----------------15.10.96 16.42------------------- --------------------------------------------------*/ -#define SGL_START 0 +#define SGL_START 0 #define DBL_START 1 #define SGL_END 2 #define DBL_END 3 @@ -2395,7 +2395,7 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet), - aCBActiv (this, CUI_RES(CB_ACTIV)), + aCBActiv (this, CUI_RES(CB_ACTIV)), aCBAppendSpace (this, CUI_RES(CB_APPEND_SPACE)), aCBAsTip (this, CUI_RES(CB_AS_TIP)), aCBCollect (this, CUI_RES(CB_COLLECT)), @@ -2428,7 +2428,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent, KeyCode aKCode( *pKeys ); USHORT nPos = aDCBExpandKey.InsertEntry( aKCode.GetName() ); aDCBExpandKey.SetEntryData( nPos, (void*)(ULONG)*pKeys ); - if( KEY_RETURN == *pKeys ) // default to RETURN + if( KEY_RETURN == *pKeys ) // default to RETURN aDCBExpandKey.SelectEntryPos( nPos ); } @@ -2441,7 +2441,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { } -SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, +SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutoCompleteTabPage( pParent, rSet ); @@ -2461,7 +2461,7 @@ BOOL OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) bModified |= pOpt->bAutoCmpltCollectWords != bCheck; pOpt->bAutoCmpltCollectWords = bCheck; bCheck = !aCBRemoveList.IsChecked(); // inverted value! - bModified |= pOpt->bAutoCmpltKeepList != bCheck; + bModified |= pOpt->bAutoCmpltKeepList != bCheck; pOpt->bAutoCmpltKeepList = bCheck; bCheck = aCBAppendSpace.IsChecked(); bModified |= pOpt->bAutoCmpltAppendBlanc != bCheck; @@ -2665,7 +2665,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaSmartTagOptionsTabPage( pParent, rSet ); } diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 7a747939b4d5..e63684c96061 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -1,7 +1,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 @@ -31,7 +31,7 @@ // defines ------------------------------------------------------------------ -#define CLB_SETTINGS 1 +#define CLB_SETTINGS 1 /* #define STR_DOUBLECAPS 3 #define STR_STARTCAPS 4 @@ -48,14 +48,14 @@ #define FT_ENDQUOTE 14 #define PB_ENDQUOTE 15 -#define FL_ABBREV 16 -#define ED_ABBREV 17 -#define LB_ABBREV 18 -#define PB_NEWABBREV 19 -#define PB_DELABBREV 20 -#define FL_DOUBLECAPS 21 -#define ED_DOUBLE_CAPS 22 -#define LB_DOUBLE_CAPS 23 +#define FL_ABBREV 16 +#define ED_ABBREV 17 +#define LB_ABBREV 18 +#define PB_NEWABBREV 19 +#define PB_DELABBREV 20 +#define FL_DOUBLECAPS 21 +#define ED_DOUBLE_CAPS 22 +#define LB_DOUBLE_CAPS 23 #define PB_NEWDOUBLECAPS 24 #define PB_DELDOUBLECAPS 25 @@ -69,9 +69,9 @@ #define STR_CLOSE_AUTOCORR 38 #define FT_SHORT 39 #define FT_REPLACE 40 -#define STR_CHANGE_START 41 +#define STR_CHANGE_START 41 #define STR_CHANGE_END 42 -#define CB_AUTOABBREV 43 +#define CB_AUTOABBREV 43 #define CB_AUTOCAPS 44 #define FT_SGL_STARTQUOTE 45 @@ -89,39 +89,39 @@ #define CB_SGL_TYPO 57 #define ST_STANDARD 58 -#define PB_EDIT 61 -#define ST_DEL_EMPTY_PARA 62 -#define ST_TYPO 66 -#define ST_USER_STYLE 67 -#define ST_BULLET 68 -#define STR_DEL_SPACES_AT_STT_END 69 +#define PB_EDIT 61 +#define ST_DEL_EMPTY_PARA 62 +#define ST_TYPO 66 +#define ST_USER_STYLE 67 +#define ST_BULLET 68 +#define STR_DEL_SPACES_AT_STT_END 69 #define STR_DEL_SPACES_BETWEEN_LINES 70 -#define ST_RIGHT_MARGIN 74 -#define STR_NUM 75 -#define STR_BORDER 76 -#define STR_TABLE 77 -#define STR_REPLACE_TEMPLATES 78 -#define FL_PRCNT 79 - -#define STR_HEADER 90 -#define FT_HEADER_EXPLANATION 91 -#define STR_HEADER1 92 -#define STR_HEADER2 93 -#define FT_HEADER1_EXPLANATION 94 -#define FT_HEADER2_EXPLANATION 95 - -#define ED_RIGHT_MARGIN 100 -#define BT_OK 101 -#define BT_CANCEL 102 - -#define BT_AWCP_OK 110 -#define BT_AWCP_CANCEL 111 -#define GB_AWCP_VALUE 112 -#define ED_AWCP_WORD_LEN 113 -#define ED_AWCP_LIST_LEN 114 -#define FT_AWCP_WORD_LEN 115 -#define FT_AWCP_LIST_LEN 116 +#define ST_RIGHT_MARGIN 74 +#define STR_NUM 75 +#define STR_BORDER 76 +#define STR_TABLE 77 +#define STR_REPLACE_TEMPLATES 78 +#define FL_PRCNT 79 + +#define STR_HEADER 90 +#define FT_HEADER_EXPLANATION 91 +#define STR_HEADER1 92 +#define STR_HEADER2 93 +#define FT_HEADER1_EXPLANATION 94 +#define FT_HEADER2_EXPLANATION 95 + +#define ED_RIGHT_MARGIN 100 +#define BT_OK 101 +#define BT_CANCEL 102 + +#define BT_AWCP_OK 110 +#define BT_AWCP_CANCEL 111 +#define GB_AWCP_VALUE 112 +#define ED_AWCP_WORD_LEN 113 +#define ED_AWCP_LIST_LEN 114 +#define FT_AWCP_WORD_LEN 115 +#define FT_AWCP_LIST_LEN 116 #define CB_ACTIV 121 #define CB_COLLECT 122 @@ -138,7 +138,7 @@ #define PB_ENTRIES 133 -#define ST_USE_REPLACE 200 +#define ST_USE_REPLACE 200 #define ST_CPTL_STT_WORD 201 #define ST_CPTL_STT_SENT 202 #define ST_BOLD_UNDER 203 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 53b31dc575ea..2fbbd2177cb0 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -1,7 +1,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 @@ -768,7 +768,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS SVLook = TRUE ; Hide = TRUE ; Text [ en-US ] = "Smart Tags"; - + CheckBox CB_SMARTTAGS { Pos = MAP_APPFONT( 4, 3 ); @@ -782,7 +782,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS Size = MAP_APPFONT( 116, 8 ); Text [ en-US ] = "Currently installed smart tags"; }; - + Control LB_SMARTTAGS { Pos = MAP_APPFONT ( 12 , 25 ) ; @@ -790,14 +790,14 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS Border = TRUE ; TabStop = TRUE ; }; - + PushButton PB_SMARTTAGS { Pos = MAP_APPFONT ( 188 , 25 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Properties..."; }; - + }; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index d3224b6bf78b..231bcdd18db1 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.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 @@ -51,9 +51,9 @@ #include <editeng/eerdll.hxx> // Tabellenhintergrund -#define TBL_DEST_CELL 0 -#define TBL_DEST_ROW 1 -#define TBL_DEST_TBL 2 +#define TBL_DEST_CELL 0 +#define TBL_DEST_ROW 1 +#define TBL_DEST_TBL 2 #include <editeng/brshitem.hxx> #include "backgrnd.hxx" @@ -81,9 +81,9 @@ static USHORT pRanges[] = struct SvxBackgroundTable_Impl { - SvxBrushItem* pCellBrush; - SvxBrushItem* pRowBrush; - SvxBrushItem* pTableBrush; + SvxBrushItem* pCellBrush; + SvxBrushItem* pRowBrush; + SvxBrushItem* pTableBrush; USHORT nCellWhich; USHORT nRowWhich; USHORT nTableWhich; @@ -96,10 +96,10 @@ struct SvxBackgroundTable_Impl struct SvxBackgroundPara_Impl { - SvxBrushItem* pParaBrush; - SvxBrushItem* pCharBrush; + SvxBrushItem* pParaBrush; + SvxBrushItem* pCharBrush; - USHORT nActPos; + USHORT nActPos; SvxBackgroundPara_Impl() : pParaBrush(NULL), pCharBrush(NULL) {} @@ -133,15 +133,15 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) } //------------------------------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] */ USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { - BOOL bFound = FALSE; - USHORT nCount = rValueSet.GetItemCount(); - USHORT n = 1; + BOOL bFound = FALSE; + USHORT nCount = rValueSet.GetItemCount(); + USHORT n = 1; while ( !bFound && n <= nCount ) { @@ -159,7 +159,7 @@ USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) // class BackgroundPreview ----------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Vorschaufenster f"ur Brush oder Bitmap */ @@ -171,19 +171,19 @@ public: const ResId& rResId, BOOL bIsBmpPreview ); ~BackgroundPreviewImpl(); - void NotifyChange( const Color& rColor ); - void NotifyChange( const Bitmap* pBitmap ); + void NotifyChange( const Color& rColor ); + void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: - const BOOL bIsBmp; - Bitmap* pBitmap; - Point aDrawPos; - Size aDrawSize; - Rectangle aDrawRect; + const BOOL bIsBmp; + Bitmap* pBitmap; + Point aDrawPos; + Size aDrawSize; + Rectangle aDrawRect; BYTE nTransparency; }; @@ -196,14 +196,14 @@ BackgroundPreviewImpl::BackgroundPreviewImpl BOOL bIsBmpPreview ) : -/* [Beschreibung] +/* [Beschreibung] */ Window( pParent, rResId ), - bIsBmp ( bIsBmpPreview ), - pBitmap ( NULL ), + bIsBmp ( bIsBmpPreview ), + pBitmap ( NULL ), aDrawRect( Point(0,0), GetOutputSizePixel() ), nTransparency(0) @@ -216,7 +216,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl BackgroundPreviewImpl::~BackgroundPreviewImpl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -241,7 +241,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) //----------------------------------------------------------------------- void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -314,7 +314,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& ) { Size aSize = GetOutputSizePixel(); DrawLine( Point(0,0), Point(aSize.Width(),aSize.Height()) ); - DrawLine( Point(0,aSize.Height()), Point(aSize.Width(),0) ); + DrawLine( Point(0,aSize.Height()), Point(aSize.Width(),0) ); } } } @@ -338,51 +338,51 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : -/* [Beschreibung] +/* [Beschreibung] */ SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ), - aBorderWin ( this, CUI_RES(CT_BORDER) ), + aBorderWin ( this, CUI_RES(CT_BORDER) ), aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ), aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ), pPreviewWin1 ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ), aColTransFT ( this, CUI_RES( FT_COL_TRANS ) ), aColTransMF ( this, CUI_RES( MF_COL_TRANS ) ), - aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ), - aBtnLink ( this, CUI_RES( BTN_LINK ) ), - aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ), - aFtFile ( this, CUI_RES( FT_FILE ) ), - aGbFile ( this, CUI_RES( GB_FILE ) ), + aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ), + aBtnLink ( this, CUI_RES( BTN_LINK ) ), + aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ), + aFtFile ( this, CUI_RES( FT_FILE ) ), + aGbFile ( this, CUI_RES( GB_FILE ) ), aBtnPosition ( this, CUI_RES( BTN_POSITION ) ), - aBtnArea ( this, CUI_RES( BTN_AREA ) ), - aBtnTile ( this, CUI_RES( BTN_TILE ) ), - aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ), - aGbPosition ( this, CUI_RES( GB_POSITION ) ), + aBtnArea ( this, CUI_RES( BTN_AREA ) ), + aBtnTile ( this, CUI_RES( BTN_TILE ) ), + aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ), + aGbPosition ( this, CUI_RES( GB_POSITION ) ), aGraphTransFL ( this, CUI_RES( FL_GRAPH_TRANS ) ), aGraphTransMF ( this, CUI_RES( MF_GRAPH_TRANS ) ), pPreviewWin2 ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ), - aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), - aLbSelect ( this, CUI_RES( LB_SELECTOR ) ), + aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), + aLbSelect ( this, CUI_RES( LB_SELECTOR ) ), aStrBrowse ( CUI_RES( STR_BROWSE ) ), aStrUnlinked ( CUI_RES( STR_UNLINKED ) ), aTblDesc ( this, CUI_RES( FT_TBL_DESC ) ), aTblLBox ( this, CUI_RES( LB_TBL_BOX ) ), aParaLBox ( this, CUI_RES( LB_PARA_BOX ) ), nHtmlMode ( 0 ), - bAllowShowSelector ( TRUE ), - bIsGraphicValid ( FALSE ), - bLinkOnly ( FALSE ), + bAllowShowSelector ( TRUE ), + bIsGraphicValid ( FALSE ), + bLinkOnly ( FALSE ), bResized ( FALSE ), bColTransparency ( FALSE ), bGraphTransparency ( FALSE ), pPageImpl ( new SvxBackgroundPage_Impl ), - pImportDlg ( NULL ), - pTableBck_Impl ( NULL ), + pImportDlg ( NULL ), + pTableBck_Impl ( NULL ), pParaBck_Impl ( NULL ) { @@ -409,7 +409,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, SvxBackgroundTabPage::~SvxBackgroundTabPage() -/* [Beschreibung] +/* [Beschreibung] */ @@ -440,7 +440,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage() USHORT* SvxBackgroundTabPage::GetRanges() -/* [Beschreibung] +/* [Beschreibung] gibt den Bereich der Which-Werte zur"uck */ @@ -454,7 +454,7 @@ USHORT* SvxBackgroundTabPage::GetRanges() SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) -/* [Beschreibung] +/* [Beschreibung] Create-Methode f"ur den TabDialog */ @@ -467,15 +467,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) -/* [Beschreibung] +/* [Beschreibung] */ { // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, -// es muss aber im rSet vorhanden sein! -// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); -// if( pX && pX->ISA(SfxWallpaperItem)) +// es muss aber im rSet vorhanden sein! +// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); +// if( pX && pX->ISA(SfxWallpaperItem)) if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE)) { ResetFromWallpaperItem( rSet ); @@ -496,7 +496,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; USHORT nDestValue = USHRT_MAX; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, + if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, FALSE, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -712,8 +712,8 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) bLinkOnly = TRUE; aBtnLink.Check( TRUE ); aBtnLink.Show( FALSE ); -// if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() ) -// aBtnLink.Check(); +// if( !pItem || !pItem->GetWallpaper(FALSE).IsBitmap() ) +// aBtnLink.Check(); delete pTemp; } @@ -724,7 +724,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) void SvxBackgroundTabPage::FillUserData() -/* [Beschreibung] +/* [Beschreibung] Beim Destruieren einer SfxTabPage wird diese virtuelle Methode gerufen, damit die TabPage interne Informationen sichern kann. @@ -740,7 +740,7 @@ void SvxBackgroundTabPage::FillUserData() BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -751,10 +751,10 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) LoadTimerHdl_Impl( pPageImpl->pLoadTimer ); } // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, -// es muss aber im rSet vorhanden sein! +// es muss aber im rSet vorhanden sein! -// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC ); -// if( pX && pX->ISA(SfxWallpaperItem)) +// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC ); +// if( pX && pX->ISA(SfxWallpaperItem)) if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), FALSE)) return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC ); @@ -797,9 +797,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) BOOL bGraphTransparencyChanged = bGraphTransparency && (aGraphTransMF.GetText() != aGraphTransMF.GetSavedValue()); if ( pOld ) { - const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; - SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); + const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; + SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); + const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); // transparency has to be set if enabled, the color not already set to "No fill" and if( bColTransparency && @@ -828,9 +828,9 @@ BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { // Bitmap-Behandlung: - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); - const BOOL bWasLink = (NULL != rOldItem.GetGraphicLink() ); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); + const BOOL bWasLink = (NULL != rOldItem.GetGraphicLink() ); if ( !bIsLink && !bIsGraphicValid ) @@ -1001,10 +1001,10 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U const SfxItemSet& rOldSet = GetItemSet(); DBG_ASSERT(pOld,"FillItemSetWithWallpaperItem: Item not found"); - SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); - SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); - BOOL bModified = FALSE; + SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); + SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); + const BOOL bIsBrush = ( 0 == aLbSelect.GetSelectEntryPos() ); + BOOL bModified = FALSE; if ( ( (GPOS_NONE == eOldPos) && bIsBrush ) || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap gewechselt? @@ -1027,7 +1027,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U else { // Bitmap-Behandlung: - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); int bBitmapChanged = ( ( eNewPos != eOldPos ) || ( *rOldItem.GetGraphicLink() != aBgdGraphicPath ) ); @@ -1074,7 +1074,7 @@ BOOL SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, U int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) -/* [Beschreibung] +/* [Beschreibung] virtuelle Methode, wird beim Deaktivieren gerufen */ @@ -1093,7 +1093,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1105,7 +1105,7 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) void SvxBackgroundTabPage::ShowSelector() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1144,7 +1144,7 @@ void SvxBackgroundTabPage::ShowSelector() void SvxBackgroundTabPage::RaiseLoadError_Impl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1164,7 +1164,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl() -/* [Beschreibung] +/* [Beschreibung] */ @@ -1181,7 +1181,7 @@ BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl() void SvxBackgroundTabPage::FillColorValueSets_Impl() -/* [Beschreibung] +/* [Beschreibung] F"ullen des Farb-Sets */ @@ -1204,9 +1204,9 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() if ( pColorTable ) { - short i = 0; - long nCount = pColorTable->Count(); - XColorEntry* pEntry = NULL; + short i = 0; + long nCount = pColorTable->Count(); + XColorEntry* pEntry = NULL; Color aColWhite( COL_WHITE ); String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) ); WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD ); @@ -1215,7 +1215,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() for ( i = 0; i < nCount; i++ ) { pEntry = pColorTable->GetColor(i); - aBackgroundColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() ); + aBackgroundColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() ); } while ( i < 80 ) @@ -1247,7 +1247,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() void SvxBackgroundTabPage::ShowColorUI_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur das Einstellen der Grafik ausblenden und die Controls f"ur die Farbeinstellung einblenden. @@ -1285,7 +1285,7 @@ void SvxBackgroundTabPage::ShowColorUI_Impl() void SvxBackgroundTabPage::ShowBitmapUI_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur die Farbeinstellung ausblenden und die Controls f"ur das Einstellen der Grafik einblenden. @@ -1328,7 +1328,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) -/* [Beschreibung] +/* [Beschreibung] Die Controls f"ur die Grafikposition einstellen. */ @@ -1358,15 +1358,15 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) switch ( ePos ) { - case GPOS_MM: break; - case GPOS_LT: eNewPos = RP_LT; break; - case GPOS_MT: eNewPos = RP_MT; break; - case GPOS_RT: eNewPos = RP_RT; break; - case GPOS_LM: eNewPos = RP_LM; break; - case GPOS_RM: eNewPos = RP_RM; break; - case GPOS_LB: eNewPos = RP_LB; break; - case GPOS_MB: eNewPos = RP_MB; break; - case GPOS_RB: eNewPos = RP_RB; break; + case GPOS_MM: break; + case GPOS_LT: eNewPos = RP_LT; break; + case GPOS_MT: eNewPos = RP_MT; break; + case GPOS_RT: eNewPos = RP_RT; break; + case GPOS_LM: eNewPos = RP_LM; break; + case GPOS_RM: eNewPos = RP_RM; break; + case GPOS_LB: eNewPos = RP_LB; break; + case GPOS_MB: eNewPos = RP_MB; break; + case GPOS_RB: eNewPos = RP_RB; break; default: ;//prevent warning } aWndPosition.SetActualRP( eNewPos ); @@ -1380,7 +1380,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos ) SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() -/* [Beschreibung] +/* [Beschreibung] Die Position der Grafik zur"uckgeben. */ @@ -1394,15 +1394,15 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() { switch ( aWndPosition.GetActualRP() ) { - case RP_LT: return GPOS_LT; - case RP_MT: return GPOS_MT; - case RP_RT: return GPOS_RT; - case RP_LM: return GPOS_LM; - case RP_MM: return GPOS_MM; - case RP_RM: return GPOS_RM; - case RP_LB: return GPOS_LB; - case RP_MB: return GPOS_MB; - case RP_RB: return GPOS_RB; + case RP_LT: return GPOS_LT; + case RP_MT: return GPOS_MT; + case RP_RT: return GPOS_RT; + case RP_LM: return GPOS_LM; + case RP_MM: return GPOS_MM; + case RP_RM: return GPOS_RM; + case RP_LB: return GPOS_LB; + case RP_MB: return GPOS_MB; + case RP_RB: return GPOS_RB; } } return GPOS_MM; @@ -1431,7 +1431,7 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1453,7 +1453,7 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1488,7 +1488,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) else { if ( aBgdGraphicPath.Len() > 0 ) // nur bei gelinkter Grafik - RaiseLoadError_Impl(); // ein Fehler + RaiseLoadError_Impl(); // ein Fehler pPreviewWin2->NotifyChange( NULL ); } } @@ -1502,7 +1502,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1527,7 +1527,7 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG ) -/* [Beschreibung] +/* [Beschreibung] Handler, gerufen durch das Dr"ucken des Durchsuchen-Buttons. Grafik/Einf"ugen-Dialog erzeugen, Pfad setzen und starten. @@ -1568,7 +1568,7 @@ IMPL_LINK( SvxBackgroundTabPage, BrowseHdl_Impl, PushButton* , EMPTYARG ) IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) -/* [Beschreibung] +/* [Beschreibung] Verz"ogertes Laden der Grafik. Grafik wird nur dann geladen, wenn sie unterschiedlich zur @@ -1588,7 +1588,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) { // neue Datei gew"ahlt aBgdGraphicPath = pImportDlg->GetPath(); - aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); + aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); BOOL bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? TRUE : pImportDlg->IsAsLink(); aBtnLink.Check( bLink ); aBtnLink.Enable(); @@ -1629,13 +1629,13 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) void SvxBackgroundTabPage::ShowTblControl() -/* [Beschreibung] +/* [Beschreibung] */ { - aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); - aTblLBox .SelectEntryPos(0); + aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); + aTblLBox .SelectEntryPos(0); aTblDesc.Show(); aTblLBox.Show(); } @@ -1657,7 +1657,7 @@ void SvxBackgroundTabPage::ShowParaControl(BOOL bCharOnly) IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) -/* [Beschreibung] +/* [Beschreibung] */ @@ -1691,8 +1691,8 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) } else { - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1762,8 +1762,8 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) } else { - SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const BOOL bIsLink = aBtnLink.IsChecked(); + SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); + const BOOL bIsLink = aBtnLink.IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1803,12 +1803,12 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, const String& rUserData ) -/* [Beschreibung] +/* [Beschreibung] */ { - SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); + SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); const Color& rColor = rBgdAttr.GetColor(); if(bColTransparency) { @@ -1852,13 +1852,13 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, aBtnLink.Check( FALSE ); aBtnLink.Disable(); pPreviewWin2->NotifyChange( NULL ); - SetGraphicPosition_Impl( GPOS_TILED ); // Kacheln als Default + SetGraphicPosition_Impl( GPOS_TILED ); // Kacheln als Default } } else { - const String* pStrLink = rBgdAttr.GetGraphicLink(); - const String* pStrFilter = rBgdAttr.GetGraphicFilter(); + const String* pStrLink = rBgdAttr.GetGraphicLink(); + const String* pStrFilter = rBgdAttr.GetGraphicFilter(); aLbSelect.SelectEntryPos( 1 ); ShowBitmapUI_Impl(); diff --git a/cui/source/tabpages/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc index fdfafabe8f11..dcd161ce8110 100644 --- a/cui/source/tabpages/backgrnd.hrc +++ b/cui/source/tabpages/backgrnd.hrc @@ -1,7 +1,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 @@ -29,32 +29,32 @@ // defines ------------------------------------------------------------------ -#define FT_SELECTOR 1 -#define LB_SELECTOR 1 +#define FT_SELECTOR 1 +#define LB_SELECTOR 1 -#define SET_BGDCOLOR 10 -#define GB_BGDCOLOR 11 -#define SET_PATTERN 12 -#define GB_COL_PREVIEW 13 -#define SET_PATCOLOR 14 -#define GB_PATCOLOR 15 -#define CT_BORDER 16 -#define FT_PREVIEW 20 -#define WIN_PREVIEW1 21 +#define SET_BGDCOLOR 10 +#define GB_BGDCOLOR 11 +#define SET_PATTERN 12 +#define GB_COL_PREVIEW 13 +#define SET_PATCOLOR 14 +#define GB_PATCOLOR 15 +#define CT_BORDER 16 +#define FT_PREVIEW 20 +#define WIN_PREVIEW1 21 -#define BTN_BROWSE 20 -#define FT_FILE 21 -#define BTN_LINK 22 -#define BTN_PREVIEW 23 -#define GB_FILE 24 -#define BTN_AREA 25 -#define BTN_TILE 26 -#define BTN_POSITION 27 -#define WND_POSITION 28 -#define GB_POSITION 29 -#define WIN_PREVIEW2 30 -#define GB_PREVIEW 31 -#define LB_TBL_BOX 32 +#define BTN_BROWSE 20 +#define FT_FILE 21 +#define BTN_LINK 22 +#define BTN_PREVIEW 23 +#define GB_FILE 24 +#define BTN_AREA 25 +#define BTN_TILE 26 +#define BTN_POSITION 27 +#define WND_POSITION 28 +#define GB_POSITION 29 +#define WIN_PREVIEW2 30 +#define GB_PREVIEW 31 +#define LB_TBL_BOX 32 #define FT_TBL_DESC 33 #define LB_PARA_BOX 34 #define FT_COL_TRANS 35 @@ -62,8 +62,8 @@ #define FL_GRAPH_TRANS 37 #define MF_GRAPH_TRANS 38 -#define STR_BROWSE 1 -#define STR_UNLINKED 2 +#define STR_BROWSE 1 +#define STR_UNLINKED 2 #endif diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 7f413f116aff..21b87099d20f 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -1,7 +1,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 @@ -32,7 +32,7 @@ #include <svx/dialogs.hrc> // define ---------------------------------------------------------------- -#define UNLINKED_IMAGE \ +#define UNLINKED_IMAGE \ Text [ en-US ] = "Unlinked graphic" ; \ // pragma ---------------------------------------------------------------- diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f688e9b720f5..f22d1c28db14 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.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 diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src index 973272d11d2e..0b4089801060 100644 --- a/cui/source/tabpages/bbdlg.src +++ b/cui/source/tabpages/bbdlg.src @@ -1,7 +1,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 @@ -36,7 +36,7 @@ TabDialog RID_SVXDLG_BBDLG Size = MAP_APPFONT ( 328 , 155 ) ; Text [ en-US ] = "Border / Background" ; Moveable = TRUE ; - // Closeable = TRUE; hat ja einen OKButton + // Closeable = TRUE; hat ja einen OKButton TabControl 1 { OutputSize = TRUE ; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index ffe2fae38679..e080287acd75 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.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 @@ -43,7 +43,7 @@ #define LINESTYLE_HTML_MAX 5 -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include <svx/drawitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> @@ -64,14 +64,14 @@ * [Beschreibung:] * TabPage zum Einstellen der Rahmen-Attribute. * Benoetigt - * ein SvxShadowItem: Schatten - * ein SvxBoxItem: Linien links,rechts,oben,unten ), - * ein SvxBoxInfo: Linien vertikal,horizontal, Abstaende, Flags ) + * ein SvxShadowItem: Schatten + * ein SvxBoxItem: Linien links,rechts,oben,unten ), + * ein SvxBoxInfo: Linien vertikal,horizontal, Abstaende, Flags ) * * Linien koennen drei Zustaende haben. - * 1. Show ( -> gueltige Werte ) - * 2. Hide ( -> NULL-Pointer ) - * 3. DontCare ( -> gesonderte Valid-Flags im InfoItem ) + * 1. Show ( -> gueltige Werte ) + * 2. Hide ( -> NULL-Pointer ) + * 3. DontCare ( -> gesonderte Valid-Flags im InfoItem ) */ // static ---------------------------------------------------------------- @@ -91,56 +91,56 @@ BOOL SvxBorderTabPage::bSync = TRUE; //------------------------------------------------------------------------ -#define LINE_WIDTH0 (DEF_LINE_WIDTH_0 *100) -#define LINE_WIDTH1 (DEF_LINE_WIDTH_1 *100) -#define LINE_WIDTH2 (DEF_LINE_WIDTH_2 *100) -#define LINE_WIDTH3 (DEF_LINE_WIDTH_3 *100) -#define LINE_WIDTH4 (DEF_LINE_WIDTH_4 *100) +#define LINE_WIDTH0 (DEF_LINE_WIDTH_0 *100) +#define LINE_WIDTH1 (DEF_LINE_WIDTH_1 *100) +#define LINE_WIDTH2 (DEF_LINE_WIDTH_2 *100) +#define LINE_WIDTH3 (DEF_LINE_WIDTH_3 *100) +#define LINE_WIDTH4 (DEF_LINE_WIDTH_4 *100) #define LINE_WIDTH5 (DEF_LINE_WIDTH_5 *100) -#define DLINE0_OUT (DEF_DOUBLE_LINE0_OUT *100) -#define DLINE0_IN (DEF_DOUBLE_LINE0_IN *100) -#define DLINE0_DIST (DEF_DOUBLE_LINE0_DIST *100) +#define DLINE0_OUT (DEF_DOUBLE_LINE0_OUT *100) +#define DLINE0_IN (DEF_DOUBLE_LINE0_IN *100) +#define DLINE0_DIST (DEF_DOUBLE_LINE0_DIST *100) -#define DLINE1_OUT (DEF_DOUBLE_LINE1_OUT *100) -#define DLINE1_IN (DEF_DOUBLE_LINE1_IN *100) -#define DLINE1_DIST (DEF_DOUBLE_LINE1_DIST *100) +#define DLINE1_OUT (DEF_DOUBLE_LINE1_OUT *100) +#define DLINE1_IN (DEF_DOUBLE_LINE1_IN *100) +#define DLINE1_DIST (DEF_DOUBLE_LINE1_DIST *100) -#define DLINE2_OUT (DEF_DOUBLE_LINE2_OUT *100) -#define DLINE2_IN (DEF_DOUBLE_LINE2_IN *100) -#define DLINE2_DIST (DEF_DOUBLE_LINE2_DIST *100) +#define DLINE2_OUT (DEF_DOUBLE_LINE2_OUT *100) +#define DLINE2_IN (DEF_DOUBLE_LINE2_IN *100) +#define DLINE2_DIST (DEF_DOUBLE_LINE2_DIST *100) -#define DLINE3_OUT (DEF_DOUBLE_LINE3_OUT *100) -#define DLINE3_IN (DEF_DOUBLE_LINE3_IN *100) -#define DLINE3_DIST (DEF_DOUBLE_LINE3_DIST *100) +#define DLINE3_OUT (DEF_DOUBLE_LINE3_OUT *100) +#define DLINE3_IN (DEF_DOUBLE_LINE3_IN *100) +#define DLINE3_DIST (DEF_DOUBLE_LINE3_DIST *100) -#define DLINE4_OUT (DEF_DOUBLE_LINE4_OUT *100) -#define DLINE4_IN (DEF_DOUBLE_LINE4_IN *100) -#define DLINE4_DIST (DEF_DOUBLE_LINE4_DIST *100) +#define DLINE4_OUT (DEF_DOUBLE_LINE4_OUT *100) +#define DLINE4_IN (DEF_DOUBLE_LINE4_IN *100) +#define DLINE4_DIST (DEF_DOUBLE_LINE4_DIST *100) -#define DLINE5_OUT (DEF_DOUBLE_LINE5_OUT *100) -#define DLINE5_IN (DEF_DOUBLE_LINE5_IN *100) -#define DLINE5_DIST (DEF_DOUBLE_LINE5_DIST *100) +#define DLINE5_OUT (DEF_DOUBLE_LINE5_OUT *100) +#define DLINE5_IN (DEF_DOUBLE_LINE5_IN *100) +#define DLINE5_DIST (DEF_DOUBLE_LINE5_DIST *100) -#define DLINE6_OUT (DEF_DOUBLE_LINE6_OUT *100) -#define DLINE6_IN (DEF_DOUBLE_LINE6_IN *100) -#define DLINE6_DIST (DEF_DOUBLE_LINE6_DIST *100) +#define DLINE6_OUT (DEF_DOUBLE_LINE6_OUT *100) +#define DLINE6_IN (DEF_DOUBLE_LINE6_IN *100) +#define DLINE6_DIST (DEF_DOUBLE_LINE6_DIST *100) -#define DLINE7_OUT (DEF_DOUBLE_LINE7_OUT *100) -#define DLINE7_IN (DEF_DOUBLE_LINE7_IN *100) -#define DLINE7_DIST (DEF_DOUBLE_LINE7_DIST *100) +#define DLINE7_OUT (DEF_DOUBLE_LINE7_OUT *100) +#define DLINE7_IN (DEF_DOUBLE_LINE7_IN *100) +#define DLINE7_DIST (DEF_DOUBLE_LINE7_DIST *100) -#define DLINE8_OUT (DEF_DOUBLE_LINE8_OUT *100) -#define DLINE8_IN (DEF_DOUBLE_LINE8_IN *100) -#define DLINE8_DIST (DEF_DOUBLE_LINE8_DIST *100) +#define DLINE8_OUT (DEF_DOUBLE_LINE8_OUT *100) +#define DLINE8_IN (DEF_DOUBLE_LINE8_IN *100) +#define DLINE8_DIST (DEF_DOUBLE_LINE8_DIST *100) -#define DLINE9_OUT (DEF_DOUBLE_LINE9_OUT *100) -#define DLINE9_IN (DEF_DOUBLE_LINE9_IN *100) -#define DLINE9_DIST (DEF_DOUBLE_LINE9_DIST *100) +#define DLINE9_OUT (DEF_DOUBLE_LINE9_OUT *100) +#define DLINE9_IN (DEF_DOUBLE_LINE9_IN *100) +#define DLINE9_DIST (DEF_DOUBLE_LINE9_DIST *100) -#define DLINE10_OUT (DEF_DOUBLE_LINE10_OUT *100) -#define DLINE10_IN (DEF_DOUBLE_LINE10_IN *100) -#define DLINE10_DIST (DEF_DOUBLE_LINE10_DIST*100) +#define DLINE10_OUT (DEF_DOUBLE_LINE10_OUT *100) +#define DLINE10_IN (DEF_DOUBLE_LINE10_IN *100) +#define DLINE10_DIST (DEF_DOUBLE_LINE10_DIST*100) #define RGBCOL(eColorName) (TpBorderRGBColor(eColorName)) @@ -178,14 +178,14 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField) SvxBorderTabPage::SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ), aFlBorder ( this, CUI_RES( FL_BORDER ) ), aDefaultFT ( this, CUI_RES( FT_DEFAULT ) ), aWndPresets ( this, CUI_RES( WIN_PRESETS ) ), aUserDefFT ( this, CUI_RES( FT_USERDEF ) ), aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ), - + aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ), aFlLine ( this, CUI_RES( FL_LINE ) ), aStyleFT ( this, CUI_RES( FT_STYLE ) ), @@ -352,9 +352,9 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, FillLineListBox_Impl(); // ColorBox aus der XColorTable fuellen. - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - const SfxPoolItem* pItem = NULL; - XColorTable* pColorTable = NULL; + SfxObjectShell* pDocSh = SfxObjectShell::Current(); + const SfxPoolItem* pItem = NULL; + XColorTable* pColorTable = NULL; DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -449,13 +449,13 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SvxBoxItem* pBoxItem; const SvxBoxInfoItem* pBoxInfoItem; - USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); - SfxMapUnit eCoreUnit; - const Color aColBlack = RGBCOL(COL_BLACK); + USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); + SfxMapUnit eCoreUnit; + const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); - - + + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False ); eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); @@ -671,11 +671,11 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); - BOOL bPut = TRUE; - USHORT nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); - USHORT nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False ); - const SfxItemSet& rOldSet = GetItemSet(); - SvxBoxItem aBoxItem ( nBoxWhich ); + BOOL bPut = TRUE; + USHORT nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); + USHORT nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False ); + const SfxItemSet& rOldSet = GetItemSet(); + SvxBoxItem aBoxItem ( nBoxWhich ); SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich ); SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER ); @@ -743,7 +743,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) nMinValue == aRightMF .GetValue() || nMinValue == aTopMF .GetValue() || nMinValue == aBottomMF.GetValue() || - (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) ) { aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT ); @@ -1151,7 +1151,7 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, EMPTYARG ) { BOOL bLineSet = aFrameSel.IsAnyBorderVisible(); BOOL bMinAllowed = 0 != (nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_TABLE)); - BOOL bSpaceModified = aLeftMF .IsModified()|| + BOOL bSpaceModified = aLeftMF .IsModified()|| aRightMF .IsModified()|| aTopMF .IsModified()|| aBottomMF.IsModified(); diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc index 3f7699df951b..2d7359ef1e33 100644 --- a/cui/source/tabpages/border.hrc +++ b/cui/source/tabpages/border.hrc @@ -1,7 +1,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 @@ -69,7 +69,7 @@ #define CB_MERGEADJACENTBORDERS 66 // ImageListe fuer ValueSets: -#define IL_PRE_BITMAPS 1400 +#define IL_PRE_BITMAPS 1400 #define ILH_PRE_BITMAPS 1401 #define IID_PRE_CELL_NONE 1 #define IID_PRE_CELL_ALL 2 @@ -93,13 +93,13 @@ #define IID_PRE_TABLE_ALL 20 #define IID_PRE_TABLE_OUTER2 21 -#define IL_SDW_BITMAPS 1500 +#define IL_SDW_BITMAPS 1500 #define ILH_SDW_BITMAPS 1501 -#define IID_SHADOWNONE 1 -#define IID_SHADOW_BOT_RIGHT 2 -#define IID_SHADOW_BOT_LEFT 3 -#define IID_SHADOW_TOP_RIGHT 4 -#define IID_SHADOW_TOP_LEFT 5 +#define IID_SHADOWNONE 1 +#define IID_SHADOW_BOT_RIGHT 2 +#define IID_SHADOW_BOT_LEFT 3 +#define IID_SHADOW_TOP_RIGHT 4 +#define IID_SHADOW_TOP_LEFT 5 #endif diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 811f5429aeb7..a2ad4d617fe0 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 290306176e1c..780e969e1958 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.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 diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 76071f904a6d..7f8343d8742f 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -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 diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index e0356b2b5391..2c0f8ac5e500 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.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 @@ -51,7 +51,7 @@ #include <cuires.hrc> #include "chardlg.hrc" -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include "chardlg.hxx" #include "editeng/fontitem.hxx" #include <editeng/postitem.hxx> @@ -95,13 +95,13 @@ using namespace ::com::sun::star; // define ---------------------------------------------------------------- -#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT +#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT -#define CLEARTITEM rSet.InvalidateItem(nWhich) +#define CLEARTITEM rSet.InvalidateItem(nWhich) -#define LW_NORMAL 0 +#define LW_NORMAL 0 #define LW_GESPERRT 1 -#define LW_SCHMAL 2 +#define LW_SCHMAL 2 // static ---------------------------------------------------------------- @@ -214,10 +214,10 @@ SvxCharBasePage::~SvxCharBasePage() //void SvxCharBasePage::SetPrevFontAttributes( const SfxItemSet& rSet ) void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) { - SvxFont& rFont = GetPreviewFont(); - SvxFont& rCJKFont = GetPreviewCJKFont(); - SvxFont& rCTLFont = GetPreviewCTLFont(); - USHORT nWhich; + SvxFont& rFont = GetPreviewFont(); + SvxFont& rCJKFont = GetPreviewCJKFont(); + SvxFont& rCTLFont = GetPreviewCTLFont(); + USHORT nWhich; nWhich = GetWhich( SID_CHAR_DLG_PREVIEW_STRING ); if( ISITEMSET ) @@ -262,7 +262,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) rCJKFont.SetOverline( eOverline ); rCTLFont.SetOverline( eOverline ); - // Strikeout + // Strikeout FontStrikeout eStrikeout; nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); if( ISITEMSET ) @@ -400,7 +400,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) rCJKFont.SetColor( aCol ); rCTLFont.SetColor( aCol ); - m_aPreviewWin.AutoCorrectFontColor(); // handle color COL_AUTO + m_aPreviewWin.AutoCorrectFontColor(); // handle color COL_AUTO } // Kerning @@ -453,12 +453,12 @@ void SvxCharBasePage::SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, Svx long nH; if( rSet.GetItemState( nWhich ) >= SFX_ITEM_SET ) { - nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), + nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); } else - nH = 240; // as default 12pt + nH = 240; // as default 12pt rFont.SetSize( Size( 0, nH ) ); } @@ -502,10 +502,10 @@ void SvxCharBasePage::SetPrevFontStyle( const SfxItemSet& rSet, USHORT nPosture, void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) { - USHORT nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); + USHORT nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); if( ISITEMSET ) { - const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); m_aPreviewWin.SetFontWidthScale( rItem.GetValue() ); } @@ -538,19 +538,19 @@ void SvxCharBasePage::SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nE struct SvxCharNamePage_Impl { - Timer m_aUpdateTimer; - String m_aNoStyleText; - String m_aTransparentText; - const FontList* m_pFontList; - USHORT m_nExtraEntryPos; - BOOL m_bMustDelete; - BOOL m_bInSearchMode; + Timer m_aUpdateTimer; + String m_aNoStyleText; + String m_aTransparentText; + const FontList* m_pFontList; + USHORT m_nExtraEntryPos; + BOOL m_bMustDelete; + BOOL m_bInSearchMode; SvxCharNamePage_Impl() : - m_pFontList ( NULL ), + m_pFontList ( NULL ), m_nExtraEntryPos( LISTBOX_ENTRY_NOTFOUND ), - m_bMustDelete ( FALSE ), + m_bMustDelete ( FALSE ), m_bInSearchMode ( FALSE ) { @@ -608,12 +608,12 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pCTLLine = new FixedLine( this, CUI_RES( FL_CTL ) ); m_pCTLFontNameFT = new FixedText( this, CUI_RES( FT_CTL_NAME ) ); m_pCTLFontNameLB = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) ); - m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) ); - m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) ); - m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) ); - m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) ); - m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) ); - m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) ); + m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) ); + m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) ); + m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) ); + m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) ); + m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) ); + m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) ); if( bCJK ) { @@ -662,9 +662,9 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : FreeResource(); - m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN, TRUE, FALSE, TRUE ); - m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK, TRUE, FALSE, TRUE ); - m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL, TRUE, FALSE, TRUE ); + m_pWestFontLanguageLB->SetLanguageList( LANG_LIST_WESTERN, TRUE, FALSE, TRUE ); + m_pEastFontLanguageLB->SetLanguageList( LANG_LIST_CJK, TRUE, FALSE, TRUE ); + m_pCTLFontLanguageLB->SetLanguageList( LANG_LIST_CTL, TRUE, FALSE, TRUE ); Initialize(); } @@ -813,7 +813,7 @@ const FontList* SvxCharNamePage::GetFontList() const // ----------------------------------------------------------------------------- namespace { - FontInfo calcFontInfo( SvxFont& _rFont, + FontInfo calcFontInfo( SvxFont& _rFont, SvxCharNamePage* _pPage, const FontNameBox* _pFontNameLB, const FontStyleBox* _pFontStyleLB, @@ -862,7 +862,7 @@ namespace else if ( _pFontSizeLB->GetText().Len() ) aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ); else - aSize.Height() = 200; // default 10pt + aSize.Height() = 200; // default 10pt aFontInfo.SetSize( aSize ); _rFont.SetFamily( aFontInfo.GetFamily() ); @@ -1379,7 +1379,7 @@ BOOL SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp // FontSize long nSize = static_cast<long>(pSizeBox->GetValue()); - if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck + if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); bool bRel = true; @@ -1612,7 +1612,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); - UpdatePreview_Impl(); // instead of asynchronous calling in ctor + UpdatePreview_Impl(); // instead of asynchronous calling in ctor } // ----------------------------------------------------------------------- @@ -1659,7 +1659,7 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) BOOL bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); -//! bModified |= FillItemSetColor_Impl( rSet ); +//! bModified |= FillItemSetColor_Impl( rSet ); return bModified; } @@ -1689,8 +1689,8 @@ namespace static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 ); // ausgehend von der akt. Hoehe: - // - negativ bis minimal 2 pt - // - positiv bis maximal 999 pt + // - negativ bis minimal 2 pt + // - positiv bis maximal 999 pt _pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)), (9999 - nCurHeight), 10 ); } } @@ -1769,41 +1769,41 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe m_aFontColorFT ( this, CUI_RES( FT_FONTCOLOR ) ), m_aFontColorLB ( this, CUI_RES( LB_FONTCOLOR ) ), - m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ), - m_aEffectsLB ( this, 0 ), + m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ), + m_aEffectsLB ( this, 0 ), - m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ), + m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ), m_aReliefFT ( this, CUI_RES( FT_RELIEF ) ), m_aReliefLB ( this, CUI_RES( LB_RELIEF ) ), - m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ), - m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ), - m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ), + m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ), + m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ), + m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ), m_aHiddenBtn ( this, CUI_RES( CB_CHARHIDDEN ) ), - m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ), + m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ), - m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ), - m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ), - m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ), - m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ), - m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ), - m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ), - m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ), - m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ), - m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ), - m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ), - m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ), + m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ), + m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ), + m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ), + m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ), + m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ), + m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ), + m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ), + m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ), + m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ), + m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ), + m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ), - m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ), + m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ), - m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ), - m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ), - m_aPositionFT ( this, CUI_RES( FT_POSITION ) ), - m_aPositionLB ( this, CUI_RES( LB_POSITION ) ), + m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ), + m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ), + m_aPositionFT ( this, CUI_RES( FT_POSITION ) ), + m_aPositionLB ( this, CUI_RES( LB_POSITION ) ), - m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) ) + m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) ) { m_aEffectsLB.Hide(); @@ -2332,7 +2332,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } } - // Strikeout + // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); rFont.SetStrikeout( STRIKEOUT_NONE ); rCJKFont.SetStrikeout( STRIKEOUT_NONE ); @@ -2440,7 +2440,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } // the select handler for the underline/overline/strikeout list boxes -// SelectHdl_Impl( NULL ); +// SelectHdl_Impl( NULL ); DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aOverlineLB.GetSelectHdl(), "SvxCharEffectsPage::Reset: inconsistence (1)!"); DBG_ASSERT(m_aUnderlineLB.GetSelectHdl() == m_aStrikeoutLB.GetSelectHdl(), @@ -2451,7 +2451,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox -// SelectHdl_Impl( &m_aEmphasisLB ); +// SelectHdl_Impl( &m_aEmphasisLB ); DBG_ASSERT(m_aEmphasisLB.GetSelectHdl() == LINK(this, SvxCharEffectsPage, SelectHdl_Impl), "SvxCharEffectsPage::Reset: inconsistence (2)!"); m_aEmphasisLB.GetSelectHdl().Call( &m_aEmphasisLB ); @@ -3039,35 +3039,35 @@ SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rIn SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ), - m_aPositionLine ( this, CUI_RES( FL_POSITION ) ), - m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ), - m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ), - m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ), - m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ), - m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ), - m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ), - m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ), - m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ), + m_aPositionLine ( this, CUI_RES( FL_POSITION ) ), + m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ), + m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ), + m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ), + m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ), + m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ), + m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ), + m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ), + m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ), m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ), - m_aScalingFL ( this, CUI_RES( FL_SCALING ) ), - m_a0degRB ( this, CUI_RES( RB_0_DEG ) ), - m_a90degRB ( this, CUI_RES( RB_90_DEG ) ), - m_a270degRB ( this, CUI_RES( RB_270_DEG ) ), - m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ), - m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ), - m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ), - - m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ), - m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ), - m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ), - m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ), - m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ), - - m_nSuperEsc ( (short)DFLT_ESC_SUPER ), - m_nSubEsc ( (short)DFLT_ESC_SUB ), - m_nScaleWidthItemSetVal ( 100 ), - m_nScaleWidthInitialVal ( 100 ), - m_nSuperProp ( (BYTE)DFLT_ESC_PROP ), + m_aScalingFL ( this, CUI_RES( FL_SCALING ) ), + m_a0degRB ( this, CUI_RES( RB_0_DEG ) ), + m_a90degRB ( this, CUI_RES( RB_90_DEG ) ), + m_a270degRB ( this, CUI_RES( RB_270_DEG ) ), + m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ), + m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ), + m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ), + + m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ), + m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ), + m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ), + m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ), + m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ), + + m_nSuperEsc ( (short)DFLT_ESC_SUPER ), + m_nSubEsc ( (short)DFLT_ESC_SUB ), + m_nScaleWidthItemSetVal ( 100 ), + m_nScaleWidthInitialVal ( 100 ), + m_nSuperProp ( (BYTE)DFLT_ESC_PROP ), m_nSubProp ( (BYTE)DFLT_ESC_PROP ) { FreeResource(); @@ -3175,7 +3175,7 @@ void SvxCharPositionPage::SetEscapement_Impl( USHORT nEsc ) IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) { - USHORT nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL + USHORT nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL if ( &m_aHighPosBtn == pBtn ) nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; @@ -3204,7 +3204,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) IMPL_LINK( SvxCharPositionPage, FontModifyHdl_Impl, MetricField*, EMPTYARG ) { BYTE nEscProp = (BYTE)m_aFontSizeEdit.GetValue(); - short nEsc = (short)m_aHighLowEdit.GetValue(); + short nEsc = (short)m_aHighLowEdit.GetValue(); nEsc *= m_aLowPosBtn.IsChecked() ? -1 : 1; UpdatePreview_Impl( 100, nEscProp, nEsc ); return 0; @@ -3641,7 +3641,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { - // Position (hoch, normal oder tief) + // Position (hoch, normal oder tief) const SfxItemSet& rOldSet = GetItemSet(); BOOL bModified = FALSE, bChanged = TRUE; USHORT nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); @@ -3670,7 +3670,7 @@ BOOL SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( pOld ) { const SvxEscapementItem& rItem = *( (const SvxEscapementItem*)pOld ); - if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) + if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) bChanged = FALSE; } @@ -3808,14 +3808,14 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rIn SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ), - m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ), - m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ), + m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ), + m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ), - m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ), - m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ), - m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ), - m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ), - m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ), + m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ), + m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ), + m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ), + m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ), + m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ), m_nStartBracketPosition( 0 ), m_nEndBracketPosition( 0 ) { @@ -4035,7 +4035,7 @@ BOOL SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -void SvxCharTwoLinesPage::UpdatePreview_Impl() +void SvxCharTwoLinesPage::UpdatePreview_Impl() { sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0 ? m_aStartBracketLB.GetSelectEntry().GetChar(0) : 0; diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h index 168502b6f331..f597a9beed85 100644 --- a/cui/source/tabpages/chardlg.h +++ b/cui/source/tabpages/chardlg.h @@ -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 @@ -30,43 +30,43 @@ // define ---------------------------------------------------------------- -#define CHRDLG_UNDERLINE_NONE 0 -#define CHRDLG_UNDERLINE_SINGLE 1 -#define CHRDLG_UNDERLINE_DOUBLE 2 -#define CHRDLG_UNDERLINE_DOTTED 3 -#define CHRDLG_UNDERLINE_DONTKNOW 4 -#define CHRDLG_UNDERLINE_DASH 5 -#define CHRDLG_UNDERLINE_LONGDASH 6 -#define CHRDLG_UNDERLINE_DASHDOT 7 -#define CHRDLG_UNDERLINE_DASHDOTDOT 8 -#define CHRDLG_UNDERLINE_SMALLWAVE 9 -#define CHRDLG_UNDERLINE_WAVE 10 -#define CHRDLG_UNDERLINE_DOUBLEWAVE 11 -#define CHRDLG_UNDERLINE_BOLD 12 -#define CHRDLG_UNDERLINE_BOLDDOTTED 13 -#define CHRDLG_UNDERLINE_BOLDDASH 14 -#define CHRDLG_UNDERLINE_BOLDLONGDASH 15 -#define CHRDLG_UNDERLINE_BOLDDASHDOT 16 -#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT 17 -#define CHRDLG_UNDERLINE_BOLDWAVE 18 +#define CHRDLG_UNDERLINE_NONE 0 +#define CHRDLG_UNDERLINE_SINGLE 1 +#define CHRDLG_UNDERLINE_DOUBLE 2 +#define CHRDLG_UNDERLINE_DOTTED 3 +#define CHRDLG_UNDERLINE_DONTKNOW 4 +#define CHRDLG_UNDERLINE_DASH 5 +#define CHRDLG_UNDERLINE_LONGDASH 6 +#define CHRDLG_UNDERLINE_DASHDOT 7 +#define CHRDLG_UNDERLINE_DASHDOTDOT 8 +#define CHRDLG_UNDERLINE_SMALLWAVE 9 +#define CHRDLG_UNDERLINE_WAVE 10 +#define CHRDLG_UNDERLINE_DOUBLEWAVE 11 +#define CHRDLG_UNDERLINE_BOLD 12 +#define CHRDLG_UNDERLINE_BOLDDOTTED 13 +#define CHRDLG_UNDERLINE_BOLDDASH 14 +#define CHRDLG_UNDERLINE_BOLDLONGDASH 15 +#define CHRDLG_UNDERLINE_BOLDDASHDOT 16 +#define CHRDLG_UNDERLINE_BOLDDASHDOTDOT 17 +#define CHRDLG_UNDERLINE_BOLDWAVE 18 -#define CHRDLG_STRIKEOUT_NONE 0 -#define CHRDLG_STRIKEOUT_SINGLE 1 -#define CHRDLG_STRIKEOUT_DOUBLE 2 -#define CHRDLG_STRIKEOUT_DONTKNOW 3 -#define CHRDLG_STRIKEOUT_BOLD 4 -#define CHRDLG_STRIKEOUT_SLASH 5 -#define CHRDLG_STRIKEOUT_X 6 +#define CHRDLG_STRIKEOUT_NONE 0 +#define CHRDLG_STRIKEOUT_SINGLE 1 +#define CHRDLG_STRIKEOUT_DOUBLE 2 +#define CHRDLG_STRIKEOUT_DONTKNOW 3 +#define CHRDLG_STRIKEOUT_BOLD 4 +#define CHRDLG_STRIKEOUT_SLASH 5 +#define CHRDLG_STRIKEOUT_X 6 -#define CHRDLG_ENCLOSE_NONE 0 -#define CHRDLG_ENCLOSE_ROUND 1 -#define CHRDLG_ENCLOSE_SQUARE 2 -#define CHRDLG_ENCLOSE_POINTED 3 -#define CHRDLG_ENCLOSE_CURVED 4 -#define CHRDLG_ENCLOSE_SPECIAL_CHAR 5 +#define CHRDLG_ENCLOSE_NONE 0 +#define CHRDLG_ENCLOSE_ROUND 1 +#define CHRDLG_ENCLOSE_SQUARE 2 +#define CHRDLG_ENCLOSE_POINTED 3 +#define CHRDLG_ENCLOSE_CURVED 4 +#define CHRDLG_ENCLOSE_SPECIAL_CHAR 5 -#define CHRDLG_POSITION_OVER 0 -#define CHRDLG_POSITION_UNDER 1 +#define CHRDLG_POSITION_OVER 0 +#define CHRDLG_POSITION_UNDER 1 #endif diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..fa33c07cedd9 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -1,7 +1,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 @@ -31,142 +31,142 @@ // NamePage ----------------------------------------------------------------- -#define FL_WEST 100 -#define FT_WEST_NAME 101 -#define LB_WEST_NAME 102 -#define FT_WEST_STYLE 103 -#define LB_WEST_STYLE 104 -#define FT_WEST_SIZE 105 -#define LB_WEST_SIZE 106 -#define FT_WEST_LANG 107 -#define LB_WEST_LANG 108 - -#define FL_EAST 110 -#define FT_EAST_NAME 111 -#define LB_EAST_NAME 112 -#define FT_EAST_STYLE 113 -#define LB_EAST_STYLE 114 -#define FT_EAST_SIZE 115 -#define LB_EAST_SIZE 116 -#define FT_EAST_LANG 117 -#define LB_EAST_LANG 118 - -#define FL_CTL 120 -#define FT_CTL_NAME 121 -#define LB_CTL_NAME 122 -#define FT_CTL_STYLE 123 -#define LB_CTL_STYLE 124 -#define FT_CTL_SIZE 125 -#define LB_CTL_SIZE 126 -#define FT_CTL_LANG 127 -#define LB_CTL_LANG 128 - -#define WIN_CHAR_PREVIEW 131 -#define FT_CHAR_FONTTYPE 132 +#define FL_WEST 100 +#define FT_WEST_NAME 101 +#define LB_WEST_NAME 102 +#define FT_WEST_STYLE 103 +#define LB_WEST_STYLE 104 +#define FT_WEST_SIZE 105 +#define LB_WEST_SIZE 106 +#define FT_WEST_LANG 107 +#define LB_WEST_LANG 108 + +#define FL_EAST 110 +#define FT_EAST_NAME 111 +#define LB_EAST_NAME 112 +#define FT_EAST_STYLE 113 +#define LB_EAST_STYLE 114 +#define FT_EAST_SIZE 115 +#define LB_EAST_SIZE 116 +#define FT_EAST_LANG 117 +#define LB_EAST_LANG 118 + +#define FL_CTL 120 +#define FT_CTL_NAME 121 +#define LB_CTL_NAME 122 +#define FT_CTL_STYLE 123 +#define LB_CTL_STYLE 124 +#define FT_CTL_SIZE 125 +#define LB_CTL_SIZE 126 +#define FT_CTL_LANG 127 +#define LB_CTL_LANG 128 + +#define WIN_CHAR_PREVIEW 131 +#define FT_CHAR_FONTTYPE 132 #define FL_COLOR2 140 -#define FT_COLOR2 141 -#define LB_COLOR2 142 +#define FT_COLOR2 141 +#define LB_COLOR2 142 -#define STR_CHARNAME_NOSTYLE 150 -#define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_NOSTYLE 150 +#define STR_CHARNAME_TRANSPARENT 151 // EffectsPage -------------------------------------------------------------- #define FT_FONTCOLOR 201 #define LB_FONTCOLOR 202 -#define FT_EFFECTS 203 -#define LB_EFFECTS 204 -#define LB_EFFECTS2 205 +#define FT_EFFECTS 203 +#define LB_EFFECTS 204 +#define LB_EFFECTS2 205 #define FT_RELIEF 206 #define LB_RELIEF 207 -#define CB_OUTLINE 208 -#define CB_SHADOW 209 -#define CB_BLINKING 210 +#define CB_OUTLINE 208 +#define CB_SHADOW 209 +#define CB_BLINKING 210 #define CB_CHARHIDDEN 211 -#define FL_EFFECTS_VERTICAL 220 +#define FL_EFFECTS_VERTICAL 220 #define FT_OVERLINE 221 #define LB_OVERLINE 222 #define FT_OVERLINE_COLOR 223 #define LB_OVERLINE_COLOR 224 -#define FT_STRIKEOUT 225 -#define LB_STRIKEOUT 226 +#define FT_STRIKEOUT 225 +#define LB_STRIKEOUT 226 -#define FT_UNDERLINE 227 -#define LB_UNDERLINE 228 -#define FT_UNDERLINE_COLOR 229 -#define LB_UNDERLINE_COLOR 230 +#define FT_UNDERLINE 227 +#define LB_UNDERLINE 228 +#define FT_UNDERLINE_COLOR 229 +#define LB_UNDERLINE_COLOR 230 -#define CB_INDIVIDUALWORDS 231 +#define CB_INDIVIDUALWORDS 231 -#define FL_EFFECTS_ASIAN 240 +#define FL_EFFECTS_ASIAN 240 -#define FT_EMPHASIS 241 -#define LB_EMPHASIS 242 -#define FT_POSITION 243 -#define LB_POSITION 244 +#define FT_EMPHASIS 241 +#define LB_EMPHASIS 242 +#define FT_POSITION 243 +#define LB_POSITION 244 -#define WIN_EFFECTS_PREVIEW 251 -#define FT_EFFECTS_FONTTYPE 252 +#define WIN_EFFECTS_PREVIEW 251 +#define FT_EFFECTS_FONTTYPE 252 -#define STR_EFFECTS_TRANSPARENT 260 -#define STR_EFFECTS_CAPITALS 261 -#define STR_EFFECTS_LOWERCASE 262 -#define STR_EFFECTS_TITLE 263 -#define STR_EFFECTS_SMALL 264 -#define STR_EFFECTS_OUTLINE 265 -#define STR_EFFECTS_SHADOW 266 -#define STR_EFFECTS_BLINKING 267 +#define STR_EFFECTS_TRANSPARENT 260 +#define STR_EFFECTS_CAPITALS 261 +#define STR_EFFECTS_LOWERCASE 262 +#define STR_EFFECTS_TITLE 263 +#define STR_EFFECTS_SMALL 264 +#define STR_EFFECTS_OUTLINE 265 +#define STR_EFFECTS_SHADOW 266 +#define STR_EFFECTS_BLINKING 267 // PositionPage ------------------------------------------------------------- -#define FL_POSITION 300 -#define RB_HIGHPOS 301 -#define RB_NORMALPOS 302 -#define RB_LOWPOS 303 -#define FT_HIGHLOW 304 -#define ED_HIGHLOW 305 -#define CB_HIGHLOW 306 -#define FT_FONTSIZE 307 -#define ED_FONTSIZE 308 -#define FL_ROTATION_SCALING 309 -#define FL_SCALING 310 -#define RB_0_DEG 311 -#define RB_90_DEG 312 -#define RB_270_DEG 313 -#define CB_FIT_TO_LINE 314 -#define FT_SCALE_WIDTH 315 -#define MF_SCALE_WIDTH 316 - -#define FL_KERNING2 320 -#define LB_KERNING2 321 -#define FT_KERNING2 322 -#define ED_KERNING2 323 -#define CB_PAIRKERNING 324 - -#define WIN_POS_PREVIEW 331 -#define FT_POS_FONTTYPE 332 +#define FL_POSITION 300 +#define RB_HIGHPOS 301 +#define RB_NORMALPOS 302 +#define RB_LOWPOS 303 +#define FT_HIGHLOW 304 +#define ED_HIGHLOW 305 +#define CB_HIGHLOW 306 +#define FT_FONTSIZE 307 +#define ED_FONTSIZE 308 +#define FL_ROTATION_SCALING 309 +#define FL_SCALING 310 +#define RB_0_DEG 311 +#define RB_90_DEG 312 +#define RB_270_DEG 313 +#define CB_FIT_TO_LINE 314 +#define FT_SCALE_WIDTH 315 +#define MF_SCALE_WIDTH 316 + +#define FL_KERNING2 320 +#define LB_KERNING2 321 +#define FT_KERNING2 322 +#define ED_KERNING2 323 +#define CB_PAIRKERNING 324 + +#define WIN_POS_PREVIEW 331 +#define FT_POS_FONTTYPE 332 // TwoLinesPage ------------------------------------------------------------- -#define FL_SWITCHON 400 -#define CB_TWOLINES 401 +#define FL_SWITCHON 400 +#define CB_TWOLINES 401 -#define FL_ENCLOSE 410 -#define FT_STARTBRACKET 411 -#define ED_STARTBRACKET 412 -#define FT_ENDBRACKET 413 -#define ED_ENDBRACKET 414 +#define FL_ENCLOSE 410 +#define FT_STARTBRACKET 411 +#define ED_STARTBRACKET 412 +#define FT_ENDBRACKET 413 +#define ED_ENDBRACKET 414 -#define FL_TWOLINES_PREVIEW 420 -#define WIN_TWOLINES_PREVIEW 421 -#define FT_TWOLINES_FONTTYPE 422 +#define FL_TWOLINES_PREVIEW 420 +#define WIN_TWOLINES_PREVIEW 421 +#define FT_TWOLINES_FONTTYPE 422 #define FT_WEST_NAME_NOCJK 423 #define LB_WEST_NAME_NOCJK 424 diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 9673fc950f3f..532a1bf8946c 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 8962d489d8c5..126a0adb1402 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.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 @@ -95,11 +95,11 @@ SvxConnectionDialog::~SvxConnectionDialog() \************************************************************************/ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ), rInAttrs ), - aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbType ( this, CUI_RES( LB_TYPE ) ), + aFtType ( this, CUI_RES( FT_TYPE ) ), + aLbType ( this, CUI_RES( LB_TYPE ) ), aFlDelta ( this, CUI_RES( FL_DELTA ) ), aFtLine1 ( this, CUI_RES( FT_LINE_1 ) ), @@ -110,14 +110,14 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr aMtrFldLine3 ( this, CUI_RES( MTR_FLD_LINE_3 ) ), aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), - aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ), - aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ), + aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ), + aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ), aFtVert1 ( this, CUI_RES( FT_VERT_1 ) ), aMtrFldVert1 ( this, CUI_RES( MTR_FLD_VERT_1 ) ), aFtHorz2 ( this, CUI_RES( FT_HORZ_2 ) ), aMtrFldHorz2 ( this, CUI_RES( MTR_FLD_HORZ_2 ) ), aFtVert2 ( this, CUI_RES( FT_VERT_2 ) ), - aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ), + aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ), rOutAttrs ( rInAttrs ), @@ -331,8 +331,8 @@ void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) BOOL SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) { - BOOL bModified = FALSE; - INT32 nValue; + BOOL bModified = FALSE; + INT32 nValue; if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() ) { @@ -429,7 +429,7 @@ SfxTabPage* SvxConnectionPage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxConnectionPage::GetRanges() +USHORT* SvxConnectionPage::GetRanges() { return( pRanges ); } @@ -559,7 +559,7 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) ); - + Construct(); } diff --git a/cui/source/tabpages/connect.hrc b/cui/source/tabpages/connect.hrc index 2d0584d94232..263972a1dad0 100644 --- a/cui/source/tabpages/connect.hrc +++ b/cui/source/tabpages/connect.hrc @@ -1,7 +1,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 diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src index 64623b0cee25..a52e893e601c 100644 --- a/cui/source/tabpages/connect.src +++ b/cui/source/tabpages/connect.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 433b5e6e2ab5..2a51a2c6fce3 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.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 @@ -56,7 +56,7 @@ SvxDistributeDialog::SvxDistributeDialog( const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) -: SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ), +: SfxSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ), mpPage(0L) { mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer); @@ -85,27 +85,27 @@ SvxDistributePage::SvxDistributePage( const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) -: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), +: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), meDistributeHor(eHor), meDistributeVer(eVer), - maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), - maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )), - maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )), - maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), - maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), - maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), - maHorLow (this, CUI_RES(IMG_HOR_LOW )), - maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), - maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )), - maHorHigh (this, CUI_RES(IMG_HOR_HIGH )), - maFlVertical (this, CUI_RES(FL_VERTICAL )), - maBtnVerNone (this, CUI_RES(BTN_VER_NONE )), - maBtnVerTop (this, CUI_RES(BTN_VER_TOP )), - maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), - maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )), - maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), + maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), + maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )), + maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )), + maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), + maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), + maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), + maHorLow (this, CUI_RES(IMG_HOR_LOW )), + maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), + maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )), + maHorHigh (this, CUI_RES(IMG_HOR_HIGH )), + maFlVertical (this, CUI_RES(FL_VERTICAL )), + maBtnVerNone (this, CUI_RES(BTN_VER_NONE )), + maBtnVerTop (this, CUI_RES(BTN_VER_TOP )), + maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), + maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )), + maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), maVerLow (this, CUI_RES(IMG_VER_LOW )), - maVerCenter (this, CUI_RES(IMG_VER_CENTER )), + maVerCenter (this, CUI_RES(IMG_VER_CENTER )), maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), maVerHigh (this, CUI_RES(IMG_VER_HIGH )) { @@ -149,7 +149,7 @@ SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, |* \************************************************************************/ -UINT16* SvxDistributePage::GetRanges() +UINT16* SvxDistributePage::GetRanges() { return(pRanges); } diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc index 201fac2b5227..13d979e411e9 100644 --- a/cui/source/tabpages/dstribut.hrc +++ b/cui/source/tabpages/dstribut.hrc @@ -1,7 +1,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 @@ -24,32 +24,32 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FL_HORIZONTAL 1 -#define BTN_HOR_NONE 2 -#define BTN_HOR_LEFT 3 -#define BTN_HOR_CENTER 4 -#define BTN_HOR_DISTANCE 5 -#define BTN_HOR_RIGHT 6 -#define FL_VERTICAL 7 -#define BTN_VER_NONE 8 -#define BTN_VER_TOP 9 -#define BTN_VER_CENTER 10 -#define BTN_VER_DISTANCE 11 -#define BTN_VER_BOTTOM 12 -#define IMG_HOR_LOW 14 -#define IMG_HOR_CENTER 15 -#define IMG_HOR_DISTANCE 16 -#define IMG_HOR_HIGH 17 -#define IMG_VER_LOW 18 -#define IMG_VER_CENTER 19 -#define IMG_VER_DISTANCE 20 -#define IMG_VER_HIGH 21 +#define FL_HORIZONTAL 1 +#define BTN_HOR_NONE 2 +#define BTN_HOR_LEFT 3 +#define BTN_HOR_CENTER 4 +#define BTN_HOR_DISTANCE 5 +#define BTN_HOR_RIGHT 6 +#define FL_VERTICAL 7 +#define BTN_VER_NONE 8 +#define BTN_VER_TOP 9 +#define BTN_VER_CENTER 10 +#define BTN_VER_DISTANCE 11 +#define BTN_VER_BOTTOM 12 +#define IMG_HOR_LOW 14 +#define IMG_HOR_CENTER 15 +#define IMG_HOR_DISTANCE 16 +#define IMG_HOR_HIGH 17 +#define IMG_VER_LOW 18 +#define IMG_VER_CENTER 19 +#define IMG_VER_DISTANCE 20 +#define IMG_VER_HIGH 21 -#define IMG_HOR_LOW_H 22 -#define IMG_HOR_CENTER_H 23 -#define IMG_HOR_DISTANCE_H 24 -#define IMG_HOR_HIGH_H 25 -#define IMG_VER_LOW_H 26 -#define IMG_VER_CENTER_H 27 -#define IMG_VER_DISTANCE_H 28 -#define IMG_VER_HIGH_H 29 +#define IMG_HOR_LOW_H 22 +#define IMG_HOR_CENTER_H 23 +#define IMG_HOR_DISTANCE_H 24 +#define IMG_HOR_HIGH_H 25 +#define IMG_VER_LOW_H 26 +#define IMG_VER_CENTER_H 27 +#define IMG_VER_DISTANCE_H 28 +#define IMG_VER_HIGH_H 29 diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index 18e38fd5236a..667d12ab8599 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src index a6a43160afa5..518defe0c95b 100644 --- a/cui/source/tabpages/frmdirlbox.src +++ b/cui/source/tabpages/frmdirlbox.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0500207c2049..24715455bf7c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.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 @@ -44,7 +44,7 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP -#define CM_1_TO_TWIP 567 +#define CM_1_TO_TWIP 567 inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) @@ -57,7 +57,7 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) --------------------------------------------------------------------*/ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ), aCropFL( this, CUI_RES( FL_CROP )), aZoomConstRB( this, CUI_RES( RB_ZOOMCONST)), aSizeConstRB( this, CUI_RES( RB_SIZECONST)), @@ -71,16 +71,16 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) aBottomMF( this, CUI_RES( MF_BOTTOM )), aZoomFL( this, CUI_RES( FL_ZOOM )), aWidthZoomFT( this, CUI_RES( FT_WIDTHZOOM )), - aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )), - aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)), - aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)), + aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )), + aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)), + aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)), aSizeFL( this, CUI_RES( FL_SIZE )), aWidthFT( this, CUI_RES( FT_WIDTH )), aWidthMF( this, CUI_RES( MF_WIDTH )), aHeightFT( this, CUI_RES( FT_HEIGHT )), aHeightMF( this, CUI_RES( MF_HEIGHT )), aOrigSizeFT( this, CUI_RES(FT_ORIG_SIZE)), - aOrigSizePB( this, CUI_RES( PB_ORGSIZE )), + aOrigSizePB( this, CUI_RES( PB_ORGSIZE )), aExampleWN( this, CUI_RES( WN_BSP )), pLastCropField(0), bInitialized(FALSE), @@ -180,10 +180,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) SvxGrfCrop* pCrop = (SvxGrfCrop*)pItem; - aExampleWN.SetLeft( pCrop->GetLeft()); - aExampleWN.SetRight( pCrop->GetRight()); - aExampleWN.SetTop( pCrop->GetTop()); - aExampleWN.SetBottom( pCrop->GetBottom()); + aExampleWN.SetLeft( pCrop->GetLeft()); + aExampleWN.SetRight( pCrop->GetRight()); + aExampleWN.SetTop( pCrop->GetTop()); + aExampleWN.SetBottom( pCrop->GetBottom()); aLeftMF.SetValue( aLeftMF.Normalize( pCrop->GetLeft()), eUnit ); aRightMF.SetValue( aRightMF.Normalize( pCrop->GetRight()), eUnit ); @@ -291,7 +291,7 @@ BOOL SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) } } if( aLeftMF.IsModified() || aRightMF.IsModified() || - aTopMF.IsModified() || aBottomMF.IsModified() ) + aTopMF.IsModified() || aBottomMF.IsModified() ) { USHORT nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); @@ -493,16 +493,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; +// nLeft = aPageSize.Width() - +// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; nLeft = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nRight ); aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit ); } else { -// nRight = aPageSize.Width() - -// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; +// nRight = aPageSize.Width() - +// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -526,16 +526,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; +// nTop = aPageSize.Height() - +// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; nTop = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nBottom); aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit ); } else { -// nBottom = aPageSize.Height() - -// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; +// nBottom = aPageSize.Height() - +// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -629,7 +629,7 @@ void SvxGrfCropPage::CalcMinMaxBorder() aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; +/* nMin = (aOrigSize.Width() * 102) /100; aLeftMF.SetMax(aPageSize.Width() - nR - nMin); aRightMF.SetMax(aPageSize.Width() - nL - nMin); */ @@ -643,12 +643,12 @@ void SvxGrfCropPage::CalcMinMaxBorder() aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; +/* nMin = (aOrigSize.Height() * 102) /100; aTopMF.SetMax(aPageSize.Height() - nLow - nMin); aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/ } /*-------------------------------------------------------------------- - Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, + Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, FixedText mit der Originalgroesse fuellen --------------------------------------------------------------------*/ @@ -710,7 +710,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) sTemp += aFld.GetText(); aOrigSizeFT.SetText(sTemp); } - aLeftFT .Enable(bFound); + aLeftFT .Enable(bFound); aLeftMF .Enable(bFound); aRightFT .Enable(bFound); aRightMF .Enable(bFound); @@ -723,7 +723,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) aWidthFT .Enable(bFound); aWidthMF .Enable(bFound); aHeightFT .Enable(bFound); - aHeightMF .Enable(bFound); + aHeightMF .Enable(bFound); aWidthZoomFT .Enable(bFound); aWidthZoomMF .Enable(bFound); aHeightZoomFT .Enable(bFound); @@ -801,10 +801,10 @@ void SvxGrfCropPage::SvxCropExample::Paint( const Rectangle& ) aSz = PixelToLogic( aSz ); SetFillColor( Color( COL_TRANSPARENT ) ); SetRasterOp( ROP_INVERT ); - aRect.Left() += aTopLeft.Y(); - aRect.Top() += aTopLeft.X(); - aRect.Right() -= aBottomRight.Y(); - aRect.Bottom() -= aBottomRight.X(); + aRect.Left() += aTopLeft.Y(); + aRect.Top() += aTopLeft.X(); + aRect.Right() -= aBottomRight.Y(); + aRect.Bottom() -= aBottomRight.X(); DrawRect( aRect ); } diff --git a/cui/source/tabpages/grfpage.hrc b/cui/source/tabpages/grfpage.hrc index 438e67a8010f..72b288d8f415 100644 --- a/cui/source/tabpages/grfpage.hrc +++ b/cui/source/tabpages/grfpage.hrc @@ -1,7 +1,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 @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FT_BOTTOM 1 +#define FT_BOTTOM 1 #define FT_HEIGHT 2 #define FT_HEIGHTZOOM 3 #define FT_LEFT 4 diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src index 74b9e8e5cda0..863f8787d083 100644 --- a/cui/source/tabpages/grfpage.src +++ b/cui/source/tabpages/grfpage.src @@ -1,7 +1,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 @@ -31,11 +31,11 @@ #include <svx/dialogs.hrc> /************************************************************/ -/* */ -/* */ -/* Crop-Page */ -/* */ -/* */ +/* */ +/* */ +/* Crop-Page */ +/* */ +/* */ /************************************************************/ TabPage RID_SVXPAGE_GRFCROP { diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 4eeb6be807fe..e722bfa43c6b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.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 @@ -48,21 +48,21 @@ // define ---------------------------------------------------------------- -#define AZ_OPTIMAL 0 -#define AZ_VON_OBEN 1 -#define AZ_VON_LINKS 2 -#define AZ_HORIZONTAL 3 -#define AZ_VERTIKAL 4 +#define AZ_OPTIMAL 0 +#define AZ_VON_OBEN 1 +#define AZ_VON_LINKS 2 +#define AZ_HORIZONTAL 3 +#define AZ_VERTIKAL 4 -#define AT_OBEN 0 -#define AT_MITTE 1 -#define AT_UNTEN 2 +#define AT_OBEN 0 +#define AT_MITTE 1 +#define AT_UNTEN 2 -#define WK_OPTIMAL 0 -#define WK_30 1 -#define WK_45 2 -#define WK_60 3 -#define WK_90 4 +#define WK_OPTIMAL 0 +#define WK_30 1 +#define WK_45 2 +#define WK_60 3 +#define WK_90 4 // static ---------------------------------------------------------------- @@ -84,27 +84,27 @@ static USHORT pCaptionRanges[] = // ----------------------------------------------------------------------- SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ), - - aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ), - aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ), - aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ), - aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ), - aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ), - aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ), - aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ), - aFT_UM( this, CUI_RES( FT_UM ) ), - aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ), - aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ), - aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ), - aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ), - aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ), - aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ), + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ), + + aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ), + aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ), + aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ), + aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ), + aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ), + aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ), + aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ), + aFT_UM( this, CUI_RES( FT_UM ) ), + aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ), + aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ), + aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ), + aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ), + aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ), + aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ), aStrHorzList( CUI_RES(STR_HORZ_LIST) ), aStrVertList( CUI_RES(STR_VERT_LIST) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { //------------NYI------------------------------------------- aFT_WINKEL.Hide(); @@ -138,9 +138,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl)); Image aImage; - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1))); - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2))); - aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2))); + aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3))); FillValueSet(); @@ -178,7 +178,7 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) SfxItemPool* pPool = _rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - SfxMapUnit eUnit; + SfxMapUnit eUnit; nCaptionType = aCT_CAPTTYPE.GetSelectItemId()-1; @@ -195,8 +195,8 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) { switch( nEscDir ) { - case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; - case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; + case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; + case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; } } @@ -207,13 +207,13 @@ BOOL SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) if( bEscRel ) { - long nVal = 0; + long nVal = 0; switch( aLB_ANSATZ_REL.GetSelectEntryPos() ) { - case AT_OBEN: nVal=0;break; - case AT_MITTE: nVal=5000;break; - case AT_UNTEN: nVal=10000;break; + case AT_OBEN: nVal=0;break; + case AT_MITTE: nVal=5000;break; + case AT_UNTEN: nVal=10000;break; } _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) ); } @@ -265,11 +265,11 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) SetFieldUnit( aMF_ANSATZ, eFUnit ); SetFieldUnit( aMF_LAENGE, eFUnit ); - SfxItemPool* pPool = rOutAttrs.GetPool(); + SfxItemPool* pPool = rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - USHORT nWhich; - SfxMapUnit eUnit; + USHORT nWhich; + SfxMapUnit eUnit; //------- Winkel ---------- nWhich = GetWhich( SDRATTR_CAPTIONANGLE ); @@ -311,8 +311,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) { switch( nEscDir ) { - case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; - case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; + case SDRCAPT_ESCHORIZONTAL: nEscDir=SDRCAPT_ESCVERTICAL;break; + case SDRCAPT_ESCVERTICAL: nEscDir=SDRCAPT_ESCHORIZONTAL;break; } } @@ -392,7 +392,7 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxCaptionTabPage::GetRanges() +USHORT* SvxCaptionTabPage::GetRanges() { return( pCaptionRanges ); } @@ -401,13 +401,13 @@ USHORT* SvxCaptionTabPage::GetRanges() void SvxCaptionTabPage::SetupAnsatz_Impl( USHORT nType ) { - xub_StrLen nCnt=0, nIdx=0; + xub_StrLen nCnt=0, nIdx=0; switch( nType ) { case AZ_OPTIMAL: -// aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen -// aFT_UM.Hide(); +// aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen +// aFT_UM.Hide(); aMF_ANSATZ.Show(); aFT_UM.Show(); aFT_ANSATZ_REL.Hide(); @@ -580,7 +580,7 @@ void SvxCaptionTabPage::FillValueSet() SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes) - : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ), + : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ), pView ( pSdrView ), nAnchorCtrls(nAnchorTypes) { @@ -590,13 +590,13 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrVie //different positioning page in Writer if(nAnchorCtrls & 0x00ff ) - { - AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, + { + AddTabPage( RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage( RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges ); RemoveTabPage( RID_SVXPAGE_SWPOSSIZE ); @@ -631,7 +631,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) SvxSwPosSizeTabPage& rSwPage = static_cast<SvxSwPosSizeTabPage&>(rPage); rSwPage.EnableAnchorTypes(nAnchorCtrls); rSwPage.SetValidateFramePosLink( aValidateLink ); - } + } break; case RID_SVXPAGE_CAPTION: @@ -646,7 +646,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink ) { aValidateLink = rLink; -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc index 8f76e8572f86..5c82d8c90fcc 100644 --- a/cui/source/tabpages/labdlg.hrc +++ b/cui/source/tabpages/labdlg.hrc @@ -1,7 +1,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 @@ -25,53 +25,53 @@ * ************************************************************************/ #include <cuires.hrc> -//#define RID_SVXPAGE_CAPTION 1000 -//#define RID_SVXDLG_CAPTION 1001 +//#define RID_SVXPAGE_CAPTION 1000 +//#define RID_SVXDLG_CAPTION 1001 -#define TAB_CONTROL 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define TAB_CONTROL 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 -#define FT_ABSTAND 1 -#define FT_WINKEL 2 -#define FT_ANSATZ 3 -#define FT_LAENGE 4 -#define FT_UM 5 -#define FT_ANSATZ_REL 6 +#define FT_ABSTAND 1 +#define FT_WINKEL 2 +#define FT_ANSATZ 3 +#define FT_LAENGE 4 +#define FT_UM 5 +#define FT_ANSATZ_REL 6 -#define CT_CAPTTYPE 1 +#define CT_CAPTTYPE 1 -#define MF_ABSTAND 1 -#define MF_ANSATZ 2 -#define MF_LAENGE 3 +#define MF_ABSTAND 1 +#define MF_ANSATZ 2 +#define MF_LAENGE 3 -#define CB_LAENGE 1 +#define CB_LAENGE 1 -#define CM_LAENGE 1 +#define CM_LAENGE 1 -#define LB_WINKEL 1 -#define LB_ANSATZ 2 -#define LB_ANSATZ_REL 3 +#define LB_WINKEL 1 +#define LB_ANSATZ 2 +#define LB_ANSATZ_REL 3 -#define STR_CAPTTYPE_1 1 -#define STR_CAPTTYPE_2 2 -#define STR_CAPTTYPE_3 3 -#define STR_CAPTTYPE_4 4 -#define STR_HORZ_LIST 10 -#define STR_VERT_LIST 11 +#define STR_CAPTTYPE_1 1 +#define STR_CAPTTYPE_2 2 +#define STR_CAPTTYPE_3 3 +#define STR_CAPTTYPE_4 4 +#define STR_HORZ_LIST 10 +#define STR_VERT_LIST 11 -#define BMP_CAPTTYPE_1 1 -#define BMP_CAPTTYPE_2 2 -#define BMP_CAPTTYPE_3 3 -#define BMP_CAPTTYPE_4 4 +#define BMP_CAPTTYPE_1 1 +#define BMP_CAPTTYPE_2 2 +#define BMP_CAPTTYPE_3 3 +#define BMP_CAPTTYPE_4 4 -#define BMP_CAPTTYPE_1_H 5 -#define BMP_CAPTTYPE_2_H 6 -#define BMP_CAPTTYPE_3_H 7 -#define BMP_CAPTTYPE_4_H 8 +#define BMP_CAPTTYPE_1_H 5 +#define BMP_CAPTTYPE_2_H 6 +#define BMP_CAPTTYPE_3_H 7 +#define BMP_CAPTTYPE_4_H 8 -#define SHOW_HORZ 1 -#define SHOW_VERT 2 -#define SHOW_ABS 3 -#define SHOW_NONE 4 +#define SHOW_HORZ 1 +#define SHOW_VERT 2 +#define SHOW_ABS 3 +#define SHOW_NONE 4 diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index ed13f2de9b49..45e8aa370ff7 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -1,7 +1,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 @@ -255,7 +255,7 @@ TabDialog RID_SVXDLG_CAPTION\ Identifier = RID_SVXPAGE_POSITION_SIZE ; PageResID = RID_SVXPAGE_POSITION_SIZE ; _POS_SIZE_TEXT - }; + }; PageItem { Identifier = RID_SVXPAGE_SWPOSSIZE; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index ebdc7554123d..69bc1ac0a319 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.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 @@ -59,25 +59,25 @@ public: _SfxMacroTabPage_Impl( void ); ~_SfxMacroTabPage_Impl(); - String maStaticMacroLBLabel; - PushButton* pAssignPB; - PushButton* pDeletePB; - String* pStrEvent; - String* pAssignedMacro; - ListBox* pScriptTypeLB; - _HeaderTabListBox* pEventLB; - SfxConfigGroupListBox_Impl* pGroupLB; - FixedText* pFT_MacroLBLabel; - SfxConfigFunctionListBox_Impl* pMacroLB; - - FixedText* pMacroFT; - String* pMacroStr; - FNGetRangeHdl fnGetRange; - FNGetMacrosOfRangeHdl fnGetMacroOfRange; - - BOOL bReadOnly; + String maStaticMacroLBLabel; + PushButton* pAssignPB; + PushButton* pDeletePB; + String* pStrEvent; + String* pAssignedMacro; + ListBox* pScriptTypeLB; + _HeaderTabListBox* pEventLB; + SfxConfigGroupListBox_Impl* pGroupLB; + FixedText* pFT_MacroLBLabel; + SfxConfigFunctionListBox_Impl* pMacroLB; + + FixedText* pMacroFT; + String* pMacroStr; + FNGetRangeHdl fnGetRange; + FNGetMacrosOfRangeHdl fnGetMacroOfRange; + + BOOL bReadOnly; Timer maFillGroupTimer; - BOOL bGotEvents; + BOOL bGotEvents; }; _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) : @@ -130,15 +130,15 @@ static long nTabs[] = 0, 90 }; -#define TAB_WIDTH_MIN 10 +#define TAB_WIDTH_MIN 10 // IDs for items in HeaderBar of EventLB -#define ITEMID_EVENT 1 -#define ITMEID_ASSMACRO 2 +#define ITEMID_EVENT 1 +#define ITMEID_ASSMACRO 2 -#define LB_EVENTS_ITEMPOS 1 -#define LB_MACROS_ITEMPOS 2 +#define LB_EVENTS_ITEMPOS 1 +#define LB_MACROS_ITEMPOS 2 String ConvertToUIName_Impl( SvxMacro *pMacro, const String& /*rLanguage*/ ) { @@ -273,7 +273,7 @@ BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) return FALSE; } -void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) +void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) { const SfxPoolItem* pEventsItem; if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, TRUE, &pEventsItem ) ) @@ -326,10 +326,10 @@ BOOL _SfxMacroTabPage::IsReadOnly() const IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; - SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); - SvLBoxEntry* pE = rListBox.FirstSelected(); - ULONG nPos; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); + SvLBoxEntry* pE = rListBox.FirstSelected(); + ULONG nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { @@ -360,14 +360,14 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; - String sSel( pImpl->pGroupLB->GetGroup() ); - String aLanguage = pImpl->pScriptTypeLB->GetSelectEntry(); + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + String sSel( pImpl->pGroupLB->GetGroup() ); + String aLanguage = pImpl->pScriptTypeLB->GetSelectEntry(); if( !aLanguage.EqualsAscii( "JavaScript" ) ) { pImpl->pGroupLB->GroupSelected(); - SfxMacroInfo* pMacro = pImpl->pMacroLB->GetMacroInfo(); - String aLabelText; + SfxMacroInfo* pMacro = pImpl->pMacroLB->GetMacroInfo(); + String aLabelText; if( pMacro ) { aLabelText = pImpl->maStaticMacroLBLabel; @@ -387,7 +387,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; pImpl->pMacroLB->FunctionSelected(); pThis->EnableButtons( pImpl->pScriptTypeLB->GetSelectEntry() ); return 0; @@ -401,7 +401,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG ) IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { - _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; + _SfxMacroTabPage_Impl* pImpl = pThis->mpImpl; SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox(); SvLBoxEntry* pE = rListBox.FirstSelected(); ULONG nPos; @@ -489,12 +489,12 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG ) void _SfxMacroTabPage::InitAndSetHandler() { // Handler installieren - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); - Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); + Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pMacroLB->SetDoubleClickHdl( aLnk ); - mpImpl->pDeletePB->SetClickHdl( aLnk ); - mpImpl->pAssignPB->SetClickHdl( aLnk ); + mpImpl->pDeletePB->SetClickHdl( aLnk ); + mpImpl->pAssignPB->SetClickHdl( aLnk ); rListBox.SetDoubleClickHdl( aLnk ); rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl )); @@ -507,7 +507,7 @@ void _SfxMacroTabPage::InitAndSetHandler() rListBox.SetTabs( &nTabs[0], MAP_APPFONT ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, *mpImpl->pStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); - aSize.Width() = 1764; // don't know what, so 42^2 is best to use... + aSize.Width() = 1764; // don't know what, so 42^2 is best to use... rHeaderBar.InsertItem( ITMEID_ASSMACRO, *mpImpl->pAssignedMacro, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); rListBox.SetSpaceBetweenEntries( 0 ); @@ -552,23 +552,23 @@ void _SfxMacroTabPage::FillMacroList() void _SfxMacroTabPage::FillEvents() { - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - String aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry(); - ULONG nEntryCnt = rListBox.GetEntryCount(); + String aLanguage = mpImpl->pScriptTypeLB->GetSelectEntry(); + ULONG nEntryCnt = rListBox.GetEntryCount(); // Events aus der Tabelle holen und die EventListBox entsprechen fuellen for( ULONG n = 0 ; n < nEntryCnt ; ++n ) { - SvLBoxEntry* pE = rListBox.GetEntry( n ); + SvLBoxEntry* pE = rListBox.GetEntry( n ); if( pE ) { - SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); + SvLBoxString* pLItem = ( SvLBoxString* ) pE->GetItem( LB_MACROS_ITEMPOS ); DBG_ASSERT( pLItem && SV_ITEM_ID_LBOXSTRING == pLItem->IsA(), "_SfxMacroTabPage::FillEvents(): no LBoxString" ); - String sOld( pLItem->GetText() ); - String sNew; - USHORT nEventId = ( USHORT ) ( ULONG ) pE->GetUserData(); + String sOld( pLItem->GetText() ); + String sNew; + USHORT nEventId = ( USHORT ) ( ULONG ) pE->GetUserData(); if( aTbl.IsKeyValid( nEventId ) ) sNew = ConvertToUIName_Impl( aTbl.Get( nEventId ), aLanguage ); @@ -583,12 +583,12 @@ void _SfxMacroTabPage::FillEvents() void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId ) { - SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - ULONG nEntryCnt = rListBox.GetEntryCount(); + SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); + ULONG nEntryCnt = rListBox.GetEntryCount(); for( ULONG n = 0 ; n < nEntryCnt ; ++n ) { - SvLBoxEntry* pE = rListBox.GetEntry( n ); + SvLBoxEntry* pE = rListBox.GetEntry( n ); if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId ) { rListBox.SetCurEntry( pE ); @@ -674,19 +674,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl( SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rResId, rSet ) { - mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); - mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); - mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); - mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); - mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); - mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) ); + mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) ); + mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) ); + mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) ); + mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) ); + mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) ); + mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) ); mpImpl->pScriptTypeLB->Hide(); - mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) ); - mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) ); - mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) ); + mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) ); + mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) ); + mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) ); mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText(); - mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) ); - mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) ); + mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) ); + mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) ); FreeResource(); diff --git a/cui/source/tabpages/macroass.hrc b/cui/source/tabpages/macroass.hrc index 614711e1981e..9c6fd7ccd021 100644 --- a/cui/source/tabpages/macroass.hrc +++ b/cui/source/tabpages/macroass.hrc @@ -1,7 +1,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 @@ -32,51 +32,51 @@ #include <svtools/controldims.hrc> #endif -#define LB_EVENT 2 -#define PB_ASSIGN 3 -#define PB_DELETE 4 -#define FT_MACRO 5 -#define LB_GROUP 6 -#define LB_MACROS 7 -#define LB_SCRIPTTYPE 8 -#define FT_LABEL4LB_MACROS 9 -#define STR_JAVASCRIPT 10 -#define STR_MACROS 11 -#define ED_JAVASCRIPT 12 -#define STR_EVENT 13 -#define STR_ASSMACRO 14 +#define LB_EVENT 2 +#define PB_ASSIGN 3 +#define PB_DELETE 4 +#define FT_MACRO 5 +#define LB_GROUP 6 +#define LB_MACROS 7 +#define LB_SCRIPTTYPE 8 +#define FT_LABEL4LB_MACROS 9 +#define STR_JAVASCRIPT 10 +#define STR_MACROS 11 +#define ED_JAVASCRIPT 12 +#define STR_EVENT 13 +#define STR_ASSMACRO 14 // COL0<---------------WIDTH_1_2--------------->COL3<->COL4<----WIDTH4---->COL5 // <--WIDTH1-->COL1<-SPACE1->COL2<--WIDTH2-> -#define WIDTH_TP 260 // of whole tabpage -#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) -#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) -#define COL3 (COL4-RSC_SP_CTRL_X) -#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) -#define WIDTH1_2 (COL3-COL0) // width of upper listbox -#define SPACE1 4 // space between lower listboxes -#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox -#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox -#define COL1 (COL0+WIDTH1) -#define COL2 (COL1+SPACE1) +#define WIDTH_TP 260 // of whole tabpage +#define COL5 (WIDTH_TP-RSC_SP_DLG_INNERBORDER_RIGHT) +#define COL4 (COL5-RSC_CD_PUSHBUTTON_WIDTH) +#define COL3 (COL4-RSC_SP_CTRL_X) +#define COL0 (RSC_SP_TBPG_INNERBORDER_LEFT) +#define WIDTH1_2 (COL3-COL0) // width of upper listbox +#define SPACE1 4 // space between lower listboxes +#define WIDTH1 ((WIDTH1_2-SPACE1)/2) // width of lower left listbox +#define WIDTH2 (WIDTH1_2-WIDTH1-SPACE1) // width of lower right listbox +#define COL1 (COL0+WIDTH1) +#define COL2 (COL1+SPACE1) -#define HEIGHT_TP 185 // of whole tabpage -#define HEIGHT0 62 // of upper listbox -#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design -#define ROW1 (ROW0+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button -#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) -#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Remove button -#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) -#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) -#define ROW6 (ROW0+HEIGHT0) -#define ROW7 (ROW6+RSC_SP_CTRL_Y) -#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS -#define ROW7A (ROW7+HEIGHT_EXTRA7) -#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) -#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) -#define HEIGHT8 (ROW9-ROW8) // of lower listboxes +#define HEIGHT_TP 185 // of whole tabpage +#define HEIGHT0 62 // of upper listbox +#define ROW0 6 // more than RSC_SP_FLGR_INNERBORDER_TOP cause of bad design +#define ROW1 (ROW0+RSC_CD_PUSHBUTTON_HEIGHT) // Assign button +#define ROW2 (ROW1+RSC_SP_CTRL_GROUP_Y) +#define ROW3 (ROW2+RSC_CD_PUSHBUTTON_HEIGHT) // Remove button +#define ROW4 (ROW3+RSC_SP_CTRL_GROUP_Y) +#define ROW5 (ROW4+RSC_CD_DROPDOWN_HEIGHT) // script type listbox (hidden) +#define ROW6 (ROW0+HEIGHT0) +#define ROW7 (ROW6+RSC_SP_CTRL_Y) +#define HEIGHT_EXTRA7 (RSC_CD_FIXEDTEXT_HEIGHT) // additional height for FT_LABEL4LB_MACROS +#define ROW7A (ROW7+HEIGHT_EXTRA7) +#define ROW8 (ROW7+RSC_CD_FIXEDTEXT_HEIGHT+HEIGHT_EXTRA7)// label for lower listboxes (2 lines!) +#define ROW9 (HEIGHT_TP-RSC_SP_TBPG_INNERBORDER_BOTTOM) +#define HEIGHT8 (ROW9-ROW8) // of lower listboxes #endif diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 4f5d78ffe795..c64aac6c1284 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index a6f198151f26..13c60ff7378e 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.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 @@ -96,25 +96,25 @@ SvxMeasureDialog::~SvxMeasureDialog() \************************************************************************/ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ), + SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ), rInAttrs ), aFlLine ( this, CUI_RES( FL_LINE ) ), - aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ), - aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ), - aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ), - aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ), - aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ), - aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ), - aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ), - aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ), - aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ), - aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ), - aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ), - aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ), - aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ), - - aFlLabel ( this, CUI_RES( FL_LABEL ) ), + aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ), + aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ), + aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ), + aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ), + aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ), + aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ), + aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ), + aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ), + aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ), + aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ), + aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ), + aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ), + aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ), + + aFlLabel ( this, CUI_RES( FL_LABEL ) ), aFtPosition ( this, CUI_RES( FT_POSITION ) ), aCtlPosition ( this, CUI_RES( CTL_POSITION ) ), aTsbAutoPosV ( this, CUI_RES( TSB_AUTOPOSV ) ), @@ -123,12 +123,12 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : aLbUnit ( this, CUI_RES( LB_UNIT ) ), aTsbParallel ( this, CUI_RES( TSB_PARALLEL ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ), - + aFlVert ( this, CUI_RES( FL_VERT ) ), rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), pView( 0 ), - + bPositionModified ( FALSE ) { FillUnitLB(); @@ -364,37 +364,37 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) case SDRMEASURE_ABOVE: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MT; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RT; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MT; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RT; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; } break; case SDRMEASURETEXT_VERTICALCENTERED: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; } break; case SDRMEASURE_BELOW: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MB; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RB; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MB; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RB; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; } break; case SDRMEASURE_TEXTVAUTO: switch( eHPos ) { - case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; - case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; - case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; - case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; + case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; + case SDRMEASURE_TEXTINSIDE: eRP = RP_MM; break; + case SDRMEASURE_TEXTRIGHTOUTSIDE: eRP = RP_RM; break; + case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; } break; default: ;//prevent warning @@ -443,8 +443,8 @@ void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { - BOOL bModified = FALSE; - INT32 nValue; + BOOL bModified = FALSE; + INT32 nValue; TriState eState; if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() ) @@ -631,7 +631,7 @@ SfxTabPage* SvxMeasurePage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxMeasurePage::GetRanges() +USHORT* SvxMeasurePage::GetRanges() { return( pRanges ); } @@ -866,10 +866,10 @@ void SvxMeasurePage::FillUnitLB() void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); - + if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue())); - + Construct(); } diff --git a/cui/source/tabpages/measure.hrc b/cui/source/tabpages/measure.hrc index 11dfaba27d22..0229ca775d5d 100644 --- a/cui/source/tabpages/measure.hrc +++ b/cui/source/tabpages/measure.hrc @@ -1,7 +1,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 @@ -24,9 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FL_LINE 1 -#define FL_LABEL 2 -#define FL_VERT 3 +#define FL_LINE 1 +#define FL_LABEL 2 +#define FL_VERT 3 #define FT_LINE_DIST 1 #define FT_HELPLINE_OVERHANG 2 diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src index 79c46b13079b..bec4950362cf 100644 --- a/cui/source/tabpages/measure.src +++ b/cui/source/tabpages/measure.src @@ -1,7 +1,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 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; diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index f863a303c800..5e549c18e994 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -1,7 +1,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 @@ -31,44 +31,44 @@ //================================================ // Zahlen-TabPage: -#define WND_NUMBER_PREVIEW 2 -#define FT_CATEGORY 3 -#define FT_FORMAT 4 -#define FT_OPTIONS 5 -#define FT_EDFORMAT 6 -#define LB_CATEGORY 9 -#define LB_FORMAT 10 +#define WND_NUMBER_PREVIEW 2 +#define FT_CATEGORY 3 +#define FT_FORMAT 4 +#define FT_OPTIONS 5 +#define FT_EDFORMAT 6 +#define LB_CATEGORY 9 +#define LB_FORMAT 10 #define FL_OPTIONS 11 -#define FT_LANGUAGE 12 -#define LB_LANGUAGE 13 -#define ED_FORMAT 14 -#define BTN_ADD 15 -#define BTN_REMOVE 16 -#define BMP_CHECK 17 -#define BMP_DCHECK 18 -#define BMP_CROSS 19 -#define BMP_DCROSS 20 -#define FT_DECIMALS 21 -#define ED_DECIMALS 22 -#define FT_LEADZEROES 23 -#define ED_LEADZEROES 24 -#define BTN_NEGRED 25 -#define BTN_THOUSAND 26 -#define FT_COMMENT 27 -#define ED_COMMENT 28 -#define IB_ADD 29 -#define IB_REMOVE 30 -#define IB_INFO 31 -#define IL_ICON 32 -#define LB_CURRENCY 33 +#define FT_LANGUAGE 12 +#define LB_LANGUAGE 13 +#define ED_FORMAT 14 +#define BTN_ADD 15 +#define BTN_REMOVE 16 +#define BMP_CHECK 17 +#define BMP_DCHECK 18 +#define BMP_CROSS 19 +#define BMP_DCROSS 20 +#define FT_DECIMALS 21 +#define ED_DECIMALS 22 +#define FT_LEADZEROES 23 +#define ED_LEADZEROES 24 +#define BTN_NEGRED 25 +#define BTN_THOUSAND 26 +#define FT_COMMENT 27 +#define ED_COMMENT 28 +#define IB_ADD 29 +#define IB_REMOVE 30 +#define IB_INFO 31 +#define IL_ICON 32 +#define LB_CURRENCY 33 #define CB_SOURCEFORMAT 34 -#define IL_ICON_HC 35 +#define IL_ICON_HC 35 #define STR_AUTO_ENTRY 36 -#define TBX_ADDREMOVE 1 -#define IID_ADD 1 -#define IID_REMOVE 2 -#define IID_INFO 3 +#define TBX_ADDREMOVE 1 +#define IID_ADD 1 +#define IID_REMOVE 2 +#define IID_INFO 3 #endif diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index 2538b196932c..78074755ed4a 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0a1e02b78a9e..582f34b6982c 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -97,20 +97,20 @@ SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr); /*-----------------07.02.97 15.37------------------- --------------------------------------------------*/ -#define NUM_PAGETYPE_BULLET 0 +#define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 #define NUM_PAGETYPE_BMP 3 #define PAGETYPE_USER_START 10 -#define SHOW_NUMBERING 0 -#define SHOW_BULLET 1 -#define SHOW_BITMAP 2 +#define SHOW_NUMBERING 0 +#define SHOW_BULLET 1 +#define SHOW_BITMAP 2 -#define MAX_BMP_WIDTH 16 -#define MAX_BMP_HEIGHT 16 +#define MAX_BMP_WIDTH 16 +#define MAX_BMP_HEIGHT 16 -static BOOL bLastRelative = FALSE; +static BOOL bLastRelative = FALSE; static const sal_Char cNumberingType[] = "NumberingType"; static const sal_Char cValue[] = "Value"; static const sal_Char cParentNumbering[] = "ParentNumbering"; @@ -228,10 +228,10 @@ Font& lcl_GetDefaultBulletFont() SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, - const SfxItemSet& rSet) : + const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -289,7 +289,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxSingleNumPickTabPage(pParent, rAttrSet); @@ -370,7 +370,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); //im Draw gibt es das Item als WhichId, im Writer nur als SlotId SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem); if(eState != SFX_ITEM_SET) @@ -457,10 +457,10 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, - const SfxItemSet& rSet) : + const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -491,7 +491,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBulletPickTabPage(pParent, rAttrSet); @@ -586,7 +586,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); @@ -640,7 +640,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); if (pBulletCharFmt) SetCharFmtName( pBulletCharFmt->GetValue()); @@ -658,7 +658,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), - pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )), + pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -726,7 +726,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPickTabPage(pParent, rAttrSet); @@ -821,7 +821,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -925,8 +925,8 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); if (pNumCharFmt &&pBulletCharFmt) @@ -963,8 +963,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ), aValuesFL( this, CUI_RES(FL_VALUES) ), pExamplesVS( new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )), - aErrorText( this, CUI_RES(FT_ERROR)), - aLinkedCB( this, CUI_RES(CB_LINKED)), + aErrorText( this, CUI_RES(FT_ERROR)), + aLinkedCB( this, CUI_RES(CB_LINKED)), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -1025,7 +1025,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, --------------------------------------------------*/ -SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBitmapPickTabPage(pParent, rAttrSet); @@ -1040,7 +1040,7 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = FALSE; BOOL bIsPreset = FALSE; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -1089,7 +1089,7 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) if ( !aGrfNames.Count() ) { // das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); +// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } if( (bPreset || bModified) && pActNum) @@ -1235,13 +1235,13 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 aFormatTimer.Stop(); //CHINA001 } //CHINA001 -//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) +//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) //CHINA001 { //CHINA001 SvxNumValueSet::UserDraw(rUDEvt); //CHINA001 //CHINA001 Rectangle aRect = rUDEvt.GetRect(); //CHINA001 OutputDevice* pDev = rUDEvt.GetDevice(); -//CHINA001 USHORT nItemId = rUDEvt.GetItemId(); +//CHINA001 USHORT nItemId = rUDEvt.GetItemId(); //CHINA001 Point aBLPos = aRect.TopLeft(); //CHINA001 //CHINA001 int nRectHeight = aRect.GetHeight(); @@ -1252,8 +1252,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 &aGraphic, NULL)) //CHINA001 { //CHINA001 bGrfNotFound = TRUE; -//CHINA001 } -//CHINA001 else +//CHINA001 } +//CHINA001 else //CHINA001 { //CHINA001 Point aPos(aBLPos.X() + 5, 0); //CHINA001 for( USHORT i = 0; i < 3; i++ ) @@ -1261,8 +1261,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 USHORT nY = 11 + i * 33; //CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; //CHINA001 aGraphic.Draw( pDev, aPos, aSize ); -//CHINA001 } -//CHINA001 } +//CHINA001 } +//CHINA001 } //CHINA001 } //CHINA001 //CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) @@ -1272,7 +1272,7 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) //CHINA001 { //CHINA001 bGrfNotFound = FALSE; //CHINA001 Format(); -//CHINA001 } +//CHINA001 } //CHINA001 Invalidate(); //CHINA001 return 0; //CHINA001 } @@ -1286,38 +1286,38 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, aFormatFL( this, CUI_RES(FL_FORMAT )), aLevelFT( this, CUI_RES(FT_LEVEL )), - aLevelLB( this, CUI_RES(LB_LEVEL )), - aFmtFT( this, CUI_RES(FT_FMT )), - aFmtLB( this, CUI_RES(LB_FMT )), - aPrefixFT( this, CUI_RES(FT_PREFIX )), - aPrefixED( this, CUI_RES(ED_PREFIX )), - aSuffixFT( this, CUI_RES(FT_SUFFIX )), - aSuffixED( this, CUI_RES(ED_SUFFIX )), - aCharFmtFT( this, CUI_RES(FT_CHARFMT )), - aCharFmtLB( this, CUI_RES(LB_CHARFMT )), - aBulColorFT( this, CUI_RES(FT_BUL_COLOR)), - aBulColLB( this, CUI_RES(LB_BUL_COLOR)), - aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)), - aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)), - aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)), - aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)), - aStartFT( this, CUI_RES(FT_START )), - aStartED( this, CUI_RES(ED_START )), - aBulletPB( this, CUI_RES(PB_BULLET )), - aAlignFT( this, CUI_RES(FT_ALIGN )), - aAlignLB( this, CUI_RES(LB_ALIGN )), - aBitmapFT( this, CUI_RES(FT_BITMAP )), - aBitmapMB( this, CUI_RES(MB_BITMAP )), - aSizeFT( this, CUI_RES(FT_SIZE )), - aWidthMF( this, CUI_RES(MF_WIDTH )), - aMultFT( this, CUI_RES(FT_MULT )), - aHeightMF( this, CUI_RES(MF_HEIGHT )), - aRatioCB( this, CUI_RES(CB_RATIO )), - aOrientFT( this, CUI_RES(FT_ORIENT )), - aOrientLB( this, CUI_RES(LB_ORIENT )), + aLevelLB( this, CUI_RES(LB_LEVEL )), + aFmtFT( this, CUI_RES(FT_FMT )), + aFmtLB( this, CUI_RES(LB_FMT )), + aPrefixFT( this, CUI_RES(FT_PREFIX )), + aPrefixED( this, CUI_RES(ED_PREFIX )), + aSuffixFT( this, CUI_RES(FT_SUFFIX )), + aSuffixED( this, CUI_RES(ED_SUFFIX )), + aCharFmtFT( this, CUI_RES(FT_CHARFMT )), + aCharFmtLB( this, CUI_RES(LB_CHARFMT )), + aBulColorFT( this, CUI_RES(FT_BUL_COLOR)), + aBulColLB( this, CUI_RES(LB_BUL_COLOR)), + aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)), + aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)), + aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)), + aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)), + aStartFT( this, CUI_RES(FT_START )), + aStartED( this, CUI_RES(ED_START )), + aBulletPB( this, CUI_RES(PB_BULLET )), + aAlignFT( this, CUI_RES(FT_ALIGN )), + aAlignLB( this, CUI_RES(LB_ALIGN )), + aBitmapFT( this, CUI_RES(FT_BITMAP )), + aBitmapMB( this, CUI_RES(MB_BITMAP )), + aSizeFT( this, CUI_RES(FT_SIZE )), + aWidthMF( this, CUI_RES(MF_WIDTH )), + aMultFT( this, CUI_RES(FT_MULT )), + aHeightMF( this, CUI_RES(MF_HEIGHT )), + aRatioCB( this, CUI_RES(CB_RATIO )), + aOrientFT( this, CUI_RES(FT_ORIENT )), + aOrientLB( this, CUI_RES(LB_ORIENT )), aSameLevelFL( this, CUI_RES(FL_SAME_LEVEL)), - aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)), - pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), + aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)), + pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), pSaveNum(0), bLastWidthModified(FALSE), @@ -1359,7 +1359,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, PopupMenu* pPopup = new PopupMenu; aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup ); - pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) ); + pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) ); pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE ); eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); @@ -1456,7 +1456,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) /*-----------------01.12.97 16:30------------------- --------------------------------------------------*/ -SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, +SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumOptionsTabPage(pParent, rAttrSet); @@ -1464,7 +1464,7 @@ SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) +void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); @@ -1507,7 +1507,7 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) +int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(*_pSet); @@ -1516,7 +1516,7 @@ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) @@ -1530,7 +1530,7 @@ BOOL SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) /*-----------------01.12.97 16:29------------------- --------------------------------------------------*/ -void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; //im Draw gibt es das Item als WhichId, im Writer nur als SlotId @@ -1569,7 +1569,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); +// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); USHORT nMask = 1; aLevelLB.SetUpdateMode(FALSE); aLevelLB.SetNoSelection(); @@ -1707,19 +1707,19 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) --------------------------------------------------*/ void SvxNumOptionsTabPage::InitControls() { - BOOL bShowBullet = TRUE; - BOOL bShowBitmap = TRUE; - BOOL bSameType = TRUE; - BOOL bSameStart = TRUE; - BOOL bSamePrefix = TRUE; - BOOL bSameSuffix = TRUE; - BOOL bAllLevel = TRUE; - BOOL bSameCharFmt = TRUE; - BOOL bSameVOrient = TRUE; - BOOL bSameSize = TRUE; - BOOL bSameBulColor = TRUE; + BOOL bShowBullet = TRUE; + BOOL bShowBitmap = TRUE; + BOOL bSameType = TRUE; + BOOL bSameStart = TRUE; + BOOL bSamePrefix = TRUE; + BOOL bSameSuffix = TRUE; + BOOL bAllLevel = TRUE; + BOOL bSameCharFmt = TRUE; + BOOL bSameVOrient = TRUE; + BOOL bSameSize = TRUE; + BOOL bSameBulColor = TRUE; BOOL bSameBulRelSize= TRUE; - BOOL bSameAdjust = TRUE; + BOOL bSameAdjust = TRUE; const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; String sFirstCharFmt; @@ -1755,13 +1755,13 @@ void SvxNumOptionsTabPage::InitControls() bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix(); bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix(); bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels(); - bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName(); + bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName(); bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient(); if(bShowBitmap && bSameSize) bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize; bSameBulColor &= aNumFmtArr[i]->GetBulletColor() == aNumFmtArr[nLvl]->GetBulletColor(); bSameBulRelSize &= aNumFmtArr[i]->GetBulletRelSize() == aNumFmtArr[nLvl]->GetBulletRelSize(); - bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); + bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); } nHighestLevel = i; } @@ -1852,10 +1852,10 @@ void SvxNumOptionsTabPage::InitControls() break; case SHOW_BULLET: { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); +// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); +// if(pFnt) +// ChgTxtFont(aBulletFT, *pFnt); +// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); } break; case SHOW_BITMAP: @@ -1936,31 +1936,31 @@ void SvxNumOptionsTabPage::SwitchNumberType( BYTE nType, BOOL ) aBulletPB.Show(bBullet); BOOL bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); - aBulColorFT.Show( !bBitmap && bBullColor ); - aBulColLB.Show( !bBitmap && bBullColor ); + aBulColorFT.Show( !bBitmap && bBullColor ); + aBulColLB.Show( !bBitmap && bBullColor ); BOOL bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); - aBulRelSizeFT.Show( !bBitmap && bBullResSize ); - aBulRelSizeMF.Show( !bBitmap && bBullResSize ); + aBulRelSizeFT.Show( !bBitmap && bBullResSize ); + aBulRelSizeMF.Show( !bBitmap && bBullResSize ); - aBitmapFT .Show(bBitmap); - aBitmapMB .Show(bBitmap); + aBitmapFT .Show(bBitmap); + aBitmapMB .Show(bBitmap); - aSizeFT .Show(bBitmap); - aWidthMF .Show(bBitmap); - aMultFT .Show(bBitmap); - aHeightMF .Show(bBitmap); - aRatioCB .Show(bBitmap); + aSizeFT .Show(bBitmap); + aWidthMF .Show(bBitmap); + aMultFT .Show(bBitmap); + aHeightMF .Show(bBitmap); + aRatioCB .Show(bBitmap); - aOrientFT .Show(bBitmap && bAllLevelFeature); - aOrientLB .Show(bBitmap && bAllLevelFeature); + aOrientFT .Show(bBitmap && bAllLevelFeature); + aOrientLB .Show(bBitmap && bAllLevelFeature); - aSizeFT .Enable(bEnableBitmap); - aWidthMF .Enable(bEnableBitmap); - aMultFT .Enable(bEnableBitmap); - aHeightMF .Enable(bEnableBitmap); - aRatioCB .Enable(bEnableBitmap); - aOrientFT .Enable(bEnableBitmap); - aOrientLB .Enable(bEnableBitmap); + aSizeFT .Enable(bEnableBitmap); + aWidthMF .Enable(bEnableBitmap); + aMultFT .Enable(bEnableBitmap); + aHeightMF .Enable(bEnableBitmap); + aRatioCB .Enable(bEnableBitmap); + aOrientFT .Enable(bEnableBitmap); + aOrientLB .Enable(bEnableBitmap); } /*-----------------02.12.97 13:51------------------- @@ -2094,7 +2094,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); +// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -2241,12 +2241,12 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) --------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { - USHORT nItemId = pButton->GetCurItemId(); - String aGrfName; - Size aSize; - sal_Bool bSucc(sal_False); - SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); + USHORT nItemId = pButton->GetCurItemId(); + String aGrfName; + Size aSize; + sal_Bool bSucc(sal_False); + SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); +// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { @@ -2267,7 +2267,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) // ausgewaehlten Filter merken aGrfName = aGrfDlg.GetPath(); - Graphic aGraphic; + Graphic aGraphic; if( !aGrfDlg.GetGraphic(aGraphic) ) { aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic); @@ -2385,7 +2385,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) { if(nActNumLvl & nMask) { - const SvxNumberFormat& rCurFmt = pActNum->GetLevel(i); + const SvxNumberFormat& rCurFmt = pActNum->GetLevel(i); if(bFirst) { cBullet = rCurFmt.GetBulletChar(); @@ -2448,7 +2448,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) MAP_100TH_MM, (MapUnit)eCoreUnit ); nHeightVal = OutputDevice::LogicToLogic( nHeightVal, MAP_100TH_MM, (MapUnit)eCoreUnit); - double fSizeRatio; + double fSizeRatio; BOOL bRepaint = FALSE; USHORT nMask = 1; @@ -2656,7 +2656,7 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev, /*-----------------02.12.97 10:34------------------- Vorschau der Numerierung painten --------------------------------------------------*/ -void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) +void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); Rectangle aRect(Point(0,0), aSize); @@ -2948,7 +2948,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } } } - DrawOutDev( Point(0,0), aSize, + DrawOutDev( Point(0,0), aSize, Point(0,0), aSize, *pVDev ); delete pVDev; @@ -2963,16 +2963,16 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ), aPositionFL( this, CUI_RES(FL_POSITION )), aLevelFT( this, CUI_RES(FT_LEVEL )), - aLevelLB( this, CUI_RES(LB_LEVEL )), - aDistBorderFT( this, CUI_RES(FT_BORDERDIST )), - aDistBorderMF( this, CUI_RES(MF_BORDERDIST )), - aRelativeCB( this, CUI_RES(CB_RELATIVE )), - aIndentFT( this, CUI_RES(FT_INDENT )), - aIndentMF( this, CUI_RES(MF_INDENT )), - aDistNumFT( this, CUI_RES(FT_NUMDIST )), - aDistNumMF( this, CUI_RES(MF_NUMDIST )), - aAlignFT( this, CUI_RES(FT_ALIGN )), - aAlignLB( this, CUI_RES(LB_ALIGN )), + aLevelLB( this, CUI_RES(LB_LEVEL )), + aDistBorderFT( this, CUI_RES(FT_BORDERDIST )), + aDistBorderMF( this, CUI_RES(MF_BORDERDIST )), + aRelativeCB( this, CUI_RES(CB_RELATIVE )), + aIndentFT( this, CUI_RES(FT_INDENT )), + aIndentMF( this, CUI_RES(MF_INDENT )), + aDistNumFT( this, CUI_RES(FT_NUMDIST )), + aDistNumMF( this, CUI_RES(MF_NUMDIST )), + aAlignFT( this, CUI_RES(FT_ALIGN )), + aAlignLB( this, CUI_RES(LB_ALIGN )), aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ), aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ), aListtabFT( this, CUI_RES(FT_LISTTAB) ), @@ -2984,7 +2984,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ), aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ), aStandardPB( this, CUI_RES(PB_STANDARD )), - pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), + pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))), pActNum(0), pSaveNum(0), nActNumLvl( USHRT_MAX ), @@ -3076,7 +3076,7 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage() #if OSL_DEBUG_LEVEL > 1 void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) { -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) sal_Char const sHash[] = " # "; if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) @@ -3106,7 +3106,7 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) --------------------------------------------------*/ void SvxNumPositionTabPage::InitControls() { - bInInintControl = TRUE; + bInInintControl = TRUE; const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && @@ -3300,7 +3300,7 @@ void SvxNumPositionTabPage::InitControls() if ( bSetDistEmpty ) aDistBorderMF.SetText(aEmptyStr); - bInInintControl = FALSE; + bInInintControl = FALSE; } /*-----------------03.12.97 10:02------------------- @@ -3508,7 +3508,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() /*-----------------03.12.97 10:02------------------- --------------------------------------------------*/ -SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPositionTabPage(pParent, rAttrSet); @@ -3517,20 +3517,20 @@ SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, /*-----------------04.12.97 12:51------------------- --------------------------------------------------*/ -void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) +void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) { aDistBorderMF .SetDecimalDigits(1); - aDistNumMF .SetDecimalDigits(1); - aIndentMF .SetDecimalDigits(1); + aDistNumMF .SetDecimalDigits(1); + aIndentMF .SetDecimalDigits(1); aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); aIndentAtMF.SetDecimalDigits(1); } aDistBorderMF .SetUnit( eMetric ); - aDistNumMF .SetUnit( eMetric ); - aIndentMF .SetUnit( eMetric ); + aDistNumMF .SetUnit( eMetric ); + aIndentMF .SetUnit( eMetric ); aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); aIndentAtMF.SetUnit( eMetric ); @@ -3723,7 +3723,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) } String aEmptyStr; if(bSetValue) - SetMetricValue(aDistBorderMF, nValue, eCoreUnit); + SetMetricValue(aDistBorderMF, nValue, eCoreUnit); else aDistBorderMF.SetText(aEmptyStr); aDistBorderMF.Enable(bOn || bSingleSelection); @@ -3938,10 +3938,10 @@ void SvxNumOptionsTabPage::SetModified(BOOL bRepaint) void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); if (pNumCharFmt &&pBulletCharFmt) SetCharFmts( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); @@ -3963,7 +3963,7 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc index 02fb93676658..1482de300adb 100644 --- a/cui/source/tabpages/numpages.hrc +++ b/cui/source/tabpages/numpages.hrc @@ -1,7 +1,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 @@ -25,7 +25,7 @@ * ************************************************************************/ -#define FT_ALIGN 50 +#define FT_ALIGN 50 #define LB_ALIGN 51 #define FT_DIST_BORDER 52 #define MF_DIST_BORDER 53 @@ -33,7 +33,7 @@ #define MF_DIST_NUM 55 #define GB_POS 56 -#define LB_FMT_CHAR 60 +#define LB_FMT_CHAR 60 #define FT_FMT_CHAR 61 #define FT_WIDTH 67 @@ -41,13 +41,13 @@ #define FT_HEIGHT 70 -#define MN_STD_NUMBER 120 +#define MN_STD_NUMBER 120 #define MD_DEL_NUMBER 121 #define MN_STD_BULLET 122 #define MN_DEL_BULLET 123 #define STR_BULLET 200 -//#define STR_NUMFMT_1 201 +//#define STR_NUMFMT_1 201 //#define STR_NUMFMT_2 202 //#define STR_NUMFMT_3 203 //#define STR_NUMFMT_4 204 @@ -65,57 +65,57 @@ #define FL_VALUES 220 #define VS_VALUES 221 -#define ST_CUSTOMIZE 222 -#define FT_ERROR 223 -#define CB_LINKED 224 +#define ST_CUSTOMIZE 222 +#define FT_ERROR 223 +#define CB_LINKED 224 #define FT_LEVEL 151 #define LB_LEVEL 152 #define FL_FORMAT 153 #define FL_POSITION 154 -#define FT_PREFIX 155 -#define ED_PREFIX 156 -#define FT_FMT 157 -#define LB_FMT 158 -#define FT_SUFFIX 159 -#define ED_SUFFIX 160 +#define FT_PREFIX 155 +#define ED_PREFIX 156 +#define FT_FMT 157 +#define LB_FMT 158 +#define FT_SUFFIX 159 +#define ED_SUFFIX 160 #define FT_BORDERDIST 161 #define MF_BORDERDIST 162 -#define FT_NUMDIST 163 -#define MF_NUMDIST 164 -#define FT_INDENT 165 -#define MF_INDENT 166 -#define FT_CHARFMT 167 -#define LB_CHARFMT 168 +#define FT_NUMDIST 163 +#define MF_NUMDIST 164 +#define FT_INDENT 165 +#define MF_INDENT 166 +#define FT_CHARFMT 167 +#define LB_CHARFMT 168 #define NF_ALL_LEVEL 169 -#define FT_START 170 -#define ED_START 171 -#define FT_BULLET 172 -#define PB_BULLET 173 +#define FT_START 170 +#define ED_START 171 +#define FT_BULLET 172 +#define PB_BULLET 173 #define WIN_PREVIEW 174 -#define FT_BITMAP 175 -#define PB_SEARCH 176 -#define CB_RATIO 177 -#define FT_SIZE 178 -#define MF_WIDTH 179 -#define FT_MULT 180 -#define MF_HEIGHT 181 -#define FT_ORIENT 182 -#define LB_ORIENT 183 +#define FT_BITMAP 175 +#define PB_SEARCH 176 +#define CB_RATIO 177 +#define FT_SIZE 178 +#define MF_WIDTH 179 +#define FT_MULT 180 +#define MF_HEIGHT 181 +#define FT_ORIENT 182 +#define LB_ORIENT 183 #define MB_BITMAP 184 #define CB_RELATIVE 185 #define FT_ALL_LEVEL 186 #define PB_STANDARD 187 #define CB_SAME_LEVEL 188 #define FL_SAME_LEVEL 189 -#define FT_BUL_COLOR 190 +#define FT_BUL_COLOR 190 #define LB_BUL_COLOR 191 #define FT_BUL_REL_SIZE 192 #define MF_BUL_REL_SIZE 193 // 194 removed #define ST_POPUP_EMPTY_ENTRY 195 -#define MN_GRAPHIC_DLG 1 +#define MN_GRAPHIC_DLG 1 #define MN_GALLERY 2 #define MN_GALLERY_ENTRY 100 diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src index 323b5cdd6ba6..7613771422db 100644 --- a/cui/source/tabpages/numpages.src +++ b/cui/source/tabpages/numpages.src @@ -1,7 +1,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 @@ -32,7 +32,7 @@ /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_BULLET @@ -56,7 +56,7 @@ TabPage RID_SVXPAGE_PICK_BULLET }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_SINGLE_NUM @@ -80,7 +80,7 @@ TabPage RID_SVXPAGE_PICK_SINGLE_NUM }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_NUM @@ -104,7 +104,7 @@ TabPage RID_SVXPAGE_PICK_NUM }; /**************************************************************************/ /* */ -/* TabPage */ +/* TabPage */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_PICK_BMP @@ -144,7 +144,7 @@ TabPage RID_SVXPAGE_PICK_BMP }; /**************************************************************************/ /* */ -/* TabPage Numerierungsoptionen */ +/* TabPage Numerierungsoptionen */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_NUM_OPTIONS @@ -189,17 +189,17 @@ TabPage RID_SVXPAGE_NUM_OPTIONS CurPos = 0 ; StringList [ en-US ] = { - < "1, 2, 3, ... " ; 4/*SVX_NUM_ARABIC */; > ; - < "A, B, C, ... " ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; - < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; - < "I, II, III, ... " ; 2/*SVX_NUM_ROMAN_UPPER */; > ; - < "i, ii, iii, ... " ; 3/*SVX_NUM_ROMAN_LOWER */; > ; - < "A, .., AA, .., AAA, ... " ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "1, 2, 3, ... " ; 4/*SVX_NUM_ARABIC */; > ; + < "A, B, C, ... " ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I, II, III, ... " ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i, ii, iii, ... " ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "A, .., AA, .., AAA, ... " ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; - < "Linked graphics" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ; - < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; + < "Linked graphics" ; 0x88/*SVX_NUM_BITMAP|0x80 */; > ; + < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ; < "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ; < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ; @@ -520,7 +520,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS }; /**************************************************************************/ /* */ -/* TabPage Positionen */ +/* TabPage Positionen */ /* */ /**************************************************************************/ TabPage RID_SVXPAGE_NUM_POSITION diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5ac69582c99e..49d7221974dc 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.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 @@ -126,9 +126,9 @@ void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequen // static ---------------------------------------------------------------- -static const long MINBODY = 284; // 0,5cm in twips aufgerundet -//static const long PRINT_OFFSET = 17; // 0,03cm in twips abgerundet -static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins. +static const long MINBODY = 284; // 0,5cm in twips aufgerundet +//static const long PRINT_OFFSET = 17; // 0,03cm in twips abgerundet +static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins. static USHORT pRanges[] = { @@ -208,14 +208,14 @@ BOOL IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) // ----------------------------------------------------------------------- -#define MARGIN_LEFT ( (MarginPosition)0x0001 ) -#define MARGIN_RIGHT ( (MarginPosition)0x0002 ) -#define MARGIN_TOP ( (MarginPosition)0x0004 ) -#define MARGIN_BOTTOM ( (MarginPosition)0x0008 ) +#define MARGIN_LEFT ( (MarginPosition)0x0001 ) +#define MARGIN_RIGHT ( (MarginPosition)0x0002 ) +#define MARGIN_TOP ( (MarginPosition)0x0004 ) +#define MARGIN_BOTTOM ( (MarginPosition)0x0008 ) struct SvxPage_Impl { - MarginPosition m_nPos; + MarginPosition m_nPos; Printer* mpDefPrinter; bool mbDelPrinter; @@ -266,37 +266,37 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : aPaperTrayBox ( this, CUI_RES( LB_PAPER_TRAY ) ), aMarginFl ( this, CUI_RES( FL_MARGIN ) ), aLeftMarginLbl ( this, CUI_RES( FT_LEFT_MARGIN ) ), - aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ), - aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ), - aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ), - aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ), - aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ), - aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ), - aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ), + aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ), + aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ), + aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ), + aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ), + aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ), + aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ), + aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ), aLayoutFL ( this, CUI_RES( FL_LAYOUT ) ), - aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ), + aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ), aLayoutBox ( this, CUI_RES( LB_LAYOUT ) ), - aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ), - aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ), + aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ), + aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ), aBottomSeparatorFl ( this, CUI_RES( FL_BOTTOM_SEP ) ), aTblAlignFT ( this, CUI_RES( FT_TBL_ALIGN ) ), aHorzBox ( this, CUI_RES( CB_HORZ ) ), - aVertBox ( this, CUI_RES( CB_VERT ) ), - aAdaptBox ( this, CUI_RES( CB_ADAPT ) ), + aVertBox ( this, CUI_RES( CB_VERT ) ), + aAdaptBox ( this, CUI_RES( CB_ADAPT ) ), aRegisterCB ( this, CUI_RES( CB_REGISTER ) ), aRegisterFT ( this, CUI_RES( FT_REGISTER ) ), - aRegisterLB ( this, CUI_RES( LB_REGISTER ) ), + aRegisterLB ( this, CUI_RES( LB_REGISTER ) ), - aInsideText ( CUI_RES( STR_INSIDE ) ), - aOutsideText ( CUI_RES( STR_OUTSIDE ) ), - aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ), + aInsideText ( CUI_RES( STR_INSIDE ) ), + aOutsideText ( CUI_RES( STR_OUTSIDE ) ), + aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ), - bLandscape ( FALSE ), - eMode ( SVX_PAGE_MODE_STANDARD ), - ePaperStart ( PAPER_A3 ), - ePaperEnd ( PAPER_ENV_DL ), - pImpl ( new SvxPage_Impl ) + bLandscape ( FALSE ), + eMode ( SVX_PAGE_MODE_STANDARD ), + ePaperStart ( PAPER_A3 ), + ePaperEnd ( PAPER_ENV_DL ), + pImpl ( new SvxPage_Impl ) { bBorderModified = FALSE; @@ -546,7 +546,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) String aBinName; - if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin ) + if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin ) aBinName = EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ); else aBinName = pImpl->mpDefPrinter->GetPaperBinName( (USHORT)nPaperBin ); @@ -668,7 +668,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) // im Beispiel Hintergrund und Umrandung anzeigen ResetBackground_Impl( rSet ); -//! UpdateExample_Impl(); +//! UpdateExample_Impl(); RangeHdl_Impl( 0 ); // Header Footer anzeigen @@ -822,7 +822,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( PAPER_USER == ePaper ) { - if ( nOld != nPos || + if ( nOld != nPos || aPaperWidthEdit.IsValueModified() || aPaperHeightEdit.IsValueModified() || bChecked != aLandscapeBtn.GetSavedValue() ) @@ -860,7 +860,7 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // sonstiges Zeug der Page nWhich = GetWhich( SID_ATTR_PAGE ); SvxPageItem aPage( (const SvxPageItem&)rOldSet.Get( nWhich ) ); - bMod = aLayoutBox.GetSelectEntryPos() != aLayoutBox.GetSavedValue(); + bMod = aLayoutBox.GetSelectEntryPos() != aLayoutBox.GetSavedValue(); if ( bMod ) aPage.SetPageUsage( @@ -1158,7 +1158,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); - Orientation eOri = ORIENTATION_PORTRAIT; + Orientation eOri = ORIENTATION_PORTRAIT; if ( bLandscape ) eOri = ORIENTATION_LANDSCAPE; @@ -1202,7 +1202,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) nFirstRightMargin = static_cast<long>(aRightMarginEdit.GetFirst()); aTopMarginEdit.SetFirst( aTopMarginEdit.Normalize( nNewT ), FUNIT_TWIP ); nFirstTopMargin = static_cast<long>(aTopMarginEdit.GetFirst()); - aBottomMarginEdit.SetFirst( aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP ); + aBottomMarginEdit.SetFirst( aBottomMarginEdit.Normalize( nNewB ), FUNIT_TWIP ); nFirstBottomMargin = static_cast<long>(aBottomMarginEdit.GetFirst()); if ( bSet ) @@ -1239,7 +1239,7 @@ IMPL_LINK_INLINE_END( SvxPageDescPage, BorderModify_Impl, MetricField *, EMPTYAR void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) { // Size - Size aSize( GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ), + Size aSize( GetCoreValue( aPaperWidthEdit, SFX_MAPUNIT_TWIP ), GetCoreValue( aPaperHeightEdit, SFX_MAPUNIT_TWIP ) ); aBspWin.SetSize( aSize ); @@ -1478,13 +1478,13 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) MetricField* pField = NULL; if ( IsPrinterRangeOverflow( aLeftMarginEdit, nFirstLeftMargin, nLastLeftMargin, MARGIN_LEFT ) ) pField = &aLeftMarginEdit; - if ( IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT ) + if ( IsPrinterRangeOverflow( aRightMarginEdit, nFirstRightMargin, nLastRightMargin, MARGIN_RIGHT ) && !pField ) pField = &aRightMarginEdit; - if ( IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP ) + if ( IsPrinterRangeOverflow( aTopMarginEdit, nFirstTopMargin, nLastTopMargin, MARGIN_TOP ) && !pField ) pField = &aTopMarginEdit; - if ( IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM ) + if ( IsPrinterRangeOverflow( aBottomMarginEdit, nFirstBottomMargin, nLastBottomMargin, MARGIN_BOTTOM ) && !pField ) pField = &aBottomMarginEdit; if ( pField ) @@ -1569,8 +1569,8 @@ IMPL_LINK( SvxPageDescPage, RangeHdl_Impl, Edit *, EMPTYARG ) nW = static_cast<long>(aPaperWidthEdit.Denormalize(aPaperWidthEdit.GetValue(FUNIT_TWIP))); // Top - long nMax = nH - nBB - aBorder.Height() - MINBODY - - nFDist - nFHeight - nHDist - nHHeight; + long nMax = nH - nBB - aBorder.Height() - MINBODY - + nFDist - nFHeight - nHDist - nHHeight; aTopMarginEdit.SetMax(aTopMarginEdit.Normalize(nMax), FUNIT_TWIP); diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 733ef66a0aab..eeb9ce3a6f5c 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -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 @@ -30,43 +30,43 @@ // define ---------------------------------------------------------------- -#define PAPERSIZE_A0 0 -#define PAPERSIZE_A1 1 -#define PAPERSIZE_A2 2 -#define PAPERSIZE_A3 3 -#define PAPERSIZE_A4 4 -#define PAPERSIZE_A5 5 -#define PAPERSIZE_B4_ISO 6 -#define PAPERSIZE_B5_ISO 7 -#define PAPERSIZE_LETTER 8 -#define PAPERSIZE_LEGAL 9 -#define PAPERSIZE_TABLOID 10 -#define PAPERSIZE_USER 11 -#define PAPERSIZE_B6_ISO 12 -#define PAPERSIZE_C4 13 -#define PAPERSIZE_C5 14 -#define PAPERSIZE_C6 15 -#define PAPERSIZE_C65 16 -#define PAPERSIZE_DL 17 -#define PAPERSIZE_DIA 18 -#define PAPERSIZE_SCREEN 19 -#define PAPERSIZE_C 20 -#define PAPERSIZE_D 21 -#define PAPERSIZE_E 22 -#define PAPERSIZE_EXECUTIVE 23 -#define PAPERSIZE_LEGAL2 24 -#define PAPERSIZE_MONARCH 25 -#define PAPERSIZE_COM675 26 -#define PAPERSIZE_COM9 27 -#define PAPERSIZE_COM10 28 -#define PAPERSIZE_COM11 29 -#define PAPERSIZE_COM12 30 -#define PAPERSIZE_KAI16 31 -#define PAPERSIZE_KAI32 32 -#define PAPERSIZE_KAI32BIG 33 -#define PAPERSIZE_B4_JIS 34 -#define PAPERSIZE_B5_JIS 35 -#define PAPERSIZE_B6_JIS 36 +#define PAPERSIZE_A0 0 +#define PAPERSIZE_A1 1 +#define PAPERSIZE_A2 2 +#define PAPERSIZE_A3 3 +#define PAPERSIZE_A4 4 +#define PAPERSIZE_A5 5 +#define PAPERSIZE_B4_ISO 6 +#define PAPERSIZE_B5_ISO 7 +#define PAPERSIZE_LETTER 8 +#define PAPERSIZE_LEGAL 9 +#define PAPERSIZE_TABLOID 10 +#define PAPERSIZE_USER 11 +#define PAPERSIZE_B6_ISO 12 +#define PAPERSIZE_C4 13 +#define PAPERSIZE_C5 14 +#define PAPERSIZE_C6 15 +#define PAPERSIZE_C65 16 +#define PAPERSIZE_DL 17 +#define PAPERSIZE_DIA 18 +#define PAPERSIZE_SCREEN 19 +#define PAPERSIZE_C 20 +#define PAPERSIZE_D 21 +#define PAPERSIZE_E 22 +#define PAPERSIZE_EXECUTIVE 23 +#define PAPERSIZE_LEGAL2 24 +#define PAPERSIZE_MONARCH 25 +#define PAPERSIZE_COM675 26 +#define PAPERSIZE_COM9 27 +#define PAPERSIZE_COM10 28 +#define PAPERSIZE_COM11 29 +#define PAPERSIZE_COM12 30 +#define PAPERSIZE_KAI16 31 +#define PAPERSIZE_KAI32 32 +#define PAPERSIZE_KAI32BIG 33 +#define PAPERSIZE_B4_JIS 34 +#define PAPERSIZE_B5_JIS 35 +#define PAPERSIZE_B6_JIS 36 #endif diff --git a/cui/source/tabpages/page.hrc b/cui/source/tabpages/page.hrc index de66988c2b0c..55ffdbd0c772 100644 --- a/cui/source/tabpages/page.hrc +++ b/cui/source/tabpages/page.hrc @@ -1,7 +1,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 @@ -29,55 +29,55 @@ // defines --------------------------------------------------------------- -#define FT_LEFT_MARGIN 10 -#define ED_LEFT_MARGIN 11 -#define FT_RIGHT_MARGIN 12 -#define ED_RIGHT_MARGIN 13 -#define FT_TOP_MARGIN 14 -#define ED_TOP_MARGIN 15 -#define FT_BOTTOM_MARGIN 16 -#define ED_BOTTOM_MARGIN 17 -#define FL_MARGIN 18 +#define FT_LEFT_MARGIN 10 +#define ED_LEFT_MARGIN 11 +#define FT_RIGHT_MARGIN 12 +#define ED_RIGHT_MARGIN 13 +#define FT_TOP_MARGIN 14 +#define ED_TOP_MARGIN 15 +#define FT_BOTTOM_MARGIN 16 +#define ED_BOTTOM_MARGIN 17 +#define FL_MARGIN 18 -#define LB_LAYOUT 20 -#define FT_PAGELAYOUT 21 +#define LB_LAYOUT 20 +#define FT_PAGELAYOUT 21 -#define LB_NUMBER_FORMAT 30 +#define LB_NUMBER_FORMAT 30 #define FL_LAYOUT 31 -#define FT_NUMBER_FORMAT 32 +#define FT_NUMBER_FORMAT 32 -#define FT_TEXT_FLOW 35 -#define LB_TEXT_FLOW 36 +#define FT_TEXT_FLOW 35 +#define LB_TEXT_FLOW 36 -#define WN_BSP 40 +#define WN_BSP 40 #define FT_ORIENTATION 48 #define FT_PAPER_FORMAT 49 -#define LB_PAPER_SIZE 50 -#define RB_PORTRAIT 51 -#define RB_LANDSCAPE 52 -#define FT_PAPER_WIDTH 53 -#define ED_PAPER_WIDTH 54 -#define FT_PAPER_HEIGHT 55 -#define ED_PAPER_HEIGHT 56 -#define FT_PAPER_TRAY 57 -#define LB_PAPER_TRAY 58 -#define FL_PAPER_SIZE 59 +#define LB_PAPER_SIZE 50 +#define RB_PORTRAIT 51 +#define RB_LANDSCAPE 52 +#define FT_PAPER_WIDTH 53 +#define ED_PAPER_WIDTH 54 +#define FT_PAPER_HEIGHT 55 +#define ED_PAPER_HEIGHT 56 +#define FT_PAPER_TRAY 57 +#define LB_PAPER_TRAY 58 +#define FL_PAPER_SIZE 59 #define CB_REGISTER 60 #define FT_REGISTER 61 #define LB_REGISTER 62 #define FL_BOTTOM_SEP 64 -#define CB_HORZ 70 -#define CB_VERT 71 -#define CB_ADAPT 72 +#define CB_HORZ 70 +#define CB_VERT 71 +#define CB_ADAPT 72 #define FT_TBL_ALIGN 73 -#define PB_BACK 80 +#define PB_BACK 80 -#define STR_INSIDE 90 -#define STR_OUTSIDE 91 +#define STR_INSIDE 90 +#define STR_OUTSIDE 91 #define STR_QUERY_PRINTRANGE 92 #endif diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src index c96b43a5a966..35c06cce5dc1 100644 --- a/cui/source/tabpages/page.src +++ b/cui/source/tabpages/page.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index bae6fde93b8b..5351d90b9779 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.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 @@ -69,28 +69,28 @@ static USHORT pStdRanges[] = { - SID_ATTR_PARA_LINESPACE, // 10033 + SID_ATTR_PARA_LINESPACE, // 10033 SID_ATTR_PARA_LINESPACE, - SID_ATTR_LRSPACE, // 10048 - - SID_ATTR_ULSPACE, // 10049 - SID_ATTR_PARA_REGISTER, // 10413 + SID_ATTR_LRSPACE, // 10048 - + SID_ATTR_ULSPACE, // 10049 + SID_ATTR_PARA_REGISTER, // 10413 SID_ATTR_PARA_REGISTER, 0 }; static USHORT pAlignRanges[] = { - SID_ATTR_PARA_ADJUST, // 10027 + SID_ATTR_PARA_ADJUST, // 10027 SID_ATTR_PARA_ADJUST, 0 }; static USHORT pExtRanges[] = { - SID_ATTR_PARA_PAGEBREAK, // 10037 - - SID_ATTR_PARA_WIDOWS, // 10041 - SID_ATTR_PARA_MODEL, // 10065 - - SID_ATTR_PARA_KEEP, // 10066 + SID_ATTR_PARA_PAGEBREAK, // 10037 - + SID_ATTR_PARA_WIDOWS, // 10041 + SID_ATTR_PARA_MODEL, // 10065 - + SID_ATTR_PARA_KEEP, // 10066 0 }; @@ -110,7 +110,7 @@ enum LineSpaceList LLINESPACE_PROP = 3, LLINESPACE_MIN = 4, LLINESPACE_DURCH= 5, - LLINESPACE_FIX = 6, + LLINESPACE_FIX = 6, LLINESPACE_END }; @@ -182,7 +182,7 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { //! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! +//! return 0; //!!! SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -334,7 +334,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || aRightIndent.IsValueModified() - || aAutoCB.GetSavedValue() != aAutoCB.IsChecked() ) + || aAutoCB.GetSavedValue() != aAutoCB.IsChecked() ) { nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); @@ -665,7 +665,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, aLeftIndent ( this, CUI_RES( ED_LEFTINDENT ) ), aRightLabel ( this, CUI_RES( FT_RIGHTINDENT ) ), aRightIndent ( this, CUI_RES( ED_RIGHTINDENT ) ), - + aFLineLabel ( this, CUI_RES( FT_FLINEINDENT ) ), aFLineIndent ( this, CUI_RES( ED_FLINEINDENT ) ), aAutoCB ( this, CUI_RES( CB_AUTO ) ), @@ -988,14 +988,14 @@ void SvxStdParagraphTabPage::EnableAutoFirstLine() } -void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) +void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) { aLineDist.InsertEntry(sAbsDist); nMinFixDist = nMinTwip; } -void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) +void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) { /* different bit represent call to different method of SvxStdParagraphTabPage @@ -1006,9 +1006,9 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) */ - SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); - SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); + SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False); if (pPageWidthItem) SetPageWidth(pPageWidthItem->GetValue()); @@ -1029,17 +1029,17 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) EnableAbsLineDist(pLineDistItem->GetValue()); if (pFlagSetItem) - if (( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 ) + if (( 0x0008 & pFlagSetItem->GetValue()) == 0x0008 ) EnableNegativeMode(); } -#define LASTLINEPOS_DEFAULT 0 -#define LASTLINEPOS_LEFT 1 +#define LASTLINEPOS_DEFAULT 0 +#define LASTLINEPOS_LEFT 1 -#define LASTLINECOUNT_OLD 3 -#define LASTLINECOUNT_NEW 4 +#define LASTLINECOUNT_OLD 3 +#define LASTLINECOUNT_NEW 4 // class SvxParaAlignTabPage ------------------------------------------------ @@ -1047,22 +1047,22 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet), aAlignFrm ( this, CUI_RES( FL_ALIGN ) ), aLeft ( this, CUI_RES( BTN_LEFTALIGN ) ), - aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ), - aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ), - aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ), + aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ), + aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ), + aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ), aLastLineFT ( this, CUI_RES( FT_LASTLINE ) ), - aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ), - aExpandCB ( this, CUI_RES( CB_EXPAND ) ), - aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ), - aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ), + aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ), + aExpandCB ( this, CUI_RES( CB_EXPAND ) ), + aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ), + aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ), - aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ), - aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ), - aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ), + aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ), + aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ), + aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ), - aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )), - aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )), - aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION )) + aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )), + aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )), + aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION )) { SvtLanguageOptions aLangOptions; USHORT nLastLinePos = LASTLINEPOS_DEFAULT; @@ -1122,12 +1122,12 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxParaAlignTabPage(pParent, rSet); } -USHORT* SvxParaAlignTabPage::GetRanges() +USHORT* SvxParaAlignTabPage::GetRanges() { return pAlignRanges; @@ -1344,9 +1344,9 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) switch ( eDir ) { // check the default alignment for this text direction - case FRMDIR_HORI_LEFT_TOP : aLeft.Check( TRUE ); break; - case FRMDIR_HORI_RIGHT_TOP : aRight.Check( TRUE ); break; - case FRMDIR_ENVIRONMENT : /* do nothing */ break; + case FRMDIR_HORI_LEFT_TOP : aLeft.Check( TRUE ); break; + case FRMDIR_HORI_RIGHT_TOP : aRight.Check( TRUE ); break; + case FRMDIR_ENVIRONMENT : /* do nothing */ break; default: { DBG_ERRORFILE( "SvxParaAlignTabPage::TextDirectionHdl_Impl(): other directions not supported" ); @@ -1356,7 +1356,7 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) return 0; } -void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll ) +void SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll ) { if ( aLeft.IsChecked() ) aExampleWin.SetAdjust( SVX_ADJUST_LEFT ); @@ -1394,7 +1394,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); if (pBoolItem) if(pBoolItem->GetValue()) EnableJustifyExt(); @@ -1415,9 +1415,9 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) const TriState eHyphenState = aHyphenBox.GetState(); const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE ); - if ( eHyphenState != aHyphenBox.GetSavedValue() || - aExtHyphenBeforeBox.IsValueModified() || - aExtHyphenAfterBox.IsValueModified() || + if ( eHyphenState != aHyphenBox.GetSavedValue() || + aExtHyphenBeforeBox.IsValueModified() || + aExtHyphenAfterBox.IsValueModified() || aMaxHyphenEdit.IsValueModified() ) { SvxHyphenZoneItem aHyphen( @@ -1496,7 +1496,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, FALSE); if ( (eModelState == SFX_ITEM_SET && STATE_CHECK == aPageBreakBox.GetState()) || - eState != aPageBreakBox.GetSavedValue() || + eState != aPageBreakBox.GetSavedValue() || aBreakTypeLB.GetSelectEntryPos() != aBreakTypeLB.GetSavedValue() || aBreakPositionLB.GetSelectEntryPos() != aBreakPositionLB.GetSavedValue() ) { @@ -1534,7 +1534,7 @@ BOOL SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGEBREAK ); - if ( eState != aPageBreakBox.GetSavedValue() || + if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { bModified = TRUE; @@ -1711,7 +1711,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(FALSE); aPagenumText.Enable(FALSE); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); +//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1923,13 +1923,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ), - aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ), - aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ), + aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ), + aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ), aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ), - aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ), + aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ), aExtHyphenAfterBox ( this, CUI_RES( ED_HYPHENAFTER ) ), aMaxHyphenLabel ( this, CUI_RES( FT_MAXHYPH ) ), - aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ), + aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ), aExtFL ( this, CUI_RES( FL_HYPHEN ) ), aBreaksFL ( this, CUI_RES( FL_BREAKS ) ), aPageBreakBox ( this, CUI_RES( BTN_PAGEBREAK ) ), @@ -1943,11 +1943,11 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), - aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), - aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ), + aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), + aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ), aExtendFL ( this, CUI_RES( FL_OPTIONS ) ), aKeepTogetherBox ( this, CUI_RES( BTN_KEEPTOGETHER ) ), - aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ), + aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ), aOrphanBox ( this, CUI_RES( BTN_ORPHANS ) ), aOrphanRowNo ( this, CUI_RES( ED_ORPHANS ) ), aOrphanRowLabel ( this, CUI_RES( FT_ORPHANS ) ), @@ -1963,12 +1963,12 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // diese Page braucht ExchangeSupport SetExchangeSupport(); - aHyphenBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) ); - aPageBreakBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) ); - aKeepTogetherBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) ); - aWidowBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) ); - aOrphanBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) ); - aApplyCollBtn.SetClickHdl( LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) ); + aHyphenBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) ); + aPageBreakBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, PageBreakHdl_Impl ) ); + aKeepTogetherBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, KeepTogetherHdl_Impl ) ); + aWidowBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, WidowHdl_Impl ) ); + aOrphanBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, OrphanHdl_Impl ) ); + aApplyCollBtn.SetClickHdl( LINK( this, SvxExtParagraphTabPage, ApplyCollClickHdl_Impl ) ); aBreakTypeLB.SetSelectHdl( LINK( this, SvxExtParagraphTabPage, PageBreakTypeHdl_Impl ) ); aBreakPositionLB.SetSelectHdl( LINK( this, SvxExtParagraphTabPage, PageBreakPosHdl_Impl ) ); @@ -1995,13 +1995,13 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe if ( nHtmlMode & HTMLMODE_ON ) { bHtmlMode = TRUE; - aHyphenBox .Enable(FALSE); - aBeforeText .Enable(FALSE); + aHyphenBox .Enable(FALSE); + aBeforeText .Enable(FALSE); aExtHyphenBeforeBox .Enable(FALSE); - aAfterText .Enable(FALSE); + aAfterText .Enable(FALSE); aExtHyphenAfterBox .Enable(FALSE); aMaxHyphenLabel .Enable(FALSE); - aMaxHyphenEdit .Enable(FALSE); + aMaxHyphenEdit .Enable(FALSE); aExtFL .Enable(FALSE); aPagenumText .Enable(FALSE); aPagenumEdit .Enable(FALSE); @@ -2221,7 +2221,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False); + SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False); if (pDisablePageBreakItem) if ( pDisablePageBreakItem->GetValue()) @@ -2235,7 +2235,7 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )), aForbiddenRulesCB( this, CUI_RES(CB_AS_FORBIDDEN )), aHangingPunctCB( this, CUI_RES(CB_AS_HANG_PUNC )), - aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//, + aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//, { FreeResource(); @@ -2251,12 +2251,12 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxAsianTabPage(pParent, rSet); } -USHORT* SvxAsianTabPage::GetRanges() +USHORT* SvxAsianTabPage::GetRanges() { static USHORT pRanges[] = { @@ -2266,7 +2266,7 @@ USHORT* SvxAsianTabPage::GetRanges() return pRanges; } -BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) +BOOL SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { BOOL bRet = FALSE; SfxItemPool* pPool = rSet.GetPool(); @@ -2320,17 +2320,17 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox) void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) { lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB ); -// lcl_SetBox(rSet, , aAllowWordBreakCB ); +// lcl_SetBox(rSet, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); +// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(FALSE); -// aPuntuationCB .Enable(FALSE); -// aAdjustNumbersCB .Enable(FALSE); +// lcl_SetBox(rSet, , aAdjustNumbersCB ); +// aAllowWordBreakCB .Enable(FALSE); +// aPuntuationCB .Enable(FALSE); +// aAdjustNumbersCB .Enable(FALSE); } /* -----------------------------19.12.00 12:59-------------------------------- diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc index 8a14407a9cd0..b521366ef9f1 100644 --- a/cui/source/tabpages/paragrph.hrc +++ b/cui/source/tabpages/paragrph.hrc @@ -1,7 +1,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 @@ -29,24 +29,24 @@ // StandardTabPage ---------------------------------------------------------- -#define FT_LEFTINDENT 10 -#define ED_LEFTINDENT 11 -#define FT_FLINEINDENT 12 -#define ED_FLINEINDENT 13 -#define FT_RIGHTINDENT 14 -#define ED_RIGHTINDENT 15 +#define FT_LEFTINDENT 10 +#define ED_LEFTINDENT 11 +#define FT_FLINEINDENT 12 +#define ED_FLINEINDENT 13 +#define FT_RIGHTINDENT 14 +#define ED_RIGHTINDENT 15 #define FL_INDENT 16 #define FT_TOPDIST 20 #define ED_TOPDIST 21 -#define FT_BOTTOMDIST 22 -#define ED_BOTTOMDIST 23 +#define FT_BOTTOMDIST 22 +#define ED_BOTTOMDIST 23 #define FL_DIST 24 -#define BTN_LEFTALIGN 30 -#define BTN_RIGHTALIGN 31 -#define BTN_CENTERALIGN 32 -#define BTN_JUSTIFYALIGN 33 +#define BTN_LEFTALIGN 30 +#define BTN_RIGHTALIGN 31 +#define BTN_CENTERALIGN 32 +#define BTN_JUSTIFYALIGN 33 #define FL_ALIGN 34 #define FL_VERTALIGN 35 #define LB_VERTALIGN 36 @@ -57,8 +57,8 @@ #define LB_LINEDIST 40 #define FT_LINEDIST 41 -#define ED_LINEDISTPERCENT 42 -#define ED_LINEDISTMETRIC 43 +#define ED_LINEDISTPERCENT 42 +#define ED_LINEDISTMETRIC 43 #define FL_LINEDIST 44 #define WN_EXAMPLE 46 @@ -73,20 +73,20 @@ // ExtendedTabPage ---------------------------------------------------------- #define BTN_HYPHEN 50 -#define ED_HYPHENBEFORE 52 -#define FT_HYPHENBEFORE 53 -#define ED_HYPHENAFTER 55 -#define FT_HYPHENAFTER 56 +#define ED_HYPHENBEFORE 52 +#define FT_HYPHENBEFORE 53 +#define ED_HYPHENAFTER 55 +#define FT_HYPHENAFTER 56 #define FL_HYPHEN 57 -#define BTN_PAGEBREAK 60 +#define BTN_PAGEBREAK 60 #define FT_BREAKTYPE 61 #define LB_BREAKTYPE 62 #define FT_BREAKPOSITION 63 #define LB_BREAKPOSITION 64 -#define BTN_PAGECOLL 65 +#define BTN_PAGECOLL 65 #define LB_PAGECOLL 66 -#define BTN_KEEPTOGETHER 67 +#define BTN_KEEPTOGETHER 67 #define BTN_WIDOWS 68 #define ED_WIDOWS 69 #define FT_WIDOWS 70 @@ -96,10 +96,10 @@ #define FL_OPTIONS 74 #define FT_PAGENUM 75 #define ED_PAGENUM 76 -#define FL_BREAKS 77 +#define FL_BREAKS 77 #define CB_KEEPTOGETHER 80 -#define FT_MAXHYPH 81 +#define FT_MAXHYPH 81 #define ED_MAXHYPH 83 #define CB_REGISTER 84 @@ -115,7 +115,7 @@ #define CB_AS_FORBIDDEN 4 -#define CB_AS_SCRIPT_SPACE 7 +#define CB_AS_SCRIPT_SPACE 7 #endif diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index d52283ceea8f..9b06d2612a80 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -1,7 +1,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 @@ -486,7 +486,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH Text [ en-US ] = "Hyphenation" ; }; FixedLine FL_OPTIONS - { // is moved one section deeper to not raise unnecessary translations + { // is moved one section deeper to not raise unnecessary translations Pos = MAP_APPFONT ( 6 , 116 ) ; Size = MAP_APPFONT ( 248 , 8 ) ; Text [ en-US ] = "Options" ; @@ -501,7 +501,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGEBREAK { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 61 , 10 ) ; Text [ en-US ] = "Insert" ; @@ -546,7 +546,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; TriStateBox BTN_PAGECOLL { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT (21 , 100 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "With Page St~yle" ; @@ -554,7 +554,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH }; ListBox LB_PAGECOLL { - // Disable = TRUE; + // Disable = TRUE; Pos = MAP_APPFONT ( 98 , 98 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; DropDown = TRUE ; diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..2bc1c595f584 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index b8bfdf5c5052..d9a02c37cdbb 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.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 @@ -1930,7 +1930,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) } // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE - if( rMarkList.GetMarkCount() == 1 ) + if( rMarkList.GetMarkCount() != 1 ) + m_bIsMultiSelection = true; +#if OSL_DEBUG_LEVEL > 1 + else { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); @@ -1941,8 +1944,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) DBG_ERROR("AutoWidth/AutoHeight should be enabled"); } } - else - m_bIsMultiSelection = true; +#endif // use page offset and recalculate Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() ); diff --git a/cui/source/tabpages/swpossizetabpage.hrc b/cui/source/tabpages/swpossizetabpage.hrc index 9c5170b21d83..b7e69c27c83b 100644 --- a/cui/source/tabpages/swpossizetabpage.hrc +++ b/cui/source/tabpages/swpossizetabpage.hrc @@ -1,7 +1,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 diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index 4ad36b9aa1d7..224504cc14d7 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -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 @@ -50,7 +50,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage FixedText m_aHeightFT; MetricField m_aHeightMF; CheckBox m_aKeepRatioCB; - + FixedLine m_aSeparatorFL; FixedLine m_aAnchorFL; @@ -71,7 +71,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage MetricField m_aHoriByMF; FixedText m_aHoriToFT; ListBox m_aHoriToLB; - + CheckBox m_aHoriMirrorCB; FixedText m_aVertFT; @@ -82,16 +82,16 @@ class SvxSwPosSizeTabPage : public SfxTabPage ListBox m_aVertToLB; CheckBox m_aFollowCB; - + SvxSwFrameExample m_aExampleWN; - + Link m_aValidateLink; - + //'string provider' SvxSwFramePosString m_aFramePosString; - + Rectangle m_aRect; //size of all selected objects - Rectangle m_aWorkArea; + Rectangle m_aWorkArea; Point m_aAnchorPos; FrmMap* m_pVMap; @@ -103,7 +103,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage short m_nOldHRel; short m_nOldV; short m_nOldVRel; - + double m_fWidthHeightRatio; //width-to-height ratio to support the KeepRatio button USHORT m_nHtmlMode; bool m_bHtmlMode; @@ -115,7 +115,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - + DECL_LINK( RangeModifyHdl, Edit * ); DECL_LINK( AnchorTypeHdl, RadioButton * ); DECL_LINK( PosHdl, ListBox * ); @@ -123,7 +123,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK( MirrorHdl, CheckBox * ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( ProtectHdl, TriStateBox *); - + void InitPos(short nAnchorType, USHORT nH, USHORT nHRel, USHORT nV, USHORT nVRel, long nX, long nY); @@ -136,10 +136,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage void UpdateExample(); -public: +public: SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); ~SvxSwPosSizeTabPage(); - + static SfxTabPage* Create( Window*, const SfxItemSet& ); static USHORT* GetRanges(); @@ -149,9 +149,9 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ); void EnableAnchorTypes(USHORT nAnchorEnable); - + void SetValidateFramePosLink( const Link& rLink ) - {m_aValidateLink = rLink;} + {m_aValidateLink = rLink;} void SetView( const SdrView* pSdrView ); }; diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src index c5fd8e8816e9..d8bcad8e81ed 100644 --- a/cui/source/tabpages/swpossizetabpage.src +++ b/cui/source/tabpages/swpossizetabpage.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 49fd6bcf393e..4f8b1bc5e760 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.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 diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc index 10fe10f1495d..dfa14dd7f04b 100644 --- a/cui/source/tabpages/tabarea.hrc +++ b/cui/source/tabpages/tabarea.hrc @@ -1,7 +1,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 @@ -141,7 +141,7 @@ #define FT_Y_OFFSET 2 #define MTR_FLD_X_OFFSET 1 #define MTR_FLD_Y_OFFSET 2 -#define LB_AREA_TYPE 19 +#define LB_AREA_TYPE 19 #define RBT_ROW 6 #define RBT_COLUMN 7 #define MTR_FLD_OFFSET 3 @@ -152,36 +152,36 @@ #define FT_Y_SIZE 11 #define FT_BITMAPS_HIDDEN 12 -#define RBT_TRANS_OFF 8 -#define RBT_TRANS_LINEAR 9 -#define RBT_TRANS_GRADIENT 10 -#define GRP_TRANS_MODE 9 -#define GRP_TRANS_GRADIENT 10 -#define CTL_TRANS_PREVIEW 19 +#define RBT_TRANS_OFF 8 +#define RBT_TRANS_LINEAR 9 +#define RBT_TRANS_GRADIENT 10 +#define GRP_TRANS_MODE 9 +#define GRP_TRANS_GRADIENT 10 +#define CTL_TRANS_PREVIEW 19 -#define FT_TRGR_TYPE 12 -#define LB_TRGR_GRADIENT_TYPES 3 -#define FT_TRGR_CENTER_X 13 -#define MTR_TRGR_CENTER_X 4 -#define FT_TRGR_CENTER_Y 14 -#define MTR_TRGR_CENTER_Y 5 -#define FT_TRGR_ANGLE 15 -#define MTR_TRGR_ANGLE 6 -#define FT_TRGR_BORDER 16 -#define MTR_TRGR_BORDER 7 -#define FT_TRGR_START_VALUE 17 -#define MTR_TRGR_START_VALUE 8 -#define FT_TRGR_END_VALUE 18 -#define MTR_TRGR_END_VALUE 9 +#define FT_TRGR_TYPE 12 +#define LB_TRGR_GRADIENT_TYPES 3 +#define FT_TRGR_CENTER_X 13 +#define MTR_TRGR_CENTER_X 4 +#define FT_TRGR_CENTER_Y 14 +#define MTR_TRGR_CENTER_Y 5 +#define FT_TRGR_ANGLE 15 +#define MTR_TRGR_ANGLE 6 +#define FT_TRGR_BORDER 16 +#define MTR_TRGR_BORDER 7 +#define FT_TRGR_START_VALUE 17 +#define MTR_TRGR_START_VALUE 8 +#define FT_TRGR_END_VALUE 18 +#define MTR_TRGR_END_VALUE 9 #define MTR_TRANSPARENT 10 #define MTR_SHADOW_TRANSPARENT 11 // Hatch-Background on Area-TabPage -#define GRP_HATCHBCKGRD 20 -#define CB_HATCHBCKGRD 21 -#define LB_HATCHBCKGRDCOLOR 22 +#define GRP_HATCHBCKGRD 20 +#define CB_HATCHBCKGRD 21 +#define LB_HATCHBCKGRDCOLOR 22 -#define IMG_LOAD_H 23 -#define IMG_SAVE_H 24 +#define IMG_LOAD_H 23 +#define IMG_SAVE_H 24 diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index f5ff6b24ff66..9ff8c0d6f919 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1,7 +1,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 @@ -30,13 +30,13 @@ #include "tabarea.hrc" #include <svx/dialogs.hrc> -#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; +#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; // RID_SVXPAGE_AREA ------------------------------------------------------ -#define TRANS_GRAD_OFFSET_X 6 -#define TRANS_GRAD_OFFSET_Y 64 -#define TRANS_GRAD_FIELD_SEPARATION 24 +#define TRANS_GRAD_OFFSET_X 6 +#define TRANS_GRAD_OFFSET_Y 64 +#define TRANS_GRAD_FIELD_SEPARATION 24 TabPage RID_SVXPAGE_TRANSPARENCE { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 42e4a867b181..2a50f906c088 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.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 @@ -69,9 +69,9 @@ SvxLineTabDialog::SvxLineTabDialog BOOL bHasObj ) : - SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ), - pDrawModel ( pModel ), - pObj ( pSdrObj ), + SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ), + pDrawModel ( pModel ), + pObj ( pSdrObj ), rOutAttrs ( *pAttr ), pColorTab ( pModel->GetColorTable() ), mpNewColorTab ( pModel->GetColorTable() ), @@ -121,7 +121,7 @@ SvxLineTabDialog::SvxLineTabDialog AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0); AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0); -// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); +// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc index 0034e2126bf5..34b7e7fe4085 100644 --- a/cui/source/tabpages/tabline.hrc +++ b/cui/source/tabpages/tabline.hrc @@ -1,7 +1,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 @@ -77,9 +77,9 @@ #define TSB_CENTER_END 5 #define FT_TRANSPARENT 10 #define MTR_LINE_TRANSPARENT 5 -#define FL_SEPARATOR 4 -#define FT_LINE_END_STYLE 11 -#define FT_TITLE 12 +#define FL_SEPARATOR 4 +#define FT_LINE_END_STYLE 11 +#define FT_TITLE 12 // #116827# #define FL_EDGE_STYLE 5 @@ -87,16 +87,16 @@ #define LB_EDGE_STYLE 5 //Symbole (fuer StarChart) -#define FT_SYMBOL_WIDTH 20 -#define FT_SYMBOL_HEIGHT 21 -#define MF_SYMBOL_WIDTH 22 -#define MF_SYMBOL_HEIGHT 23 -#define CB_SYMBOL_RATIO 24 -#define FL_SYMBOL_FORMAT 25 -#define MB_SYMBOL_BITMAP 26 +#define FT_SYMBOL_WIDTH 20 +#define FT_SYMBOL_HEIGHT 21 +#define MF_SYMBOL_WIDTH 22 +#define MF_SYMBOL_HEIGHT 23 +#define CB_SYMBOL_RATIO 24 +#define FL_SYMBOL_FORMAT 25 +#define MB_SYMBOL_BITMAP 26 -#define MN_GRAPHIC_DLG 1 +#define MN_GRAPHIC_DLG 1 #define MN_GALLERY 2 #define MN_SYMBOLS 3 #define MN_SYMBOLS_NONE 4 diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index e16c3d7e9529..57d821389ad9 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -1,7 +1,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 @@ -32,7 +32,7 @@ // Selecting LineStyle / Color / Width -------------------- -#define MASKCOLOR MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; +#define MASKCOLOR MaskColor = Color{ Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; TabPage RID_SVXPAGE_LINE @@ -744,7 +744,7 @@ TabDialog RID_SVXDLG_LINE Identifier = RID_SVXPAGE_SHADOW ; PageResID = RID_SVXPAGE_SHADOW ; Text [ en-US ] = "Shadow" ; - }; + }; PageItem { Identifier = RID_SVXPAGE_LINE_DEF ; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index b6d047977c64..a40a1a448340 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.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 @@ -738,7 +738,7 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG ) void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); + SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); if (pControlItem) DisableControls(pControlItem->GetValue()); } diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc index be3823fd9cd4..97ae4d947381 100644 --- a/cui/source/tabpages/tabstpge.hrc +++ b/cui/source/tabpages/tabstpge.hrc @@ -1,7 +1,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 @@ -33,25 +33,25 @@ #define FL_TABPOS 11 #define FL_TABPOS_VERT 12 -#define BTN_TABTYPE_LEFT 20 +#define BTN_TABTYPE_LEFT 20 #define WIN_TABLEFT 21 -#define BTN_TABTYPE_RIGHT 22 -#define WIN_TABRIGHT 23 -#define BTN_TABTYPE_CENTER 24 -#define WIN_TABCENTER 25 -#define BTN_TABTYPE_DECIMAL 26 -#define WIN_TABDECIMAL 27 -#define ED_TABTYPE_DECCHAR 28 -#define FT_TABTYPE_DECCHAR 29 +#define BTN_TABTYPE_RIGHT 22 +#define WIN_TABRIGHT 23 +#define BTN_TABTYPE_CENTER 24 +#define WIN_TABCENTER 25 +#define BTN_TABTYPE_DECIMAL 26 +#define WIN_TABDECIMAL 27 +#define ED_TABTYPE_DECCHAR 28 +#define FT_TABTYPE_DECCHAR 29 #define FL_TABTYPE 30 -#define BTN_FILLCHAR_NO 40 -#define BTN_FILLCHAR_POINTS 41 +#define BTN_FILLCHAR_NO 40 +#define BTN_FILLCHAR_POINTS 41 #define BTN_FILLCHAR_DASHLINE 42 #define BTN_FILLCHAR_UNDERSCORE 43 -#define BTN_FILLCHAR_OTHER 44 -#define ED_FILLCHAR_OTHER 45 +#define BTN_FILLCHAR_OTHER 44 +#define ED_FILLCHAR_OTHER 45 #define FL_FILLCHAR 46 #define BTN_NEW 50 diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src index 3bd0467f2f0c..cb743cf849a1 100644 --- a/cui/source/tabpages/tabstpge.src +++ b/cui/source/tabpages/tabstpge.src @@ -1,7 +1,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 diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e489a91546e5..5c1a3ea232a8 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.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 @@ -63,8 +63,8 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ), - rOutAttrs ( *pAttr ), - pView ( pSdrView ) + rOutAttrs ( *pAttr ), + pView ( pSdrView ) { FreeResource(); @@ -105,36 +105,36 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) \************************************************************************/ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ), + SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ), rInAttrs ), - aFlEffect ( this, CUI_RES(FL_EFFECT)), - aFtEffects ( this, CUI_RES(FT_EFFECTS)), - aLbEffect ( this, CUI_RES( LB_EFFECT ) ), - //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ), - aFtDirection ( this, CUI_RES(FT_DIRECTION) ), - aBtnUp ( this, CUI_RES( BTN_UP ) ), - aBtnLeft ( this, CUI_RES( BTN_LEFT ) ), - aBtnRight ( this, CUI_RES( BTN_RIGHT ) ), - aBtnDown ( this, CUI_RES( BTN_DOWN ) ), + aFlEffect ( this, CUI_RES(FL_EFFECT)), + aFtEffects ( this, CUI_RES(FT_EFFECTS)), + aLbEffect ( this, CUI_RES( LB_EFFECT ) ), + //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ), + aFtDirection ( this, CUI_RES(FT_DIRECTION) ), + aBtnUp ( this, CUI_RES( BTN_UP ) ), + aBtnLeft ( this, CUI_RES( BTN_LEFT ) ), + aBtnRight ( this, CUI_RES( BTN_RIGHT ) ), + aBtnDown ( this, CUI_RES( BTN_DOWN ) ), aFlProperties ( this, CUI_RES(FL_PROPERTIES)), - aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ), - aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ), + aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ), + aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ), - aFtCount ( this, CUI_RES(FT_COUNT)), - aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ), - aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ), + aFtCount ( this, CUI_RES(FT_COUNT)), + aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ), + aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ), - aFtAmount ( this, CUI_RES(FT_AMOUNT)), - aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ), - aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ), + aFtAmount ( this, CUI_RES(FT_AMOUNT)), + aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ), + aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ), - aFtDelay ( this, CUI_RES(FT_DELAY)), - aTsbAuto ( this, CUI_RES( TSB_AUTO ) ), - aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ), + aFtDelay ( this, CUI_RES(FT_DELAY)), + aTsbAuto ( this, CUI_RES( TSB_AUTO ) ), + aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ), - rOutAttrs ( rInAttrs ), - eAniKind ( SDRTEXTANI_NONE ) + rOutAttrs ( rInAttrs ), + eAniKind ( SDRTEXTANI_NONE ) { FreeResource(); @@ -494,7 +494,7 @@ void SvxTextAnimationPage::Construct() |* \************************************************************************/ -USHORT* SvxTextAnimationPage::GetRanges() +USHORT* SvxTextAnimationPage::GetRanges() { return( pRanges ); } diff --git a/cui/source/tabpages/textanim.hrc b/cui/source/tabpages/textanim.hrc index 2f29d81a146a..9fc1d207e8fe 100644 --- a/cui/source/tabpages/textanim.hrc +++ b/cui/source/tabpages/textanim.hrc @@ -1,7 +1,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 diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index 229875a6ad4d..346426f24ea9 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -1,7 +1,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 @@ -32,40 +32,40 @@ #include <svx/dialogs.hrc> // direction image buttons -#define MA_HALFBUTTON_WIDTH 7 -#define MA_BUTTON_WIDTH (2 * MA_HALFBUTTON_WIDTH) -#define MA_BUTTON_HEIGHT (2 * MA_HALFBUTTON_WIDTH) -#define BUTTON_SIZE MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH ) +#define MA_HALFBUTTON_WIDTH 7 +#define MA_BUTTON_WIDTH (2 * MA_HALFBUTTON_WIDTH) +#define MA_BUTTON_HEIGHT (2 * MA_HALFBUTTON_WIDTH) +#define BUTTON_SIZE MAP_APPFONT( MA_BUTTON_WIDTH, MA_BUTTON_WIDTH ) #define MA_MOVEBUT_GRACE_X 6 // height of first group Text effects -#define MA_EFFECTSGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + \ +#define MA_EFFECTSGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + \ RSC_SP_FLGR_INNERBORDER_LEFT + \ -/* direction buttons */ 3*MA_BUTTON_HEIGHT + \ +/* direction buttons */ 3*MA_BUTTON_HEIGHT + \ RSC_SP_FLGR_INNERBORDER_BOTTOM + RSC_SP_FLGR_SPACE_Y) -// height of second group height of FIXEDTEXT -#define MA_PROPERTIESGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \ -/* text initially visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* text finally visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* animation runs */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* number of runs */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* step size */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* number of pixel */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* step delay */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ -/* delay time */ RSC_CD_TEXTBOX_HEIGHT) +// height of second group height of FIXEDTEXT +#define MA_PROPERTIESGROUP_HEIGHT (RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_LEFT + \ +/* text initially visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* text finally visible */ RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* animation runs */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* number of runs */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* step size */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* number of pixel */ RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* step delay */ RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_GROUP_Y + \ +/* delay time */ RSC_CD_TEXTBOX_HEIGHT) // left space for real controls -#define MA_LEFT_SPACE (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) +#define MA_LEFT_SPACE (RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) // tabpage total size -#define MA_TOTAL_WIDTH 260 -#define MA_TOTAL_HEIGHT RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM +#define MA_TOTAL_WIDTH 260 +#define MA_TOTAL_HEIGHT RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + MA_PROPERTIESGROUP_HEIGHT + RSC_SP_TBPG_INNERBORDER_BOTTOM // X position and width of effects drop down -#define MA_EFFECTLIST_X 50 -#define MA_EFFECTLIST_WIDTH 95 +#define MA_EFFECTLIST_X 50 +#define MA_EFFECTLIST_WIDTH 95 // RID_SVXPAGE_TEXTANIMATION --------------------------------------------- @@ -81,7 +81,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Text animation effects" ; }; -#define MA_CURR_Y RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT +#define MA_CURR_Y RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT FixedText FT_EFFECTS { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y + 3 ) ; @@ -154,7 +154,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; Text [ en-US ] = "Properties" ; }; -#define MA_CURR_Y2 RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y2 RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_START_INSIDE { TabStop = TRUE ; @@ -162,7 +162,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "S~tart inside" ; }; -#define MA_CURR_Y3 MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y3 MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y TriStateBox TSB_STOP_INSIDE { TabStop = TRUE ; @@ -170,7 +170,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Text visible when exiting" ; }; -#define MA_CURR_Y4 MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y4 MA_CURR_Y3 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_COUNT { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y4 ) ; @@ -178,7 +178,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Animation cycles" ; }; -#define MA_CURR_Y5 MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y5 MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_ENDLESS { TabStop = TRUE ; @@ -198,7 +198,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Minimum = 1 ; First = 1 ; }; -#define MA_CURR_Y6 MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y6 MA_CURR_Y5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_AMOUNT { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y6 ) ; @@ -206,7 +206,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Increment" ; }; -#define MA_CURR_Y7 MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y7 MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_PIXEL { TabStop = TRUE ; @@ -231,7 +231,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Maximum = 10000 ; Last = 10000 ; }; -#define MA_CURR_Y8 MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y +#define MA_CURR_Y8 MA_CURR_Y7 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y FixedText FT_DELAY { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y8 ) ; @@ -239,7 +239,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Delay" ; }; -#define MA_CURR_Y9 MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP +#define MA_CURR_Y9 MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP TriStateBox TSB_AUTO { Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 8ca6d49e4ab1..152f1b911256 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -71,8 +71,8 @@ static USHORT pRanges[] = \************************************************************************/ //CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs, -//CHINA001 const SdrView* pSdrView ) : -//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) +//CHINA001 const SdrView* pSdrView ) : +//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) //CHINA001 { //CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs ); //CHINA001 @@ -99,34 +99,34 @@ static USHORT pRanges[] = \************************************************************************/ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ), + SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ), rInAttrs ), - aFlText ( this, CUI_RES( FL_TEXT ) ), + aFlText ( this, CUI_RES( FL_TEXT ) ), aTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), - aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ), - aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ), + aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ), + aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ), aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ), aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ), - aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), - aFtLeft ( this, CUI_RES( FT_LEFT ) ), - aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ), - aFtRight ( this, CUI_RES( FT_RIGHT ) ), - aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ), - aFtTop ( this, CUI_RES( FT_TOP ) ), - aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ), - aFtBottom ( this, CUI_RES( FT_BOTTOM ) ), - aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ), - - aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), - - aFlPosition ( this, CUI_RES( FL_POSITION ) ), - aCtlPosition ( this, CUI_RES( CTL_POSITION ), + aFlDistance ( this, CUI_RES( FL_DISTANCE ) ), + aFtLeft ( this, CUI_RES( FT_LEFT ) ), + aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ), + aFtRight ( this, CUI_RES( FT_RIGHT ) ), + aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ), + aFtTop ( this, CUI_RES( FT_TOP ) ), + aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ), + aFtBottom ( this, CUI_RES( FT_BOTTOM ) ), + aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ), + + aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ), + + aFlPosition ( this, CUI_RES( FL_POSITION ) ), + aCtlPosition ( this, CUI_RES( CTL_POSITION ), RP_MM, 240, 100 ), - aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ), + aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ), - rOutAttrs ( rInAttrs ) + rOutAttrs ( rInAttrs ) { FreeResource(); @@ -384,7 +384,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); - INT32 nValue; + INT32 nValue; TriState eState; if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() ) @@ -595,7 +595,7 @@ SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, |* \************************************************************************/ -USHORT* SvxTextAttrPage::GetRanges() +USHORT* SvxTextAttrPage::GetRanges() { return( pRanges ); } @@ -715,8 +715,8 @@ IMPL_LINK( SvxTextAttrPage, ClickHdl_Impl, void *, EMPTYARG ) { BOOL bAutoGrowWidth = aTsbAutoGrowWidth.GetState() == STATE_CHECK; BOOL bAutoGrowHeight = aTsbAutoGrowHeight.GetState() == STATE_CHECK; - BOOL bFitToSize = aTsbFitToSize.GetState() == STATE_CHECK; - BOOL bContour = aTsbContour.GetState() == STATE_CHECK; + BOOL bFitToSize = aTsbFitToSize.GetState() == STATE_CHECK; + BOOL bContour = aTsbContour.GetState() == STATE_CHECK; aTsbContour.Enable( !bFitToSize && !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) && diff --git a/cui/source/tabpages/textattr.hrc b/cui/source/tabpages/textattr.hrc index b5da04f607e5..70d4512c51c4 100644 --- a/cui/source/tabpages/textattr.hrc +++ b/cui/source/tabpages/textattr.hrc @@ -1,7 +1,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 diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src index 59b0a534472d..23a2138cbe57 100644 --- a/cui/source/tabpages/textattr.src +++ b/cui/source/tabpages/textattr.src @@ -1,7 +1,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 @@ -74,7 +74,7 @@ TabPage RID_SVXPAGE_TEXTATTR }; TriStateBox TSB_WORDWRAP_TEXT { - TabStop = TRUE; + TabStop = TRUE; Pos = MAP_APPFONT( 132, 14 ) ; Size = MAP_APPFONT( 127 , 10 ) ; Text [ en-US ] = "~Word wrap text in shape"; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 5ba3c1b9511e..ffb0f487ccf9 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.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 @@ -83,7 +83,7 @@ static USHORT pTransparenceRanges[] = /************************************************************************* |* -|* Dialog for transparence +|* Dialog for transparence |* \************************************************************************/ @@ -251,33 +251,33 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS) } SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs) -: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs), +: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs), rOutAttrs ( rInAttrs ), nPageType(0), nDlgType(0), - + aFlProp ( this, CUI_RES( FL_PROP ) ), - aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ), + aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ), aRbtTransLinear ( this, CUI_RES( RBT_TRANS_LINEAR ) ), - aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ), + aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ), aMtrTransparent ( this, CUI_RES( MTR_TRANSPARENT ) ), - aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ), - aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ), - aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ), - aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ), - aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ), - aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ), - aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ), - aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ), - aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ), - aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ), - aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ), - aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ), - aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ), - aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ), - + aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ), + aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ), + aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ), + aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ), + aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ), + aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ), + aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ), + aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ), + aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ), + aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ), + aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ), + aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ), + aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ), + aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ), + aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), aCtlXRectPreview ( this, CUI_RES( CTL_TRANS_PREVIEW ) ), bBitmap ( FALSE ), @@ -605,22 +605,22 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) } /************************************************************************* |* -|* Dialog to modify fill-attributes +|* Dialog to modify fill-attributes |* \************************************************************************/ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aTypeLB ( this, CUI_RES( LB_AREA_TYPE ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), - aLbGradient ( this, CUI_RES( LB_GRADIENT ) ), - aLbHatching ( this, CUI_RES( LB_HATCHING ) ), - aLbBitmap ( this, CUI_RES( LB_BITMAP ) ), - aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), + aLbGradient ( this, CUI_RES( LB_GRADIENT ) ), + aLbHatching ( this, CUI_RES( LB_HATCHING ) ), + aLbBitmap ( this, CUI_RES( LB_BITMAP ) ), + aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ), aTsbStepCount ( this, CUI_RES( TSB_STEPCOUNT ) ), aFlStepCount ( this, CUI_RES( FL_STEPCOUNT ) ), @@ -643,14 +643,14 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : aFtYOffset ( this, CUI_RES( FT_Y_OFFSET ) ), aMtrFldYOffset ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ), aTsbTile ( this, CUI_RES( TSB_TILE ) ), - aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ), + aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ), aFlOffset ( this, CUI_RES( FL_OFFSET ) ), aRbtRow ( this, CUI_RES( RBT_ROW ) ), - aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ), + aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ), aMtrFldOffset ( this, CUI_RES( MTR_FLD_OFFSET ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), - + rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -975,7 +975,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; USHORT _nPos; - BOOL bModified = FALSE; + BOOL bModified = FALSE; if( nDlgType != 0 || *pbAreaTP ) { @@ -1442,7 +1442,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { XFillGradientItem aGradientItem( ( ( const XFillGradientItem& ) rAttrs.Get( XATTR_FILLGRADIENT ) ) ); - String aString( aGradientItem.GetName() ); + String aString( aGradientItem.GetName() ); XGradient aGradient( aGradientItem.GetGradientValue() ); aLbGradient.SelectEntryByList( pGradientList, aString, aGradient ); @@ -1725,7 +1725,7 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxAreaTabPage::GetRanges() +USHORT* SvxAreaTabPage::GetRanges() { return( pAreaRanges ); } @@ -1834,8 +1834,8 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Hide(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pColorTab->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pColorTab->GetPath() ); aURL.Append( pColorTab->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -1924,8 +1924,8 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Hide(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pGradientList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pGradientList->GetPath() ); aURL.Append( pGradientList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -2016,8 +2016,8 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) aLbHatchBckgrdColor.Enable(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pHatchingList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pHatchingList->GetPath() ); aURL.Append( pHatchingList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -2177,8 +2177,8 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) aFlOffset.Show(); // Text der Tabelle setzen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pBitmapList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pBitmapList->GetPath() ); aURL.Append( pBitmapList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2b1ae42646c9..dd42c0a14b23 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -74,7 +74,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Bitmaps +|* Dialog zum Aendern und Definieren der Bitmaps |* \************************************************************************/ @@ -84,26 +84,26 @@ SvxBitmapTabPage::SvxBitmapTabPage const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ), aCtlPixel ( this, CUI_RES( CTL_PIXEL ) ), aFtPixelEdit ( this, CUI_RES( FT_PIXEL_EDIT ) ), aFtColor ( this, CUI_RES( FT_COLOR ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), - aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ), - aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), + aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ), + aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ), // This fix text is used only to provide the name for the following // bitmap list box. The fixed text is not displayed. aLbBitmapsHidden ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ), - aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ), + aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ), aFlProp ( this, CUI_RES( FL_PROP ) ), - aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), aBtnImport ( this, CUI_RES( BTN_IMPORT ) ), aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aBitmapCtl ( this, aCtlPreview.GetSizePixel() ), rOutAttrs ( rInAttrs ), @@ -210,8 +210,8 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pBitmapList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pBitmapList->GetPath() ); aURL.Append( pBitmapList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -359,13 +359,13 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //USHORT nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //BOOL bPixelColor = FALSE; - //USHORT nWidth = pBitmap->GetSizePixel().Width(); - //USHORT nHeight = pBitmap->GetSizePixel().Height(); + //WorkWindow aTmpWW( DLGWIN ); + //VirtualDevice aVD( aTmpWW ); + //USHORT nLines = aCtlPixel.GetLineCount(); + //Color aPixelColor, aBackColor; + //BOOL bPixelColor = FALSE; + //USHORT nWidth = pBitmap->GetSizePixel().Width(); + //USHORT nHeight = pBitmap->GetSizePixel().Height(); // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) @@ -688,7 +688,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbBitmaps.Invalidate(); @@ -731,8 +731,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( !aDlg.Execute() ) { - Graphic aGraphic; - int nError = 1; + Graphic aGraphic; + int nError = 1; EnterWait(); nError = aDlg.GetGraphic( aGraphic ); @@ -744,8 +744,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) WarningBox* pWarnBox = NULL; // convert file URL to UI name - String aName; - INetURLObject aURL( aDlg.GetPath() ); + String aName; + INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc ); @@ -797,7 +797,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbBitmaps.Invalidate(); @@ -1053,8 +1053,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); @@ -1150,7 +1150,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) -Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const +Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const { if (pLabeled == &aLbBitmaps) return const_cast<FixedText*>(&aLbBitmapsHidden); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 00f5fb5739cb..efb6a0d82172 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.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 @@ -60,7 +60,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Farben +|* Dialog zum Aendern und Definieren der Farben |* \************************************************************************/ @@ -83,13 +83,13 @@ SvxColorTabPage::SvxColorTabPage const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ), + SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aFtName ( this, CUI_RES( FT_NAME ) ), - aEdtName ( this, CUI_RES( EDT_NAME ) ), - aFtColor ( this, CUI_RES( FT_COLOR ) ), - aLbColor ( this, CUI_RES( LB_COLOR ) ), + aEdtName ( this, CUI_RES( EDT_NAME ) ), + aFtColor ( this, CUI_RES( FT_COLOR ) ), + aLbColor ( this, CUI_RES( LB_COLOR ) ), aTableNameFT ( this, CUI_RES( FT_TABLE_NAME ) ), aValSetColorTable ( this, CUI_RES( CTL_COLORTABLE ) ), @@ -98,20 +98,20 @@ SvxColorTabPage::SvxColorTabPage aCtlPreviewNew ( this, CUI_RES( CTL_PREVIEW_NEW ) ), aLbColorModel ( this, CUI_RES( LB_COLORMODEL ) ), - aFtColorModel1 ( this, CUI_RES( FT_1 ) ), - aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ), - aFtColorModel2 ( this, CUI_RES( FT_2 ) ), - aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ), - aFtColorModel3 ( this, CUI_RES( FT_3 ) ), - aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ), - aFtColorModel4 ( this, CUI_RES( FT_4 ) ), - aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aFtColorModel1 ( this, CUI_RES( FT_1 ) ), + aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ), + aFtColorModel2 ( this, CUI_RES( FT_2 ) ), + aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ), + aFtColorModel3 ( this, CUI_RES( FT_3 ) ), + aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ), + aFtColorModel4 ( this, CUI_RES( FT_4 ) ), + aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -227,8 +227,8 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pColorTab->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pColorTab->GetPath() ); aURL.Append( pColorTab->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index ef48bbbe9483..270c7b9384e5 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -61,7 +61,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Farbverlaeufe +|* Dialog zum Aendern und Definieren der Farbverlaeufe |* \************************************************************************/ @@ -70,20 +70,20 @@ SvxGradientTabPage::SvxGradientTabPage Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ), + SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbGradientType ( this, CUI_RES( LB_GRADIENT_TYPES ) ), - aFtCenterX ( this, CUI_RES( FT_CENTER_X ) ), - aMtrCenterX ( this, CUI_RES( MTR_CENTER_X ) ), - aFtCenterY ( this, CUI_RES( FT_CENTER_Y ) ), - aMtrCenterY ( this, CUI_RES( MTR_CENTER_Y ) ), - aFtAngle ( this, CUI_RES( FT_ANGLE ) ), - aMtrAngle ( this, CUI_RES( MTR_ANGLE ) ), - aFtBorder ( this, CUI_RES( FT_BORDER ) ), - aMtrBorder ( this, CUI_RES( MTR_BORDER ) ), - aFtColorFrom ( this, CUI_RES( FT_COLOR_FROM ) ), + aLbGradientType ( this, CUI_RES( LB_GRADIENT_TYPES ) ), + aFtCenterX ( this, CUI_RES( FT_CENTER_X ) ), + aMtrCenterX ( this, CUI_RES( MTR_CENTER_X ) ), + aFtCenterY ( this, CUI_RES( FT_CENTER_Y ) ), + aMtrCenterY ( this, CUI_RES( MTR_CENTER_Y ) ), + aFtAngle ( this, CUI_RES( FT_ANGLE ) ), + aMtrAngle ( this, CUI_RES( MTR_ANGLE ) ), + aFtBorder ( this, CUI_RES( FT_BORDER ) ), + aMtrBorder ( this, CUI_RES( MTR_BORDER ) ), + aFtColorFrom ( this, CUI_RES( FT_COLOR_FROM ) ), aLbColorFrom ( this, CUI_RES( LB_COLOR_FROM ) ), aMtrColorFrom ( this, CUI_RES( MTR_COLOR_FROM ) ), aFtColorTo ( this, CUI_RES( FT_COLOR_TO ) ), @@ -91,11 +91,11 @@ SvxGradientTabPage::SvxGradientTabPage aMtrColorTo ( this, CUI_RES( MTR_COLOR_TO ) ), aLbGradients ( this, CUI_RES( LB_GRADIENTS ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), @@ -218,8 +218,8 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pGradientList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pGradientList->GetPath() ); aURL.Append( pGradientList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -338,9 +338,9 @@ BOOL SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { // CheckChanges(); <-- doppelte Abfrage ? - XGradient* pXGradient = NULL; - String aString; - USHORT nPos = aLbGradients.GetSelectEntryPos(); + XGradient* pXGradient = NULL; + String aString; + USHORT nPos = aLbGradients.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXGradient = new XGradient( pGradientList->GetGradient( nPos )->GetGradient() ); @@ -513,7 +513,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbGradients.GetPosPixel(), aLbGradients.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbGradients.Invalidate(); @@ -771,8 +771,8 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 3ff6cb8134be..4d14a8558174 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -62,7 +62,7 @@ /************************************************************************* |* -|* Dialog zum Aendern und Definieren der Schraffuren +|* Dialog zum Aendern und Definieren der Schraffuren |* \************************************************************************/ @@ -72,26 +72,26 @@ SvxHatchTabPage::SvxHatchTabPage const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ), aFtDistance ( this, CUI_RES( FT_LINE_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), - aFtAngle ( this, CUI_RES( FT_LINE_ANGLE ) ), - aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), - aCtlAngle ( this, CUI_RES( CTL_ANGLE ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aFtAngle ( this, CUI_RES( FT_LINE_ANGLE ) ), + aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), + aCtlAngle ( this, CUI_RES( CTL_ANGLE ), RP_RB, 200, 80, CS_ANGLE ), aFlProp ( this, CUI_RES( FL_PROP ) ), - aFtLineType ( this, CUI_RES( FT_LINE_TYPE ) ), - aLbLineType ( this, CUI_RES( LB_LINE_TYPE ) ), - aFtLineColor ( this, CUI_RES( FT_LINE_COLOR ) ), - aLbLineColor ( this, CUI_RES( LB_LINE_COLOR ) ), - aLbHatchings ( this, CUI_RES( LB_HATCHINGS ) ), - aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), - aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), - aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aFtLineType ( this, CUI_RES( FT_LINE_TYPE ) ), + aLbLineType ( this, CUI_RES( LB_LINE_TYPE ) ), + aFtLineColor ( this, CUI_RES( FT_LINE_COLOR ) ), + aLbLineColor ( this, CUI_RES( LB_LINE_COLOR ) ), + aLbHatchings ( this, CUI_RES( LB_HATCHINGS ) ), + aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), + aBtnAdd ( this, CUI_RES( BTN_ADD ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -202,8 +202,8 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pHatchingList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pHatchingList->GetPath() ); aURL.Append( pHatchingList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -251,9 +251,9 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) long SvxHatchTabPage::CheckChanges_Impl() { - if( aMtrDistance.GetText() != aMtrDistance.GetSavedValue() || - aMtrAngle.GetText() != aMtrAngle.GetSavedValue() || - aLbLineType.GetSelectEntryPos() != aLbLineType.GetSavedValue() || + if( aMtrDistance.GetText() != aMtrDistance.GetSavedValue() || + aMtrAngle.GetText() != aMtrAngle.GetSavedValue() || + aLbLineType.GetSelectEntryPos() != aLbLineType.GetSavedValue() || aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() || aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() ) { @@ -311,9 +311,9 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { // CheckChanges(); <-- doppelte Abfrage ? - XHatch* pXHatch = NULL; - String aString; - USHORT nPos = aLbHatchings.GetSelectEntryPos(); + XHatch* pXHatch = NULL; + String aString; + USHORT nPos = aLbHatchings.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() ); @@ -572,7 +572,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) #ifdef WNT // hack: #31355# W.P. Rectangle aRect( aLbHatchings.GetPosPixel(), aLbHatchings.GetSizePixel() ); - if( TRUE ) { // ??? overlapped with pDlg + if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); //aLbHatchings.Invalidate(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 024de010e4db..2b48ff26dcc3 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.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 @@ -52,7 +52,7 @@ #include <svx/svdmodel.hxx> #include "svx/svxgrahicitem.hxx" #include <sfx2/request.hxx> -#include "svx/ofaitem.hxx" +#include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdmodel.hxx> @@ -69,7 +69,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#define MAX_BMP_WIDTH 16 +#define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 // define ---------------------------------------------------------------- @@ -92,7 +92,7 @@ static USHORT pLineRanges[] = /************************************************************************* |* -|* Dialog zum Aendern der Linien +|* Dialog zum Aendern der Linien |* \************************************************************************/ @@ -101,7 +101,7 @@ SvxLineTabPage::SvxLineTabPage Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ), aFtLineStyle ( this, CUI_RES( FT_LINE_STYLE ) ), aLbLineStyle ( this, CUI_RES( LB_LINE_STYLE ) ), aFtColor ( this, CUI_RES( FT_COLOR ) ), @@ -123,26 +123,26 @@ SvxLineTabPage::SvxLineTabPage aFlLineEnds ( this, CUI_RES( FL_LINE_ENDS ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), aFLSeparator ( this, CUI_RES( FL_SEPARATOR ) ), - + // #116827# maFLEdgeStyle ( this, CUI_RES( FL_EDGE_STYLE ) ), maFTEdgeStyle ( this, CUI_RES( FT_EDGE_STYLE ) ), maLBEdgeStyle ( this, CUI_RES( LB_EDGE_STYLE ) ), - + pSymbolList(NULL), bNewSize(false), nNumMenuGalleryItems(0), nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged pSymbolAttr(NULL), - //#58425# Symbole auf einer Linie (z.B. StarChart) + //#58425# Symbole auf einer Linie (z.B. StarChart) aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)), aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)), aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)), - aSymbolWidthMF ( this, CUI_RES(MF_SYMBOL_WIDTH)), - aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)), - aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)), + aSymbolWidthMF ( this, CUI_RES(MF_SYMBOL_WIDTH)), + aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)), + aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)), aSymbolRatioCB ( this, CUI_RES(CB_SYMBOL_RATIO)), - + bLastWidthModified(FALSE), aSymbolLastSize(Size(0,0)), bSymbols(FALSE), @@ -343,7 +343,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) // SelectStyleHdl_Impl( this ); } - INetURLObject aDashURL( pDashList->GetPath() ); + INetURLObject aDashURL( pDashList->GetPath() ); aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -474,8 +474,8 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; - USHORT nPos; - BOOL bModified = FALSE; + USHORT nPos; + BOOL bModified = FALSE; // Um evtl. Modifikationen der Liste vorzubeugen // werden Items anderer Seiten nicht gesetzt @@ -485,7 +485,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLineStyle.GetSavedValue() ) { - XLineStyleItem* pStyleItem = NULL; + XLineStyleItem* pStyleItem = NULL; if( nPos == 0 ) pStyleItem = new XLineStyleItem( XLINE_NONE ); @@ -859,8 +859,8 @@ BOOL SvxLineTabPage::FillXLSet_Impl() void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { - String aString; - XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH + String aString; + XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH // Linienstil const SfxPoolItem *pPoolItem; @@ -1172,10 +1172,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) else aMtrTransparent.SetText( String() ); - if( !aLbStartStyle.IsEnabled() && - !aLbEndStyle.IsEnabled() && + if( !aLbStartStyle.IsEnabled() && + !aLbEndStyle.IsEnabled() && !aMtrStartWidth.IsEnabled() && - !aMtrEndWidth.IsEnabled() && + !aMtrEndWidth.IsEnabled() && !aTsbCenterStart.IsEnabled()&& !aTsbCenterEnd.IsEnabled() ) { @@ -1244,7 +1244,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxLineTabPage::GetRanges() +USHORT* SvxLineTabPage::GetRanges() { return( pLineRanges ); } @@ -1740,7 +1740,7 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit ); nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MAP_100TH_MM,(MapUnit)ePoolUnit); aSymbolSize=Size(nWidthVal,nHeightVal); - double fSizeRatio = (double)1; + double fSizeRatio = (double)1; if(bRatio) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4aeb0959456e..48471ae74e6d 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -65,7 +65,7 @@ /************************************************************************* |* -|* Dialog zum Definieren von Linienstilen +|* Dialog zum Definieren von Linienstilen |* \************************************************************************/ @@ -81,22 +81,22 @@ SvxLineDefTabPage::SvxLineDefTabPage aFTLinestyle ( this, CUI_RES( FT_LINESTYLE ) ), aLbLineStyles ( this, CUI_RES( LB_LINESTYLES ) ), aFtType ( this, CUI_RES( FT_TYPE ) ), - aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ), - aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ), - aFtNumber ( this, CUI_RES( FT_NUMBER ) ), - aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ), - aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ), + aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ), + aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ), + aFtNumber ( this, CUI_RES( FT_NUMBER ) ), + aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ), + aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ), aFtLength ( this, CUI_RES( FT_LENGTH ) ), aMtrLength1 ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ), aMtrLength2 ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ), aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ), aBtnAdd ( this, CUI_RES( BTN_ADD ) ), - aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), - aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), + aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), + aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), rOutAttrs ( rInAttrs ), @@ -204,13 +204,13 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - INetURLObject aURL( pDashList->GetPath() ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + INetURLObject aURL( pDashList->GetPath() ); aURL.Append( pDashList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* if ( aURL.getBase().Len() > 18 ) +/* if ( aURL.getBase().Len() > 18 ) { aString += aURL.getBase().Copy( 0, 15 ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); @@ -245,13 +245,13 @@ void SvxLineDefTabPage::CheckChanges_Impl() // wird hier benutzt, um Aenderungen NICHT zu verlieren //XDashStyle eXDS; - if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() || - aMtrLength1.GetText() != aMtrLength1.GetSavedValue() || + if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() || + aMtrLength1.GetText() != aMtrLength1.GetSavedValue() || aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() || - aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() || - aMtrLength2.GetText() != aMtrLength2.GetSavedValue() || + aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() || + aMtrLength2.GetText() != aMtrLength2.GetSavedValue() || aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() || - aMtrDistance.GetText() != aMtrDistance.GetSavedValue() ) + aMtrDistance.GetText() != aMtrDistance.GetSavedValue() ) { ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); @@ -820,7 +820,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pDashList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -898,7 +898,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pDashList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -934,7 +934,7 @@ void SvxLineDefTabPage::FillDash_Impl() { XDashStyle eXDS; -/* Alle Stile werden z.Z. nicht benutzt +/* Alle Stile werden z.Z. nicht benutzt if( aRbtEnds1.IsChecked() ) eXDS = XDASH_ROUND; else if( aRbtEnds2.IsChecked() ) diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 68cbc76aa7a0..749e83f12e21 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.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 @@ -69,7 +69,7 @@ /************************************************************************* |* -|* Dialog zum Definieren von Linienenden-Stilen +|* Dialog zum Definieren von Linienenden-Stilen |* \************************************************************************/ @@ -90,7 +90,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage aBtnModify ( this, CUI_RES( BTN_MODIFY ) ), aBtnDelete ( this, CUI_RES( BTN_DELETE ) ), aBtnLoad ( this, CUI_RES( BTN_LOAD ) ), - aBtnSave ( this, CUI_RES( BTN_SAVE ) ), + aBtnSave ( this, CUI_RES( BTN_SAVE ) ), aFiTip ( this, CUI_RES( FI_TIP ) ), aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ), @@ -186,13 +186,13 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) aLbLineEnds.SelectEntryPos( *pPosLineEndLb ); SelectLineEndHdl_Impl( this ); } - INetURLObject aURL( pLineEndList->GetPath() ); + INetURLObject aURL( pLineEndList->GetPath() ); aURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); if ( aURL.getBase().Len() > 18 ) { @@ -629,7 +629,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pLineEndList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); @@ -694,8 +694,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aDlg.Execute() == ERRCODE_NONE ) { - INetURLObject aURL( aDlg.GetPath() ); - INetURLObject aPathURL( aURL ); + INetURLObject aURL( aDlg.GetPath() ); + INetURLObject aPathURL( aURL ); aPathURL.removeSegment(); aPathURL.removeFinalSlash(); @@ -705,7 +705,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pLineEndList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in +/* // Ermitteln (evtl. abschneiden) des Namens und in // der GroupBox darstellen String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index bf615350c5c8..e57c19c874f5 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.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 @@ -66,26 +66,26 @@ static USHORT pShadowRanges[] = /************************************************************************* |* -|* Dialog zum Aendern des Schattens +|* Dialog zum Aendern des Schattens |* \************************************************************************/ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : - SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ), + SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ), aFlProp ( this, CUI_RES( FL_PROP ) ), aTsbShowShadow ( this, CUI_RES( TSB_SHOW_SHADOW ) ), aFtPosition ( this, CUI_RES( FT_POSITION ) ), aCtlPosition ( this, CUI_RES( CTL_POSITION ) ), - aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), - aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), - aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), - aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), + aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), + aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), + aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), + aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ), aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), - rOutAttrs ( rInAttrs ), + rOutAttrs ( rInAttrs ), pColorTab( NULL ), bDisable ( FALSE ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), @@ -279,8 +279,8 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { - const SfxPoolItem* pOld = NULL; - BOOL bModified = FALSE; + const SfxPoolItem* pOld = NULL; + BOOL bModified = FALSE; if( !bDisable ) { @@ -305,14 +305,14 @@ BOOL SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) switch( aCtlPosition.GetActualRP() ) { - case RP_LT: nX = nY = -nXY; break; - case RP_MT: nY = -nXY; break; + case RP_LT: nX = nY = -nXY; break; + case RP_MT: nY = -nXY; break; case RP_RT: nX = nXY; nY = -nXY; break; - case RP_LM: nX = -nXY; break; - case RP_RM: nX = nXY; break; + case RP_LM: nX = -nXY; break; + case RP_RM: nX = nXY; break; case RP_LB: nX = -nXY; nY = nXY; break; - case RP_MB: nY = nXY; break; - case RP_RB: nX = nY = nXY; break; + case RP_MB: nY = nXY; break; + case RP_RB: nX = nY = nXY; break; case RP_MM: break; } @@ -425,7 +425,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) SetMetricValue( aMtrDistance, nY < 0L ? -nY : nY, ePoolUnit ); // Setzen des Schatten-Controls - if ( nX < 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_LT ); + if ( nX < 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_LT ); else if( nX == 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_MT ); else if( nX > 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_RT ); else if( nX < 0L && nY == 0L ) aCtlPosition.SetActualRP( RP_LM ); @@ -502,7 +502,7 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, //------------------------------------------------------------------------ -USHORT* SvxShadowTabPage::GetRanges() +USHORT* SvxShadowTabPage::GetRanges() { return( pShadowRanges ); } @@ -564,14 +564,14 @@ IMPL_LINK( SvxShadowTabPage, ModifyShadowHdl_Impl, void *, EMPTYARG ) INT32 nXY = GetCoreValue( aMtrDistance, ePoolUnit ); switch( aCtlPosition.GetActualRP() ) { - case RP_LT: nX = nY = -nXY; break; - case RP_MT: nY = -nXY; break; + case RP_LT: nX = nY = -nXY; break; + case RP_MT: nY = -nXY; break; case RP_RT: nX = nXY; nY = -nXY; break; - case RP_LM: nX = -nXY; break; - case RP_RM: nX = nXY; break; + case RP_LM: nX = -nXY; break; + case RP_RM: nX = nXY; break; case RP_LB: nX = -nXY; nY = nXY; break; - case RP_MB: nY = nXY; break; - case RP_RB: nX = nY = nXY; break; + case RP_MB: nY = nXY; break; + case RP_RB: nX = nY = nXY; break; case RP_MM: break; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 2c6b73bc2985..c54658e495e3 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.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 @@ -132,12 +132,12 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* //different positioning page in Writer if(nAnchorCtrls & 0x00ff) - { + { AddTabPage(RID_SVXPAGE_SWPOSSIZE, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_POSITION_SIZE); } else - { + { AddTabPage(RID_SVXPAGE_POSITION_SIZE, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges); RemoveTabPage(RID_SVXPAGE_SWPOSSIZE); } @@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) SvxPositionSizeTabPage& rSvxPos = static_cast<SvxPositionSizeTabPage&>(rPage); rSvxPos.SetView(pView); rSvxPos.Construct(); - + if(nAnchorCtrls & SVX_OBJ_NORESIZE) { rSvxPos.DisableResize(); @@ -174,7 +174,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxPos.DisableProtect(); rSvxPos.UpdateControlStates(); } - + break; } case RID_SVXPAGE_SWPOSSIZE : @@ -194,7 +194,7 @@ void SvxTransformTabDialog::PageCreated(USHORT nId, SfxTabPage &rPage) rSvxAng.SetView( pView ); rSvxAng.Construct(); - + break; } @@ -226,18 +226,18 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ), - aFlPosition ( this, CUI_RES( FL_POSITION ) ), + aFlPosition ( this, CUI_RES( FL_POSITION ) ), aFtPosX ( this, CUI_RES( FT_POS_X ) ), aMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), aFtPosY ( this, CUI_RES( FT_POS_Y ) ), aMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), - aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), + aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ), aCtlRect ( this, CUI_RES( CTL_RECT ) ), - + aFlAngle ( this, CUI_RES( FL_ANGLE ) ), aFtAngle ( this, CUI_RES( FT_ANGLE ) ), aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ), - aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), + aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ), aCtlAngle ( this, CUI_RES( CTL_ANGLE ), RP_RB, 200, 80, CS_ANGLE ), rOutAttrs ( rInAttrs ) @@ -707,34 +707,34 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ), - maFlPosition ( this, CUI_RES( FL_POSITION ) ), - maFtPosX ( this, CUI_RES( FT_POS_X ) ), - maMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), - maFtPosY ( this, CUI_RES( FT_POS_Y ) ), - maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), + maFlPosition ( this, CUI_RES( FL_POSITION ) ), + maFtPosX ( this, CUI_RES( FT_POS_X ) ), + maMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ), + maFtPosY ( this, CUI_RES( FT_POS_Y ) ), + maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ), maFtPosReference ( this, CUI_RES( FT_POSREFERENCE ) ), maCtlPos ( this, CUI_RES( CTL_POSRECT ), RP_LT ), - + maFlSize ( this, CUI_RES( FL_SIZE ) ), maFtWidth ( this, CUI_RES( FT_WIDTH ) ), maMtrWidth ( this, CUI_RES( MTR_FLD_WIDTH ) ), maFtHeight ( this, CUI_RES( FT_HEIGHT ) ), maMtrHeight ( this, CUI_RES( MTR_FLD_HEIGHT ) ), maCbxScale ( this, CUI_RES( CBX_SCALE ) ), - maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), + maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ), maCtlSize ( this, CUI_RES( CTL_SIZERECT ), RP_LT ), - + maFlProtect ( this, CUI_RES( FL_PROTECT) ), maTsbPosProtect ( this, CUI_RES( TSB_POSPROTECT ) ), maTsbSizeProtect ( this, CUI_RES( TSB_SIZEPROTECT ) ), - + maFlAdjust ( this, CUI_RES( FL_ADJUST ) ), - maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), - maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), - - maFlDivider (this, CUI_RES( FL_DIVIDER ) ), + maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ), + maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ), + maFlDivider (this, CUI_RES( FL_DIVIDER ) ), + mrOutAttrs ( rInAttrs ), mnProtectSizeState( STATE_NOCHECK ), mbPageDisabled ( FALSE ), @@ -830,7 +830,7 @@ void SvxPositionSizeTabPage::Construct() } } - // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE + // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE if(1 == rMarkList.GetMarkCount()) { const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -1622,7 +1622,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) { sal_Int64 nHeight(basegfx::fround64((mfOldHeight * (double)maMtrWidth.GetValue()) / mfOldWidth)); - + if(nHeight <= maMtrHeight.GetMax(FUNIT_NONE)) { maMtrHeight.SetUserValue(nHeight, FUNIT_NONE); @@ -1631,7 +1631,7 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeWidthHdl, void *, EMPTYARG ) { nHeight = maMtrHeight.GetMax(FUNIT_NONE); maMtrHeight.SetUserValue(nHeight); - + const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * (double)nHeight) / mfOldHeight)); maMtrWidth.SetUserValue(nWidth, FUNIT_NONE); } diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc index 2d57b7208f68..28d81fa62355 100644 --- a/cui/source/tabpages/transfrm.hrc +++ b/cui/source/tabpages/transfrm.hrc @@ -1,7 +1,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 @@ -24,53 +24,53 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_CONTROL 1 -#define BTN_OK 2 -#define BTN_CANCEL 3 -#define BTN_HELP 4 -#define FT_POS_X 5 -#define FT_POS_Y 6 -#define MTR_FLD_POS_X 7 -#define MTR_FLD_POS_Y 8 -#define CBX_COPY 9 -#define TSB_PROTECT 10 -#define TSB_AUTO 11 -#define TSB_AUTOGROW_HEIGHT 12 -#define TSB_AUTOGROW_WIDTH 13 -#define BTN_RESET 14 -#define FT_WIDTH 15 -#define FT_HEIGHT 16 -#define MTR_FLD_WIDTH 17 -#define MTR_FLD_HEIGHT 18 -#define MTR_FLD_ANGLE 19 -#define CTL_RECT 20 -#define CTL_ANGLE 21 -#define CBX_SCALE 22 -#define FL_ADJUST 23 -#define FL_POSITION 24 -#define FL_SIZE 25 -#define FL_SLANT 26 -#define FL_RADIUS 27 -#define FT_RADIUS 28 -#define MTR_FLD_RADIUS 29 -#define FL_ANGLE 30 -#define FT_ANGLE 31 -#define TSB_VERTICAL 32 -#define FL_ANCHOR 33 -#define FT_ANCHOR 34 -#define LB_ANCHOR 35 -#define FT_ORIENT 36 -#define FT_REFERENCE 37 -#define FT_POSPRESETS 38 -#define FT_ANGLEPRESETS 39 -#define LB_ORIENT 40 -#define FT_SIZEREFERENCE 41 -#define CTL_SIZERECT 42 -#define FT_POSREFERENCE 43 -#define CTL_POSRECT 44 -#define TSB_POSPROTECT 45 -#define TSB_SIZEPROTECT 46 -#define FL_PROTECT 47 -#define FL_DIVIDER 48 +#define TAB_CONTROL 1 +#define BTN_OK 2 +#define BTN_CANCEL 3 +#define BTN_HELP 4 +#define FT_POS_X 5 +#define FT_POS_Y 6 +#define MTR_FLD_POS_X 7 +#define MTR_FLD_POS_Y 8 +#define CBX_COPY 9 +#define TSB_PROTECT 10 +#define TSB_AUTO 11 +#define TSB_AUTOGROW_HEIGHT 12 +#define TSB_AUTOGROW_WIDTH 13 +#define BTN_RESET 14 +#define FT_WIDTH 15 +#define FT_HEIGHT 16 +#define MTR_FLD_WIDTH 17 +#define MTR_FLD_HEIGHT 18 +#define MTR_FLD_ANGLE 19 +#define CTL_RECT 20 +#define CTL_ANGLE 21 +#define CBX_SCALE 22 +#define FL_ADJUST 23 +#define FL_POSITION 24 +#define FL_SIZE 25 +#define FL_SLANT 26 +#define FL_RADIUS 27 +#define FT_RADIUS 28 +#define MTR_FLD_RADIUS 29 +#define FL_ANGLE 30 +#define FT_ANGLE 31 +#define TSB_VERTICAL 32 +#define FL_ANCHOR 33 +#define FT_ANCHOR 34 +#define LB_ANCHOR 35 +#define FT_ORIENT 36 +#define FT_REFERENCE 37 +#define FT_POSPRESETS 38 +#define FT_ANGLEPRESETS 39 +#define LB_ORIENT 40 +#define FT_SIZEREFERENCE 41 +#define CTL_SIZERECT 42 +#define FT_POSREFERENCE 43 +#define CTL_POSRECT 44 +#define TSB_POSPROTECT 45 +#define TSB_SIZEPROTECT 46 +#define FL_PROTECT 47 +#define FL_DIVIDER 48 // diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src index 761fdcfb2349..5e57d5742344 100644 --- a/cui/source/tabpages/transfrm.src +++ b/cui/source/tabpages/transfrm.src @@ -1,7 +1,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 |