diff options
Diffstat (limited to 'cui/source/tabpages')
58 files changed, 1012 insertions, 2543 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index d50ee7b5752d..be1deaafa3f6 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "align.hxx" @@ -40,6 +38,7 @@ #include <svx/algitem.hxx> #include <editeng/frmdiritem.hxx> +#include <editeng/justifyitem.hxx> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <tools/shl.hxx> @@ -49,9 +48,9 @@ #include <svl/cjkoptions.hxx> #include <svl/languageoptions.hxx> #include <svtools/localresaccess.hxx> -#include <svx/flagsdef.hxx> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svx/flagsdef.hxx> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> namespace svx { @@ -70,6 +69,7 @@ static const HorJustConnection::MapEntryType s_pHorJustMap[] = { ALIGNDLG_HORALIGN_RIGHT, SVX_HOR_JUSTIFY_RIGHT }, { ALIGNDLG_HORALIGN_BLOCK, SVX_HOR_JUSTIFY_BLOCK }, { ALIGNDLG_HORALIGN_FILL, SVX_HOR_JUSTIFY_REPEAT }, + { ALIGNDLG_HORALIGN_DISTRIBUTED, SVX_HOR_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_HOR_JUSTIFY_STANDARD } }; @@ -84,6 +84,8 @@ static const VerJustConnection::MapEntryType s_pVerJustMap[] = { ALIGNDLG_VERALIGN_TOP, SVX_VER_JUSTIFY_TOP }, { ALIGNDLG_VERALIGN_MID, SVX_VER_JUSTIFY_CENTER }, { ALIGNDLG_VERALIGN_BOTTOM, SVX_VER_JUSTIFY_BOTTOM }, + { ALIGNDLG_VERALIGN_BLOCK, SVX_VER_JUSTIFY_BLOCK }, + { ALIGNDLG_VERALIGN_DISTRIBUTED, SVX_VER_JUSTIFY_BLOCK }, { LISTBOX_ENTRY_NOTFOUND, SVX_VER_JUSTIFY_STANDARD } }; @@ -118,6 +120,48 @@ static sal_uInt16 s_pRanges[] = // ============================================================================ +namespace { + +template<typename _JustContainerType, typename _JustEnumType> +void lcl_MaybeResetAlignToDistro( + ListBox& rLB, USHORT nListPos, const SfxItemSet& rCoreAttrs, USHORT nWhichAlign, USHORT nWhichJM, _JustEnumType eBlock) +{ + const SfxPoolItem* pItem; + if (rCoreAttrs.GetItemState(nWhichAlign, TRUE, &pItem) != SFX_ITEM_SET) + // alignment not set. + return; + + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + _JustContainerType eVal = static_cast<_JustContainerType>(p->GetEnumValue()); + if (eVal != eBlock) + // alignment is not 'justify'. No need to go further. + return; + + if (rCoreAttrs.GetItemState(nWhichJM, TRUE, &pItem) != SFX_ITEM_SET) + // justification method is not set. + return; + + p = static_cast<const SfxEnumItem*>(pItem); + SvxCellJustifyMethod eMethod = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + if (eMethod == SVX_JUSTIFY_METHOD_DISTRIBUTE) + // Select the 'distribute' entry in the specified list box. + rLB.SelectEntryPos(nListPos); +} + +void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, USHORT nWhichJM, const ListBox& rLB, USHORT nListPos) +{ + SvxCellJustifyMethod eJM = SVX_JUSTIFY_METHOD_AUTO; + if (rLB.GetSelectEntryPos() == nListPos) + eJM = SVX_JUSTIFY_METHOD_DISTRIBUTE; + + SvxJustifyMethodItem aItem(eJM, nWhichJM); + rSet.Put(aItem); +} + +} + +// ============================================================================ + AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ), @@ -174,7 +218,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr maLbFrameDir.Hide(); } - // diese Page braucht ExchangeSupport + // This page needs ExchangeSupport. SetExchangeSupport(); FreeResource(); @@ -217,9 +261,43 @@ sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } +BOOL AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +{ + bool bChanged = SfxTabPage::FillItemSet(rSet); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + USHORT nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichHorJM); + + USHORT nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD); + lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); + if (!bChanged) + bChanged = HasAlignmentChanged(rSet, nWhichVerJM); + + return bChanged; +} + void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) { SfxTabPage::Reset( rCoreAttrs ); + + // Special treatment for distributed alignment; we need to set the justify + // method to 'distribute' to distinguish from the normal justification. + + lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>( + maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD), + SVX_HOR_JUSTIFY_BLOCK); + + lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>( + maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs, + GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD), + SVX_VER_JUSTIFY_BLOCK); + UpdateEnableControls(); } @@ -245,7 +323,7 @@ void AlignmentTabPage::InitVsRefEgde() // remember selection - is deleted in call to ValueSet::Clear() sal_uInt16 nSel = maVsRefEdge.GetSelectItemId(); - ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() ); + ResId aResId( IL_LOCK_BMPS, CUI_MGR() ); ImageList aImageList( aResId ); Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() ); @@ -268,6 +346,7 @@ void AlignmentTabPage::UpdateEnableControls() bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT); bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK); bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL); + bool bHorDist = (nHorAlign == ALIGNDLG_HORALIGN_DISTRIBUTED); // indent edit field only for left alignment maFtIndent.Enable( bHorLeft ); @@ -279,8 +358,8 @@ void AlignmentTabPage::UpdateEnableControls() // hyphenation only for automatic line breaks or for block alignment maBtnHyphen.Enable( maBtnWrap.IsChecked() || bHorBlock ); - // shrink only without automatic line break, and not for block and fill - maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill ); + // shrink only without automatic line break, and not for block, fill or distribute. + maBtnShrink.Enable( (maBtnWrap.GetState() == STATE_NOCHECK) && !bHorBlock && !bHorFill && !bHorDist ); // visibility of fixed lines maFlAlignment.Show( maLbHorAlign.IsVisible() || maEdIndent.IsVisible() || maLbVerAlign.IsVisible() ); @@ -288,6 +367,27 @@ void AlignmentTabPage::UpdateEnableControls() maFlProperties.Show( maBtnWrap.IsVisible() || maBtnHyphen.IsVisible() || maBtnShrink.IsVisible() || maLbFrameDir.IsVisible() ); } +bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const +{ + const SfxItemSet& rOld = GetItemSet(); + const SfxPoolItem* pItem; + SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO; + SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO; + if (rOld.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + if (rNew.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET) + { + const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem); + eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue()); + } + + return eMethodOld != eMethodNew; +} + IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) { UpdateEnableControls(); @@ -298,3 +398,4 @@ IMPL_LINK( AlignmentTabPage, UpdateEnableHdl, void*, EMPTYARG ) } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc index f67d3f666bae..133064889e9e 100644 --- a/cui/source/tabpages/align.hrc +++ b/cui/source/tabpages/align.hrc @@ -63,15 +63,17 @@ #define ALIGNDLG_HORALIGN_RIGHT 3 #define ALIGNDLG_HORALIGN_BLOCK 4 #define ALIGNDLG_HORALIGN_FILL 5 +#define ALIGNDLG_HORALIGN_DISTRIBUTED 6 -#define ALIGNDLG_VERALIGN_STD 0 -#define ALIGNDLG_VERALIGN_TOP 1 -#define ALIGNDLG_VERALIGN_MID 2 -#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_STD 0 +#define ALIGNDLG_VERALIGN_TOP 1 +#define ALIGNDLG_VERALIGN_MID 2 +#define ALIGNDLG_VERALIGN_BOTTOM 3 +#define ALIGNDLG_VERALIGN_BLOCK 4 +#define ALIGNDLG_VERALIGN_DISTRIBUTED 5 // image list for ValueSets: #define IL_LOCK_BMPS 1100 -#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 acaa9234b87d..05d4b39d6767 100644 --- a/cui/source/tabpages/align.src +++ b/cui/source/tabpages/align.src @@ -71,6 +71,7 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Right" ; ALIGNDLG_HORALIGN_RIGHT ; > ; < "Justified" ; ALIGNDLG_HORALIGN_BLOCK ; > ; < "Filled" ; ALIGNDLG_HORALIGN_FILL ; > ; + < "Distributed" ; ALIGNDLG_HORALIGN_DISTRIBUTED ; > ; }; }; FixedText FT_INDENT @@ -112,6 +113,8 @@ TabPage RID_SVXPAGE_ALIGNMENT < "Top" ; ALIGNDLG_VERALIGN_TOP ; > ; < "Middle" ; ALIGNDLG_VERALIGN_MID ; > ; < "Bottom" ; ALIGNDLG_VERALIGN_BOTTOM ; > ; + < "Justified" ; ALIGNDLG_VERALIGN_BLOCK ; > ; + < "Distributed" ; ALIGNDLG_VERALIGN_DISTRIBUTED ; > ; }; }; FixedLine FL_ORIENTATION @@ -229,18 +232,6 @@ TabPage RID_SVXPAGE_ALIGNMENT }; IdCount = { 3 ; }; }; - ImageList IL_LOCK_BMPS_HC - { - Prefix = "loh"; - MaskColor = IL_LOCK_MCOL ; - IdList = - { - IID_BOTTOMLOCK ; - IID_TOPLOCK ; - IID_CELLLOCK ; - }; - IdCount = { 3 ; }; - }; String STR_BOTTOMLOCK { Text [ en-US ] = "Text Extension From Lower Cell Border" ; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index afc38b00adb4..4eb25d799bc1 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR + #include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/field.hxx> @@ -80,10 +79,6 @@ static ::com::sun::star::uno::Reference< return xMSF; } -/*-----------------14.10.96 15.47------------------- - ---------------------------------------------------*/ - OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet), aLanguageFT( this, CUI_RES(FT_LANG )), @@ -167,9 +162,6 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : if ( bOpenSmartTagOptions ) SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS ); } -/*-----------------16.10.96 14.06------------------- - ---------------------------------------------------*/ sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, CollatorWrapper& rCmpClass ) @@ -190,9 +182,6 @@ sal_Bool lcl_FindEntry( ListBox& rLB, const String& rEntry, return sal_False; } -/* -----------------23.11.98 10:46------------------- - * - * --------------------------------------------------*/ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) { sal_uInt16 nPos = pBox->GetSelectEntryPos(); @@ -209,9 +198,6 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) } return 0; } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, const SfxItemSet& rSet ) : @@ -224,36 +210,23 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, 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(); aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage() { } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrOptionsPage(pParent, rSet); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) { @@ -268,6 +241,7 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, aCheckLB.IsChecked(nPos++)); sal_Bool bReturn = nFlags != pAutoCorrect->GetFlags(); if(bReturn ) @@ -279,19 +253,11 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) return bReturn; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -307,6 +273,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry(sURL); aCheckLB.InsertEntry(sDash); aCheckLB.InsertEntry(sNoDblSpaces); + aCheckLB.InsertEntry(sAccidentalCaps); sal_uInt16 nPos = 0; aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & Autocorrect) ); @@ -316,6 +283,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & SetINetAttr) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IgnoreDoubleSpace) ); + aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) ); aCheckLB.SetUpdateMode(sal_True); } @@ -385,7 +353,7 @@ public: /*********************************************************************/ -void __EXPORT OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, +void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry ) { rDev.DrawText( rPos, GetText() ); @@ -446,6 +414,7 @@ enum OfaAutoFmtOptions DEL_SPACES_AT_STT_END, DEL_SPACES_BETWEEN_LINES, IGNORE_DBLSPACE, + CORRECT_CAPS_LOCK, APPLY_NUMBERING, INSERT_BORDER, CREATE_TABLE, @@ -473,6 +442,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, 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 )), @@ -550,7 +520,7 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16 nCol) /*********************************************************************/ -__EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() +OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() { delete (ImpUserData*) aCheckLB.GetUserData( REPLACE_BULLETS ); delete (ImpUserData*) aCheckLB.GetUserData( APPLY_NUMBERING ); @@ -562,7 +532,7 @@ __EXPORT OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() /* */ /*********************************************************************/ -SfxTabPage* __EXPORT OfaSwAutoFmtOptionsPage::Create( Window* pParent, +SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet); @@ -606,6 +576,9 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND)); + pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, + aCheckLB.IsChecked(CORRECT_CAPS_LOCK, CBCOL_SECOND)); + bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST); bModified |= pOpt->bSetINetAttr != bCheck; pOpt->bSetINetAttr = bCheck; @@ -685,9 +658,6 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) return sal_True; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); @@ -719,6 +689,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); 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)); @@ -737,6 +708,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) 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 ); @@ -926,9 +898,7 @@ void OfaACorrCheckListBox::HBarClick() { // Sortierung durch diese Ueberladung abgeklemmt } -/* -----------------------------22.05.2002 11:06------------------------------ - ---------------------------------------------------------------------------*/ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) { if(!rKEvt.GetKeyCode().GetModifier() && @@ -955,9 +925,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) else SvxSimpleTable::KeyInput(rKEvt); } -/* -----------------19.11.98 15:57------------------- - * - * --------------------------------------------------*/ + struct DoubleString { String sShort; @@ -968,9 +936,6 @@ typedef DoubleString* DoubleStringPtr; SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4) SV_IMPL_PTRARR(DoubleStringArray, DoubleStringPtr); -/* -----------------19.11.98 16:07------------------- - * - * --------------------------------------------------*/ void lcl_ClearTable(DoubleStringTable& rTable) { DoubleStringArrayPtr pArray = rTable.Last(); @@ -983,10 +948,6 @@ void lcl_ClearTable(DoubleStringTable& rTable) rTable.Clear(); } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ - OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet), @@ -1013,10 +974,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); static long nTabs[] = { 2 /* Tab-Count */, 1, 61 }; @@ -1036,47 +994,31 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, aShortED.SetMaxTextLen(30); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - OfaAutocorrReplacePage::~OfaAutocorrReplacePage() { delete pFormatText; lcl_ClearTable(aDoubleStringTable); delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrReplacePage(pParent, rSet); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) { @@ -1111,7 +1053,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) nLastPos = nPos - 1; bFound = sal_True; if( !(pWordPtr->IsTextOnly() == (0 == pDouble->pUserData) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), pDouble->sLong ) ) ) { pAutoCorrect->PutText(sEntry, pDouble->sLong, eCurLang); @@ -1174,7 +1116,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) bFound = sal_True; String sLong = aReplaceTLB.GetEntryText(pEntry, 1); if( !(pWordPtr->IsTextOnly() == (0 == pEntry->GetUserData()) - && 0 == pCompareCaseClass->compareString( + && 0 == pCompareClass->compareString( pWordPtr->GetLong(), sLong ))) { pAutoCorrect->PutText(sEntry, sLong, eLang); @@ -1210,9 +1152,6 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) return sal_False; } -/* -----------------19.11.98 13:16------------------- - * - * --------------------------------------------------*/ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) @@ -1322,9 +1261,6 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, else aTextOnlyCB.Enable( sal_False ); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) { @@ -1332,9 +1268,6 @@ void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) aShortED.GrabFocus(); } -/* -----------------23.11.98 10:33------------------- - * - * --------------------------------------------------*/ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) { //save old settings an refill @@ -1343,23 +1276,15 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) RefillReplaceBox(sal_False, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; - delete pCompareCaseClass; delete pCharClass; ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( GetProcessFact() ); - pCompareCaseClass = new CollatorWrapper( GetProcessFact() ); - pCompareClass->loadDefaultCollator( aLcl, ::com::sun::star::i18n:: - CollatorOptions::CollatorOptions_IGNORE_CASE ); - pCompareCaseClass->loadDefaultCollator( aLcl, 0 ); + pCompareClass->loadDefaultCollator( aLcl, 0 ); pCharClass = new CharClass( aLcl ); ModifyHdl(&aShortED); } } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) { @@ -1391,11 +1316,6 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) return 0; }; -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - - IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) { SvLBoxEntry* _pEntry = aReplaceTLB.FirstSelected(); @@ -1462,9 +1382,6 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) return 1; } -/*-----------------17.10.96 07.49------------------- - ---------------------------------------------------*/ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { SvLBoxEntry* pFirstSel = aReplaceTLB.FirstSelected(); @@ -1550,10 +1467,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) return 0; } -/* -----------------20.11.98 13:48------------------- - * - * --------------------------------------------------*/ - struct StringsArrays { @@ -1564,9 +1477,7 @@ struct StringsArrays aAbbrevStrings(5,5), aDoubleCapsStrings(5,5) {} }; typedef StringsArrays* StringsArraysPtr; -/* -----------------19.11.98 16:07------------------- - * - * --------------------------------------------------*/ + sal_Bool lcl_FindInArray(SvStringsDtor& rStrings, const String& rString) { for(sal_uInt16 i = 0; i < rStrings.Count(); i++) @@ -1586,10 +1497,6 @@ void lcl_ClearTable(StringsTable& rTable) rTable.Clear(); } -/*-----------------14.10.96 15.57------------------- - ---------------------------------------------------*/ - OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet), @@ -1638,44 +1545,29 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent, aDelDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL); } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - OfaAutocorrExceptPage::~OfaAutocorrExceptPage() { lcl_ClearTable(aStringsTable); delete pCompareClass; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, const SfxItemSet& rSet) { return new OfaAutocorrExceptPage(pParent, rSet); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); } -/* -----------------20.11.98 13:26------------------- - * - * --------------------------------------------------*/ + int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) { @@ -1785,9 +1677,6 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) return sal_False; } -/* -----------------23.11.98 10:33------------------- - * - * --------------------------------------------------*/ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) { if(eLang != eSet) @@ -1804,9 +1693,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) ModifyHdl(&aDoubleCapsED); } } -/* -----------------20.11.98 14:06------------------- - * - * --------------------------------------------------*/ + void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) @@ -1880,10 +1767,6 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, } } -/*-----------------14.10.96 15.58------------------- - ---------------------------------------------------*/ - void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -1894,11 +1777,6 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) aAutoCapsCB.SaveValue(); } -/*-----------------16.10.96 12.27------------------- - ---------------------------------------------------*/ - - IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) { if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED ) @@ -1926,10 +1804,6 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) return 0; } -/*-----------------16.10.96 12.57------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) { if(pBox == &aAbbrevLB) @@ -1947,10 +1821,6 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) return 0; } -/*-----------------16.10.96 13.02------------------- - ---------------------------------------------------*/ - IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); @@ -1975,10 +1845,6 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) return 0; } -/*-----------------16.10.96 15.03------------------- - ---------------------------------------------------*/ - void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) { const KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -1994,10 +1860,6 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); } -/*-----------------03.07.97 13:17------------------- - ---------------------------------------------------*/ - enum OfaQuoteOptions { ADD_NONBRK_SPACE, @@ -2126,24 +1988,18 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aSglStandardPB.SetAccessibleRelationMemberOf(&aSingleFL); aDblStandardPB.SetAccessibleRelationMemberOf(&aDoubleFL); } -/*-----------------03.07.97 13:17------------------- ---------------------------------------------------*/ OfaQuoteTabPage::~OfaQuoteTabPage() { delete( pCheckButtonData ); } -/*-----------------03.07.97 13:17------------------- ---------------------------------------------------*/ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new OfaQuoteTabPage(pParent, rAttrSet); } -/*-----------------03.07.97 13:18------------------- ---------------------------------------------------*/ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -2211,16 +2067,12 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) } return bReturn; } -/* -----------------23.11.98 16:15------------------- - * - * --------------------------------------------------*/ + void OfaQuoteTabPage::ActivatePage( const SfxItemSet& ) { ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); } -/*-----------------03.07.97 13:18------------------- ---------------------------------------------------*/ void OfaQuoteTabPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); @@ -2278,10 +2130,6 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) aDblEndExFT .SetText(ChangeStringExt_Impl(cEndQuote)); } - -/*-----------------15.10.96 16.42------------------- - ---------------------------------------------------*/ #define SGL_START 0 #define DBL_START 1 #define SGL_END 2 @@ -2303,7 +2151,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg ); sal_UCS4 cDlg; - //The two lines below are added by BerryJia for Bug95846 Time:2002-8-13 15:50 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguage(); switch( nMode ) @@ -2311,25 +2158,25 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) case SGL_START: cDlg = cSglStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',sal_True,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'', sal_True, eLang); break; case SGL_END: cDlg = cSglEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',sal_False,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'', sal_False, eLang); break; case DBL_START: cDlg = cStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',sal_True,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"', sal_True, eLang); break; case DBL_END: cDlg = cEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',sal_False,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"', sal_False, eLang); break; default: - DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); + OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); cDlg = 0; break; @@ -2364,9 +2211,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) return 0; } -/*-----------------27.06.97 09.55------------------- - ---------------------------------------------------*/ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn ) { if(pBtn == &aDblStandardPB) @@ -2753,9 +2597,9 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) aSmartTagCaption = aSmartTagType; const rtl::OUString aLBEntry = aSmartTagCaption + - OUString::createFromAscii(" (") + + OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) + aName + - OUString::createFromAscii(")"); + OUString(RTL_CONSTASCII_USTRINGPARAM(")")); SvLBoxEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry ); if ( pEntry ) @@ -2892,3 +2736,4 @@ void OfaSmartTagOptionsTabPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( sal_False ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 8920dadd35a0..61ea73eb03de 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -149,6 +149,7 @@ #define ST_DASH 208 #define FT_LANG 209 #define LB_LANG 210 +#define ST_CORRECT_ACCIDENTAL_CAPS_LOCK 211 #define CB_SMARTTAGS 220 #define FT_SMARTTAGS 221 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 8a906cf54e45..e9b4769b8caf 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -129,6 +129,10 @@ TabDialog RID_OFA_AUTOCORR_DLG String ST_DASH \ { \ Text [ en-US ] = "Replace dashes" ; \ + }; \ + String ST_CORRECT_ACCIDENTAL_CAPS_LOCK \ + { \ + Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; \ }; /**************************************************************************/ @@ -202,7 +206,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY COMMON_CLB_ENTRIES String ST_DEL_EMPTY_PARA { - /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absõtze entfernen */ Text [ en-US ] = "Remove blank paragraphs" ; }; String ST_USER_STYLE @@ -215,7 +218,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY }; String ST_RIGHT_MARGIN { - /* ### ACHTUNG: Neuer Text in Resource? Zusammenfassen von einzeiligen Absätzen ab : Zusammenfassen von einzeiligen Absõtzen ab */ // Text [ norwegian_wrong ] = "+++Combine single line paragraphs at" ; // Text [ swedish_wrong ] = ~Kombinera enradiga stycken B738vid " ; Text [ en-US ] = "Combine single line paragraphs if length greater than" ; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2c7dcd315f3f..409d53016e5d 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,8 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/pathoptions.hxx> -#include <svl/intitem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <sfx2/objsh.hxx> @@ -64,9 +61,9 @@ #include <dialmgr.hxx> #include <svx/htmlmode.hxx> #include <svtools/controldims.hrc> -#include <svx/flagsdef.hxx> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svx/flagsdef.hxx> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> using namespace ::com::sun::star; // static ---------------------------------------------------------------- @@ -112,9 +109,7 @@ struct SvxBackgroundPage_Impl SvxBackgroundPage_Impl() : pLoadTimer(NULL), bIsImportDlgInExecute(sal_False) {} }; -/* -----------------------------15.08.2002 12:21------------------------------ - ---------------------------------------------------------------------------*/ inline sal_uInt8 lcl_PercentToTransparency(long nPercent) { //0xff must not be returned! @@ -132,10 +127,6 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency) } //------------------------------------------------------------------------- -/* [Beschreibung] - -*/ - sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { sal_Bool bFound = sal_False; @@ -195,10 +186,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl sal_Bool bIsBmpPreview ) : -/* [Beschreibung] - -*/ - Window( pParent, rResId ), bIsBmp ( bIsBmpPreview ), @@ -214,11 +201,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl //----------------------------------------------------------------------- BackgroundPreviewImpl::~BackgroundPreviewImpl() - -/* [Beschreibung] - -*/ - { delete pBitmap; } @@ -240,10 +222,6 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) //----------------------------------------------------------------------- void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap ) -/* [Beschreibung] - -*/ - { if ( bIsBmp && (pNewBitmap || pBitmap) ) { @@ -317,9 +295,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& ) } } } -/* -----------------------------27.02.2002 11:07------------------------------ - ---------------------------------------------------------------------------*/ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -337,10 +313,6 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : -/* [Beschreibung] - -*/ - SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ), aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ), @@ -414,11 +386,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent, //------------------------------------------------------------------------ SvxBackgroundTabPage::~SvxBackgroundTabPage() - -/* [Beschreibung] - -*/ - { delete pPreviewWin1; delete pPreviewWin2; @@ -472,11 +439,6 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, //------------------------------------------------------------------------ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) - -/* [Beschreibung] - -*/ - { // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden, // es muss aber im rSet vorhanden sein! @@ -636,8 +598,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - SfxItemState eState = rSet.GetItemState( nWhich, sal_True ); - eState = rSet.GetItemState( nWhich, sal_False ); + rSet.GetItemState( nWhich, sal_True ); + rSet.GetItemState( nWhich, sal_False ); if ( rSet.GetItemState( nWhich, sal_True ) > SFX_ITEM_AVAILABLE ) { pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); @@ -746,11 +708,6 @@ void SvxBackgroundTabPage::FillUserData() //------------------------------------------------------------------------ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) - -/* [Beschreibung] - -*/ - { if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() ) { @@ -1099,11 +1056,6 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) - -/* [Beschreibung] - -*/ - { // muss implementiert werden, damit Position-Control funktioniert } @@ -1111,11 +1063,6 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::ShowSelector() - -/* [Beschreibung] - -*/ - { if( bAllowShowSelector) { @@ -1150,11 +1097,6 @@ void SvxBackgroundTabPage::ShowSelector() void SvxBackgroundTabPage::RaiseLoadError_Impl() - -/* [Beschreibung] - -*/ - { SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND, String(), @@ -1170,11 +1112,6 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() //------------------------------------------------------------------------ sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() - -/* [Beschreibung] - -*/ - { sal_Bool bResult = ( aBgdGraphicPath.Len() > 0 ) && ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath, @@ -1198,7 +1135,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const SfxPoolItem* pItem = NULL; XColorTable* pColorTable = NULL; const Size aSize15x15 = Size( 15, 15 ); - FASTBOOL bOwn = sal_False; + bool bOwn = FALSE; if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) ) pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable(); @@ -1438,11 +1375,6 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) - -/* [Beschreibung] - -*/ - { if ( 0 == aLbSelect.GetSelectEntryPos() ) { @@ -1460,11 +1392,6 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) - -/* [Beschreibung] - -*/ - { if ( &aBtnLink == pBox ) { @@ -1509,11 +1436,6 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) //------------------------------------------------------------------------ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) - -/* [Beschreibung] - -*/ - { if ( pBtn == &aBtnPosition ) { @@ -1636,11 +1558,6 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) //----------------------------------------------------------------------- void SvxBackgroundTabPage::ShowTblControl() - -/* [Beschreibung] - -*/ - { aTblLBox .SetSelectHdl( HDL(TblDestinationHdl_Impl) ); aTblLBox .SelectEntryPos(0); @@ -1664,11 +1581,6 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) //----------------------------------------------------------------------- IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) - -/* [Beschreibung] - -*/ - { sal_uInt16 nSelPos = pBox->GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) @@ -1810,11 +1722,6 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, const String& rUserData ) - -/* [Beschreibung] - -*/ - { SvxGraphicPosition ePos = rBgdAttr.GetGraphicPos(); const Color& rColor = rBgdAttr.GetColor(); @@ -1943,9 +1850,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, SetGraphicPosition_Impl( ePos ); } } -/* -----------------------------09.08.2002 14:04------------------------------ - ---------------------------------------------------------------------------*/ void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic) { bColTransparency = bColor; @@ -1968,7 +1873,7 @@ void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic } } -void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -1984,3 +1889,5 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 EnableTransparency(sal_True, sal_True); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 6d7c74e9b330..bbf7970fbb65 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -72,7 +72,6 @@ TabPage RID_SVXPAGE_BACKGROUND Size = MAP_APPFONT ( 24 , 10 ) ; Hide = TRUE ; LeftLabel = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Fü~r : F³~r */ Text [ en-US ] = "F~or" ; }; ListBox LB_TBL_BOX @@ -211,7 +210,6 @@ TabPage RID_SVXPAGE_BACKGROUND Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Fläche : ~Flõche */ Text [ en-US ] = "Ar~ea" ; }; RadioButton BTN_TILE diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index 79bf90a5606c..3133b2fb7638 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svx/dialogs.hrc> @@ -70,3 +68,4 @@ void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPa } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 9140a2f0e4c2..cc239df13481 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -51,10 +49,11 @@ #include <dialmgr.hxx> #include "svx/htmlmode.hxx" #include <vcl/msgbox.hxx> -#include "svx/flagsdef.hxx" //CHINA001 +#include "svx/flagsdef.hxx" #include <sfx2/request.hxx> -#include <svl/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> #include <sfx2/itemconnect.hxx> +#include <sal/macros.h> #include "borderconn.hxx" // ----------------------------------------------------------------------- @@ -203,9 +202,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aPropertiesFL ( this, CUI_RES( FL_PROPERTIES ) ), aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ), aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ), - aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)), aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)), - aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)), aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)), nMinValue(0), nSWMode(0), @@ -385,7 +382,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_TLBR, aFrameSel, svx::FRAMEBORDER_TLBR ) ); if( aFrameSel.IsBorderEnabled( svx::FRAMEBORDER_BLTR ) ) AddItemConnection( svx::CreateFrameLineConnection( SID_ATTR_BORDER_DIAG_BLTR, aFrameSel, svx::FRAMEBORDER_BLTR ) ); - // --> OD 2005-03-01 #i43593# - item connection doesn't work for Writer, + // #i43593# - item connection doesn't work for Writer, // because the Writer item sets contain these items // checkbox "Merge with next paragraph" only visible for Writer dialog format.paragraph AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_BORDER_CONNECT, aMergeWithNextCB, sfx::ITEMCONN_DEFAULT ) ); @@ -393,7 +390,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, // checkbox "Merge adjacent line styles" only visible for Writer dialog format.table AddItemConnection( new sfx::CheckBoxConnection( SID_SW_COLLAPSING_BORDERS, aMergeAdjacentBordersCB, sfx::ITEMCONN_DEFAULT ) ); aMergeAdjacentBordersCB.Hide(); - // <-- } // ----------------------------------------------------------------------- @@ -440,7 +436,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SvxBoxInfoItem* pBoxInfoItem; sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); SfxMapUnit eCoreUnit; - const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); @@ -554,9 +549,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) { // Do all visible lines show the same line widths? sal_uInt16 nPrim, nDist, nSecn; - bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn ); + SvxBorderStyle nStyle; + bool bWidthEq = aFrameSel.GetVisibleWidth( nPrim, nDist, nSecn, nStyle ); if( bWidthEq ) - aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100 ); + aLbLineStyle.SelectEntry( nPrim * 100, nSecn * 100, nDist * 100, nStyle ); else aLbLineStyle.SelectEntryPos( 1 ); @@ -681,7 +677,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) TBorderPair(svx::FRAMEBORDER_RIGHT,BOX_LINE_RIGHT), }; - for (sal_uInt32 i=0; i < sizeof(eTypes1)/sizeof(TBorderPair); ++i) + for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(eTypes1); ++i) aBoxItem.SetLine( aFrameSel.GetFrameBorderStyle( eTypes1[i].first ), eTypes1[i].second ); //-------------------------------- @@ -691,7 +687,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI), TBorderPair(svx::FRAMEBORDER_VER,BOXINFO_LINE_VERT) }; - for (sal_uInt32 j=0; j < sizeof(eTypes2)/sizeof(TBorderPair); ++j) + for (sal_uInt32 j=0; j < SAL_N_ELEMENTS(eTypes2); ++j) aBoxInfoItem.SetLine( aFrameSel.GetFrameBorderStyle( eTypes2[j].first ), eTypes2[j].second ); aBoxInfoItem.EnableHor( mbHorEnabled ); @@ -921,13 +917,31 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb ) // ----------------------------------------------------------------------- +SvxBorderStyle lcl_getBorderStyle( USHORT nStyle ) +{ + SvxBorderStyle nResult = SOLID; + switch ( nStyle ) + { + case STYLE_DOTTED: + nResult = DOTTED; + break; + case STYLE_DASHED: + nResult = DASHED; + break; + default: + nResult = SOLID; + } + return nResult; +} + IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb ) { if ( pLb == &aLbLineStyle ) aFrameSel.SetStyleToSelection( static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine1() / 100 ), static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryDistance() / 100 ), - static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine2() / 100 ) ); + static_cast< sal_uInt16 >( aLbLineStyle.GetSelectEntryLine2() / 100 ), + lcl_getBorderStyle( aLbLineStyle.GetSelectEntryStyle() ) ); return 0; } @@ -1014,9 +1028,7 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const void SvxBorderTabPage::FillPresetVS() { - // find correct image list - bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList& rImgList = bHC ? aBorderImgLstH : aBorderImgLst; + ImageList& rImgList = aBorderImgLst; Size aImgSize( rImgList.GetImage( IID_PRE_CELL_NONE ).GetSizePixel() ); // basic initialization of the ValueSet @@ -1041,9 +1053,7 @@ void SvxBorderTabPage::FillPresetVS() void SvxBorderTabPage::FillShadowVS() { - // find correct image list - bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode(); - ImageList& rImgList = bHC ? aShadowImgLstH : aShadowImgLst; + ImageList& rImgList = aShadowImgLst; Size aImgSize( rImgList.GetImage( IID_SHADOWNONE ).GetSizePixel() ); // basic initialization of the ValueSet @@ -1091,6 +1101,8 @@ void SvxBorderTabPage::FillLineListBox_Impl() aLbLineStyle.InsertEntry( LINE_WIDTH0 ); aLbLineStyle.InsertEntry( LINE_WIDTH5 ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DOTTED ); + aLbLineStyle.InsertEntry( LINE_WIDTH5, 0, 0, STYLE_DASHED ); aLbLineStyle.InsertEntry( LINE_WIDTH1 ); aLbLineStyle.InsertEntry( LINE_WIDTH2 ); aLbLineStyle.InsertEntry( LINE_WIDTH3 ); @@ -1214,9 +1226,6 @@ IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox) return 0; } -/* -----------------------------03.06.2002 10:15------------------------------ - - ---------------------------------------------------------------------------*/ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) @@ -1225,14 +1234,14 @@ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) SfxTabPage::DataChanged( rDCEvt ); } -void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pSWModeItem) { nSWMode = pSWModeItem->GetValue(); - // --> OD 2005-03-01 #i43593# + // #i43593# // show checkbox <aMergeWithNextCB> for format.paragraph if ( nSWMode == SW_BORDER_MODE_PARA ) { @@ -1254,3 +1263,4 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc index 3f7699df951b..faf4837eebb7 100644 --- a/cui/source/tabpages/border.hrc +++ b/cui/source/tabpages/border.hrc @@ -70,7 +70,6 @@ // ImageListe fuer ValueSets: #define IL_PRE_BITMAPS 1400 -#define ILH_PRE_BITMAPS 1401 #define IID_PRE_CELL_NONE 1 #define IID_PRE_CELL_ALL 2 #define IID_PRE_CELL_LR 3 @@ -94,7 +93,6 @@ #define IID_PRE_TABLE_OUTER2 21 #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 diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 4fc781943d3a..10f6e327ff5b 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -335,12 +335,6 @@ TabPage RID_SVXPAGE_BORDER MaskColor = STD_MASKCOLOR ; _PREVIEW_IDLIST_ }; - ImageList ILH_PRE_BITMAPS - { - Prefix = "prh"; - MaskColor = STD_MASKCOLOR ; - _PREVIEW_IDLIST_ - }; #define _SHADOW_IDLIST_ \ IdList = \ @@ -359,12 +353,6 @@ TabPage RID_SVXPAGE_BORDER MaskColor = STD_MASKCOLOR ; _SHADOW_IDLIST_ }; - ImageList ILH_SDW_BITMAPS - { - Prefix = "shh"; - MaskColor = STD_MASKCOLOR ; - _SHADOW_IDLIST_ - }; }; String RID_SVXSTR_TABLE_PRESET_NONE diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b46f24d5cbfd..04ecaa58e3da 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "borderconn.hxx" #include <svx/frmsel.hxx> #include "editeng/bolnitem.hxx" @@ -302,3 +300,4 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, } // namespace svx +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 7ea7289d8ee4..8e6b7c11d917 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a3dc52bd43ad..a02cacd281de 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> @@ -47,7 +45,6 @@ #define _SVX_CHARDLG_CXX #include <svl/languageoptions.hxx> -#include <cuires.hrc> #include "chardlg.hrc" #include <svx/xtable.hxx> // XColorTable @@ -84,11 +81,11 @@ #include <svl/stritem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <cuires.hrc> //CHINA001 -#include <svl/intitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 -#include "svx/flagsdef.hxx" //CHINA001 +#include <svx/svxdlg.hxx> +#include <cuires.hrc> +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> +#include "svx/flagsdef.hxx" using namespace ::com::sun::star; @@ -621,6 +618,30 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) ); } + //In MacOSX the standard dialogs name font-name, font-style as + //Family, Typeface + //In GNOME the standard dialogs name font-name, font-style as + //Family, Style + //In Windows the standard dialogs name font-name, font-style as + //Font, Style +#ifdef WNT + String sFontFamilyString(CUI_RES(STR_CHARNAME_FONT)); +#else + String sFontFamilyString(CUI_RES(STR_CHARNAME_FAMILY)); +#endif + m_pWestFontNameFT->SetText(sFontFamilyString); + m_pEastFontNameFT->SetText(sFontFamilyString); + m_pCTLFontNameFT->SetText(sFontFamilyString); + +#ifdef MACOSX + String sFontStyleString(CUI_RES(STR_CHARNAME_TYPEFACE)); +#else + String sFontStyleString(CUI_RES(STR_CHARNAME_STYLE)); +#endif + m_pWestFontStyleFT->SetText(sFontStyleString); + m_pEastFontStyleFT->SetText(sFontStyleString); + m_pCTLFontStyleFT->SetText(sFontStyleString); + m_pWestLine ->Show( bCJK ); m_pColorFL ->Show( bCJK ); @@ -720,7 +741,7 @@ void SvxCharNamePage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); //DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; const SfxPoolItem* pItem = NULL; if ( pDocSh ) @@ -733,7 +754,7 @@ void SvxCharNamePage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } m_pColorLB->SetUpdateMode( sal_False ); @@ -922,6 +943,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) else { DBG_ERRORFILE( "invalid font name box" ); + return; } pStyleBox->Fill( pNameBox->GetText(), pFontList ); @@ -968,6 +990,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) else { DBG_ERRORFILE( "invalid font name box" ); + return; } FontInfo _aFontInfo( pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) ); @@ -978,7 +1001,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { - FixedText* pNameLabel = NULL; FontNameBox* pNameBox = NULL; FixedText* pStyleLabel = NULL; FontStyleBox* pStyleBox = NULL; @@ -991,7 +1013,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp switch ( eLangGrp ) { case Western : - pNameLabel = m_pWestFontNameFT; pNameBox = m_pWestFontNameLB; pStyleLabel = m_pWestFontStyleFT; pStyleBox = m_pWestFontStyleLB; @@ -1003,7 +1024,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Asian : - pNameLabel = m_pEastFontNameFT; pNameBox = m_pEastFontNameLB; pStyleLabel = m_pEastFontStyleFT; pStyleBox = m_pEastFontStyleLB; @@ -1015,7 +1035,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp break; case Ctl : - pNameLabel = m_pCTLFontNameFT; pNameBox = m_pCTLFontNameLB; pStyleLabel = m_pCTLFontStyleFT; pStyleBox = m_pCTLFontStyleLB; @@ -1047,8 +1066,8 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp FillStyleBox_Impl( pNameBox ); - FASTBOOL bStyle = sal_False; - FASTBOOL bStyleAvailable = sal_True; + bool bStyle = false; + bool bStyleAvailable = true; FontItalic eItalic = ITALIC_NONE; FontWeight eWeight = WEIGHT_NORMAL; switch ( eLangGrp ) @@ -1063,7 +1082,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp { const SvxPostureItem& rItem = (SvxPostureItem&)rSet.Get( nWhich ); eItalic = (FontItalic)rItem.GetValue(); - bStyle = sal_True; + bStyle = true; } bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); @@ -1081,7 +1100,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp eWeight = (FontWeight)rItem.GetValue(); } else - bStyle = sal_False; + bStyle = false; bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE); // Aktuell eingestellter Font @@ -1240,7 +1259,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; - FASTBOOL bChanged = sal_True; + bool bChanged = true; const String& rFontName = pNameBox->GetText(); const FontList* pFontList = GetFontList(); String aStyleBoxText =pStyleBox->GetText(); @@ -1257,7 +1276,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxFontItem& rItem = *( (const SvxFontItem*)pOld ); if ( rItem.GetFamilyName() == aFontItem.GetFamilyName() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1266,12 +1285,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && rFontName.Len() ) { rSet.Put( aFontItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) rSet.ClearItem( nWhich ); @@ -1296,7 +1315,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxWeightItem& rItem = *( (const SvxWeightItem*)pOld ); if ( rItem.GetValue() == aWeightItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1305,13 +1324,13 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetWeight() == WEIGHT_NORMAL && aInfo.GetItalic() != ITALIC_NONE ) - bChanged = sal_False; + bChanged = true; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxWeightItem*)pItem )->GetValue() != aWeightItem.GetValue() ) - bChanged = sal_True; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == m_pImpl->m_nExtraEntryPos ); @@ -1321,12 +1340,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && aText.Len() ) { rSet.Put( aWeightItem ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_POSTURE; break; @@ -1345,7 +1364,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxPostureItem& rItem = *( (const SvxPostureItem*)pOld ); if ( rItem.GetValue() == aPostureItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1354,13 +1373,13 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( m_pImpl->m_bInSearchMode && bChanged && aInfo.GetItalic() == ITALIC_NONE && aInfo.GetWeight() != WEIGHT_NORMAL ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && ( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() ) - bChanged = sal_True; + bChanged = true; if ( nEntryPos >= m_pImpl->m_nExtraEntryPos ) bChanged = ( nEntryPos == ( m_pImpl->m_nExtraEntryPos + 1 ) ); @@ -1368,7 +1387,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && aText.Len() ) { rSet.Put( aPostureItem ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -1379,12 +1398,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck nSize = 0; long nSavedSize = pSizeBox->GetSavedValue().ToInt32(); - FASTBOOL bRel = sal_True; + bool bRel = true; if ( !pSizeBox->IsRelative() ) { nSavedSize *= 10; - bRel = sal_False; + bRel = false; } switch ( eLangGrp ) @@ -1403,7 +1422,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) ); if ( ( (SvxFontHeightItem*)pItem )->GetHeight() != (sal_uInt32)nVal ) - bChanged = sal_True; + bChanged = true; } if ( bChanged || !pOldHeight || @@ -1428,12 +1447,12 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_LANGUAGE; break; @@ -1450,7 +1469,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan const SvxLanguageItem& rItem = *( (const SvxLanguageItem*)pOld ); if ( nLangPos == LISTBOX_ENTRY_NOTFOUND || eLangType == (LanguageType)rItem.GetValue() ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged ) @@ -1459,7 +1478,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -1696,14 +1715,13 @@ void SvxCharNamePage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); if (pFontListItem) SetFontList(*pFontListItem); - //CHINA001 SetFontList(pFontListItem->GetFontList()); if (pFlagItem) { @@ -1792,7 +1810,7 @@ void SvxCharEffectsPage::Initialize() SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; if ( pDocSh ) { @@ -1804,7 +1822,7 @@ void SvxCharEffectsPage::Initialize() if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } m_aUnderlineColorLB.SetUpdateMode( sal_False ); @@ -2202,7 +2220,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_aUnderlineLB.GetEntryData(i) == eUnderline ) { m_aUnderlineLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2259,7 +2277,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_aOverlineLB.GetEntryData(i) == eOverline ) { m_aOverlineLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2316,7 +2334,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontStrikeout)(sal_uLong)m_aStrikeoutLB.GetEntryData(i) == eStrikeout ) { m_aStrikeoutLB.SelectEntryPos(i); - bEnable |= sal_True; + bEnable = TRUE; break; } } @@ -2404,7 +2422,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_aUnderlineLB.GetSelectHdl().Call(NULL); // don't call SelectHdl_Impl directly! // in DisableControls, we may have re-reouted the select handler - // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox // SelectHdl_Impl( &m_aEmphasisLB ); @@ -2619,7 +2636,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); sal_Bool bModified = sal_False; - FASTBOOL bChanged = sal_True; + bool bChanged = true; // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); @@ -2640,7 +2657,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eUnder && ( UNDERLINE_NONE == eUnder || rItem.GetColor() == m_aUnderlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) @@ -2648,12 +2665,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_aUnderlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); @@ -2674,7 +2691,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( (FontUnderline)rItem.GetValue() == eOver && ( UNDERLINE_NONE == eOver || rItem.GetColor() == m_aOverlineColorLB.GetSelectEntryColor() ) && ! bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) @@ -2682,12 +2699,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_aOverlineColorLB.GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); @@ -2707,18 +2724,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld ); if ( !m_aStrikeoutLB.IsEnabled() || ((FontStrikeout)rItem.GetValue() == eStrike && !bAllowChg) ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) { rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Individual words nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); @@ -2728,22 +2745,22 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxWordLineModeItem& rItem = *( (const SvxWordLineModeItem*)pOld ); if ( rItem.GetValue() == m_aIndividualWordsBtn.IsChecked() ) - bChanged = sal_False; + bChanged = false; } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aIndividualWordsBtn.IsChecked() == m_aIndividualWordsBtn.GetSavedValue() ) - bChanged = sal_False; + bChanged = false; if ( bChanged ) { rSet.Put( SvxWordLineModeItem( m_aIndividualWordsBtn.IsChecked(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); @@ -2763,34 +2780,34 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxEmphasisMarkItem& rItem = *( (const SvxEmphasisMarkItem*)pOld ); if ( rItem.GetEmphasisMark() == eMark ) - bChanged = sal_False; + bChanged = false; } } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && m_aEmphasisLB.GetSavedValue() == nMarkPos && m_aPositionLB.GetSavedValue() == nPosPos ) - bChanged = sal_False; + bChanged = false; if ( bChanged ) { rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; - FASTBOOL bChecked = sal_False; + bool bChecked = false; sal_uInt16 nCapsPos = m_aEffects2LB.GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; - bChecked = sal_True; + bChecked = true; } if ( pOld ) @@ -2804,18 +2821,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld ); if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg ) - bChanged = sal_False; + bChanged = false; } if ( bChanged && bChecked ) { rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); @@ -2837,22 +2854,22 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxContourItem& rItem = *( (const SvxContourItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aOutlineBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); @@ -2863,12 +2880,12 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxShadowedItem& rItem = *( (const SvxShadowedItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aShadowBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2878,7 +2895,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); @@ -2889,17 +2906,17 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SvxBlinkItem& rItem = *( (const SvxBlinkItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aBlinkingBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -2908,18 +2925,18 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN ); eState = m_aHiddenBtn.GetState(); - bChanged = sal_True; + bChanged = true; if ( pOld ) { const SvxCharHiddenItem& rItem = *( (const SvxCharHiddenItem*)pOld ); if ( rItem.GetValue() == StateToAttr( eState ) && m_aHiddenBtn.GetSavedValue() == eState ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET && !StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && eState != STATE_DONTKNOW ) { @@ -2972,7 +2989,7 @@ void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); @@ -3299,9 +3316,6 @@ IMPL_LINK( SvxCharPositionPage, ScaleWidthModifyHdl_Impl, MetricField*, EMPTYARG return 0; } -/* -----------------28.08.2003 12:12----------------- - - --------------------------------------------------*/ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) { //update the preview @@ -3602,7 +3616,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) sal_Bool bModified = sal_False, bChanged = sal_True; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); - const FASTBOOL bHigh = m_aHighPosBtn.IsChecked(); + const bool bHigh = m_aHighPosBtn.IsChecked(); short nEsc; sal_uInt8 nEscProp; @@ -3677,7 +3691,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxKerningItem( nKerning, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3690,7 +3704,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aPairKerningBtn.IsChecked() != m_aPairKerningBtn.GetSavedValue() ) { rSet.Put( SvxAutoKernItem( m_aPairKerningBtn.IsChecked(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3700,7 +3714,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_aScaleWidthMF.GetText() != m_aScaleWidthMF.GetSavedValue() ) { rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_aScaleWidthMF.GetValue(), nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3718,7 +3732,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) else if (m_a270degRB.IsChecked()) aItem.SetTopToBotton(); rSet.Put( aItem ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; @@ -3748,7 +3762,7 @@ void SvxCharPositionPage::SetPreviewBackgroundToCharacter() m_bPreviewBackgroundToCharacter = sal_True; } // ----------------------------------------------------------------------- -void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -3811,25 +3825,25 @@ void SvxCharTwoLinesPage::Initialize() void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { - //CHINA001 SvxCharacterMap aDlg( this ); + bool bStart = pBox == &m_aStartBracketLB; //SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); //if(pFact) { //AbstractSvxCharacterMap* aDlg = pFact->CreateSvxCharacterMap( this, RID_SVXDLG_CHARMAP ); SvxCharacterMap* aDlg = new SvxCharacterMap( this ); - aDlg->DisableFontSelection();//CHINA001 aDlg.DisableFontSelection(); + aDlg->DisableFontSelection(); - if ( aDlg->Execute() == RET_OK )//CHINA001 ( aDlg.Execute() == RET_OK ) + if ( aDlg->Execute() == RET_OK ) { - sal_Unicode cChar = (sal_Unicode) aDlg->GetChar();//CHINA001 aDlg.GetChar(); + sal_Unicode cChar = (sal_Unicode) aDlg->GetChar(); SetBracket( cChar, bStart ); } else { pBox->SelectEntryPos( bStart ? m_nStartBracketPosition : m_nEndBracketPosition ); } - delete aDlg; //add CHINA001 + delete aDlg; } } @@ -3843,7 +3857,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) pBox->SelectEntryPos(0); else { - FASTBOOL bFound = sal_False; + bool bFound = FALSE; for ( sal_uInt16 i = 1; i < pBox->GetEntryCount(); ++i ) { if ( (sal_uLong)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR ) @@ -3983,16 +3997,14 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); - bModified |= sal_True; + bModified = TRUE; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) ) CLEARTITEM; return bModified; } -/* -----------------------------04.12.00 09:48-------------------------------- - ---------------------------------------------------------------------------*/ void SvxCharTwoLinesPage::UpdatePreview_Impl() { sal_Unicode cStart = m_aStartBracketLB.GetSelectEntryPos() > 0 @@ -4010,7 +4022,7 @@ void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() } // ----------------------------------------------------------------------- -void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); if (pFlagItem) @@ -4020,3 +4032,5 @@ void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 SetPreviewBackgroundToCharacter(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h index 253745d9623a..168502b6f331 100644 --- a/cui/source/tabpages/chardlg.h +++ b/cui/source/tabpages/chardlg.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..0d583b0431e8 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -70,6 +70,10 @@ #define STR_CHARNAME_NOSTYLE 150 #define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_FAMILY 152 +#define STR_CHARNAME_FONT 153 +#define STR_CHARNAME_STYLE 154 +#define STR_CHARNAME_TYPEFACE 155 // EffectsPage -------------------------------------------------------------- diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 60c511a87f61..abf9edcbd1eb 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -48,13 +48,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; FixedText FT_WEST_NAME_NOCJK { Pos = MAP_APPFONT ( 12 , 6 ); Size = MAP_APPFONT ( 112 , 8 ); - Text [ en-US ] = "~Font"; }; ComboBox LB_WEST_NAME { @@ -78,13 +76,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 14 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "~Typeface"; }; FixedText FT_WEST_STYLE_NOCJK { Pos = MAP_APPFONT ( 130 , 6 ); Size = MAP_APPFONT ( 72 , 8 ); - Text [ en-US ] = "~Typeface"; }; ComboBox LB_WEST_STYLE { @@ -190,7 +186,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 54 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_EAST_NAME { @@ -205,7 +200,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 54 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "T~ypeface"; }; ComboBox LB_EAST_STYLE { @@ -264,7 +258,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_CTL_NAME { @@ -279,7 +272,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 94 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "Ty~peface"; }; ComboBox LB_CTL_STYLE { @@ -370,6 +362,22 @@ TabPage RID_SVXPAGE_CHAR_NAME { Text [ en-US ] = "Transparent"; }; + String STR_CHARNAME_FAMILY + { + Text [ en-US ] = "Family"; + }; + String STR_CHARNAME_FONT + { + Text [ en-US ] = "Font"; + }; + String STR_CHARNAME_STYLE + { + Text [ en-US ] = "Style"; + }; + String STR_CHARNAME_TYPEFACE + { + Text [ en-US ] = "Typeface"; + }; }; // RID_SVXPAGE_CHAR_EFFECTS --------------------------------------------------- diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index f13d36697ca8..f20b636b0570 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,15 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <tools/shl.hxx> -#include "svx/ofaitem.hxx" // add CHINA001 -#include <sfx2/request.hxx> // add CHINA001 +#include "svx/ofaitem.hxx" +#include <sfx2/request.hxx> #include <svx/dialogs.hrc> #define _SVX_CONNECT_CXX @@ -182,7 +180,7 @@ SvxConnectionPage::~SvxConnectionPage() |* \************************************************************************/ -void __EXPORT SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) +void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) { const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_EDGENODE1HORZDIST ); const SfxItemPool* pPool = rAttrs.GetPool(); @@ -556,7 +554,7 @@ void SvxConnectionPage::FillTypeLB() } } } -void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); if (pOfaPtrItem) @@ -565,3 +563,4 @@ void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 8d30c4431e55..37788da81f22 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/basedlgs.hxx> #include <cuires.hrc> #include "dstribut.hxx" @@ -87,36 +85,27 @@ SvxDistributePage::SvxDistributePage( : SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), meDistributeHor(eHor), meDistributeVer(eVer), - maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), + 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 )), + maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), - maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), + maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), maHorLow (this, CUI_RES(IMG_HOR_LOW )), - maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), + 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 )), + 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 )), - maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), - maVerHigh (this, CUI_RES(IMG_VER_HIGH )) + maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), + maVerLow (this, CUI_RES(IMG_VER_LOW )), + maVerCenter (this, CUI_RES(IMG_VER_CENTER )), + maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), + maVerHigh (this, CUI_RES(IMG_VER_HIGH )) { - maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); } @@ -169,7 +158,7 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) |* \************************************************************************/ -void __EXPORT SvxDistributePage::Reset(const SfxItemSet& ) +void SvxDistributePage::Reset(const SfxItemSet& ) { maBtnHorNone.SetState(sal_False); maBtnHorLeft.SetState(sal_False); @@ -183,7 +172,7 @@ void __EXPORT SvxDistributePage::Reset(const SfxItemSet& ) case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(sal_True); break; case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(sal_True); break; case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(sal_True); break; - case SvxDistributeHorizontalRight : maBtnHorRight.SetState(sal_True); break; + case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break; } maBtnVerNone.SetState(sal_False); @@ -242,3 +231,4 @@ sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc index 201fac2b5227..564d7d8c3d64 100644 --- a/cui/source/tabpages/dstribut.hrc +++ b/cui/source/tabpages/dstribut.hrc @@ -44,12 +44,3 @@ #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 diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index 2c6e953e6b71..ed5108c90d6a 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -214,88 +214,6 @@ TabPage RID_SVXPAGE_DISTRIBUTE }; }; - - Image IMG_HOR_LOW_H - { - ImageBitmap = Bitmap { File = "dsth_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dsth_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_CENTER_H - { - ImageBitmap = Bitmap { File = "dsth_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_HIGH_H - { - ImageBitmap = Bitmap { File = "dsth_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_HIGH_H - { - ImageBitmap = Bitmap { File = "dstv_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_CENTER_H - { - ImageBitmap = Bitmap { File = "dstv_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dstv_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_LOW_H - { - ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 4267ce1a795d..435345baeda2 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> @@ -138,26 +136,15 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) aOrigSizePB.SetAccessibleRelationLabeledBy( &aOrigSizeFT ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SvxGrfCropPage::~SvxGrfCropPage() { aTimer.Stop(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SvxGrfCropPage( pParent, rSet ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) { @@ -248,10 +235,6 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) bReset = sal_False; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); @@ -317,10 +300,6 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) return bModified; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) { #ifdef DBG_UTIL @@ -392,10 +371,6 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcZoom(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) @@ -494,16 +469,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// 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 = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -527,16 +498,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// 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 = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -629,11 +596,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() nMin = nMinWidth - (nL >= 0 ? nL : 0); aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; - aLeftMF.SetMax(aPageSize.Width() - nR - nMin); - aRightMF.SetMax(aPageSize.Width() - nL - nMin); -*/ long nUp = lcl_GetValue( aTopMF, eUnit ); long nMinHeight = (aOrigSize.Height() * 10) /11; nMin = nMinHeight - (nUp >= 0 ? nUp : 0); @@ -642,11 +604,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() long nLow = lcl_GetValue(aBottomMF, eUnit ); nMin = nMinHeight - (nLow >= 0 ? nLow : 0); aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); - - // Zoom nicht unter 2% -/* 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, @@ -832,6 +789,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz ) Invalidate(); } - - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index e4ef79b4f1f9..7177dcfb716d 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> @@ -125,10 +123,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA ); - mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA ); - } //------------ValueSet installieren-------------------------- aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD ); @@ -156,10 +151,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage() { sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { delete mpBmpCapTypes[nBitmap]; - delete mpBmpCapTypesH[nBitmap]; - } } // ----------------------------------------------------------------------- @@ -567,9 +559,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxCaptionTabPage::FillValueSet() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - Image** ppBitmaps = bHighContrast ? mpBmpCapTypesH : mpBmpCapTypes; + Image** ppBitmaps = mpBmpCapTypes; aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) ); @@ -639,12 +629,11 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) break; } } -/*-- 05.03.2004 13:54:26--------------------------------------------------- - -----------------------------------------------------------------------*/ 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..8759a0158f22 100644 --- a/cui/source/tabpages/labdlg.hrc +++ b/cui/source/tabpages/labdlg.hrc @@ -66,11 +66,6 @@ #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 SHOW_HORZ 1 #define SHOW_VERT 2 #define SHOW_ABS 3 diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 1e7da5393a2a..b096b01c0137 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -154,8 +154,6 @@ TabPage RID_SVXPAGE_CAPTION { Pos = MAP_APPFONT ( 6 , 85 ) ; Size = MAP_APPFONT ( 42 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ Text [ en-US ] = "~Length" ; }; MetricField MF_LAENGE @@ -221,22 +219,6 @@ TabPage RID_SVXPAGE_CAPTION { File = "legtyp4.bmp" ; }; - Bitmap BMP_CAPTTYPE_1_H - { - File = "legtyp1_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_2_H - { - File = "legtyp2_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_3_H - { - File = "legtyp3_hc.bmp" ; - }; - Bitmap BMP_CAPTTYPE_4_H - { - File = "legtyp4_hc.bmp" ; - }; }; // RID_SVXDLG_CAPTION ---------------------------------------------------- diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 339559ba6d92..2084b64da970 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define ITEMID_MACRO 0 #include <svl/macitem.hxx> #undef ITEMID_MACRO @@ -108,7 +106,7 @@ _SfxMacroTabPage_Impl::~_SfxMacroTabPage_Impl() } -static sal_uInt16 __FAR_DATA aPageRg[] = { +static sal_uInt16 aPageRg[] = { SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, 0 }; @@ -235,9 +233,9 @@ void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) { mpImpl->bGotEvents = sal_True; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); - for ( sal_uInt16 nNo = 0; nNo < rList.Count(); ++nNo ) + for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { - const SfxEventName *pOwn = rList.GetObject(nNo); + const SfxEventName *pOwn = rList.at(nNo); AddEvent( pOwn->maUIName, pOwn->mnId ); } } @@ -254,9 +252,9 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) { mpImpl->bGotEvents = sal_True; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); - for ( sal_uInt16 nNo = 0; nNo < rList.Count(); ++nNo ) + for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { - const SfxEventName *pOwn = rList.GetObject(nNo); + const SfxEventName *pOwn = rList.at(nNo); AddEvent( pOwn->maUIName, pOwn->mnId ); } } @@ -500,3 +498,4 @@ SfxMacroAssignDlg::~SfxMacroAssignDlg() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 05e81658b8a3..b5269c81ae3d 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -93,7 +93,6 @@ TabPage RID_SVXPAGE_EVENTASSIGN HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN"; Pos = MAP_APPFONT ( COL4 , ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen Disable = TRUE ; TabStop = TRUE ; Text [ en-US ] = "~Assign" ; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 1ee81c946cfc..27743a3b1819 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -49,8 +47,8 @@ #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/strarray.hxx> -#include <sfx2/request.hxx> //add CHINA001 -#include "svx/ofaitem.hxx" //add CHINA001 +#include <sfx2/request.hxx> +#include "svx/ofaitem.hxx" static sal_uInt16 pRanges[] = { @@ -190,7 +188,7 @@ SvxMeasurePage::~SvxMeasurePage() |* \************************************************************************/ -void __EXPORT SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) +void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -527,9 +525,6 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } } -//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; -//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW}; - if( bPositionModified ) { // Position @@ -866,7 +861,7 @@ void SvxMeasurePage::FillUnitLB() aLbUnit.SetEntryData( nPos, (void*)nUnit ); } } -void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); @@ -876,3 +871,4 @@ void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 27678b02f50b..2fa12f871019 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,13 +26,6 @@ * ************************************************************************/ -#if !ENABLE_LAYOUT_EXPERIMENTAL -//#undef ENABLE_LAYOUT -#endif - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -55,10 +49,10 @@ #include "numfmt.hxx" #include <svx/numfmtsh.hxx> #include <dialmgr.hxx> -#include <sfx2/request.hxx> //CHINA001 -#include <sfx2/app.hxx> //CHINA001 +#include <sfx2/request.hxx> +#include <sfx2/app.hxx> #include <sfx2/basedlgs.hxx> -#include "svx/flagsdef.hxx" //CHINA001 +#include "svx/flagsdef.hxx" #define NUMKEY_UNDEFINED SAL_MAX_UINT32 @@ -78,15 +72,12 @@ static sal_uInt16 pRanges[] = }; /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreview -#* #* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl -#* #* Input: Fenster, Resource-ID -#* #* Output: --- #* #************************************************************************/ @@ -105,15 +96,12 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId } /************************************************************************* -#* Methode: SvxNumberPreviewImpl Datum:02.10.97 +#* Methode: SvxNumberPreviewImpl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreview -#* #* Funktion: Destruktor der Klasse SvxNumberPreviewImpl -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -123,15 +111,12 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl() } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreviewImpl -#* #* Funktion: Funktion fuer das Aendern des Preview- Strings -#* #* Input: String, Farbe -#* #* Output: --- #* #************************************************************************/ @@ -148,15 +133,12 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr, } /************************************************************************* -#* Methode: Paint Datum:02.10.97 +#* Methode: Paint #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberPreviewImpl -#* #* Funktion: Funktion fuer das neu zeichnen des Fensters. -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -307,7 +289,6 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); - ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); bNumItemFlag=sal_True; bOneAreaFlag=sal_False; @@ -320,13 +301,8 @@ void SvxNumberFormatTabPage::Init_Impl() nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight; 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 ); - aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); - aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); aIbAdd.Enable(sal_False ); aIbRemove.Enable(sal_False ); @@ -390,15 +366,12 @@ void SvxNumberFormatTabPage::Init_Impl() } /************************************************************************* -#* Methode: GetRanges Datum:02.10.97 +#* Methode: GetRanges #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Liefert Bereichsangaben zurueck. -#* #* Input: --- -#* #* Output: Bereich #* #************************************************************************/ @@ -410,15 +383,12 @@ sal_uInt16* SvxNumberFormatTabPage::GetRanges() /************************************************************************* -#* Methode: Create Datum:02.10.97 +#* Methode: Create #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Erzeugt eine neue Zahlenformat- Seite. -#* #* Input: Fenster, SfxItemSet -#* #* Output: neue TabPage #* #************************************************************************/ @@ -431,16 +401,13 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, /************************************************************************* -#* Methode: Reset Datum:02.10.97 +#* Methode: Reset #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Die Attribute des Dialogs werden mit Hilfe #* des Itemsets neu eingestellt. -#* #* Input: SfxItemSet -#* #* Output: --- #* #************************************************************************/ @@ -511,7 +478,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) bOneAreaFlag= pBoolItem->GetValue(); } } - //bOneAreaFlag=sal_True; //@@ Debug-Test eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); @@ -623,7 +589,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); UpdateFormatListBox_Impl(sal_False,sal_True); -//! erAck 26.01.01 //! 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? @@ -649,16 +614,13 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } /************************************************************************* -#* Methode: Obstructing Datum:02.10.97 +#* Methode: Obstructing #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel #* und direkter Eingabe. -#* #* Input: --- -#* #* Output: --- #* #************************************************************************/ @@ -731,15 +693,12 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() /************************************************************************* -#* Methode: HideLanguage Datum:14.05.98 +#* Methode: HideLanguage #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Versteckt die Spracheinstellung: -#* #* Input: sal_Bool nFlag -#* #* Output: --- #* #************************************************************************/ @@ -764,17 +723,14 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) } /************************************************************************* -#* Methode: FillItemSet Datum:02.10.97 +#* Methode: FillItemSet #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Stellt die Attribute im ItemSet ein, #* sowie in der DocShell den numItem, wenn #* bNumItemFlag nicht gesetzt ist. -#* #* Input: SfxItemSet -#* #* Output: --- #* #************************************************************************/ @@ -883,18 +839,6 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { -/* if ( (ULONG_MAX != nInitFormat) && _pSet ) - { - const sal_uLong nCurKey = pNumFmtShell->GetCurNumFmtKey(); - const sal_uInt16 nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ); - SfxItemState eItemState = GetItemSet().GetItemState( nWhich, sal_False ); - - if ( (nInitFormat == nCurKey) && (SFX_ITEM_DEFAULT == eItemState) ) - _pSet->ClearItem( nWhich ); - else - _pSet->Put( SfxUInt32Item( nWhich, nCurKey ) ); - } - */ if ( _pSet ) FillItemSet( *_pSet ); return LEAVE_PAGE; @@ -979,15 +923,12 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: DeleteEntryList_Impl Datum:02.10.97 +#* Methode: DeleteEntryList_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Loescht eine SvStrings- Liste -#* #* Input: String-liste -#* #* Output: --- #* #************************************************************************/ @@ -1000,19 +941,16 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( SvxDelStrgs& rEntries ) /************************************************************************* -#* Methode: UpdateOptions_Impl Datum:02.10.97 +#* Methode: UpdateOptions_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Stellt je nach eingestelltem Format die Options- #* attribute neu ein. -#* #* Input: Flag, ob sich die Kategorie geaendert hat. -#* #* Output: --- #* -#***?********************************************************************/ +#************************************************************************/ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sal_False*/ ) { @@ -1024,18 +962,10 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa sal_uInt16 nZeroes = 0; sal_Bool bNegRed = sal_False; sal_Bool bThousand = sal_False; - short nTmpCatPos; sal_uInt16 nCurrencyPos =aLbCurrency.GetSelectEntryPos(); if(bOneAreaFlag) - { - nTmpCatPos=nFixedCategory; nCurCategory=nFixedCategory; - } - else - { - nTmpCatPos=nCurCategory; - } pNumFmtShell->GetOptions( theFormat, @@ -1093,10 +1023,6 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa aEdLeadZeroes.Enable(); aBtnNegRed.Enable(); aBtnThousand.Enable(); - /* - aEdDecimals .SetValue( nDecimals ); - aEdLeadZeroes.SetValue( nZeroes ); - */ aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) ); aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) ); aBtnNegRed .Check( bNegRed ); @@ -1128,17 +1054,14 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa /************************************************************************* -#* Methode: UpdateFormatListBox_Impl Datum:02.10.97 +#* Methode: UpdateFormatListBox_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Aktualisiert die Format- Listbox und zusaetzlich #* wird abhaengig vom bUpdateEdit- Flag der String #* in der Editbox geaendert. -#* #* Input: Flags fuer Kategorie und Editbox -#* #* Output: --- #* #************************************************************************/ @@ -1207,8 +1130,6 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl String aFormat=*aEntryList[nFmtLbSelPos]; aEdFormat.SetText(aFormat); aFtComment.SetText(pNumFmtShell->GetComment4Entry(nFmtLbSelPos)); - - //@23.09.97 aEdFormat.SetText( aLbFormat.GetSelectEntry() ); } if(!bOneAreaFlag || !bCat) @@ -1259,17 +1180,14 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl /************************************************************************* -#* Handle: DoubleClickHdl_Impl Datum:02.10.97 +#* Handle: DoubleClickHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Bei einem Doppelklick in die Format- Listbox #* wird der Wert uebernommen und der OK-Button #* ausgeloest -#* #* Input: Pointer auf Listbox -#* #* Output: --- #* #************************************************************************/ @@ -1297,17 +1215,14 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) /************************************************************************* -#* Methode: SelFormatHdl_Impl Datum:02.10.97 +#* Methode: SelFormatHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie #* oder das Format aendert. Dem entsprechend werden die #* Einstellungen geaendert. -#* #* Input: Pointer auf Listbox -#* #* Output: --- #* #************************************************************************/ @@ -1403,9 +1318,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) } UpdateOptions_Impl( sal_False ); - //------- return 0; - //------- } //-------------------------------------------------------------------- @@ -1416,9 +1329,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) EditHdl_Impl( NULL ); UpdateOptions_Impl( sal_False ); - //------- return 0; - //------- } //-------------------------------------------------------------------- @@ -1428,26 +1339,21 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) UpdateFormatListBox_Impl( sal_False, sal_True ); EditHdl_Impl( &aEdFormat ); - //------- return 0; - //------- } return 0; } /************************************************************************* -#* Methode: ClickHdl_Impl, ImageButton* pIB Datum:02.10.97 +#* Methode: ClickHdl_Impl, ImageButton* pIB #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button #* wird diese Funktion aufgerufen und die Zahlenformat- #* Liste den entsprechend geaendert. -#* #* Input: Toolbox- Button -#* #* Output: --- #* #************************************************************************/ @@ -1529,7 +1435,6 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) aLbFormat.SelectEntryPos( (sal_uInt16)nFmtLbSelPos ); aEdFormat.SetText( aFormat ); - //aEdComment.SetText(String()); //@@ ??? aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert //holen ChangePreviewText( (sal_uInt16)nFmtLbSelPos ); @@ -1608,16 +1513,13 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB) /************************************************************************* -#* Methode: EditHdl_Impl Datum:02.10.97 +#* Methode: EditHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird, #* so wird die Vorschau aktualisiert und -#* #* Input: Pointer auf Editbox -#* #* Output: --- #* #************************************************************************/ @@ -1636,7 +1538,6 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) else { String aFormat = aEdFormat.GetText(); - //aFtComment.SetText(String()); MakePreviewText( aFormat ); if ( pNumFmtShell->FindEntry( aFormat, &nCurKey ) ) @@ -1682,15 +1583,12 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1720,7 +1618,6 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) (sal_uInt16)aLbFormat.GetSelectEntryPos() ); aEdFormat.SetText( aFormat ); - //aFtComment.SetText(String()); MakePreviewText( aFormat ); if ( pNumFmtShell->FindEntry( aFormat ) ) @@ -1749,15 +1646,12 @@ IMPL_LINK( SvxNumberFormatTabPage, TimeHdl_Impl, Timer*, EMPTYARG) /************************************************************************* -#* Methode: LostFocusHdl_Impl Datum:30.10.97 +#* Methode: LostFocusHdl_Impl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1783,15 +1677,12 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) } /************************************************************************* -#* Methode: NotifyChange Datum:02.10.97 +#* Methode: NotifyChange #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch. -#* #* Input: Options- Controls -#* #* Output: --- #* #************************************************************************/ @@ -1860,15 +1751,12 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) return SfxTabPage::PreNotify( rNEvt ); } /************************************************************************* -#* Methode: SetOkHdl Datum:01.11.97 +#* Methode: SetOkHdl #*------------------------------------------------------------------------ #* #* Klasse: SvxNumberFormatTabPage -#* #* Funktion: Setzt den OkHandler neu. -#* #* Input: Neuer OkHandler -#* #* Output: --- #* #************************************************************************/ @@ -1883,7 +1771,6 @@ void SvxNumberFormatTabPage::FillCurrencyBox() SvStringsDtor aList; NfShCurrencyEntries rEntries; XubString* pEntry = NULL; - sal_uInt16 nPos=0; sal_uInt16 nSelPos=0; pNumFmtShell->GetCurrencySymbols( aList, &nSelPos); @@ -1891,7 +1778,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox() for(sal_uInt16 i=1;i<aList.Count();i++) { pEntry=aList[i]; - nPos=aLbCurrency.InsertEntry( *pEntry); + aLbCurrency.InsertEntry( *pEntry); } aLbCurrency.SelectEntryPos(nSelPos); } @@ -1931,12 +1818,11 @@ void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos) } aLbCategory.SelectEntryPos(nPos); } -/* -----------------12.11.2002 14:35----------------- - * to support Writer text field language handling an - * additional entry needs to be inserted into the ListBox - * which marks a certain language as automatically detected - * Additionally the "Default" language is removed - * --------------------------------------------------*/ +/* to support Writer text field language handling an + additional entry needs to be inserted into the ListBox + which marks a certain language as automatically detected + Additionally the "Default" language is removed +*/ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect) { aLbLanguage.RemoveLanguage(LANGUAGE_SYSTEM); @@ -1946,7 +1832,7 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, s aLbLanguage.SelectEntryPos(nPos); } -void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,sal_False); SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,sal_False); @@ -1955,3 +1841,5 @@ void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 if (pLinkItem) SetOkHdl(pLinkItem->GetValue()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index f863a303c800..6b72d486af41 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -62,7 +62,6 @@ #define IL_ICON 32 #define LB_CURRENCY 33 #define CB_SOURCEFORMAT 34 -#define IL_ICON_HC 35 #define STR_AUTO_ENTRY 36 #define TBX_ADDREMOVE 1 diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index b3f2d22fd204..867f93c7e753 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -147,7 +147,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT { Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 69 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Führende ~Nullen : F³hrende ~Nullen */ Text [ en-US ] = "Leading ~zeroes" ; }; NumericField ED_LEADZEROES @@ -250,18 +249,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; IdCount = { 3 ; }; }; - ImageList IL_ICON_HC - { - Prefix = "nuh"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - IdList = - { - IID_ADD ; - IID_REMOVE ; - IID_INFO ; - }; - IdCount = { 3 ; }; - }; String STR_AUTO_ENTRY { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 5d2e85da8a3b..1f912e608ba9 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -35,7 +33,6 @@ #include <numpages.hxx> #include <numpages.hrc> #include <dialmgr.hxx> -#include <cuires.hrc> #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> @@ -75,11 +72,11 @@ #include <vector> #include "sfx2/opengrf.hxx" -#include <cuires.hrc> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 -#include <svl/aeitem.hxx> //add CHINA001 -#include <svl/stritem.hxx>//add CHINA001 -#include <svl/slstitm.hxx> //add CHINA001 +#include <cuires.hrc> +#include <sfx2/request.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/slstitm.hxx> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -90,13 +87,9 @@ using namespace com::sun::star::text; using namespace com::sun::star::container; using namespace com::sun::star::style; using rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr); -/*-----------------07.02.97 15.37------------------- - ---------------------------------------------------*/ #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 @@ -118,22 +111,18 @@ static const sal_Char cPrefix[] = "Prefix"; static const sal_Char cSuffix[] = "Suffix"; static const sal_Char cBulletChar[] = "BulletChar"; static const sal_Char cBulletFontName[] = "BulletFontName"; -/* -----------------------------31.01.01 10:23-------------------------------- - ---------------------------------------------------------------------------*/ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() { Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); Reference < XInterface > xI = xMSF->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) ); Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY); DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\""); return xRet; } -/* -----------------------------31.01.01 11:40-------------------------------- - ---------------------------------------------------------------------------*/ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps) { const PropertyValue* pValues = rLevelProps.getConstArray(); @@ -155,9 +144,7 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r } return pNew; } -/* -----------------28.10.98 08:32------------------- - * - * --------------------------------------------------*/ + // Die Auswahl an Bullets aus den StarSymbol static const sal_Unicode aBulletTypes[] = { @@ -170,10 +157,8 @@ static const sal_Unicode aBulletTypes[] = 0x2717, 0x2714 }; -/* -----------------28.10.98 09:42------------------- - * - * --------------------------------------------------*/ -static sal_Char __READONLY_DATA aNumChar[] = + +static sal_Char const aNumChar[] = { 'A', //CHARS_UPPER_LETTER 'a', //CHARS_LOWER_LETTER @@ -183,9 +168,7 @@ static sal_Char __READONLY_DATA aNumChar[] = ' ' }; -/*-----------------18.03.98 08:35------------------- - Ist eins der maskierten Formate gesetzt? ---------------------------------------------------*/ +// Ist eins der maskierten Formate gesetzt? sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) { sal_Bool bRet = sal_False; @@ -198,9 +181,6 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) } return bRet; } -/* -----------------28.10.98 08:50------------------- - * - * --------------------------------------------------*/ Font& lcl_GetDefaultBulletFont() { @@ -273,9 +253,6 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, pExamplesVS->SetNumberingSettings(aNumberings, xFormat, aLocale); } } -/*-----------------07.02.97 12.08------------------- - ---------------------------------------------------*/ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() { @@ -285,21 +262,12 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, aNumSettingsArr.DeleteAndDestroy(0, aNumSettingsArr.Count()); } -/*-----------------07.02.97 12.13------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxSingleNumPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.09------------------- - ---------------------------------------------------*/ - - sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pSaveNum) @@ -312,10 +280,6 @@ sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------08.02.97 16.27------------------- - ---------------------------------------------------*/ - void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -351,10 +315,6 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = sal_False; } -/*-----------------08.02.97 11.28------------------- - ---------------------------------------------------*/ - int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -362,15 +322,10 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.09------------------- - ---------------------------------------------------*/ - - void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// 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, sal_False, &pItem); if(eState != SFX_ITEM_SET) @@ -393,9 +348,6 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) else if(*pSaveNum != *pActNum) *pActNum = *pSaveNum; } -/*-----------------08.02.97 11.40------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { @@ -439,9 +391,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.15------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -450,11 +399,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -475,10 +419,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - SvxBulletPickTabPage::~SvxBulletPickTabPage() { @@ -486,10 +426,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, delete pExamplesVS; delete pSaveNum; } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) @@ -497,11 +433,6 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, return new SvxBulletPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.10------------------- - ---------------------------------------------------*/ - - sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) @@ -512,9 +443,6 @@ sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; } -/*-----------------08.02.97 16.28------------------- - ---------------------------------------------------*/ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) { @@ -549,9 +477,6 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) bPreset |= bIsPreset; bModified = sal_False; } -/*-----------------08.02.97 11.28------------------- - ---------------------------------------------------*/ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { @@ -560,11 +485,6 @@ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.11------------------- - ---------------------------------------------------*/ - - void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -586,16 +506,11 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); - if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) *pActNum = *pSaveNum; } -/*-----------------08.02.97 11.58------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { @@ -627,9 +542,7 @@ IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.16------------------- ---------------------------------------------------*/ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -638,7 +551,7 @@ IMPL_LINK(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -//Add CHINA001 + void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) { @@ -649,11 +562,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) } -//end of add CHINA001 -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, @@ -711,10 +619,6 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetOutlineNumberingSettings(aOutlineAccess, xFormat, aLocale); } } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - SvxNumPickTabPage::~SvxNumPickTabPage() { @@ -723,22 +627,12 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, delete pSaveNum; } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - - SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPickTabPage(pParent, rAttrSet); } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - - sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) @@ -749,9 +643,6 @@ sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; } -/*-----------------08.02.97 16.28------------------- - ---------------------------------------------------*/ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { @@ -787,10 +678,6 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = sal_False; } -/* -----------------08.02.97 11.29------------------- - ---------------------------------------------------*/ - int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -798,10 +685,6 @@ int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------07.02.97 12.12------------------- - ---------------------------------------------------*/ - void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -823,7 +706,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -831,10 +713,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) } -/*-----------------08.02.97 11.58------------------- - Hier werden alle Ebenen veraendert, ---------------------------------------------------*/ - +// Hier werden alle Ebenen veraendert IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { if(pActNum) @@ -917,9 +796,6 @@ IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.16------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -928,7 +804,6 @@ IMPL_LINK(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -//add CHINA001 begin void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); @@ -938,12 +813,7 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) if (pNumCharFmt &&pBulletCharFmt) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } -//end of CHINA001 -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -967,7 +837,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); // Grafiknamen ermitteln - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(sal_uInt16 i = 0; i < aGrfNames.Count(); i++) @@ -992,11 +861,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, pExamplesVS->SetAccessibleRelationMemberOf( &aValuesFL ); } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - - SvxBitmapPickTabPage::~SvxBitmapPickTabPage() +SvxBitmapPickTabPage::~SvxBitmapPickTabPage() { String* pStr = (String*)aGrfNames.First(); while( pStr ) @@ -1009,26 +874,17 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, delete pSaveNum; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxBitmapPickTabPage(pParent, rAttrSet); } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ - void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; bPreset = sal_False; sal_Bool bIsPreset = sal_False; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -1058,9 +914,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) bPreset |= bIsPreset; bModified = sal_False; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { @@ -1068,16 +921,11 @@ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) FillItemSet(*_pSet); return sal_True; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( !aGrfNames.Count() ) { -// das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return sal_False; } if( (bPreset || bModified) && pActNum) @@ -1089,9 +937,6 @@ sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------12.02.97 07.46------------------- - ---------------------------------------------------*/ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) { @@ -1130,10 +975,6 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) } } -/*-----------------12.02.97 07.53------------------- - ---------------------------------------------------*/ - IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) { if(pActNum) @@ -1181,9 +1022,6 @@ IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/*-----------------06.06.97 11.17------------------- - ---------------------------------------------------*/ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) { NumSelectHdl_Impl(pExamplesVS); @@ -1191,9 +1029,7 @@ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) rOk.GetClickHdl().Call(&rOk); return 0; } -/* -----------------03.11.99 13:46------------------- - --------------------------------------------------*/ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) { if(!pExamplesVS->IsNoSelection()) @@ -1202,85 +1038,8 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG ) } return 0; } -/*-----------------13.02.97 09.40------------------- - ---------------------------------------------------*/ - -//CHINA001 SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/ ) : -//CHINA001 -//CHINA001 SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), -//CHINA001 // rStrList ( rStrNames ), -//CHINA001 bGrfNotFound( sal_False ) -//CHINA001 -//CHINA001 { -//CHINA001 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); -//CHINA001 SetStyle( GetStyle() | WB_VSCROLL ); -//CHINA001 SetLineCount( 3 ); -//CHINA001 aFormatTimer.SetTimeout(300); -//CHINA001 aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl)); -//CHINA001 } -//CHINA001 -//CHINA001 /*-----------------13.02.97 09.41------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 SvxBmpNumValueSet::~SvxBmpNumValueSet() -//CHINA001 { -//CHINA001 GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); -//CHINA001 aFormatTimer.Stop(); -//CHINA001 } -//CHINA001 /*-----------------13.02.97 09.41------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) -//CHINA001 { -//CHINA001 SvxNumValueSet::UserDraw(rUDEvt); -//CHINA001 -//CHINA001 Rectangle aRect = rUDEvt.GetRect(); -//CHINA001 OutputDevice* pDev = rUDEvt.GetDevice(); -//CHINA001 sal_uInt16 nItemId = rUDEvt.GetItemId(); -//CHINA001 Point aBLPos = aRect.TopLeft(); -//CHINA001 -//CHINA001 int nRectHeight = aRect.GetHeight(); -//CHINA001 Size aSize(nRectHeight/8, nRectHeight/8); -//CHINA001 -//CHINA001 Graphic aGraphic; -//CHINA001 if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, -//CHINA001 &aGraphic, NULL)) -//CHINA001 { -//CHINA001 bGrfNotFound = sal_True; -//CHINA001 } -//CHINA001 else -//CHINA001 { -//CHINA001 Point aPos(aBLPos.X() + 5, 0); -//CHINA001 for( sal_uInt16 i = 0; i < 3; i++ ) -//CHINA001 { -//CHINA001 sal_uInt16 nY = 11 + i * 33; -//CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; -//CHINA001 aGraphic.Draw( pDev, aPos, aSize ); -//CHINA001 } -//CHINA001 } -//CHINA001 } -//CHINA001 -//CHINA001 /*-----------------14.02.97 07.34------------------- -//CHINA001 -//CHINA001 --------------------------------------------------*/ -//CHINA001 -//CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) -//CHINA001 { -//CHINA001 // nur, wenn eine Grafik nicht da war, muss formatiert werden -//CHINA001 if(bGrfNotFound) -//CHINA001 { -//CHINA001 bGrfNotFound = sal_False; -//CHINA001 Format(); -//CHINA001 } -//CHINA001 Invalidate(); -//CHINA001 return 0; -//CHINA001 } -/*-----------------01.12.97 16:15------------------- - Tabpage Numerierungsoptionen ---------------------------------------------------*/ + +// Tabpage Numerierungsoptionen #define NUM_NO_GRAPHIC 1000 SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -1430,9 +1189,6 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, aBulletPB.SetAccessibleName(aStartFT.GetText()); } -/*-----------------01.12.97 16:30------------------- - ---------------------------------------------------*/ SvxNumOptionsTabPage::~SvxNumOptionsTabPage() { delete aBitmapMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY ); @@ -1447,9 +1203,6 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage() delete pSaveNum; } -/*-----------------03.12.97 07:52------------------- - ---------------------------------------------------*/ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) @@ -1461,17 +1214,12 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) aHeightMF .SetUnit( eMetric ); } -/*-----------------01.12.97 16:30------------------- - ---------------------------------------------------*/ SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumOptionsTabPage(pParent, rAttrSet); }; -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -1512,18 +1260,14 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } } -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(*_pSet); return sal_True; } -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); @@ -1535,9 +1279,7 @@ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) } return bModified; }; -/*-----------------01.12.97 16:29------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -1577,7 +1319,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); sal_uInt16 nMask = 1; aLevelLB.SetUpdateMode(sal_False); aLevelLB.SetNoSelection(); @@ -1607,7 +1348,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); XColorTable* pColorTable = NULL; - FASTBOOL bKillTable = sal_False; + bool bKillTable = false; if ( pDocSh ) { pItem = pDocSh->GetItem( SID_COLOR_TABLE ); @@ -1618,7 +1359,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = sal_True; + bKillTable = true; } aBulColLB.InsertEntry( Color( COL_AUTO ), SVX_RESSTR( RID_SVXSTR_AUTOMATIC )); @@ -1710,9 +1451,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) bModified = sal_False; } -/*-----------------02.12.97 13:47------------------- ---------------------------------------------------*/ void SvxNumOptionsTabPage::InitControls() { sal_Bool bShowBullet = sal_True; @@ -1859,12 +1598,6 @@ void SvxNumOptionsTabPage::InitControls() aStartED.SetText(aEmptyStr); break; case SHOW_BULLET: - { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); - } break; case SHOW_BITMAP: break; @@ -1893,10 +1626,7 @@ void SvxNumOptionsTabPage::InitControls() pPreviewWIN->Invalidate(); } -/*-----------------02.12.97 14:01------------------- - 0 - Nummer; 1 - Bullet; 2 - Bitmap ---------------------------------------------------*/ - +// 0 - Nummer; 1 - Bullet; 2 - Bitmap void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) { if(nBullet == nType) @@ -1971,9 +1701,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) aOrientLB .Enable(bEnableBitmap); } -/*-----------------02.12.97 13:51------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) { sal_uInt16 nSaveNumLvl = nActNumLvl; @@ -2015,17 +1743,13 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) InitControls(); return 0; } -/* -----------------------------05.04.2002 15:30------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer*, EMPTYARG ) { pPreviewWIN->Invalidate(); return 0; } -/*-----------------03.12.97 12:01------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) { for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2046,13 +1770,9 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) return 0; } -/*-----------------02.12.97 08:56------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { String sSelectStyle; - sal_Int16 eOldType; sal_Bool bShowOrient = sal_False; sal_Bool bBmp = sal_False; String aEmptyStr; @@ -2062,7 +1782,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - eOldType = aNumFmt.GetNumberingType(); // PAGEDESC gibt es nicht sal_uInt16 nNumType = (sal_uInt16)(sal_uLong)pBox->GetEntryData(pBox->GetSelectEntryPos()); aNumFmt.SetNumberingType((sal_Int16)nNumType); @@ -2090,8 +1809,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetBulletChar( SVX_DEF_BULLET ); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); - //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont()); - //aBulletFT.SetText( aNumFmt.GetBulletChar() ); // Zuweisung der Zeichenvorlage automatisch if(bAutomaticCharStyles) { @@ -2102,7 +1819,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -2132,14 +1848,11 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aCharFmtLB.SelectEntry(sSelectStyle); CharFmtHdl_Impl(&aCharFmtLB); - // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt bAutomaticCharStyles = sal_True; } return 0; } -/* -----------------06.11.2002 14:27----------------- - * - * --------------------------------------------------*/ + void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) { sal_Bool bIsNull = aStartED.GetValue() == 0; @@ -2150,9 +1863,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) if(bIsNull && bNoZeroAllowed) aStartED.GetModifyHdl().Call(&aStartED); } -/*-----------------03.12.97 16:43------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) { sal_uInt16 nPos = pBox->GetSelectEntryPos(); @@ -2180,9 +1891,6 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) } -/*-----------------06.12.97 12:00------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) { sal_Bool bSet = pBox->IsChecked(); @@ -2201,9 +1909,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) InitControls(); return 0; } -/* -----------------16.11.98 14:20------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox ) { Color nSetColor = pBox->GetSelectEntryColor(); @@ -2222,9 +1928,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox ) SetModified(); return 0; } -/* -----------------16.11.98 14:20------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) { sal_uInt16 nRelSize = (sal_uInt16)pField->GetValue(); @@ -2244,9 +1948,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField) return 0; } -/*-----------------02.12.97 10:50------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) { sal_uInt16 nItemId = pButton->GetCurItemId(); @@ -2321,9 +2022,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) } return 0; } -/* -----------------27.07.99 12:20------------------- - --------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) { if(!bMenuButtonInitialized) @@ -2376,9 +2075,6 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG ) return 0; } -/*-----------------02.12.97 10:58------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) { SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True ); @@ -2440,10 +2136,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG ) return 0; } -/*-----------------03.03.97 15:21------------------- - ---------------------------------------------------*/ - IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) { sal_Bool bWidth = pField == &aWidthMF; @@ -2512,10 +2204,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) { if (pBox->IsChecked()) @@ -2528,9 +2216,6 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) return 0; } -/*-----------------02.12.97 16:07------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG ) { bAutomaticCharStyles = sal_False; @@ -2559,9 +2244,6 @@ IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG ) }; -/*-----------------03.12.97 11:01------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) { sal_Bool bPrefix = pEdit == &aPrefixED; @@ -2598,9 +2280,6 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) return 0; } -/*-----------------09.12.97 11:49------------------- - ---------------------------------------------------*/ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, sal_uInt16 nDivision) { @@ -2623,9 +2302,6 @@ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, sa } -/*-----------------09.12.97 11:54------------------- - ---------------------------------------------------*/ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, const SvxNumberFormat& rFmt, sal_uInt16 nXStart, sal_uInt16 nYStart, const Size& rSize) @@ -2660,9 +2336,8 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, pVDev->SetFont(aTmpFont); return nRet; } -/*-----------------02.12.97 10:34------------------- - Vorschau der Numerierung painten ---------------------------------------------------*/ + +// Vorschau der Numerierung painten void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); @@ -2710,7 +2385,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); - // sal_uInt16 nFontHeight = nYStep * 6 / 10; if(bPosition) nFontHeight = nYStep * 15 / 10; @@ -2735,7 +2409,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-16 #newlistlevelattrs# sal_uInt16 nXStart( 0 ); short nTextOffset( 0 ); sal_uInt16 nNumberXPos( 0 ); @@ -2768,7 +2441,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nNumberXPos = static_cast<sal_uInt16>( nTmpNumberXPos ); } } - // <-- sal_uInt16 nBulletWidth = 0; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType() &(~LINK_TOKEN))) @@ -2803,7 +2475,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = (sal_uInt16)pVDev->GetTextWidth(aText); nPreNum++; } - // --> OD 2008-01-16 #newlistlevelattrs# if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT && rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { @@ -2813,7 +2484,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText); } - // --> OD 2008-01-16 #newlistlevelattrs# sal_uInt16 nTextXPos( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2847,7 +2517,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) nXStart = static_cast<sal_uInt16>( rFmt.GetIndentAt() / nWidthRelation ); } - // <-- Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); pVDev->SetFillColor( aBackColor ); @@ -2875,7 +2544,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) { const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel); aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart(); - // --> OD 2008-01-31 #newlistlevelattrs# sal_uInt16 nXStart( 0 ); if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -2897,7 +2565,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } nXStart /= 2; nXStart += 2; - // <-- sal_uInt16 nTextOffset = 2 * nXStep; if( SVX_NUM_BITMAP == (rFmt.GetNumberingType()&(~LINK_TOKEN)) ) { @@ -2969,9 +2636,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ), @@ -2987,7 +2651,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aDistNumMF( this, CUI_RES(MF_NUMDIST )), aAlignFT( this, CUI_RES(FT_ALIGN )), aAlignLB( this, CUI_RES(LB_ALIGN )), - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ), aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ), aListtabFT( this, CUI_RES(FT_LISTTAB) ), @@ -2998,7 +2661,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ), 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 ))), pActNum(0), @@ -3008,9 +2670,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, bModified(false), bPreset(false), bInInintControl(sal_False), - // --> OD 2008-01-11 #newlistlevelattrs# bLabelAlignmentPosAndSpaceModeActive( false ) - // <-- { FreeResource(); SetExchangeSupport(); @@ -3018,7 +2678,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aRelativeCB.Check(); aAlignLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); - // --> OD 2008-01-10 #newlistlevelattrs# aAlign2LB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); for ( sal_uInt16 i = 0; i < aAlignLB.GetEntryCount(); ++i ) { @@ -3026,7 +2685,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, } aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() ); aAlign2FT.SetText( aAlignFT.GetText() ); - // <-- Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl); @@ -3042,7 +2700,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentMF.SetDownHdl(aLk); aIndentMF.SetLoseFocusHdl(aLk); - // --> OD 2008-01-10 #newlistlevelattrs# aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() ); aLabelFollowedByLB.SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); @@ -3060,7 +2717,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aIndentAtMF.SetUpHdl(aLk); aIndentAtMF.SetDownHdl(aLk); aIndentAtMF.SetLoseFocusHdl(aLk); - // <-- aLevelLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl)); aRelativeCB.SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl)); @@ -3071,29 +2727,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, pPreviewWIN->SetPositionMode(); eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); - //HACK("der Wert sollte mal sinnvol gesetzt werden") - long nWidth = 10000; - nWidth = OutputDevice::LogicToLogic( nWidth, - (MapUnit)eCoreUnit, MAP_100TH_MM ); - - aDistBorderMF.SetMax(aDistBorderMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aDistNumMF .SetMax(aDistNumMF .Normalize( nWidth ), FUNIT_100TH_MM ); - aIndentMF .SetMax(aIndentMF .Normalize( nWidth ), FUNIT_100TH_MM ); - // --> OD 2008-02-18 #newlistlevelattrs# - aListtabMF.SetMax(aListtabMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aAlignedAtMF.SetMax(aAlignedAtMF.Normalize( nWidth ), FUNIT_100TH_MM ); - aIndentAtMF.SetMax(aIndentAtMF.Normalize( nWidth ), FUNIT_100TH_MM ); - // <-- - long nLast2 = nWidth /2; - aDistBorderMF.SetLast( aDistBorderMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aDistNumMF .SetLast( aDistNumMF .Normalize( nLast2 ), FUNIT_100TH_MM ); - aIndentMF .SetLast( aIndentMF .Normalize( nLast2 ), FUNIT_100TH_MM ); - // --> OD 2008-02-18 #newlistlevelattrs# - aListtabMF.SetLast(aListtabMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aAlignedAtMF.SetLast(aAlignedAtMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - aIndentAtMF.SetLast(aIndentAtMF.Normalize( nLast2 ), FUNIT_100TH_MM ); - // <-- - #if OSL_DEBUG_LEVEL > 1 pDebugFixedText = new FixedText(this, 0); pDebugFixedText->Show(); @@ -3106,9 +2739,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL); } -/*-----------------03.12.97 10:02------------------- ---------------------------------------------------*/ SvxNumPositionTabPage::~SvxNumPositionTabPage() { delete pActNum; @@ -3148,16 +2779,11 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) } #endif -/*-----------------03.12.97 10:06------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::InitControls() { bInInintControl = sal_True; - // --> OD 2008-01-11 #newlistlevelattrs# const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && aRelativeCB.IsEnabled() && aRelativeCB.IsChecked(); - // <-- const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; @@ -3172,12 +2798,10 @@ void SvxNumPositionTabPage::InitControls() bool bSameIndent = !bLabelAlignmentPosAndSpaceModeActive; bool bSameAdjust = true; - // --> OD 2008-01-11 #newlistlevelattrs# bool bSameLabelFollowedBy = bLabelAlignmentPosAndSpaceModeActive; bool bSameListtab = bLabelAlignmentPosAndSpaceModeActive; bool bSameAlignAt = bLabelAlignmentPosAndSpaceModeActive; bool bSameIndentAt = bLabelAlignmentPosAndSpaceModeActive; - // <-- const SvxNumberFormat* aNumFmtArr[SVX_MAX_NUM]; sal_uInt16 nMask = 1; @@ -3203,7 +2827,6 @@ void SvxNumPositionTabPage::InitControls() if( i > nLvl) { - // --> OD 2008-01-11 #newlistlevelattrs# bSameAdjust &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust(); if ( !bLabelAlignmentPosAndSpaceModeActive ) { @@ -3238,7 +2861,6 @@ void SvxNumPositionTabPage::InitControls() bSameIndentAt &= aNumFmtArr[i]->GetIndentAt() == aNumFmtArr[nLvl]->GetIndentAt(); } - // <-- } } nMask <<= 1; @@ -3284,19 +2906,14 @@ void SvxNumPositionTabPage::InitControls() else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT) nPos = 2; aAlignLB.SelectEntryPos(nPos); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SelectEntryPos( nPos ); - // <-- } else { aAlignLB.SetNoSelection(); - // --> OD 2008-01-11 #newlistlevelattrs# aAlign2LB.SetNoSelection(); - // <-- } - // --> OD 2008-01-11 #newlistlevelattrs# if ( bSameLabelFollowedBy ) { sal_uInt16 nPos = 0; // LISTTAB @@ -3354,7 +2971,6 @@ void SvxNumPositionTabPage::InitControls() { aIndentAtMF.SetText(aEmptyStr); } - // <-- if ( bSetDistEmpty ) aDistBorderMF.SetText(aEmptyStr); @@ -3362,9 +2978,6 @@ void SvxNumPositionTabPage::InitControls() bInInintControl = sal_False; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -3377,7 +2990,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem)) nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue(); } - // if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem)) { delete pSaveNum; @@ -3403,10 +3015,8 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) aRelativeCB.Enable(nActNumLvl != 1); aLevelLB.SetUpdateMode(sal_True); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); } @@ -3414,9 +3024,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) pPreviewWIN->Invalidate(); } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) @@ -3424,9 +3031,6 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); @@ -3440,9 +3044,6 @@ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -3503,19 +3104,13 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) *pActNum = *pSaveNum; pPreviewWIN->SetNumRule(pActNum); - // --> OD 2008-01-11 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); -// const sal_Bool bDraw = pActNum->IsFeatureSupported(NUM_CONTINUOUS); -// aDistNumFT.Show(bDraw); -// aDistNumMF.Show(bDraw); - // <-- InitControls(); bModified = sal_False; } -// --> OD 2008-01-11 #newlistlevelattrs# void SvxNumPositionTabPage::InitPosAndSpaceMode() { if ( pActNum == 0 ) @@ -3571,20 +3166,13 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive ); aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive ); } -// <-- - -/*-----------------03.12.97 10:02------------------- ---------------------------------------------------*/ SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SvxNumPositionTabPage(pParent, rAttrSet); } -/*-----------------04.12.97 12:51------------------- - ---------------------------------------------------*/ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) { if(eMetric == FUNIT_MM) @@ -3592,25 +3180,18 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) aDistBorderMF .SetDecimalDigits(1); aDistNumMF .SetDecimalDigits(1); aIndentMF .SetDecimalDigits(1); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetDecimalDigits(1); aAlignedAtMF.SetDecimalDigits(1); aIndentAtMF.SetDecimalDigits(1); - // <-- } aDistBorderMF .SetUnit( eMetric ); aDistNumMF .SetUnit( eMetric ); aIndentMF .SetUnit( eMetric ); - // --> OD 2008-02-18 #newlistlevelattrs# aListtabMF.SetUnit( eMetric ); aAlignedAtMF.SetUnit( eMetric ); aIndentAtMF.SetUnit( eMetric ); - // <-- } -/*-----------------03.12.97 11:06------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) { sal_uInt16 nMask = 1; @@ -3620,11 +3201,9 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - // --> OD 2008-01-11 #newlistlevelattrs# const sal_uInt16 nPos = aAlignLB.IsVisible() ? aAlignLB.GetSelectEntryPos() : aAlign2LB.GetSelectEntryPos(); - // <-- SvxAdjust eAdjust = SVX_ADJUST_CENTER; if(nPos == 0) eAdjust = SVX_ADJUST_LEFT; @@ -3638,9 +3217,7 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG ) SetModified(); return 0; } -/*-----------------03.12.97 11:11------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) { sal_uInt16 nSaveNumLvl = nActNumLvl; @@ -3681,16 +3258,12 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) } aRelativeCB.Enable(nActNumLvl != 1); SetModified(); - // --> OD 2008-01-15 #newlistlevelattrs# InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); - // <-- InitControls(); return 0; } -/*-----------------03.12.97 12:24------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) { if(bInInintControl) @@ -3762,9 +3335,6 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) return 0; } -/*-----------------04.12.97 12:35------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) { sal_Bool bOn = pBox->IsChecked(); @@ -3808,7 +3378,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) return 0; } -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) { // determine value to be set at the chosen list levels @@ -3868,9 +3437,7 @@ IMPL_LINK( SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox*, EMPTYARG ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3896,9 +3463,7 @@ IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3925,9 +3490,7 @@ IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -// --> OD 2008-01-14 #newlistlevelattrs# IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) { // determine value to be set at the chosen list levels @@ -3957,27 +3520,21 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -// <-- -/*-----------------05.12.97 15:33------------------- ---------------------------------------------------*/ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) { sal_uInt16 nMask = 1; - // --> OD 2008-02-11 #newlistlevelattrs# SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), pActNum->GetLevelCount(), pActNum->IsContinuousNumbering(), SVX_RULETYPE_NUMBERING, pActNum->GetLevel( 0 ).GetPositionAndSpaceMode() ); - // <-- for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt( pActNum->GetLevel( i ) ); SvxNumberFormat aTempFmt(aTmpNumRule.GetLevel( i )); - // --> OD 2008-02-05 #newlistlevelattrs# aNumFmt.SetPositionAndSpaceMode( aTempFmt.GetPositionAndSpaceMode() ); if ( aTempFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { @@ -3993,7 +3550,6 @@ IMPL_LINK( SvxNumPositionTabPage, StandardHdl_Impl, PushButton *, EMPTYARG ) aNumFmt.SetFirstLineIndent( aTempFmt.GetFirstLineIndent() ); aNumFmt.SetIndentAt( aTempFmt.GetIndentAt() ); } - // <-- pActNum->SetLevel( i, aNumFmt ); } @@ -4025,7 +3581,7 @@ void SvxNumOptionsTabPage::SetModified(sal_Bool bRepaint) } } -//Add CHINA001 + void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); @@ -4051,10 +3607,6 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); } -//end of add CHINA001 - -//add CHINA001 begin - void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); @@ -4062,3 +3614,5 @@ void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5bc52b99f3a9..aa5d75239b65 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -39,6 +37,7 @@ #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> #include "svx/htmlmode.hxx" +#include <sal/macros.h> #define _SVX_PAGE_CXX @@ -56,7 +55,6 @@ #include <editeng/sizeitem.hxx> #include <editeng/frmdiritem.hxx> #include "svx/dlgutil.hxx" -#include <dialmgr.hxx> #include <editeng/paperinf.hxx> #include <dialmgr.hxx> #include <sfx2/module.hxx> @@ -68,9 +66,9 @@ // #i4219# #include <svtools/optionsdrawinglayer.hxx> -#include <svl/slstitm.hxx> //CHINA001 -#include <svl/aeitem.hxx> //CHINA001 -#include <sfx2/request.hxx> //CHINA001 +#include <svl/slstitm.hxx> +#include <svl/aeitem.hxx> +#include <sfx2/request.hxx> // configuration helper ======================================================= /** Helper to get a configuration setting. @@ -154,9 +152,7 @@ sal_uInt16 aArr[] = sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) { - const sal_uInt16 nCount = sizeof(aArr) / sizeof(sal_uInt16); - - for ( sal_uInt16 i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aArr); ++i ) if ( aArr[i] == ( nUsage & 0x000f ) ) return i; return SVX_PAGE_ALL; @@ -166,9 +162,7 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) { - const sal_uInt16 nCount = sizeof(aArr) / sizeof(sal_uInt16); - - if ( nPos >= nCount ) + if ( nPos >= SAL_N_ELEMENTS(aArr) ) return 0; return aArr[nPos]; } @@ -564,7 +558,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); - FASTBOOL bOrientationSupport = + bool bOrientationSupport = pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION ); #ifdef OS2 // unter OS/2 wird bei HasSupport() immer sal_True returned @@ -1157,7 +1151,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) // ----------------------------------------------------------------------- -void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet ) +void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode(); Orientation eOri = ORIENTATION_PORTRAIT; @@ -1759,7 +1753,7 @@ bool SvxPageDescPage::IsMarginOutOfRange() return bRet; } -void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,sal_False); SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,sal_False); @@ -1772,3 +1766,5 @@ void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 if (pCollectListItem) SetCollectionList(pCollectListItem->GetList()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h index 9de1ee21d3e5..6d5821fdc5ea 100644 --- a/cui/source/tabpages/page.h +++ b/cui/source/tabpages/page.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 81f898679984..e0c26d5d42f5 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/style.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -38,6 +36,7 @@ #define _SVX_PARAGRPH_CXX 0 #include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> #include <editeng/pgrditem.hxx> #include <cuires.hrc> #include "paragrph.hrc" @@ -59,9 +58,9 @@ #include <dialmgr.hxx> #include "svx/htmlmode.hxx" #include <editeng/paravertalignitem.hxx> -#include <svl/eitem.hxx> //add CHINA001 -#include <sfx2/request.hxx> //add CHINA001 -#include <svl/intitem.hxx> //add CHINA001 +#include <svl/eitem.hxx> +#include <sfx2/request.hxx> +#include <svl/intitem.hxx> // static ---------------------------------------------------------------- @@ -179,9 +178,6 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { -//! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! - SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = @@ -272,7 +268,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: - DBG_ERROR( "unbekannter Type fuer Zeilenabstand." ); + OSL_FAIL( "unbekannter Type fuer Zeilenabstand." ); break; } eState = GetItemSet().GetItemState( nWhich ); @@ -282,7 +278,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aSpacing ); - bModified |= sal_True; + bModified = sal_True; } } @@ -324,10 +320,10 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= sal_True; + bModified = sal_True; } } - FASTBOOL bNullTab = sal_False; + bool bNullTab = false; if ( aLeftIndent.IsValueModified() || aFLineIndent.IsValueModified() || @@ -374,14 +370,14 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } aMargin.SetAutoFirst(aAutoCB.IsChecked()); if ( aMargin.GetTxtFirstLineOfst() < 0 ) - bNullTab = sal_True; + bNullTab = true; eState = GetItemSet().GetItemState( nWhich ); if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified |= sal_True; + bModified = sal_True; } } @@ -418,7 +414,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { pRegItem->SetValue(!bSet); rOutSet.Put(*pRegItem); - bModified |= sal_True; + bModified = sal_True; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, sal_False ) ) rOutSet.ClearItem(_nWhich); @@ -438,12 +434,28 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) // Metrik einstellen FieldUnit eFUnit = GetModuleFieldUnit( rSet ); + + sal_Bool bApplyCharUnit = GetApplyCharUnit( rSet ); + + SvtCJKOptions aCJKOptions; + if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) + eFUnit = FUNIT_CHAR; + SetFieldUnit( aLeftIndent, eFUnit ); SetFieldUnit( aRightIndent, eFUnit ); SetFieldUnit( aFLineIndent, eFUnit ); - SetFieldUnit( aTopDist, eFUnit ); - SetFieldUnit( aBottomDist, eFUnit ); - SetFieldUnit( aLineDistAtMetricBox, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + { + SetFieldUnit( aTopDist, FUNIT_LINE ); + SetFieldUnit( aBottomDist, FUNIT_LINE ); + SetFieldUnit( aLineDistAtMetricBox, FUNIT_POINT ); + } + else + { + SetFieldUnit( aTopDist, eFUnit ); + SetFieldUnit( aBottomDist, eFUnit ); + SetFieldUnit( aLineDistAtMetricBox, eFUnit ); + } sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxItemState eItemState = rSet.GetItemState( _nWhich ); @@ -535,7 +547,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { aTopDist.SetRelative(); - SetFieldUnit( aTopDist, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + SetFieldUnit( aTopDist, FUNIT_LINE ); + else + SetFieldUnit( aTopDist, eFUnit ); SetMetricValue( aTopDist, rOldItem.GetUpper(), eUnit ); } @@ -547,7 +562,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { aBottomDist.SetRelative(); - SetFieldUnit( aBottomDist, eFUnit ); + if ( eFUnit == FUNIT_CHAR ) + SetFieldUnit( aBottomDist, FUNIT_LINE ); + else + SetFieldUnit( aBottomDist, eFUnit ); SetMetricValue( aBottomDist, rOldItem.GetLower(), eUnit ); } } @@ -943,9 +961,6 @@ void SvxStdParagraphTabPage::EnableRegisterMode() aRegisterFL.Show(); } -/*-----------------16.01.97 19.54------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) { sal_Bool bEnable = !pBox->IsChecked(); @@ -954,42 +969,33 @@ IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) return 0; } -/*-----------------16.01.97 18.00------------------- - ---------------------------------------------------*/ void SvxStdParagraphTabPage::SetPageWidth( sal_uInt16 nPageWidth ) { nWidth = nPageWidth; } -/*-----------------17.01.97 08.11------------------- ---------------------------------------------------*/ void SvxStdParagraphTabPage::EnableAutoFirstLine() { aAutoCB.Show(); } -/*-----------------11.06.97 11.48------------------- - absoluter Zeilenabstand ---------------------------------------------------*/ + void SvxStdParagraphTabPage::EnableAbsLineDist(long nMinTwip) { aLineDist.InsertEntry(sAbsDist); nMinFixDist = nMinTwip; } -//addd CHINA001 begin + void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) { -/* CHINA001 different bit represent call to different method of SvxStdParagraphTabPage +/* different bit represent call to different method of SvxStdParagraphTabPage 0x0001 --->EnableRelativeMode() 0x0002 --->EnableRegisterMode() 0x0004 --->EnableAutoFirstLine() 0x0008 --->EnableNegativeMode() - - */ SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); @@ -1018,7 +1024,7 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) EnableNegativeMode(); } -//end of CHINA001 + #define LASTLINEPOS_DEFAULT 0 #define LASTLINEPOS_LEFT 1 @@ -1028,9 +1034,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) // class SvxParaAlignTabPage ------------------------------------------------ -/*-----------------16.01.97 19.34------------------- - ---------------------------------------------------*/ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet), aAlignFrm ( this, CUI_RES( FL_ALIGN ) ), @@ -1102,16 +1105,10 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ SvxParaAlignTabPage::~SvxParaAlignTabPage() { } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -1119,50 +1116,41 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxParaAlignTabPage(pParent, rSet); } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ sal_uInt16* SvxParaAlignTabPage::GetRanges() { return pAlignRanges; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; - FASTBOOL bAdj = sal_False, bChecked = sal_False; + bool bAdj = false, bChecked = false; SvxAdjust eAdjust = SVX_ADJUST_LEFT; if ( aLeft.IsChecked() ) { eAdjust = SVX_ADJUST_LEFT; bAdj = !aLeft.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aRight.IsChecked() ) { eAdjust = SVX_ADJUST_RIGHT; bAdj = !aRight.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aCenter.IsChecked() ) { eAdjust = SVX_ADJUST_CENTER; bAdj = !aCenter.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } else if ( aJustify.IsChecked() ) { @@ -1170,7 +1158,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) bAdj = !aJustify.GetSavedValue() || aExpandCB.IsChecked() != aExpandCB.GetSavedValue() || aLastLineLB.GetSelectEntryPos() != aLastLineLB.GetSavedValue(); - bChecked = sal_True; + bChecked = true; } sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1188,7 +1176,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) else if ( 2 == nLBPos ) eLastBlock = SVX_ADJUST_BLOCK; - FASTBOOL bNothingWasChecked = + bool bNothingWasChecked = !aLeft.GetSavedValue() && !aRight.GetSavedValue() && !aCenter.GetSavedValue() && !aJustify.GetSavedValue(); @@ -1197,7 +1185,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) pOld->GetLastBlock() != eLastBlock || ( bChecked && bNothingWasChecked ) ) { - bModified |= sal_True; + bModified = TRUE; SvxAdjustItem aAdj( (const SvxAdjustItem&)GetItemSet().Get( _nWhich ) ); aAdj.SetAdjust( eAdjust ); @@ -1230,9 +1218,6 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) return bModified; } -/*-----------------16.01.97 19.33------------------- - ---------------------------------------------------*/ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1331,9 +1316,6 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) UpdateExample_Impl(sal_True); } -/*-----------------17.01.97 08.06------------------- - ---------------------------------------------------*/ IMPL_LINK( SvxParaAlignTabPage, AlignHdl_Impl, RadioButton*, EMPTYARG ) { sal_Bool bJustify = aJustify.IsChecked(); @@ -1368,9 +1350,6 @@ IMPL_LINK( SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox*, EMPTYARG ) return 0; } -/*-----------------16.01.97 19.34------------------- - ---------------------------------------------------*/ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) { if ( aLeft.IsChecked() ) @@ -1393,9 +1372,8 @@ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) aExampleWin.Draw( bAll ); } -/*-----------------17.01.97 08.04------------------- - Erweiterungen fuer den Blocksatz einschalten ---------------------------------------------------*/ + +// Erweiterungen fuer den Blocksatz einschalten void SvxParaAlignTabPage::EnableJustifyExt() { aLastLineFT.Show(); @@ -1406,7 +1384,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() aSnapToGridCB.Show(); } -//add CHINA001 begin + void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); @@ -1414,8 +1392,6 @@ void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) if(pBoolItem->GetValue()) EnableJustifyExt(); } -//end of CHINA001 -// class SvxExtParagraphTabPage ------------------------------------------ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, const SfxItemSet& rSet ) @@ -1453,7 +1429,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) eHyphenState != aHyphenBox.GetSavedValue()) { rOutSet.Put( aHyphen ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1467,14 +1443,14 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { rOutSet.Put( aPageNum ); - bModified |= sal_True; + bModified = sal_True; } } // Seitenumbruch TriState eState = aApplyCollBtn.GetState(); - FASTBOOL bIsPageModel = sal_False; + bool bIsPageModel = false; _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); String sPage; @@ -1492,13 +1468,13 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { rOutSet.Put( SvxPageModelItem( sPage, sal_False, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } else - bIsPageModel = sal_False; + bIsPageModel = false; } else if(STATE_CHECK == eState && aApplyCollBtn.IsEnabled()) - bIsPageModel = sal_True; + bIsPageModel = true; else rOutSet.Put( SvxPageModelItem( sPage, sal_False, _nWhich ) ); @@ -1554,7 +1530,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aPageBreakBox.GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { - bModified |= sal_True; + bModified = sal_True; rOutSet.Put( aBreak ); } } @@ -1573,7 +1549,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) ( eState == STATE_NOCHECK ) ) { rOutSet.Put( SvxFmtSplitItem( eState == STATE_NOCHECK, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1587,7 +1563,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) // hat sich der Status geaendert, muss immer geputtet werden rOutSet.Put( SvxFmtKeepItem( eState == STATE_CHECK, _nWhich ) ); - bModified |= sal_True; + bModified = sal_True; } // Witwen und Waisen @@ -1604,7 +1580,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != aWidowBox.GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1623,7 +1599,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(const SvxOrphansItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified |= sal_True; + bModified = sal_True; } } @@ -1728,7 +1704,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(sal_False); aPagenumText.Enable(sal_False); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1954,10 +1929,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )), aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )), aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )), -// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ), -// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ), -// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ), -// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), @@ -2034,7 +2005,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe // ----------------------------------------------------------------------- -__EXPORT SvxExtParagraphTabPage::~SvxExtParagraphTabPage() +SvxExtParagraphTabPage::~SvxExtParagraphTabPage() { } @@ -2238,7 +2209,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox ) PageBreakPosHdl_Impl( &aBreakPositionLB ); return 0; } -//Add CHINA001 begin + void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) { @@ -2251,10 +2222,7 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) } -//end of Add CHINA001 -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet), aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )), @@ -2271,22 +2239,16 @@ SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : aForbiddenRulesCB.SetClickHdl( aLink ); } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxAsianTabPage::~SvxAsianTabPage() { } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SvxAsianTabPage(pParent, rSet); } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxAsianTabPage::GetRanges() { static sal_uInt16 pRanges[] = @@ -2296,9 +2258,7 @@ sal_uInt16* SvxAsianTabPage::GetRanges() }; return pRanges; } -/*-- 29.11.00 11:36:24--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bRet = sal_False; @@ -2332,9 +2292,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) } return bRet; } -/*-- 29.11.00 11:36:25--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, TriStateBox& rBox) { sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId); @@ -2355,23 +2313,16 @@ void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 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, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); - //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(sal_False); -// aPuntuationCB .Enable(sal_False); -// aAdjustNumbersCB .Enable(sal_False); } -/* -----------------------------19.12.00 12:59-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox ) { pBox->EnableTriState( sal_False ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src index cd13bdb12a6d..b5659ca76f1c 100644 --- a/cui/source/tabpages/paragrph.src +++ b/cui/source/tabpages/paragrph.src @@ -694,9 +694,8 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH Left = TRUE ; }; }; -/*-- 29.11.00 11:36:24--------------------------------------------------- - Asian typography - -----------------------------------------------------------------------*/ + +// Asian typography TabPage RID_SVXPAGE_PARA_ASIAN { HelpId = HID_SVXPAGE_PARA_ASIAN ; diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..4f39be3c957b 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -29,110 +29,74 @@ String RID_SVXSTR_DESC_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ Text [ en-US ] = "Please enter a name for the gradient:" ; }; String RID_SVXSTR_ASK_DEL_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the gradient?" ; }; String RID_SVXSTR_ASK_CHANGE_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; }; String RID_SVXSTR_DESC_NEW_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ Text [ en-US ] = "Please enter a name for the bitmap:" ; }; String RID_SVXSTR_DESC_EXT_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ Text [ en-US ] = "Please enter a name for the external bitmap:" ; }; String RID_SVXSTR_ASK_DEL_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; }; String RID_SVXSTR_ASK_CHANGE_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; }; String RID_SVXSTR_DESC_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ Text [ en-US ] = "Please enter a name for the line style:" ; }; String RID_SVXSTR_ASK_DEL_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the line style?" ; }; String RID_SVXSTR_ASK_CHANGE_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; }; String RID_SVXSTR_DESC_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ Text [ en-US ] = "Please enter a name for the hatching:" ; }; String RID_SVXSTR_ASK_DEL_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the hatching?" ; }; String RID_SVXSTR_ASK_CHANGE_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; }; String RID_SVXSTR_CHANGE { - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ Text [ en-US ] = "Modify" ; }; String RID_SVXSTR_ADD { - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ Text [ en-US ] = "Add" ; }; String RID_SVXSTR_DESC_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ Text [ en-US ] = "Please enter a name for the new color:" ; }; String RID_SVXSTR_ASK_DEL_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the color?" ; }; String RID_SVXSTR_ASK_CHANGE_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; }; String RID_SVXSTR_TABLE @@ -149,8 +113,6 @@ String RID_SVXSTR_READ_DATA_ERROR }; String RID_SVXSTR_WARN_TABLE_OVERWRITE { - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; }; String RID_SVXSTR_WARN_NAME_DUPLICATE @@ -159,20 +121,14 @@ String RID_SVXSTR_WARN_NAME_DUPLICATE }; String RID_SVXSTR_DESC_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ Text [ en-US ] = "Please enter a name for the new arrowhead:" ; }; String RID_SVXSTR_ASK_DEL_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the arrowhead?" ; }; String RID_SVXSTR_ASK_CHANGE_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; }; diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index d231e3249cb4..2d08dede00ce 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <cstddef> #include <swpossizetabpage.hxx> #include <dialmgr.hxx> @@ -42,6 +40,7 @@ #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/rectenum.hxx> +#include <sal/macros.h> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -93,14 +92,14 @@ struct StringIdPair_Impl #define LB_REL_CHAR 0x00020000L // as char, relative to character #define LB_REL_ROW 0x00040000L // as char, relative to line -// OD 10.11.2003 #i22305# +// #i22305# #define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame #define LB_FLY_VERT_PRTAREA 0x00200000L // vertical frame text area -// OD 11.11.2003 #i22341# +// #i22341# #define LB_VERT_LINE 0x00400000L // vertical text line -static RelationMap __FAR_DATA aRelationMap[] = +static RelationMap aRelationMap[] = { {SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, RelOrientation::FRAME}, {SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA, RelOrientation::PRINT_AREA}, @@ -120,15 +119,15 @@ static RelationMap __FAR_DATA aRelationMap[] = {SwFPos::REL_BORDER, SwFPos::REL_BORDER, LB_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::REL_PRTAREA, SwFPos::REL_PRTAREA, LB_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 10.11.2003 #i22305# + // #i22305# {SwFPos::FLY_REL_PG_FRAME, SwFPos::FLY_REL_PG_FRAME, LB_FLY_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::FLY_REL_PG_PRTAREA, SwFPos::FLY_REL_PG_PRTAREA, LB_FLY_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 11.11.2003 #i22341# + // #i22341# {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, RelOrientation::TEXT_LINE} }; -static RelationMap __FAR_DATA aAsCharRelationMap[] = +static RelationMap aAsCharRelationMap[] = { {SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, RelOrientation::FRAME}, {SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, RelOrientation::FRAME}, @@ -142,7 +141,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] = #define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHPageMap[] = +static FrmMap aHPageMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PAGE_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PAGE_REL}, @@ -150,14 +149,14 @@ static FrmMap __FAR_DATA aHPageMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_PAGE_REL} }; -static FrmMap __FAR_DATA aHPageHtmlMap[] = +static FrmMap aHPageHtmlMap[] = { {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; #define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVPageMap[] = +static FrmMap aVPageMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PAGE_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PAGE_REL}, @@ -165,7 +164,7 @@ static FrmMap __FAR_DATA aVPageMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PAGE_REL} }; -static FrmMap __FAR_DATA aVPageHtmlMap[] = +static FrmMap aVPageHtmlMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_REL_PG_FRAME} }; @@ -177,7 +176,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] = #define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHFrameMap[] = +static FrmMap aHFrameMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_FRAME_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_FRAME_REL}, @@ -185,17 +184,17 @@ static FrmMap __FAR_DATA aHFrameMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_FRAME_REL} }; -static FrmMap __FAR_DATA aHFlyHtmlMap[] = +static FrmMap aHFlyHtmlMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, LB_FLY_REL_PG_FRAME}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects -// OD 10.11.2003 #i22305# +// #i18732# - own vertical alignment map for to frame anchored objects +// #i22305# #define VERT_FRAME_REL (LB_VERT_FRAME|LB_FLY_VERT_PRTAREA) -static FrmMap __FAR_DATA aVFrameMap[] = +static FrmMap aVFrameMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_FRAME_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_FRAME_REL}, @@ -203,17 +202,17 @@ static FrmMap __FAR_DATA aVFrameMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_FRAME_REL} }; -static FrmMap __FAR_DATA aVFlyHtmlMap[] = +static FrmMap aVFlyHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_FLY_VERT_FRAME}, {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_FLY_VERT_FRAME} }; -static FrmMap __FAR_DATA aVMultiSelectionMap[] = +static FrmMap aVMultiSelectionMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, 0} }; -static FrmMap __FAR_DATA aHMultiSelectionMap[] = +static FrmMap aHMultiSelectionMap[] = { {SwFPos::FROMLEFT, SwFPos::FROMLEFT, HoriOrientation::NONE, 0} }; @@ -226,7 +225,7 @@ static FrmMap __FAR_DATA aHMultiSelectionMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) -static FrmMap __FAR_DATA aHParaMap[] = +static FrmMap aHParaMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PARA_REL}, @@ -236,13 +235,13 @@ static FrmMap __FAR_DATA aHParaMap[] = #define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) -static FrmMap __FAR_DATA aHParaHtmlMap[] = +static FrmMap aHParaHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; -static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = +static FrmMap aHParaHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL} @@ -252,7 +251,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = #define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVParaMap[] = +static FrmMap aVParaMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PARA_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PARA_REL}, @@ -260,7 +259,7 @@ static FrmMap __FAR_DATA aVParaMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PARA_REL} }; -static FrmMap __FAR_DATA aVParaHtmlMap[] = +static FrmMap aVParaHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_VERT_PRTAREA} }; @@ -273,7 +272,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharMap[] = +static FrmMap aHCharMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_CHAR_REL}, @@ -283,27 +282,27 @@ static FrmMap __FAR_DATA aHCharMap[] = #define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharHtmlMap[] = +static FrmMap aHCharHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT, HTML_HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_CHAR_REL} }; -static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = +static FrmMap aHCharHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, LB_PRTAREA|LB_REL_CHAR}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, LB_PRTAREA}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - allow vertical alignment at page areas -// OD 12.11.2003 #i22341# - handle <LB_REL_CHAR> on its own +// #i18732# - allow vertical alignment at page areas +// #i22341# - handle <LB_REL_CHAR> on its own #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVCharMap[] = +static FrmMap aVCharMap[] = { - // OD 11.11.2003 #i22341# + // #i22341# // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> // Note: Because of these adjustments the map becomes ambigous in its values @@ -322,12 +321,12 @@ static FrmMap __FAR_DATA aVCharMap[] = }; -static FrmMap __FAR_DATA aVCharHtmlMap[] = +static FrmMap aVCharHtmlMap[] = { {SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} }; -static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = +static FrmMap aVCharHtmlAbsMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_CHAR}, {SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} @@ -336,7 +335,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = anchored as character --------------------------------------------------------------------*/ -static FrmMap __FAR_DATA aVAsCharMap[] = +static FrmMap aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE}, {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, LB_REL_BASE}, @@ -353,7 +352,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] = {SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, VertOrientation::NONE, LB_REL_BASE} }; -static FrmMap __FAR_DATA aVAsCharHtmlMap[] = +static FrmMap aVAsCharHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::CENTER, LB_REL_BASE}, @@ -364,66 +363,60 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] = {SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::LINE_BOTTOM, LB_REL_ROW}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::LINE_CENTER, LB_REL_ROW} }; -/*-- 05.03.2004 15:52:56--------------------------------------------------- - -----------------------------------------------------------------------*/ std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) { - if ( pMap ) + if( pMap ) { - std::size_t aSizeOf = sizeof(FrmMap); - if( pMap == aVParaHtmlMap) - return sizeof(aVParaHtmlMap) / aSizeOf; - if( pMap == aVAsCharHtmlMap) - return sizeof(aVAsCharHtmlMap) / aSizeOf; - if( pMap == aHParaHtmlMap) - return sizeof(aHParaHtmlMap) / aSizeOf; - if( pMap == aHParaHtmlAbsMap) - return sizeof(aHParaHtmlAbsMap) / aSizeOf; - if ( pMap == aVPageMap ) - return sizeof(aVPageMap) / aSizeOf; - if ( pMap == aVPageHtmlMap ) - return sizeof(aVPageHtmlMap) / aSizeOf; - if ( pMap == aVAsCharMap ) - return sizeof(aVAsCharMap) / aSizeOf; - if ( pMap == aVParaMap ) - return sizeof(aVParaMap) / aSizeOf; - if ( pMap == aHParaMap ) - return sizeof(aHParaMap) / aSizeOf; - if ( pMap == aHFrameMap ) - return sizeof(aHFrameMap) / aSizeOf; - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects - if ( pMap == aVFrameMap ) - return sizeof(aVFrameMap) / aSizeOf; - if ( pMap == aHCharMap ) - return sizeof(aHCharMap) / aSizeOf; - if ( pMap == aHCharHtmlMap ) - return sizeof(aHCharHtmlMap) / aSizeOf; - if ( pMap == aHCharHtmlAbsMap ) - return sizeof(aHCharHtmlAbsMap) / aSizeOf; - if ( pMap == aVCharMap ) - return sizeof(aVCharMap) / aSizeOf; - if ( pMap == aVCharHtmlMap ) - return sizeof(aVCharHtmlMap) / aSizeOf; - if ( pMap == aVCharHtmlAbsMap ) - return sizeof(aVCharHtmlAbsMap) / aSizeOf; - if ( pMap == aHPageHtmlMap ) - return sizeof(aHPageHtmlMap) / aSizeOf; - if ( pMap == aHFlyHtmlMap ) - return sizeof(aHFlyHtmlMap) / aSizeOf; - if ( pMap == aVFlyHtmlMap ) - return sizeof(aVFlyHtmlMap) / aSizeOf; - if( pMap == aVMultiSelectionMap) - return sizeof(aVMultiSelectionMap) / aSizeOf; - if( pMap == aHMultiSelectionMap) - return sizeof(aHMultiSelectionMap) / aSizeOf; - return sizeof(aHPageMap) / aSizeOf; + if( pMap == aVParaHtmlMap ) + return SAL_N_ELEMENTS(aVParaHtmlMap); + if( pMap == aVAsCharHtmlMap ) + return SAL_N_ELEMENTS( aVAsCharHtmlMap ); + if( pMap == aHParaHtmlMap ) + return SAL_N_ELEMENTS( aHParaHtmlMap ); + if( pMap == aHParaHtmlAbsMap ) + return SAL_N_ELEMENTS( aHParaHtmlAbsMap ); + if( pMap == aVPageMap ) + return SAL_N_ELEMENTS( aVPageMap ); + if( pMap == aVPageHtmlMap ) + return SAL_N_ELEMENTS( aVPageHtmlMap ); + if( pMap == aVAsCharMap ) + return SAL_N_ELEMENTS( aVAsCharMap ); + if( pMap == aVParaMap ) + return SAL_N_ELEMENTS( aVParaMap ); + if( pMap == aHParaMap ) + return SAL_N_ELEMENTS( aHParaMap ); + if( pMap == aHFrameMap ) + return SAL_N_ELEMENTS( aHFrameMap ); + if( pMap == aVFrameMap ) + return SAL_N_ELEMENTS( aVFrameMap ); + if( pMap == aHCharMap ) + return SAL_N_ELEMENTS( aHCharMap ); + if( pMap == aHCharHtmlMap ) + return SAL_N_ELEMENTS( aHCharHtmlMap ); + if( pMap == aHCharHtmlAbsMap ) + return SAL_N_ELEMENTS( aHCharHtmlAbsMap ); + if( pMap == aVCharMap ) + return SAL_N_ELEMENTS( aVCharMap ); + if( pMap == aVCharHtmlMap ) + return SAL_N_ELEMENTS( aVCharHtmlMap ); + if( pMap == aVCharHtmlAbsMap ) + return SAL_N_ELEMENTS( aVCharHtmlAbsMap ); + if( pMap == aHPageHtmlMap ) + return SAL_N_ELEMENTS( aHPageHtmlMap ); + if( pMap == aHFlyHtmlMap ) + return SAL_N_ELEMENTS( aHFlyHtmlMap ); + if( pMap == aVFlyHtmlMap ) + return SAL_N_ELEMENTS( aVFlyHtmlMap ); + if( pMap == aVMultiSelectionMap ) + return SAL_N_ELEMENTS( aVMultiSelectionMap ); + if( pMap == aHMultiSelectionMap ) + return SAL_N_ELEMENTS( aHMultiSelectionMap ); + return SAL_N_ELEMENTS(aHPageMap); } return 0; } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bRTL) { @@ -461,7 +454,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( {SwFPos::REL_FRM_BOTTOM, SwFPos::REL_FRM_RIGHT } }; sal_uInt16 nIndex; - for(nIndex = 0; nIndex < sizeof(aHoriIds) / sizeof(StringIdPair_Impl); ++nIndex) + for(nIndex = 0; nIndex < SAL_N_ELEMENTS(aHoriIds); ++nIndex) { if(aHoriIds[nIndex].eHori == eStringId) { @@ -470,7 +463,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } } nIndex = 0; - for(nIndex = 0; nIndex < sizeof(aVertIds) / sizeof(StringIdPair_Impl); ++nIndex) + for(nIndex = 0; nIndex < SAL_N_ELEMENTS(aVertIds); ++nIndex) { if(aVertIds[nIndex].eHori == eStringId) { @@ -481,14 +474,13 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } return eStringId; } -// OD 12.11.2003 #i22341# - helper method in order to determine all possible +// #i22341# - helper method in order to determine all possible // listbox relations in a relation map for a given relation sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) { sal_uLong nLBRelations = 0L; - sal_uInt16 nRelMapSize = sizeof(aRelationMap) / sizeof(RelationMap); - for ( sal_uInt16 nRelMapPos = 0; nRelMapPos < nRelMapSize; ++nRelMapPos ) + for ( sal_uInt16 nRelMapPos = 0; nRelMapPos < SAL_N_ELEMENTS(aRelationMap); ++nRelMapPos ) { if ( aRelationMap[nRelMapPos].nRelation == _nRel ) { @@ -499,7 +491,7 @@ sal_uLong lcl_GetLBRelationsForRelations( const sal_uInt16 _nRel ) return nLBRelations; } -// OD 14.11.2003 #i22341# - helper method on order to determine all possible +// #i22341# - helper method on order to determine all possible // listbox relations in a relation map for a given string ID sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, const SvxSwFramePosString::StringId _eStrId, @@ -519,9 +511,7 @@ sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ), #ifdef _MSC_VER @@ -623,22 +613,16 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn m_aHoriMirrorCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, MirrorHdl)); m_aPositionCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, ProtectHdl)); } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -/*-- 03.03.2004 12:21:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet& rSet) { return new SvxSwPosSizeTabPage(pParent, rSet); } -/*-- 05.03.2004 17:27:42--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() { static sal_uInt16 pSwPosRanges[] = @@ -667,9 +651,7 @@ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() }; return pSwPosRanges; } -/*-- 03.03.2004 12:21:34--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { bool bAnchorChanged = false; @@ -773,7 +755,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) sal_uInt16 nMapPos = GetMapPos(m_pVMap, m_aVertLB); short nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); short nRel = GetRelation(m_pVMap, m_aVertToLB); - // --> OD 2004-10-21 #i34055# - convert vertical position for + // #i34055# - convert vertical position for // as-character anchored objects long nVertByPos = static_cast<long>(m_aVertByMF.Denormalize(m_aVertByMF.GetValue(FUNIT_TWIP))); @@ -781,7 +763,6 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { nVertByPos *= -1; } - // <-- if ( nAlign != rVertOrient.GetValue() || nRel != rVertRelation.GetValue() || ( m_aVertByMF.IsEnabled() && @@ -795,7 +776,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) } } - // OD 19.09.2003 #i18732# + // #i18732# if(m_aFollowCB.IsChecked() != m_aFollowCB.GetSavedValue()) { //Writer internal type - based on SfxBoolItem @@ -826,9 +807,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) return bModified; } -/*-- 03.03.2004 12:21:34--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) { const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TRANSFORM_ANCHOR ); @@ -931,15 +910,15 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) } m_aHoriMirrorCB.Show(sal_False); m_aKeepRatioCB.Enable(sal_False); - // OD 19.09.2003 #i18732# - hide checkbox in HTML mode + // #i18732# - hide checkbox in HTML mode m_aFollowCB.Show(sal_False); } else { - // OD 06.11.2003 #i18732# correct enable/disable of check box 'Mirror on..' + // #i18732# correct enable/disable of check box 'Mirror on..' m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable/disable check box 'Follow text flow'. + // #i18732# - enable/disable check box 'Follow text flow'. m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); } @@ -997,24 +976,20 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_aVertByMF.SaveValue(); m_aHoriByMF.SaveValue(); - // OD 19.09.2003 #i18732# + // #i18732# m_aFollowCB.SaveValue(); RangeModifyHdl(&m_aWidthMF); // initially set maximum values } } -/*-- 03.03.2004 12:21:35--------------------------------------------------- - -----------------------------------------------------------------------*/ int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( *_pSet ); return( LEAVE_PAGE ); } -/*-- 04.03.2004 09:14:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) { if((nAnchorEnable & SVX_OBJ_AT_FLY)) @@ -1022,9 +997,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) if(!(nAnchorEnable & SVX_OBJ_PAGE)) m_aToPageRB.Enable(sal_False); } -/*-- 04.03.2004 09:33:33--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) { short nRet = -1; @@ -1066,9 +1039,7 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) } return nRet; } -/*-- 05.03.2004 10:43:32--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) { if(m_bPositioningDisabled) @@ -1079,7 +1050,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) aVal.bAutoHeight = false; aVal.bAutoWidth = false; aVal.bMirror = m_aHoriMirrorCB.IsChecked(); - // OD 18.09.2003 #i18732# + // #i18732# aVal.bFollowTextFlow = m_aFollowCB.IsChecked(); if ( m_pHMap ) @@ -1152,14 +1123,12 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) return 0; } -/*-- 05.03.2004 11:12:56--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) { m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable check box 'Follow text flow' for anchor + // #i18732# - enable check box 'Follow text flow' for anchor // type to-paragraph' and to-character m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); @@ -1175,9 +1144,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) } return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG ) { short nId = GetAnchorType(); @@ -1185,9 +1152,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG ) return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) { sal_Bool bHori = pLB == &m_aHoriToLB; @@ -1199,32 +1164,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) else m_bAtVertPosModified = sal_True; - // OD 12.11.2003 #i22341# - following special handling no longer needed - /* - if (!bHori && m_pVMap == aVCharMap) - { - // Ausrichtung Vertikal - String sEntry; - sal_uInt16 nMapPos = GetMapPos(m_pVMap, m_aVertLB); - sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); - sal_uInt16 nRel = GetRelation(m_pVMap, m_aVertToLB); - - if (nRel == SwFPos::REL_CHAR) - sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM); - else - sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP); - - sal_uInt16 nOldPos = m_aVertLB.GetSelectEntryPos(); - - String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1); - if (sName != sEntry) - { - m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1); - m_aVertLB.InsertEntry(sEntry); - m_aVertLB.SelectEntryPos(nOldPos); - } - } - */ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung { if(bHori) @@ -1246,9 +1185,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) { sal_Bool bHori = pLB == &m_aHoriLB; @@ -1353,9 +1290,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) } return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) { sal_Int64 nWidth = m_aWidthMF.Denormalize(m_aWidthMF.GetValue(FUNIT_TWIP)); @@ -1377,17 +1312,13 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) UpdateExample(); return 0; } -/*-- 11.03.2004 15:40:17--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SvxSwPosSizeTabPage, ProtectHdl, TriStateBox *, EMPTYARG) { m_aSizeCB.Enable(m_aPositionCB.IsEnabled() && !m_aPositionCB.IsChecked()); return 0; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) { short nRel = 0; @@ -1401,14 +1332,12 @@ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) return nRel; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &/*rAlignLB*/, ListBox &rRelationLB) { short nAlign = 0; - // OD 14.11.2003 #i22341# - special handling also for map <aVCharMap>, + // #i22341# - special handling also for map <aVCharMap>, // because it contains ambigous items for alignment if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap || pMap == aVCharMap ) @@ -1438,9 +1367,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo return nAlign; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) { sal_uInt16 nMapPos = 0; @@ -1472,9 +1399,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) return nMapPos; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::InitPos(short nAnchor, sal_uInt16 nH, sal_uInt16 nHRel, @@ -1515,7 +1440,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, } else if ( nAnchor == TextContentAnchorType_AT_FRAME ) { - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame + // #i18732# - own vertical alignment map for to frame // anchored objects. m_pVMap = m_bHtmlMode ? aVFlyHtmlMap : aVFrameMap; m_pHMap = m_bHtmlMode ? aHFlyHtmlMap : aHFrameMap; @@ -1562,7 +1487,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nH = m_nOldH; nHRel = m_nOldHRel; } - // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> sal_uInt16 nMapPos = FillPosLB(m_pHMap, nH, nHRel, m_aHoriLB); FillRelLB(m_pHMap, nMapPos, nH, nHRel, m_aHoriToLB, m_aHoriToFT); @@ -1572,7 +1497,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nV = m_nOldV; nVRel = m_nOldVRel; } - // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> nMapPos = FillPosLB(m_pVMap, nV, nVRel, m_aVertLB); FillRelLB(m_pVMap, nMapPos, nV, nVRel, m_aVertToLB, m_aVertToFT); @@ -1624,9 +1549,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, m_aVertByMF.Enable( bEnable ); UpdateExample(); } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::UpdateExample() { sal_uInt16 nPos = m_aHoriLB.GetSelectEntryPos(); @@ -1659,9 +1582,7 @@ void SvxSwPosSizeTabPage::UpdateExample() m_aExampleWN.SetAnchor( GetAnchorType() ); m_aExampleWN.Invalidate(); } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16 nAlign, sal_uInt16 nRel, ListBox &rLB, FixedText &rFT) { @@ -1676,7 +1597,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap) { String sOldEntry(rLB.GetSelectEntry()); - sal_uInt16 nRelCount = sizeof(aAsCharRelationMap) / sizeof(RelationMap); + sal_uInt16 nRelCount = SAL_N_ELEMENTS(aAsCharRelationMap); SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; for (std::size_t _nMapPos = 0; _nMapPos < nMapCount; _nMapPos++) @@ -1723,9 +1644,9 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u } else { - sal_uInt16 nRelCount = sizeof(aRelationMap) / sizeof(RelationMap); + sal_uInt16 nRelCount = SAL_N_ELEMENTS(aRelationMap); - // OD 14.11.2003 #i22341# - special handling for map <aVCharMap>, + // #i22341# - special handling for map <aVCharMap>, // because its ambigous in its <eStrId>/<eMirrorStrId>. if ( pMap == aVCharMap ) { @@ -1807,9 +1728,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_u return nLBRelations; } -/*-- 05.03.2004 14:20:19--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, sal_uInt16 _nAlign, const sal_uInt16 _nRel, @@ -1820,7 +1739,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, _rLB.Clear(); - // OD 12.11.2003 #i22341# - determine all possible listbox relations for + // #i22341# - determine all possible listbox relations for // given relation for map <aVCharMap> const sal_uLong nLBRelations = (_pMap != aVCharMap) ? 0L @@ -1841,7 +1760,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen _rLB.InsertEntry(sEntry); } - // OD 12.11.2003 #i22341# - add condition to handle map <aVCharMap> + // #i22341# - add condition to handle map <aVCharMap> // that is ambigous in the alignment. if ( _pMap[i].nAlign == _nAlign && ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) ) @@ -1862,15 +1781,13 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, return GetMapPos(_pMap, _rLB); } -/*-- 09.03.2004 15:37:50--------------------------------------------------- - -----------------------------------------------------------------------*/ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) { m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set"); + OSL_FAIL("No SdrView* set"); return; } @@ -1930,7 +1847,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(); @@ -1938,34 +1858,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled"); + OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } } - else - m_bIsMultiSelection = true; - - // use page offset and recalculate - Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() ); - - // Massstab - Fraction aUIScale = m_pSdrView->GetModel()->GetUIScale(); - -// lcl_ScaleRect( m_aWorkArea, aUIScale ); -// lcl_ScaleRect( m_aRect, aUIScale ); -// lcl_ScalePoint( aPt, aUIScale ); - - // Metrik konvertieren -// int nDigits = maMtrPosX.GetDecimalDigits(); - -// aPt = lcl_ConvertPoint( aPt, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aWorkArea = lcl_ConvertRect( m_aWorkArea, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); -// m_aRect = lcl_ConvertRect( m_aRect, nDigits, (MapUnit) mePoolUnit, meDlgUnit ); - - // use page offset -// aPt *= -1; -// aPt += m_aWorkArea.TopLeft(); -// m_aWorkArea.SetPos( aPt ); - - //SetMinMaxPosition(); +#endif } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx index 518d02535d87..76a197705cff 100644 --- a/cui/source/tabpages/swpossizetabpage.hxx +++ b/cui/source/tabpages/swpossizetabpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <svx/swframeposstrings.hxx> #include <svx/swframeexample.hxx> -/*-- 01.03.2004 15:45:01--------------------------------------------------- - SvxSwPosSizeTabPage - position and size page for Writer drawing objects - -----------------------------------------------------------------------*/ +// SvxSwPosSizeTabPage - position and size page for Writer drawing objects struct FrmMap; class SdrView; class SvxSwPosSizeTabPage : public SfxTabPage @@ -156,3 +155,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 4e873f4cb021..95491d5382ad 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - #include <tools/ref.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -50,7 +46,6 @@ #include "cuitabarea.hxx" #include "tabarea.hrc" #include "dlgname.hxx" -//#include "dlgname.hrc" #include <dialmgr.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -72,7 +67,6 @@ SvxAreaTabDialog::SvxAreaTabDialog SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ), mpDrawModel ( pModel ), -// mpView ( pSdrView ), mpColorTab ( pModel->GetColorTable() ), mpNewColorTab ( pModel->GetColorTable() ), mpGradientList ( pModel->GetGradientList() ), @@ -121,13 +115,6 @@ SvxAreaTabDialog::~SvxAreaTabDialog() void SvxAreaTabDialog::SavePalettes() { SfxObjectShell* pShell = SfxObjectShell::Current(); - /*uno::Reference< frame::XDispatchProvider > xDispatchProvider; - if ( !pShell ) - { - uno::Reference< frame::XModel> xModel = mpDrawModel->getUnoModel(); - if ( xModel.is() ) - xDispatchProvider.set(xModel->getCurrentController(),uno::UNO_QUERY); - }*/ if( mpNewColorTab != mpDrawModel->GetColorTable() ) { if(mbDeleteColorTable) @@ -280,12 +267,9 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList ); ( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList ); ( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList ); - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); //add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetDlgType( &mnDlgType ); - ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );//add CHINA001 - //CHINA001 ( (SvxAreaTabPage&) rPage ).SetPos( &nPos ); - ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );//add CHINA001 + ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType ); + ( (SvxAreaTabPage&) rPage ).SetPos( mnPos ); ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); @@ -300,9 +284,8 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) case RID_SVXPAGE_SHADOW: { ( (SvxShadowTabPage&) rPage ).SetColorTable( mpColorTab ); - ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxShadowTabPage&) rPage ).SetDlgType( &mnDlgType ); - //( (SvxShadowTabPage&) rPage ).SetPos( &nPos ); + ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP ); ( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxShadowTabPage&) rPage ).Construct(); @@ -357,12 +340,12 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) break; case RID_SVXPAGE_TRANSPARENCE: - ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetPageType( &mnPageType ); - ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );//CHINA001 ( (SvxTransparenceTabPage&) rPage ).SetDlgType( &mnDlgType ); + ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType ); + ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType ); ( (SvxTransparenceTabPage&) rPage ).Construct(); break; } } - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index 8303509d4c64..4fd3db7c8996 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1545,24 +1545,6 @@ TabDialog RID_SVXDLG_AREA }; }; -Image RID_SVXIMG_LOAD_H -{ - ImageBitmap = Bitmap - { - File = "sch05501.bmp" ; - }; - MASKCOLOR -}; - -Image RID_SVXIMG_SAVE_H -{ - ImageBitmap = Bitmap - { - File = "sch05502.bmp" ; - }; - MASKCOLOR -}; - String STR_LB_HATCHINGSTYLE { Text [ en-US ] = "Hatching Style" ; diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 8d0e287b86b5..edd5d339a5e3 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> @@ -39,7 +36,6 @@ #define _SVX_TABLINE_CXX #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "cuitabarea.hxx" #include "cuitabline.hxx" @@ -122,13 +118,11 @@ 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 ); SetCurPageId( RID_SVXPAGE_LINE ); CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); -//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) ); } // ----------------------------------------------------------------------- @@ -236,8 +230,8 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxLineTabPage&) rPage ).SetColorTable( pColorTab ); ( (SvxLineTabPage&) rPage ).SetDashList( pDashList ); ( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList ); - ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxLineTabPage&) rPage ).SetPageType( nPageType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetPageType( &nPageType ); + ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType ); + ( (SvxLineTabPage&) rPage ).SetPageType( nPageType ); ( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb ); ( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb ); ( (SvxLineTabPage&) rPage ).SetDashChgd( &nDashListState ); @@ -280,19 +274,8 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxShadowTabPage&) rPage ).Construct(); } break; -/* - case RID_SVXPAGE_COLOR: - ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab ); - ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType ); - ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxColorTabPage&) rPage ).SetPos( &mnPos ); - ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP ); - ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState ); - ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable ); - ( (SvxColorTabPage&) rPage ).Construct(); - break; -*/ } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src index bdda4ebd1e54..de03c1b0a803 100644 --- a/cui/source/tabpages/tabline.src +++ b/cui/source/tabpages/tabline.src @@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; MetricField MTR_FLD_LENGTH_2 @@ -545,7 +545,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; SpinSize = 10 ; }; FixedText FT_DISTANCE @@ -569,7 +569,7 @@ TabPage RID_SVXPAGE_LINE_DEF DecimalDigits = 2 ; Value = 1 ; Unit = FUNIT_MM ; - CustomUnitText = " %" ; + CustomUnitText = "%" ; Last = 5000 ; SpinSize = 10 ; }; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index bc285bf18c31..e49a21fa33a1 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,16 +26,12 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <tools/shl.hxx> #include <svtools/ruler.hxx> #include <svx/dialogs.hrc> -#include <svx/dialogs.hrc> #define _SVX_TABSTPGE_CXX @@ -48,8 +45,8 @@ #include <svl/cjkoptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <sfx2/request.hxx> //CHINA001 -#include <svl/intitem.hxx> //add CHINA001 +#include <sfx2/request.hxx> +#include <svl/intitem.hxx> // class TabWin_Impl ----------------------------------------------------- @@ -751,11 +748,12 @@ IMPL_LINK( SvxTabulatorTabPage, ModifyHdl_Impl, MetricBox *, EMPTYARG ) aDelBtn.Disable(); return 0; } -//add CHINA001 Begin -void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) + +void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); if (pControlItem) DisableControls(pControlItem->GetValue()); } -//end of CHINA001 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index e9a27adc2cd4..44051fcee53e 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -58,7 +56,7 @@ static sal_uInt16 pRanges[] = |* \************************************************************************/ -__EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, +SvxTextTabDialog::SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ), @@ -77,7 +75,7 @@ __EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent, |* \************************************************************************/ -void __EXPORT SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { @@ -194,7 +192,7 @@ SvxTextAnimationPage::~SvxTextAnimationPage() |* \************************************************************************/ -void __EXPORT SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) { const SfxItemPool* pPool = rAttrs.GetPool(); @@ -773,3 +771,4 @@ sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src index 3ccd6987943f..4f2ffda07519 100644 --- a/cui/source/tabpages/textanim.src +++ b/cui/source/tabpages/textanim.src @@ -237,7 +237,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION Spin = TRUE ; StrictFormat = TRUE ; Unit = FUNIT_CUSTOM ; - CustomUnitText = " Pixel" ; + CustomUnitText [ en-US ] = " Pixel" ; Minimum = 1 ; First = 1 ; Maximum = 10000 ; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index aa2eb7f30573..ba83ce16c707 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -52,8 +50,8 @@ #include "textattr.hrc" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <sfx2/request.hxx> //add CHINA001 -#include <svx/ofaitem.hxx> //add CHINA001 +#include <sfx2/request.hxx> +#include <svx/ofaitem.hxx> #include <editeng/writingmodeitem.hxx> static sal_uInt16 pRanges[] = @@ -65,35 +63,6 @@ static sal_uInt16 pRanges[] = /************************************************************************* |* -|* Dialog zum Kopieren von Objekten -|* -\************************************************************************/ - -//CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs, -//CHINA001 const SdrView* pSdrView ) : -//CHINA001 SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR ) -//CHINA001 { -//CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs ); -//CHINA001 -//CHINA001 pPage->SetView( pSdrView ); -//CHINA001 pPage->Construct(); -//CHINA001 -//CHINA001 SetTabPage( pPage ); -//CHINA001 SetText( pPage->GetText() ); -//CHINA001 } -//CHINA001 -/************************************************************************* -|* -|* Dtor -|* -\************************************************************************/ - -//CHINA001 SvxTextAttrDialog::~SvxTextAttrDialog() -//CHINA001 { -//CHINA001 } - -/************************************************************************* -|* |* Dialog (Seite) zum Kopieren von Objekten |* \************************************************************************/ @@ -164,7 +133,7 @@ SvxTextAttrPage::~SvxTextAttrPage() |* \************************************************************************/ -void __EXPORT SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -451,10 +420,9 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) switch( eState ) { default: ; //prevent warning - DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); + OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break; - //case STATE_CHECK: eFTS = SDRTEXTFIT_RESIZEATTR; break; - case STATE_CHECK: eFTS = SDRTEXTFIT_PROPORTIONAL; break; + case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break; } rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) ); } @@ -786,7 +754,6 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const return bLeftToRightDirection; } -//add CHINA001 begin void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); @@ -797,4 +764,4 @@ void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) Construct(); } -//end of CHINA001 +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0cf286217982..074cac9c084d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <sfx2/app.hxx> @@ -37,7 +34,7 @@ #define _SVX_TPAREA_CXX -#if defined (UNX) || defined (WTC) || defined (ICC) || defined(WNT) +#if defined (UNX) || defined (ICC) || defined(WNT) #include <stdlib.h> #endif @@ -45,7 +42,6 @@ #include <svx/xpool.hxx> #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include <svx/xflbckit.hxx> #include <svx/svdattr.hxx> #include <svx/xtable.hxx> @@ -55,8 +51,8 @@ #include "dlgname.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svl/intitem.hxx> //add CHINA001 -#include <sfx2/request.hxx>//add CHINA001 +#include <svl/intitem.hxx> +#include <sfx2/request.hxx> #include "paragrph.hrc" #define DLGWIN this->GetParent()->GetParent() @@ -434,9 +430,7 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) rAttrs.Put(aShadowItem); bModified = sal_True; } - //add CHINA001 begin rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - //add CHINA001 end return bModified; } @@ -507,15 +501,12 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) { - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); - //add CHINA001 end - //CHINA001 if(*pDlgType == 0) // Flaechen-Dialog - //CHINA001 *pPageType = PT_TRANSPARENCE; - if(nDlgType == 0) //add CHINA001 // Flaechen-Dialog - nPageType = PT_TRANSPARENCE; //add CHINA001 + + if(nDlgType == 0) // Flaechen-Dialog + nPageType = PT_TRANSPARENCE; InitPreview ( rSet ); } @@ -603,7 +594,7 @@ void SvxTransparenceTabPage::InvalidatePreview (sal_Bool bEnable) } } -void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); @@ -803,22 +794,20 @@ void SvxAreaTabPage::Construct() void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { - sal_uInt16 _nPos = 0; sal_uInt16 nCount; - //add CHINA001 Begin SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pPosItem) SetPos(pPosItem->GetValue()); - //add CHINA001 end - if( nDlgType == 0 )//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { *pbAreaTP = sal_True; if( pColorTab ) { + USHORT _nPos = 0; // Bitmapliste if( *pnBitmapListState ) { @@ -919,35 +908,35 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) // evaluate if any other Tabpage set another filltype if( aTypeLB.GetSelectEntryPos() > XFILL_NONE) { - switch( nPageType )//CHINA001 switch( *pPageType ) + switch( nPageType ) { case PT_GRADIENT: aTypeLB.SelectEntryPos( XFILL_GRADIENT ); - aLbGradient.SelectEntryPos( _nPos );//CHINA001 aLbGradient.SelectEntryPos( *pPos ); + aLbGradient.SelectEntryPos( _nPos ); ClickGradientHdl_Impl( this ); break; case PT_HATCH: aTypeLB.SelectEntryPos( XFILL_HATCH ); - aLbHatching.SelectEntryPos( _nPos );//CHINA001 aLbHatching.SelectEntryPos( *pPos ); + aLbHatching.SelectEntryPos( _nPos ); ClickHatchingHdl_Impl( this ); break; case PT_BITMAP: aTypeLB.SelectEntryPos( XFILL_BITMAP ); - aLbBitmap.SelectEntryPos( _nPos );//CHINA001 aLbBitmap.SelectEntryPos( *pPos ); + aLbBitmap.SelectEntryPos( _nPos ); ClickBitmapHdl_Impl( this ); break; case PT_COLOR: aTypeLB.SelectEntryPos( XFILL_SOLID ); - aLbColor.SelectEntryPos( _nPos );//CHINA001 aLbColor.SelectEntryPos( *pPos ); - aLbHatchBckgrdColor.SelectEntryPos( _nPos ); //CHINA001 aLbHatchBckgrdColor.SelectEntryPos( *pPos ); + aLbColor.SelectEntryPos( _nPos ); + aLbHatchBckgrdColor.SelectEntryPos( _nPos ); ClickColorHdl_Impl( this ); break; } } - nPageType = PT_AREA;//CHINA001 *pPageType = PT_AREA; + nPageType = PT_AREA; } } } @@ -956,33 +945,33 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Flaechen-Dialog//CHINA001 if( *pDlgType == 0 ) // Flaechen-Dialog + if( nDlgType == 0 ) // Flaechen-Dialog { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); switch( eStyle ) { case XFILL_GRADIENT: { - nPageType = PT_GRADIENT;//CHINA001 *pPageType = PT_GRADIENT; - nPos = aLbGradient.GetSelectEntryPos();//CHINA001 *pPos = aLbGradient.GetSelectEntryPos(); + nPageType = PT_GRADIENT; + nPos = aLbGradient.GetSelectEntryPos(); } break; case XFILL_HATCH: { - nPageType = PT_HATCH;//CHINA001 *pPageType = PT_HATCH; - nPos = aLbHatching.GetSelectEntryPos();//CHINA001 *pPos = aLbHatching.GetSelectEntryPos(); + nPageType = PT_HATCH; + nPos = aLbHatching.GetSelectEntryPos(); } break; case XFILL_BITMAP: { - nPageType = PT_BITMAP;//CHINA001 *pPageType = PT_BITMAP; - nPos = aLbBitmap.GetSelectEntryPos();//CHINA001 *pPos = aLbBitmap.GetSelectEntryPos(); + nPageType = PT_BITMAP; + nPos = aLbBitmap.GetSelectEntryPos(); } break; case XFILL_SOLID: { - nPageType = PT_COLOR;//CHINA001 *pPageType = PT_COLOR; - nPos = aLbColor.GetSelectEntryPos();//CHINA001 *pPos = aLbColor.GetSelectEntryPos(); + nPageType = PT_COLOR; + nPos = aLbColor.GetSelectEntryPos(); } break; default: ;//prevent warning @@ -1003,7 +992,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) sal_uInt16 _nPos; sal_Bool bModified = sal_False; - if( nDlgType != 0 || *pbAreaTP )//CHINA001 if( *pDlgType != 0 || *pbAreaTP ) + if( nDlgType != 0 || *pbAreaTP ) { XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos(); XFillStyle eSavedStyle = (XFillStyle) aTypeLB.GetSavedValue(); @@ -1274,7 +1263,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese nicht skaliert werden; dieses wird - // im Item beruecksichtigt ( KA05.11.96 ) + // im Item beruecksichtigt pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) ); } } @@ -1311,7 +1300,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese vom MetricItem nicht skaliert werden; - // dieses wird im Item beruecksichtigt ( KA05.11.96 ) + // dieses wird im Item beruecksichtigt pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) ); } } @@ -1427,10 +1416,8 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - //add CHINA001 begin rAttrs.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); rAttrs.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); - //add CHINA001 end } return( bModified ); @@ -1440,8 +1427,6 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) { - //const SfxPoolItem *pPoolItem = NULL; - XFillStyle eXFS; if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) { @@ -1455,7 +1440,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_SOLID: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLCOLOR ) ) { XFillColorItem aColorItem( ( const XFillColorItem& ) @@ -1469,7 +1453,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_GRADIENT: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLGRADIENT ) ) { XFillGradientItem aGradientItem( ( ( const XFillGradientItem& ) @@ -1483,7 +1466,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; case XFILL_HATCH: - //if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) if( SFX_ITEM_DONTCARE != rAttrs.GetItemState( XATTR_FILLHATCH ) ) { aLbHatching.SelectEntry( ( ( const XFillHatchItem& ) @@ -1521,8 +1503,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) break; default: - //aLbColor.SelectEntryPos(0); - //aRbtColor.Check(); break; } } @@ -1736,10 +1716,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aLbColor.SaveValue(); aLbGradient.SaveValue(); aLbHatching.SaveValue(); - //aCbxHatchBckgrd.SaveValue(); aLbHatchBckgrdColor.SaveValue(); aLbBitmap.SaveValue(); -// aLbTransparent.SaveValue(); aTsbStepCount.SaveValue(); aNumFldStepCount.SaveValue(); aTsbTile.SaveValue(); @@ -1750,8 +1728,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) aMtrFldOffset.SaveValue(); aMtrFldXOffset.SaveValue(); aMtrFldYOffset.SaveValue(); - //aMtrFldXSize.SaveValue(); <- wird oben behandelt - //aMtrFldYSize.SaveValue(); <- wird oben behandelt } // ----------------------------------------------------------------------- @@ -1997,7 +1973,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyGradientHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillGradientItem( String(), pEntry->GetGradient() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) ); @@ -2025,8 +2000,6 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG ) aCtlXRectPreview.Show(); aCtlBitmapPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2093,7 +2066,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchingHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); rXFSet.Put( XFillHatchItem( String(), pEntry->GetHatch() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_HATCH ) ); @@ -2117,14 +2089,11 @@ IMPL_LINK( SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, void *, EMPTYARG ) aLbColor.SelectEntryPos( _nPos ); if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); rXFSet.Put( XFillColorItem( String(), aLbHatchBckgrdColor.GetSelectEntryColor() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) { -// rXFSet.Put( XFillStyleItem( XFILL_SOLID ) ); Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() ); rXFSet.Put( XFillColorItem( String(), aColor ) ); } @@ -2174,9 +2143,6 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG ) aCtlBitmapPreview.Enable(); aCtlBitmapPreview.Show(); aCtlXRectPreview.Hide(); -// aGrpPreview.Hide(); -// aGrpTransparent.Hide(); -// aLbTransparent.Hide(); aFlStepCount.Hide(); aTsbStepCount.Hide(); aNumFldStepCount.Hide(); @@ -2259,7 +2225,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); rXFSet.Put( XFillBitmapItem( String(), pEntry->GetXBitmap() ) ); } - // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) ) { rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); @@ -2276,24 +2241,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapHdl_Impl, void *, EMPTYARG ) //------------------------------------------------------------------------ -//IMPL_LINK( SvxAreaTabPage, ModifyTransparentHdl_Impl, void *, EMPTYARG ) -//{ -// sal_uInt16 nPos = aLbTransparent.GetSelectEntryPos(); -// if( nPos != LISTBOX_ENTRY_NOTFOUND ) -// { -// XFillTransparenceItem aItem( nPos * 25 ); -// -// rXFSet.Put( XFillTransparenceItem( aItem ) ); -// aCtlXRectPreview.SetAttributes( aXFillAttr ); -// -// aCtlXRectPreview.Invalidate(); -// } -// -// return( 0L ); -//} - -//------------------------------------------------------------------------ - IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) { if( p == &aTsbStepCount ) @@ -2428,15 +2375,6 @@ IMPL_LINK( SvxAreaTabPage, ModifyTileHdl_Impl, void *, EMPTYARG ) { aMtrFldXSize.SetValue( aMtrFldXSize.GetValue() ); aMtrFldYSize.SetValue( aMtrFldYSize.GetValue() ); - /* - if( eState == STATE_CHECK ) - { - aFtXSize.Enable(); - aFtYSize.Enable(); - aMtrFldXSize.Enable(); - aMtrFldYSize.Enable(); - } - */ } rXFSet.Put( XFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ) ); @@ -2569,7 +2507,7 @@ void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) ModifyTileHdl_Impl( pWindow ); } -void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,sal_False); @@ -2596,3 +2534,4 @@ void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 Construct(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 131f6c5674f9..3deed69a50f1 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,11 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - //svdraw.hxx #define _SVDRAW_HXX #define _SDR_NOITEMS @@ -66,9 +62,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "sfx2/opengrf.hxx" #include "paragrph.hrc" @@ -120,8 +115,6 @@ SvxBitmapTabPage::SvxBitmapTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); FreeResource(); // diese Page braucht ExchangeSupport @@ -130,7 +123,6 @@ SvxBitmapTabPage::SvxBitmapTabPage // Setzen des Output-Devices rXFSet.Put( aXFStyleItem ); rXFSet.Put( aXBitmapItem ); - //aCtlPreview.SetAttributes( aXFillAttr ); aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) ); aBtnImport.SetClickHdl( @@ -372,14 +364,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //sal_uInt16 nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //sal_Bool bPixelColor = sal_False; - //sal_uInt16 nWidth = pBitmap->GetSizePixel().Width(); - //sal_uInt16 nHeight = pBitmap->GetSizePixel().Height(); - // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) { @@ -562,18 +546,18 @@ long SvxBitmapTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, String( SVX_RES( RID_SVXSTR_BITMAP ) ), String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -591,11 +575,9 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbBitmaps.GetSelectEntryPos(); @@ -630,9 +612,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -662,7 +644,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -760,9 +741,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) String aName; INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); nError = RID_SVXSTR_WARN_NAME_DUPLICATE; while( pDlg->Execute() == RET_OK ) @@ -793,7 +774,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -813,7 +793,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbBitmaps.Invalidate(); } #endif @@ -852,9 +831,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pBitmapList->Count(); sal_Bool bDifferent = sal_False; @@ -983,39 +962,36 @@ IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pBmpList->SetName( aURL.getName() ); if( pBmpList->Load() ) { - if( pBmpList ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() ) - delete pBitmapList; + // Pruefen, ob Tabelle geloescht werden darf: + if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() ) + delete pBitmapList; - pBitmapList = pBmpList; - ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList ); + pBitmapList = pBmpList; + ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList ); - aLbBitmaps.Clear(); - aLbBitmaps.Fill( pBitmapList ); - Reset( rOutAttrs ); + aLbBitmaps.Clear(); + aLbBitmaps.Fill( pBitmapList ); + Reset( rOutAttrs ); - pBitmapList->SetName( aURL.getName() ); + pBitmapList->SetName( aURL.getName() ); - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnBitmapListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnBitmapListState &= ~CT_MODIFIED; + if ( aURL.getBase().getLength() > 18 ) + { + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnBitmapListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnBitmapListState &= ~CT_MODIFIED; LeaveWait(); } else @@ -1170,3 +1146,5 @@ Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const else return SvxTabPage::GetParentLabeledBy (pLabeled); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 2a34f5beb702..5a71867ef587 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> @@ -49,9 +46,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <cuitabline.hxx> #include <svx/dialmgr.hxx> @@ -128,9 +124,6 @@ SvxColorTabPage::SvxColorTabPage eCM ( CM_RGB ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -308,18 +301,18 @@ long SvxColorTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_COLOR ), String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -339,11 +332,9 @@ long SvxColorTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } if( *pDlgType == 0 ) // Flaechen-Dialog @@ -367,8 +358,6 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) String aString; Color aColor; - // CheckChanges_Impl(); <-- doppelte Abfrage ? - sal_uInt16 nPos = aLbColor.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -469,10 +458,8 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { Window *pWindow = this; - bool bEnabled; while( pWindow ) { - bEnabled = pWindow->IsEnabled(); pWindow = pWindow->GetParent(); } @@ -497,9 +484,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -583,9 +570,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -772,78 +759,74 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pColTab->SetName( aURL.getName() ); // XXX if( pColTab->Load() ) { - if( pColTab ) + // Pruefen, ob Tabelle geloescht werden darf: + const XColorTable *pTempTable = 0; + SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); + SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); + if( pArea ) { - // Pruefen, ob Tabelle geloescht werden darf: - const XColorTable *pTempTable = 0; - SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); - SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); - if( pArea ) - { - pTempTable = pArea->GetColorTable(); - } - else if( pLine ) - { - pTempTable = pLine->GetColorTable(); - } - - if( pColorTab != pTempTable ) - { - if( bDeleteColorTable ) - delete pColorTab; - else - bDeleteColorTable = sal_True; - } - - pColorTab = pColTab; - if( pArea ) - { - pArea->SetNewColorTable( pColorTab ); - } - else if( pLine ) - { - pLine->SetNewColorTable( pColorTab ); - } - - aLbColor.Clear(); - aValSetColorTable.Clear(); - Construct(); - Reset( rOutAttrs ); - - pColorTab->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } + pTempTable = pArea->GetColorTable(); + } + else if( pLine ) + { + pTempTable = pLine->GetColorTable(); + } + + if( pColorTab != pTempTable ) + { + if( bDeleteColorTable ) + delete pColorTab; else - aString += String(aURL.getBase()); + bDeleteColorTable = sal_True; + } + + pColorTab = pColTab; + if( pArea ) + { + pArea->SetNewColorTable( pColorTab ); + } + else if( pLine ) + { + pLine->SetNewColorTable( pColorTab ); + } - aTableNameFT.SetText( aString ); + aLbColor.Clear(); + aValSetColorTable.Clear(); + Construct(); + Reset( rOutAttrs ); - // Flag fuer gewechselt setzen - *pnColorTableState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnColorTableState &= ~CT_MODIFIED; + pColorTab->SetName( aURL.getName() ); - if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) - aLbColor.SelectEntryPos( 0 ); - else - aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() ); + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - ChangeColorHdl_Impl( this ); - SelectColorLBHdl_Impl( this ); + if ( aURL.getBase().getLength() > 18 ) + { + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + aTableNameFT.SetText( aString ); + + // Flag fuer gewechselt setzen + *pnColorTableState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnColorTableState &= ~CT_MODIFIED; + + if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + aLbColor.SelectEntryPos( 0 ); + else + aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() ); + + ChangeColorHdl_Impl( this ); + SelectColorLBHdl_Impl( this ); } else { - //aIStream.Close(); ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ); aErrorBox.Execute(); @@ -1187,17 +1170,9 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ) { - sal_uInt16 nColor1, nColor2, nColor3; - sal_uInt16 nProzent; // nur temporaer !!! - - nColor1 = 255 - rColor.GetRed(); - nProzent = ColorToPercent_Impl( nColor1 ); - - nColor2 = 255 - rColor.GetGreen(); - nProzent = ColorToPercent_Impl( nColor2 ); - - nColor3 = 255 - rColor.GetBlue(); - nProzent = ColorToPercent_Impl( nColor3 ); + sal_uInt16 const nColor1 = 255 - rColor.GetRed(); + sal_uInt16 const nColor2 = 255 - rColor.GetGreen(); + sal_uInt16 const nColor3 = 255 - rColor.GetBlue(); rK = Min( Min( nColor1, nColor2 ), nColor3 ); @@ -1282,3 +1257,4 @@ void SvxColorTabPage::FillUserData() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3947a4d85aba..d762f74c70c6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -48,9 +45,8 @@ #include "svx/drawitem.hxx" #include "cuitabarea.hxx" #include "tabarea.hrc" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -//#include "dlgname.hrc" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -110,9 +106,6 @@ SvxGradientTabPage::SvxGradientTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE))); @@ -124,9 +117,7 @@ SvxGradientTabPage::SvxGradientTabPage // Solange NICHT vom Item unterstuetzt - //aMtrColorTo.Disable(); aMtrColorTo.SetValue( 100 ); - //aMtrColorFrom.Disable(); aMtrColorFrom.SetValue( 100 ); // Setzen des Output-Devices @@ -295,18 +286,18 @@ long SvxGradientTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_GRADIENT ), CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -326,11 +317,9 @@ long SvxGradientTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbGradients.GetSelectEntryPos(); @@ -465,9 +454,9 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -498,7 +487,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -527,7 +515,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbGradients.Invalidate(); } #endif @@ -562,9 +549,9 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pGradientList->Count(); sal_Bool bDifferent = sal_False; @@ -696,47 +683,43 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) if ( pGrdList->Load() ) { - if ( pGrdList ) + // Pruefen, ob Tabelle geloescht werden darf: + if ( pGradientList != + ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() ) + delete pGradientList; + + pGradientList = pGrdList; + ( (SvxAreaTabDialog*) DLGWIN )-> + SetNewGradientList( pGradientList ); + + aLbGradients.Clear(); + aLbGradients.Fill( pGradientList ); + Reset( rOutAttrs ); + + pGradientList->SetName( aURL.getName() ); + + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + + if ( aURL.getBase().getLength() > 18 ) { - // Pruefen, ob Tabelle geloescht werden darf: - if ( pGradientList != - ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() ) - delete pGradientList; - - pGradientList = pGrdList; - ( (SvxAreaTabDialog*) DLGWIN )-> - SetNewGradientList( pGradientList ); - - aLbGradients.Clear(); - aLbGradients.Fill( pGradientList ); - Reset( rOutAttrs ); - - pGradientList->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnGradientListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnGradientListState &= ~CT_MODIFIED; + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnGradientListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnGradientListState &= ~CT_MODIFIED; LeaveWait(); } else { LeaveWait(); - //aIStream.Close(); ErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); } @@ -943,3 +926,4 @@ void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index b05d32fbec1a..de7365e54d20 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,15 +39,14 @@ #include <cuires.hrc> #include "tabarea.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include "svx/drawitem.hxx" #include "cuitabarea.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -106,9 +102,6 @@ SvxHatchTabPage::SvxHatchTabPage rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -271,18 +264,18 @@ long SvxHatchTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_HATCH ), CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -299,11 +292,9 @@ long SvxHatchTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } sal_uInt16 nPos = aLbHatchings.GetSelectEntryPos(); @@ -352,7 +343,6 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { - // aLbHatchings.SelectEntryPos( 0 ); ChangeHatchHdl_Impl( this ); // Status der Buttons ermitteln @@ -475,19 +465,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) default: aCtlAngle.SetActualRP( RP_MM ); break; } - // Backgroundcolor - /* - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), sal_True, &pPoolItem ) ) - { - rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) ); - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) ) - { - Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() ); - rXFSet.Put( XFillColorItem( String(), aColor ) ); - } - } - */ // ItemSet fuellen und an aCtlPreview weiterleiten rXFSet.Put( XFillHatchItem( String(), *pHatch ) ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); @@ -530,9 +507,9 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; sal_uInt16 nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -562,7 +539,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -586,7 +562,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( sal_True ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbHatchings.Invalidate(); } #endif @@ -621,9 +596,9 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pHatchingList->Count(); sal_Bool bDifferent = sal_False; @@ -752,39 +727,36 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pHatchList->SetName( aURL.getName() ); if( pHatchList->Load() ) { - if( pHatchList ) + // Pruefen, ob Tabelle geloescht werden darf: + if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() ) + delete pHatchingList; + + pHatchingList = pHatchList; + ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList ); + + aLbHatchings.Clear(); + aLbHatchings.Fill( pHatchingList ); + Reset( rOutAttrs ); + + pHatchingList->SetName( aURL.getName() ); + + // Ermitteln (evtl. abschneiden) des Namens und in + // der GroupBox darstellen + String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); + + if ( aURL.getBase().getLength() > 18 ) { - // Pruefen, ob Tabelle geloescht werden darf: - if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() ) - delete pHatchingList; - - pHatchingList = pHatchList; - ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList ); - - aLbHatchings.Clear(); - aLbHatchings.Fill( pHatchingList ); - Reset( rOutAttrs ); - - pHatchingList->SetName( aURL.getName() ); - - // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().getLength() > 18 ) - { - aString += String(aURL.getBase()).Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += String(aURL.getBase()); - - // Flag fuer gewechselt setzen - *pnHatchingListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnHatchingListState &= ~CT_MODIFIED; + aString += String(aURL.getBase()).Copy( 0, 15 ); + aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); } + else + aString += String(aURL.getBase()); + + // Flag fuer gewechselt setzen + *pnHatchingListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnHatchingListState &= ~CT_MODIFIED; } else ErrorBox( DLGWIN, WinBits( WB_OK ), @@ -901,3 +873,4 @@ void SvxHatchTabPage::DataChanged( const DataChangedEvent& rDCEvt ) SvxTabPage::DataChanged( rDCEvt ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 7c4eea588c86..b2e10d6210a2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,13 +26,7 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- - #ifndef _SVX_SIZEITEM_HXX //autogen - #include <editeng/sizeitem.hxx> #endif #include <tools/shl.hxx> @@ -51,9 +46,7 @@ #include "dlgname.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svx/svdmodel.hxx> #include "svx/svxgrahicitem.hxx" -//#include "linectrl.hrc" #include <sfx2/request.hxx> #include "svx/ofaitem.hxx" #include <svx/svdobj.hxx> @@ -164,7 +157,7 @@ SvxLineTabPage::SvxLineTabPage pnLineEndListState( 0 ), pnDashListState( 0 ), pnColorTableState( 0 ), - nPageType ( 0 )//CHINA001 pPageType ( NULL ), + nPageType ( 0 ) { aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE))); aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) ); @@ -320,10 +313,10 @@ void SvxLineTabPage::FillListboxes() void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); //add CHINA001 begin + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) - SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end - if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog + SetPageType(pPageTypeItem->GetValue()); + if( nDlgType == 0 && pDashList ) { sal_uInt16 nPos; sal_uInt16 nCount; @@ -361,20 +354,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aDashURL.getBase().Len() > 18 ) - { - aString += aDashURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aDashURL.getBase(); - - aGrpLine.SetText( aString ); -*/ // LineEndliste if( ( *pnLineEndListState & CT_MODIFIED ) || ( *pnLineEndListState & CT_CHANGED ) ) @@ -415,29 +394,15 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aLineURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aLineURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - aString = String( ResId( RID_SVXSTR_TABLE, pMgr ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aLineURL.getBase().Len() > 18 ) - { - aString += aLineURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aLineURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ // Auswertung, ob von einer anderen TabPage ein anderer Fuelltyp gesetzt wurde if( aLbLineStyle.GetSelectEntryPos() != 0 ) { - if( nPageType == 2 ) // 1//CHINA001 if( *pPageType == 2 ) // 1 + if( nPageType == 2 ) // 1 { aLbLineStyle.SelectEntryPos( *pPosDashLb + 2 ); // +2 wegen SOLID und INVLISIBLE ChangePreviewHdl_Impl( this ); } - if( nPageType == 3 )//CHINA001 if( *pPageType == 3 ) + if( nPageType == 3 ) { aLbStartStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID aLbEndStyle.SelectEntryPos( *pPosLineEndLb + 1 );// +1 wegen SOLID @@ -466,12 +431,12 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) ChangePreviewHdl_Impl( this ); } - nPageType = 0;//CHINA001 *pPageType = 0; + nPageType = 0; } // Seite existiert im Ctor noch nicht, deswegen hier! - else if ( nDlgType == 1100 || // Chart-Dialog//CHINA001 else if ( *pDlgType == 1100 || // Chart-Dialog - nDlgType == 1101 )//CHINA001 *pDlgType == 1101 ) + else if ( nDlgType == 1100 || + nDlgType == 1101 ) { aFtLineEndsStyle.Hide(); aFtLineEndsWidth.Hide(); @@ -495,9 +460,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { - if( nDlgType == 0 ) // Linien-Dialog//CHINA001 if( *pDlgType == 0 ) // Linien-Dialog + if( nDlgType == 0 ) // Linien-Dialog { - nPageType = 1; // evtl. fuer Erweiterungen//CHINA001 *pPageType = 1; // evtl. fuer Erweiterungen + nPageType = 1; // evtl. fuer Erweiterungen *pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!! sal_uInt16 nPos = aLbStartStyle.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -521,7 +486,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // Um evtl. Modifikationen der Liste vorzubeugen // werden Items anderer Seiten nicht gesetzt - if( nDlgType != 0 || nPageType != 2 )//CHINA001 if( *pDlgType != 0 || *pPageType != 2 ) + if( nDlgType != 0 || nPageType != 2 ) { nPos = aLbLineStyle.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && @@ -607,7 +572,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } - if( nDlgType != 0 || nPageType != 3 )//CHINA001 if( *pDlgType != 0 || *pPageType != 3 ) + if( nDlgType != 0 || nPageType != 3 ) { // Linienanfang nPos = aLbStartStyle.GetSelectEntryPos(); @@ -791,7 +756,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));//add CHINA001 + rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return( bModified ); } @@ -803,7 +768,6 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl() if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { - //rXLSet.Put( XLineDashItem ( rOutAttrs.Get( GetWhich( XATTR_LINEDASH ) ) ) ); rXLSet.Put( XLineStyleItem( XLINE_NONE ) ); } else if( aLbLineStyle.IsEntryPosSelected( 0 ) ) @@ -906,13 +870,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH // Linienstil -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) == SFX_ITEM_DEFAULT ) - { - aLbLineStyle.Disable(); - } -*/ const SfxPoolItem *pPoolItem; long nSymType=SVX_SYMBOLTYPE_UNKNOWN; sal_Bool bPrevSym=sal_False; @@ -949,7 +906,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); SdrPageView* pPageView = pView->ShowSdrPage(pPage); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrObject *pObj=NULL; long nSymTmp=nSymType; if(pSymbolList) @@ -1056,13 +1012,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Linienstaerke -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINEWIDTH ) ) == SFX_ITEM_DEFAULT ) - { - aMtrLineWidth.Disable(); - } -*/ if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( aMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs. @@ -1072,13 +1021,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aMtrLineWidth.SetText( String() ); // Linienfarbe -/* - if( bObjSelected && - rAttrs.GetItemState( GetWhich( XATTR_LINECOLOR ) ) == SFX_ITEM_DEFAULT ) - { - aLbColor.Disable(); - } -*/ aLbColor.SetNoSelection(); if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) @@ -1279,15 +1221,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SetNoSelection(); } - /* - if( aLbStartStyle.GetSelectEntryPos() == aLbEndStyle.GetSelectEntryPos() && - aMtrStartWidth.GetValue() == aMtrEndWidth.GetValue() && - aTsbCenterStart.GetState() == aTsbCenterEnd.GetState() ) - { - aCbxSynchronize.Check(); - } - */ - // Werte sichern aLbLineStyle.SaveValue(); aMtrLineWidth.SaveValue(); @@ -1304,8 +1237,6 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) maLBEdgeStyle.SaveValue(); ClickInvisibleHdl_Impl( this ); - //ClickMeasuringHdl_Impl( this ); - //aCtlPosition.Reset(); ChangePreviewHdl_Impl( NULL ); } @@ -1497,26 +1428,6 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) } //------------------------------------------------------------------------ -/* - -long SvxLineTabPage::ClickMeasuringHdl_Impl( void* ) -{ - if( aTsbShowMeasuring.GetState() == STATE_NOCHECK ) - { - aFtPosition.Disable(); - aCtlPosition.Disable(); - } - else - { - aFtPosition.Enable(); - aCtlPosition.Enable(); - } - aCtlPosition.Invalidate(); - - return( 0L ); -} -*/ -//------------------------------------------------------------------------ IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG ) { @@ -1625,7 +1536,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) // 3D View SdrView* pView = new SdrView( pModel, &aVDev ); pView->hideMarkHandles(); -// SdrPageView* pPageView = pView->ShowSdrPage(pPage, Point()); SdrPageView* pPageView = pView->ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; @@ -1636,10 +1546,8 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) if(pObj==NULL) break; pObj=pObj->Clone(); - //const String* pGrfName = (const String*)aGrfNames.GetObject(i); - String *pStr=new String();//String(i)); + String *pStr=new String(); aGrfNames.Insert(pStr,LIST_APPEND); - //Rectangle aRect(pObj->GetLogicRect()); pPage->NbcInsertObject(pObj); pView->MarkObj(pObj,pPageView); if(pSymbolAttr) @@ -1899,7 +1807,7 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } -void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,sal_False); @@ -1932,3 +1840,5 @@ void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 aAutoSymbolGraphic = pGraphicItem->GetGraphic(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 7c61d05ed8f4..41f7085c2934 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,10 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - -// include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -42,7 +39,6 @@ #include <cuires.hrc> #include "tabline.hrc" -//#include "dlgname.hrc" #include "helpid.hrc" #include "svx/xattr.hxx" @@ -51,8 +47,8 @@ #include "svx/drawitem.hxx" #include "cuitabline.hxx" -#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include "defdlgname.hxx" +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> @@ -110,9 +106,6 @@ SvxLineDefTabPage::SvxLineDefTabPage aXLineAttr ( pXPool ), rXLSet ( aXLineAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - aLbType1.SetAccessibleName(String(CUI_RES( STR_START_TYPE ) ) ); aLbType2.SetAccessibleName(String(CUI_RES( STR_END_TYPE ) ) ); aNumFldNumber1.SetAccessibleName(String(CUI_RES( STR_START_NUM ) ) ); @@ -224,16 +217,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pDashList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aFTLinestyle.SetText( aString ); -*/ *pPageType = 0; // 2 *pPosDashLb = LISTBOX_ENTRY_NOTFOUND; } @@ -270,41 +253,37 @@ void SvxLineDefTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, SVX_RESSTR( RID_SVXSTR_LINESTYLE ), String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { case RET_BTN_1: // Aendern { ClickModifyHdl_Impl( this ); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_BTN_2: // Hinzufuegen { ClickAddHdl_Impl( this ); - //nPos = aLbLineStyles.GetSelectEntryPos(); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_CANCEL: break; - // return( sal_True ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } @@ -324,8 +303,6 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { if( *pPageType == 2 ) { - //CheckChanges_Impl(); - FillDash_Impl(); String aString( aLbLineStyles.GetSelectEntry() ); @@ -605,9 +582,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -683,9 +660,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pDashList->Count(); sal_Bool bDifferent = sal_False; @@ -819,41 +796,23 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) if( pDshLst->Load() ) { - if( pDshLst ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() ) - delete pDashList; - - pDashList = pDshLst; - ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList ); - - aLbLineStyles.Clear(); - aLbLineStyles.Fill( pDashList ); - Reset( rOutAttrs ); - - pDashList->SetName( aURL.getName() ); - -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ - // Flag fuer gewechselt setzen - *pnDashListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnDashListState &= ~CT_MODIFIED; - } + // Pruefen, ob Tabelle geloescht werden darf: + if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() ) + delete pDashList; + + pDashList = pDshLst; + ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList ); + + aLbLineStyles.Clear(); + aLbLineStyles.Fill( pDashList ); + Reset( rOutAttrs ); + + pDashList->SetName( aURL.getName() ); + + // Flag fuer gewechselt setzen + *pnDashListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnDashListState &= ~CT_MODIFIED; } else //aIStream.Close(); @@ -912,21 +871,6 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pDashList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnDashListState |= CT_SAVED; // Flag fuer modifiziert entfernen @@ -948,14 +892,6 @@ void SvxLineDefTabPage::FillDash_Impl() { XDashStyle eXDS; -/* Alle Stile werden z.Z. nicht benutzt - if( aRbtEnds1.IsChecked() ) - eXDS = XDASH_ROUND; - else if( aRbtEnds2.IsChecked() ) - eXDS = XDASH_RECT; - else - eXDS = XDASH_RECT; -*/ if( aCbxSynchronize.IsChecked() ) eXDS = XDASH_RECTRELATIVE; else @@ -987,14 +923,11 @@ void SvxLineDefTabPage::FillDialog_Impl() aCbxSynchronize.Check( sal_False ); aNumFldNumber1.SetValue( aDash.GetDots() ); - //aMtrLength1.SetValue( aDash.GetDotLen() ); SetMetricValue( aMtrLength1, aDash.GetDotLen(), ePoolUnit ); aLbType1.SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 ); aNumFldNumber2.SetValue( aDash.GetDashes() ); - //aMtrLength2.SetValue( aDash.GetDashLen() ); SetMetricValue( aMtrLength2, aDash.GetDashLen(), ePoolUnit ); aLbType2.SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 ); - //aMtrDistance.SetValue( aDash.GetDistance() ); SetMetricValue( aMtrDistance, aDash.GetDistance(), ePoolUnit ); ChangeMetricHdl_Impl( NULL ); @@ -1023,3 +956,4 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 4de0960a5610..30b94a0759ad 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -49,7 +47,7 @@ #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include "cuitabline.hxx" -#include <svx/svxdlg.hxx> //CHINA001 +#include <svx/svxdlg.hxx> #include <dialmgr.hxx> #include "svx/dlgutil.hxx" #include <basegfx/range/b2drange.hxx> @@ -104,9 +102,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage rXLSet ( aXLineAttr.GetItemSet() ), pLineEndList( NULL ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -192,20 +187,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ *pPageType = 0; // 3 *pPosLineEndLb = LISTBOX_ENTRY_NOTFOUND; } @@ -379,9 +360,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -486,9 +467,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); sal_Bool bLoop = sal_True; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -617,39 +598,22 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pLeList->SetName( aURL.getName() ); if( pLeList->Load() ) { - if( pLeList ) - { - // Pruefen, ob Tabelle geloescht werden darf: - if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() ) - delete pLineEndList; - - pLineEndList = pLeList; - ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList ); - aLbLineEnds.Clear(); - aLbLineEnds.Fill( pLineEndList ); - Reset( rOutAttrs ); - - pLineEndList->SetName( aURL.getName() ); - -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - if( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ - // Flag fuer gewechselt setzen - *pnLineEndListState |= CT_CHANGED; - // Flag fuer modifiziert entfernen - *pnLineEndListState &= ~CT_MODIFIED; - } + // Pruefen, ob Tabelle geloescht werden darf: + if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() ) + delete pLineEndList; + + pLineEndList = pLeList; + ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList ); + aLbLineEnds.Clear(); + aLbLineEnds.Fill( pLineEndList ); + Reset( rOutAttrs ); + + pLineEndList->SetName( aURL.getName() ); + + // Flag fuer gewechselt setzen + *pnLineEndListState |= CT_CHANGED; + // Flag fuer modifiziert entfernen + *pnLineEndListState &= ~CT_MODIFIED; } else ErrorBox( DLGWIN, WinBits( WB_OK ), @@ -707,20 +671,6 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pLineEndList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - aGrpLineEnds.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnLineEndListState |= CT_SAVED; // Flag fuer modifiziert entfernen @@ -748,3 +698,4 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index b4ed21ef0aad..a7109fadb3b3 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> @@ -48,7 +46,7 @@ #include <cuitabline.hxx> #include "paragrph.hrc" #include <svx/xlineit0.hxx> -#include <sfx2/request.hxx> //add CHINA001 +#include <sfx2/request.hxx> #define DLGWIN this->GetParent()->GetParent() @@ -219,12 +217,12 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_uInt16 nPos; sal_uInt16 nCount; - //add CHINA001 Begin + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); - //add CHINA001 end - if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog + + if( nDlgType == 0 ) { if( pColorTab ) { @@ -261,7 +259,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) ModifyShadowHdl_Impl( this ); } - nPageType = PT_SHADOW;//CHINA001 *pPageType = PT_SHADOW; + nPageType = PT_SHADOW; } } } @@ -381,9 +379,9 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) } } } - //add CHINA001 begin + rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); - //add CHINA001 end + return( bModified ); } @@ -595,7 +593,7 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) ModifyShadowHdl_Impl( pWindow ); } -void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 +void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorTableItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); @@ -610,3 +608,5 @@ void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001 SetDlgType(pDlgTypeItem->GetValue()); Construct(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 3d8deb015039..3b75b322b828 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -562,7 +560,6 @@ void SvxSlantTabPage::Construct() sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; - sal_Int32 nValue = 0L; String aStr = aMtrRadius.GetText(); if( aStr != aMtrRadius.GetSavedValue() ) @@ -579,7 +576,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) if( aStr != aMtrAngle.GetSavedValue() ) { - nValue = static_cast<sal_Int32>(aMtrAngle.GetValue()); + sal_Int32 nValue = static_cast<sal_Int32>(aMtrAngle.GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = sal_True; } @@ -1704,3 +1701,5 @@ void SvxPositionSizeTabPage::FillUserData() } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |