diff options
Diffstat (limited to 'sw/source/ui/utlui')
31 files changed, 518 insertions, 518 deletions
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 2de34301fe59..11af0bf1da9d 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -108,11 +108,11 @@ static sal_Char __READONLY_DATA sKomma[] = ", "; SfxItemPresentation SwFmtCharFmt::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -149,9 +149,9 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -177,9 +177,9 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -218,7 +218,7 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, } /************************************************************************* -|* class SwFmtDrop +|* class SwFmtDrop *************************************************************************/ @@ -227,9 +227,9 @@ SfxItemPresentation SwFmtDrop::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -262,7 +262,7 @@ SfxItemPresentation SwFmtDrop::GetPresentation } /************************************************************************* -|* class SwRegisterItem +|* class SwRegisterItem *************************************************************************/ @@ -271,9 +271,9 @@ SfxItemPresentation SwRegisterItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + XubString& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -293,7 +293,7 @@ SfxItemPresentation SwRegisterItem::GetPresentation } /************************************************************************* -|* class SwNumRuleItem +|* class SwNumRuleItem *************************************************************************/ @@ -302,9 +302,9 @@ SfxItemPresentation SwNumRuleItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + XubString& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -358,18 +358,18 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation /****************************************************************************** - * Frame-Attribute: + * Frame-Attribute: ******************************************************************************/ SfxItemPresentation SwFmtFrmSize::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -428,9 +428,9 @@ SfxItemPresentation SwFmtHeader::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -458,9 +458,9 @@ SfxItemPresentation SwFmtFooter::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -485,9 +485,9 @@ SfxItemPresentation SwFmtSurround::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -537,17 +537,17 @@ SfxItemPresentation SwFmtSurround::GetPresentation //VertOrientation, wie und woran orientiert -- -// sich der FlyFrm in der Vertikalen ----------- +// sich der FlyFrm in der Vertikalen ----------- SfxItemPresentation SwFmtVertOrient::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -598,17 +598,17 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation } //HoriOrientation, wie und woran orientiert -- -// sich der FlyFrm in der Hoizontalen ---------- +// sich der FlyFrm in der Hoizontalen ---------- SfxItemPresentation SwFmtHoriOrient::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -666,9 +666,9 @@ SfxItemPresentation SwFmtAnchor::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -707,9 +707,9 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -737,11 +737,11 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation SfxItemPresentation SwFmtCol::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, + SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { @@ -784,9 +784,9 @@ SfxItemPresentation SwFmtURL::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -828,9 +828,9 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { rText.Erase(); switch ( ePres ) @@ -856,9 +856,9 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -895,9 +895,9 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -911,7 +911,7 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation switch( GetValue() ) { case FTNEND_ATPGORDOCEND: -// rText = SW_RESSTR( STR_LAYOUT_FTN ); +// rText = SW_RESSTR( STR_LAYOUT_FTN ); break; case FTNEND_ATTXTEND: @@ -919,11 +919,11 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation case FTNEND_ATTXTEND_OWNNUMSEQ: { -// String sPrefix; -// String sSuffix; -// SvxNumberType aFmt; -// USHORT nOffset; -// rText += +// String sPrefix; +// String sSuffix; +// SvxNumberType aFmt; +// USHORT nOffset; +// rText += } break; } @@ -942,9 +942,9 @@ SfxItemPresentation SwFmtChain::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -979,9 +979,9 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1013,9 +1013,9 @@ SfxItemPresentation SwTextGridItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - String& rText, + String& rText, const IntlWrapper* /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1060,7 +1060,7 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation SfxMapUnit /*ePresUnit*/, String& /*rText*/, const IntlWrapper* /*pIntl*/ -) const +) const { // rText.Erase(); // switch ( ePres ) @@ -1098,7 +1098,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( case RES_MIRROR_GRAPH_VERT: nId = STR_VERT_MIRROR; break; case RES_MIRROR_GRAPH_HOR: nId = STR_HORI_MIRROR; break; case RES_MIRROR_GRAPH_BOTH: nId = STR_BOTH_MIRROR; break; - default: nId = 0; break; + default: nId = 0; break; } if ( nId ) { @@ -1199,10 +1199,10 @@ SfxItemPresentation SwChannelGrf::GetPresentation( USHORT nId; switch ( Which() ) { - case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break; - case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break; - case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break; - default: nId = 0; break; + case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break; + case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break; + case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break; + default: nId = 0; break; } if( nId ) rText = SW_RESSTR( nId ); @@ -1306,10 +1306,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( switch ( GetValue() ) { - case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break; + case GRAPHICDRAWMODE_GREYS: nId = STR_DRAWMODE_GREY; break; case GRAPHICDRAWMODE_MONO: nId = STR_DRAWMODE_BLACKWHITE; break; - case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break; - default: nId = STR_DRAWMODE_STD; break; + case GRAPHICDRAWMODE_WATERMARK: nId = STR_DRAWMODE_WATERMARK; break; + default: nId = STR_DRAWMODE_STD; break; } (rText = SW_RESSTR( STR_DRAWMODE ) ) += SW_RESSTR( nId ); } diff --git a/sw/source/ui/utlui/attrdesc.hrc b/sw/source/ui/utlui/attrdesc.hrc index 1f2c5d34fa37..972f13c278d7 100644 --- a/sw/source/ui/utlui/attrdesc.hrc +++ b/sw/source/ui/utlui/attrdesc.hrc @@ -30,81 +30,81 @@ #include "rcid.hrc" -#define STR_DROP_OVER (RC_ATTR_BEGIN + 1) -#define STR_DROP_LINES (RC_ATTR_BEGIN + 2) -#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3) -#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4) -#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5) -#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6) -#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7) -#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8) -#define STR_CHARFMT (RC_ATTR_BEGIN + 9) -#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10) -#define STR_FOOTER (RC_ATTR_BEGIN + 11) -#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12) -#define STR_HEADER (RC_ATTR_BEGIN + 13) -#define STR_NO_HEADER (RC_ATTR_BEGIN + 14) -#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15) -#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16) -#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17) -#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18) -#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19) -#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20) -#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21) -#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22) -#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23) -#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24) -#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25) +#define STR_DROP_OVER (RC_ATTR_BEGIN + 1) +#define STR_DROP_LINES (RC_ATTR_BEGIN + 2) +#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3) +#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4) +#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5) +#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6) +#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7) +#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8) +#define STR_CHARFMT (RC_ATTR_BEGIN + 9) +#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10) +#define STR_FOOTER (RC_ATTR_BEGIN + 11) +#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12) +#define STR_HEADER (RC_ATTR_BEGIN + 13) +#define STR_NO_HEADER (RC_ATTR_BEGIN + 14) +#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15) +#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16) +#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17) +#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18) +#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19) +#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20) +#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21) +#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22) +#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23) +#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24) +#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25) #define STR_FLY_AT_PARA (RC_ATTR_BEGIN + 26) #define STR_FLY_AS_CHAR (RC_ATTR_BEGIN + 27) #define STR_FLY_AT_PAGE (RC_ATTR_BEGIN + 28) -#define STR_POS_X (RC_ATTR_BEGIN + 29) -#define STR_POS_Y (RC_ATTR_BEGIN + 30) -#define STR_VERT_TOP (RC_ATTR_BEGIN + 31) -#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32) -#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33) -#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34) -#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35) -#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36) -#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37) -#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38) -#define STR_HORI_FULL (RC_ATTR_BEGIN + 39) -#define STR_COLUMNS (RC_ATTR_BEGIN + 40) -#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41) -#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42) -#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43) -#define STR_LINE_TOP (RC_ATTR_BEGIN + 44) -#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45) -#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46) -#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47) -#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48) -#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49) -#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50) -#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51) -#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52) -#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53) -#define STR_CONNECT1 (RC_ATTR_BEGIN + 54) -#define STR_CONNECT2 (RC_ATTR_BEGIN + 55) -#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56) -#define STR_LINECOUNT (RC_ATTR_BEGIN + 57) -#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58) -#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59) +#define STR_POS_X (RC_ATTR_BEGIN + 29) +#define STR_POS_Y (RC_ATTR_BEGIN + 30) +#define STR_VERT_TOP (RC_ATTR_BEGIN + 31) +#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32) +#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33) +#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34) +#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35) +#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36) +#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37) +#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38) +#define STR_HORI_FULL (RC_ATTR_BEGIN + 39) +#define STR_COLUMNS (RC_ATTR_BEGIN + 40) +#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41) +#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42) +#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43) +#define STR_LINE_TOP (RC_ATTR_BEGIN + 44) +#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45) +#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46) +#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47) +#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48) +#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49) +#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50) +#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51) +#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52) +#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53) +#define STR_CONNECT1 (RC_ATTR_BEGIN + 54) +#define STR_CONNECT2 (RC_ATTR_BEGIN + 55) +#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56) +#define STR_LINECOUNT (RC_ATTR_BEGIN + 57) +#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58) +#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59) -#define STR_LUMINANCE (RC_ATTR_BEGIN + 60) -#define STR_CHANNELR (RC_ATTR_BEGIN + 61) -#define STR_CHANNELG (RC_ATTR_BEGIN + 62) -#define STR_CHANNELB (RC_ATTR_BEGIN + 63) -#define STR_CONTRAST (RC_ATTR_BEGIN + 64) -#define STR_GAMMA (RC_ATTR_BEGIN + 65) -#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66) -#define STR_INVERT (RC_ATTR_BEGIN + 67) -#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68) -#define STR_DRAWMODE (RC_ATTR_BEGIN + 69) -#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70) -#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71) +#define STR_LUMINANCE (RC_ATTR_BEGIN + 60) +#define STR_CHANNELR (RC_ATTR_BEGIN + 61) +#define STR_CHANNELG (RC_ATTR_BEGIN + 62) +#define STR_CHANNELB (RC_ATTR_BEGIN + 63) +#define STR_CONTRAST (RC_ATTR_BEGIN + 64) +#define STR_GAMMA (RC_ATTR_BEGIN + 65) +#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66) +#define STR_INVERT (RC_ATTR_BEGIN + 67) +#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68) +#define STR_DRAWMODE (RC_ATTR_BEGIN + 69) +#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70) +#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71) #define STR_DRAWMODE_BLACKWHITE (RC_ATTR_BEGIN + 72) #define STR_DRAWMODE_WATERMARK (RC_ATTR_BEGIN + 73) -#define STR_ROTATION (RC_ATTR_BEGIN + 74) +#define STR_ROTATION (RC_ATTR_BEGIN + 74) #define STR_GRID_NONE (RC_ATTR_BEGIN + 75) #define STR_GRID_LINES_ONLY (RC_ATTR_BEGIN + 76) #define STR_GRID_LINES_CHARS (RC_ATTR_BEGIN + 77) diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx index c6241e2f5383..481d2d6678f1 100644 --- a/sw/source/ui/utlui/bookctrl.cxx +++ b/sw/source/ui/utlui/bookctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,10 +58,10 @@ class BookmarkPopup_Impl : public PopupMenu public: BookmarkPopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 0a9e81d45141..80ce1bc14ad8 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 1beea561d3fd..0099a982c2a7 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -98,8 +98,8 @@ #include <unomid.h> -#define CTYPE_CNT 0 -#define CTYPE_CTT 1 +#define CTYPE_CNT 0 +#define CTYPE_CTT 1 using namespace ::std; using namespace ::com::sun::star; @@ -108,7 +108,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -#define NAVI_BOOKMARK_DELIM (sal_Unicode)1 +#define NAVI_BOOKMARK_DELIM (sal_Unicode)1 typedef SwContent* SwContentPtr; SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0,4) @@ -166,7 +166,7 @@ SwContent::SwContent(const SwContentType* pCnt, const String& rName, long nYPos) { } -sal_uInt8 SwTypeNumber::GetTypeId() +sal_uInt8 SwTypeNumber::GetTypeId() { return nTypeId; } @@ -202,7 +202,7 @@ SwTOXBaseContent::~SwTOXBaseContent() } /*************************************************************************** - Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell + Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell ***************************************************************************/ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLevel) : @@ -223,7 +223,7 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe } /*************************************************************************** - Beschreibung: Initialisierung + Beschreibung: Initialisierung ***************************************************************************/ void SwContentType::Init(sal_Bool* pbInvalidateWindow) @@ -233,7 +233,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) nMemberCount = 0; switch(nContentType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { sTypeToken = C2S(pMarkToOutline); sal_uInt16 nOutlineCount = nMemberCount = @@ -250,7 +250,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : sTypeToken = C2S(pMarkToTable); nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); bEdit = sal_True; @@ -289,7 +289,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) break; case CONTENT_TYPE_REGION : { - SwContentArr* pOldMember = 0; + SwContentArr* pOldMember = 0; sal_uInt16 nOldRegionCount = 0; sal_Bool bInvalidate = sal_False; if(!pMember) @@ -326,7 +326,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 ); if( !pFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, pMember->Count()); @@ -424,8 +424,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } /* - // this code can be used once we want redline comments in the margin - else // redcomment + // this code can be used once we want redline comments in the margin + else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); if ( pRedline->GetComment().Len() ) @@ -475,7 +475,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) // ... dann koennen die Daten auch nicht mehr gueltig sein // abgesehen von denen, die schon korrigiert wurden, dann ist // nOldMemberCount doch nicht so old - if( nOldMemberCount != nMemberCount ) + if( nOldMemberCount != nMemberCount ) bDataValid = sal_False; } @@ -485,7 +485,7 @@ SwContentType::~SwContentType() } /*************************************************************************** - Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen + Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen ***************************************************************************/ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex) @@ -501,7 +501,7 @@ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex) } -void SwContentType::Invalidate() +void SwContentType::Invalidate() { bDataValid = sal_False; } @@ -510,9 +510,9 @@ void SwContentType::Invalidate() Beschreibung: Liste der Inhalte fuellen ***************************************************************************/ -void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) +void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) { - SwContentArr* pOldMember = 0; + SwContentArr* pOldMember = 0; int nOldMemberCount = -1; SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 ); if(pMember && pbLevelOrVisibiblityChanged) @@ -528,7 +528,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) pMember->DeleteAndDestroy(0, pMember->Count()); switch(nContentType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { sal_uInt16 nOutlineCount = nMemberCount = static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount()); @@ -561,12 +561,12 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : { OSL_ENSURE(nMemberCount == pWrtShell->GetTblFrmFmtCount(sal_True), "MemberCount differs"); Point aNullPt; - nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); + nMemberCount = pWrtShell->GetTblFrmFmtCount(sal_True); for(sal_uInt16 i = 0; i < nMemberCount; i++) { const SwFrmFmt& rTblFmt = pWrtShell->GetTblFrmFmt(i, sal_True); @@ -575,7 +575,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) SwContent* pCnt = new SwContent(this, sTblName, rTblFmt.FindLayoutRect(sal_False, &aNullPt).Top() ); if( !rTblFmt.GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, i); @@ -595,7 +595,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) eType = FLYCNTTYPE_OLE; else if(nContentType == CONTENT_TYPE_GRAPHIC) eType = FLYCNTTYPE_GRF; - OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType), + OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType), "MemberCount differs"); Point aNullPt; nMemberCount = pWrtShell->GetFlyCount(eType); @@ -621,7 +621,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) pFrmFmt->FindLayoutRect(sal_False, &aNullPt).Top() ); } if( !pFrmFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, i); if(nOldMemberCount > (int)i && @@ -673,7 +673,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) nLevel, pFmt->FindLayoutRect( sal_False, &aNullPt ).Top()); if( !pFmt->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert(pCnt);//, pMember->Count()); @@ -735,7 +735,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) this, sTOXNm, nTox, *pBase); if( !pBase->GetInfo( aAskItem ) && - !aAskItem.pObject ) // not visible + !aAskItem.pObject ) // not visible pCnt->SetInvisible(); pMember->Insert( pCnt );//, nTox ); @@ -776,8 +776,8 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) nMemberCount++; } } - /* this code can be used once we want redline comments in the margin - else // redcomment + /* this code can be used once we want redline comments in the margin + else // redcomment { SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster()); if ( pRedline->GetComment().Len() ) @@ -901,8 +901,8 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SetDragDropMode(SV_DRAGDROP_APP_COPY); for( i = 0; i < CONTENT_TYPE_MAX; i++) { - aActiveContentArr[i] = 0; - aHiddenContentArr[i] = 0; + aActiveContentArr[i] = 0; + aHiddenContentArr[i] = 0; } for( i = 0; i < CONTEXT_COUNT; i++ ) { @@ -971,7 +971,7 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt ) } /*************************************************************************** - Beschreibung: Drop wird im Navigator ausgefuehrt + Beschreibung: Drop wird im Navigator ausgefuehrt ***************************************************************************/ void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent) { @@ -1019,7 +1019,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) /*************************************************************************** - Beschreibung: Handler fuer Dragging und ContextMenu + Beschreibung: Handler fuer Dragging und ContextMenu ***************************************************************************/ PopupMenu* SwContentTree::CreateContextMenu( void ) { @@ -1193,17 +1193,17 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) } /*************************************************************************** - Beschreibung: Einrueckung fuer outlines (und sections) + Beschreibung: Einrueckung fuer outlines (und sections) ***************************************************************************/ -long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) { sal_uInt16 nLevel = 0; if(lcl_IsContent(pEntry)) { nLevel++; SwContent* pCnt = (SwContent *) pEntry->GetUserData(); - const SwContentType* pParent; - if(pCnt && 0 != (pParent = pCnt->GetParent())) + const SwContentType* pParent; + if(pCnt && 0 != (pParent = pCnt->GetParent())) { if(pParent->GetType() == CONTENT_TYPE_OUTLINE) nLevel = nLevel + ((SwOutlineContent*)pCnt)->GetOutlineLevel(); @@ -1216,7 +1216,7 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) } /*************************************************************************** - Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt + Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt ***************************************************************************/ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) { @@ -1292,7 +1292,7 @@ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) } /*************************************************************************** - Beschreibung: Expand - Zustand fuer Inhaltstypen merken + Beschreibung: Expand - Zustand fuer Inhaltstypen merken ***************************************************************************/ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) { @@ -1350,7 +1350,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) } /*************************************************************************** - Beschreibung: Collapse - Zustand fuer Inhaltstypen merken + Beschreibung: Collapse - Zustand fuer Inhaltstypen merken ***************************************************************************/ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) { @@ -1383,13 +1383,13 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) bRet = SvTreeListBox::Collapse(pParent); } else -// bRet = sal_False; +// bRet = sal_False; bRet = SvTreeListBox::Collapse(pParent); return bRet; } /*************************************************************************** - Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt + Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt ***************************************************************************/ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) { @@ -1410,7 +1410,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) SwContent* pCnt = (SwContent*)pEntry->GetUserData(); OSL_ENSURE( pCnt, "no UserData"); GotoContent(pCnt); - if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME) + if(pCnt->GetParent()->GetType() == CONTENT_TYPE_FRAME) pActiveShell->EnterStdMode(); } } @@ -1418,7 +1418,7 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) } /*************************************************************************** - Beschreibung: Anzeigen der Datei + Beschreibung: Anzeigen der Datei ***************************************************************************/ void SwContentTree::Display( sal_Bool bActive ) { @@ -1431,7 +1431,7 @@ void SwContentTree::Display( sal_Bool bActive ) // erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder // zu selektieren -> die UserDaten sind hier nicht mehr gueltig! SvLBoxEntry* pOldSelEntry = FirstSelected(); - String sEntryName; // Name des Eintrags + String sEntryName; // Name des Eintrags sal_uInt16 nEntryRelPos = 0; // rel. Pos zu seinem Parent sal_uInt32 nOldEntryCount = GetEntryCount(); sal_Int32 nOldScrollPos = 0; @@ -1619,7 +1619,7 @@ void SwContentTree::Display( sal_Bool bActive ) } /*************************************************************************** - Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden + Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden ***************************************************************************/ void SwContentTree::Clear() { @@ -1710,7 +1710,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, // nur, wenn primaer ein Link eingefuegt werden soll bRet = sal_True; } - else if( nActType == CONTENT_TYPE_REGION || + else if( nActType == CONTENT_TYPE_REGION || nActType == CONTENT_TYPE_BOOKMARK ) { // fuer Bereich und Textmarken ist ein Link auch ohne @@ -1769,7 +1769,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, } /*************************************************************************** - Beschreibung: Umschalten der Anzeige auf Root + Beschreibung: Umschalten der Anzeige auf Root ***************************************************************************/ sal_Bool SwContentTree::ToggleToRoot() { @@ -1801,7 +1801,7 @@ sal_Bool SwContentTree::ToggleToRoot() } /*************************************************************************** - Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen + Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen ***************************************************************************/ sal_Bool SwContentTree::HasContentChanged() { @@ -2018,9 +2018,9 @@ sal_Bool SwContentTree::HasContentChanged() } /*************************************************************************** - Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte - * aktive Eintrag festgestellt werden. Dann werden die - * UserData geloescht + Beschreibung: Bevor alle Daten geloescht werden, soll noch der letzte + * aktive Eintrag festgestellt werden. Dann werden die + * UserData geloescht ***************************************************************************/ void SwContentTree::FindActiveTypeAndRemoveUserData() { @@ -2035,8 +2035,8 @@ void SwContentTree::FindActiveTypeAndRemoveUserData() if(pEntry->GetUserData() && lcl_IsContentType(pEntry)) nLastSelType = ((SwContentType*)pEntry->GetUserData())->GetType(); } -// else -// nLastSelType = USHRT_MAX; +// else +// nLastSelType = USHRT_MAX; pEntry = First(); while(pEntry) { @@ -2046,7 +2046,7 @@ void SwContentTree::FindActiveTypeAndRemoveUserData() } /*************************************************************************** - Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde, + Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde, wird die neue Shell gesetzt ***************************************************************************/ void SwContentTree::SetHiddenShell(SwWrtShell* pSh) @@ -2064,7 +2064,7 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh) GetParentWindow()->UpdateListBox(); } /*************************************************************************** - Beschreibung: Dokumentwechsel - neue Shell setzen + Beschreibung: Dokumentwechsel - neue Shell setzen ***************************************************************************/ void SwContentTree::SetActiveShell(SwWrtShell* pSh) { @@ -2101,13 +2101,13 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh) } /*************************************************************************** - Beschreibung: Eine offene View als aktiv festlegen + Beschreibung: Eine offene View als aktiv festlegen ***************************************************************************/ void SwContentTree::SetConstantShell(SwWrtShell* pSh) { pActiveShell = pSh; - bIsActive = sal_False; - bIsConstant = sal_True; + bIsActive = sal_False; + bIsConstant = sal_True; FindActiveTypeAndRemoveUserData(); for(sal_uInt16 i=0; i < CONTENT_TYPE_MAX; i++) { @@ -2117,7 +2117,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh) } /*************************************************************************** - Beschreibung: Kommandos des Navigators ausfuehren + Beschreibung: Kommandos des Navigators ausfuehren ***************************************************************************/ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) { @@ -2140,7 +2140,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) { if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE || ((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType() - == CONTENT_TYPE_OUTLINE) + == CONTENT_TYPE_OUTLINE) { nActPos = ((SwOutlineContent*)pFirstEntry->GetUserData())->GetPos(); } @@ -2276,23 +2276,23 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) } } -void SwContentTree::ShowTree() +void SwContentTree::ShowTree() { aUpdTimer.Start(); SvTreeListBox::Show(); } /*************************************************************************** - Beschreibung: zusammengefaltet wird nicht geidlet + Beschreibung: zusammengefaltet wird nicht geidlet ***************************************************************************/ -void SwContentTree::HideTree() +void SwContentTree::HideTree() { aUpdTimer.Stop(); SvTreeListBox::Hide(); } /*************************************************************************** - Beschreibung: Kein Idle mit Focus oder waehrend des Dragging + Beschreibung: Kein Idle mit Focus oder waehrend des Dragging ***************************************************************************/ IMPL_LINK( SwContentTree, TimerUpdate, Timer*, EMPTYARG) { @@ -2351,7 +2351,7 @@ DragDropMode SwContentTree::NotifyStartDrag( } /*************************************************************************** - Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t + Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t Childs verschoben ***************************************************************************/ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, @@ -2365,7 +2365,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, nTargetPos = USHRT_MAX; else nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos(); - if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt + if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { SvLBoxEntry* pNext = Next(pTarget); @@ -2390,7 +2390,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, } /*************************************************************************** - Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e + Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e Childs verschoben ***************************************************************************/ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, @@ -2405,7 +2405,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, else nTargetPos = (( SwOutlineContent* )pTarget->GetUserData())->GetPos(); - if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt + if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { SvLBoxEntry* pNext = Next(pTarget); @@ -2419,7 +2419,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, OSL_ENSURE( pEntry && lcl_IsContent(pEntry),"Source == 0 or Source has no Content" ); - GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False); + GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False); //TreeListBox wird aus dem Dokument neu geladen aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate(); @@ -2429,7 +2429,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, } /*************************************************************************** - Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType + Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType ***************************************************************************/ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) { @@ -2437,8 +2437,8 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) } /*************************************************************************** - Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, - * dann soll die Basisfunktion des Controls gerufen werden + Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, + * dann soll die Basisfunktion des Controls gerufen werden ***************************************************************************/ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -2451,7 +2451,7 @@ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) } /*************************************************************************** - Beschreibung: sofort aktualisieren + Beschreibung: sofort aktualisieren ***************************************************************************/ void SwContentTree::GetFocus() { @@ -2749,7 +2749,7 @@ void SwContentTree::SetOutlineLevel(sal_uInt8 nSet) } /*************************************************************************** - Beschreibung: Moduswechsel: gedropptes Doc anzeigen + Beschreibung: Moduswechsel: gedropptes Doc anzeigen ***************************************************************************/ void SwContentTree::ShowHiddenShell() { @@ -2762,7 +2762,7 @@ void SwContentTree::ShowHiddenShell() } /*************************************************************************** - Beschreibung: Moduswechsel: aktive Sicht anzeigen + Beschreibung: Moduswechsel: aktive Sicht anzeigen ***************************************************************************/ void SwContentTree::ShowActualView() { @@ -2826,7 +2826,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) uno::Reference< container::XNameAccess > xNameAccess, xSecond, xThird; switch(nType) { - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : if(nMode == EDIT_UNPROTECT_TABLE) { pActiveShell->GetView().GetDocShell()-> @@ -2950,7 +2950,7 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) pActiveShell->DelRight(); } /* - // this code can be used once we want redline comments in the margin + // this code can be used once we want redline comments in the margin else { SwMarginWin* pComment = pActiveShell->GetView().GetPostItMgr()->GetPostIt(((SwPostItContent*)pCnt)->GetRedline()); @@ -3055,12 +3055,12 @@ void SwContentTree::GotoContent(SwContent* pCnt) sal_uInt16 nJumpType = pCnt->GetParent()->GetType(); switch(nJumpType) { - case CONTENT_TYPE_OUTLINE : + case CONTENT_TYPE_OUTLINE : { pActiveShell->GotoOutline(((SwOutlineContent*)pCnt)->GetPos()); } break; - case CONTENT_TYPE_TABLE : + case CONTENT_TYPE_TABLE : { pActiveShell->GotoTable(pCnt->GetName()); } @@ -3196,10 +3196,10 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData ) if( bRet ) { xub_StrLen nPos = 0; - aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); - aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); + aUrl = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); + aDescr = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ); nDefDrag= (USHORT)sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); - nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); + nDocSh = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32(); } return bRet; } @@ -3208,7 +3208,7 @@ class SwContentLBoxString : public SvLBoxString { public: SwContentLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, - const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} + const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index cf6e2b542b25..90ab5f9dfc28 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,12 +84,12 @@ using ::rtl::OUString; #define CTX_INSERT_NEW_FILE 12 #define CTX_INSERT_TEXT 13 -#define CTX_UPDATE_SEL 20 +#define CTX_UPDATE_SEL 20 #define CTX_UPDATE_INDEX 21 #define CTX_UPDATE_LINK 22 #define CTX_UPDATE_ALL 23 -#define CTX_UPDATE 1 +#define CTX_UPDATE 1 #define CTX_INSERT 2 #define CTX_EDIT 3 #define CTX_DELETE 4 @@ -98,12 +98,12 @@ using ::rtl::OUString; #define GLOBAL_UPDATE_TIMEOUT 2000 // Flags fuer PopupMenu-enable/disable -#define ENABLE_INSERT_IDX 0x0001 +#define ENABLE_INSERT_IDX 0x0001 #define ENABLE_INSERT_FILE 0x0002 #define ENABLE_INSERT_TEXT 0x0004 #define ENABLE_EDIT 0x0008 #define ENABLE_DELETE 0x0010 -#define ENABLE_UPDATE 0x0020 +#define ENABLE_UPDATE 0x0020 #define ENABLE_UPDATE_SEL 0x0040 #define ENABLE_EDIT_LINK 0x0080 @@ -113,30 +113,30 @@ using ::rtl::OUString; const SfxObjectShell* SwGlobalTree::pShowShell = 0; static const USHORT __FAR_DATA aHelpForMenu[] = { - 0, // - HID_GLBLTREE_UPDATE, //CTX_UPDATE - HID_GLBLTREE_INSERT, //CTX_INSERT - HID_GLBLTREE_EDIT, //CTX_EDIT - HID_GLBLTREE_DEL, //CTX_DELETE + 0, // + HID_GLBLTREE_UPDATE, //CTX_UPDATE + HID_GLBLTREE_INSERT, //CTX_INSERT + HID_GLBLTREE_EDIT, //CTX_EDIT + HID_GLBLTREE_DEL, //CTX_DELETE HID_GLBLTREE_EDIT_LINK, //CTX_EDIT_LINK - 0, // - 0, // - 0, // - 0, // - HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX - HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE - HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE - HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT - 0, // - 0, // - 0, // - 0, // - 0, // - 0, // - HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL - HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX - HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK - HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL + 0, // + 0, // + 0, // + 0, // + HID_GLBLTREE_INS_IDX, //CTX_INSERT_ANY_INDEX + HID_GLBLTREE_INS_FILE, //CTX_INSERT_FILE + HID_GLBLTREE_INS_NEW_FILE, //CTX_INSERT_NEW_FILE + HID_GLBLTREE_INS_TEXT, //CTX_INSERT_TEXT + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + HID_GLBLTREE_UPD_SEL, //CTX_UPDATE_SEL + HID_GLBLTREE_UPD_IDX, //CTX_UPDATE_INDEX + HID_GLBLTREE_UPD_LINK, //CTX_UPDATE_LINK + HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL }; class SwGlobalFrameListener_Impl : public SfxListener @@ -149,9 +149,9 @@ public: StartListening(rFrame); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - BOOL IsValid() const {return bValid;} + BOOL IsValid() const {return bValid;} }; void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) @@ -269,7 +269,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { INetURLObject aTemp(sFileName); GraphicDescriptor aDesc(aTemp); - if( !aDesc.Detect() ) // keine Grafiken annehmen + if( !aDesc.Detect() ) // keine Grafiken annehmen { nRet = rEvt.mnAction; InsertRegion(pCnt, &sFileName); @@ -419,7 +419,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) pMenu->EnableItem(CTX_INSERT_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE)); pMenu->EnableItem(CTX_INSERT_NEW_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); - pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); + pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); delete pMenu; pBox->EndSelection(); pBox->Invalidate(); @@ -434,14 +434,14 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) } pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); - pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); + pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft()); delete pMenu; pBox->EndSelection(); pBox->Invalidate(); } } -USHORT SwGlobalTree::GetEnableFlags() const +USHORT SwGlobalTree::GetEnableFlags() const { SvLBoxEntry* pEntry = FirstSelected(); USHORT nSelCount = (USHORT)GetSelectionCount(); @@ -454,7 +454,7 @@ USHORT SwGlobalTree::GetEnableFlags() const if(nSelCount == 1) { nRet |= ENABLE_EDIT; - if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN && + if( ((SwGlblDocContent*)pEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN && (!pPrevEntry || ((SwGlblDocContent*)pPrevEntry->GetUserData())->GetType() != GLBLDOC_UNKNOWN)) nRet |= ENABLE_INSERT_TEXT; if( GLBLDOC_SECTION == ((SwGlblDocContent*)pEntry->GetUserData())->GetType() ) @@ -471,7 +471,7 @@ USHORT SwGlobalTree::GetEnableFlags() const return nRet; } -void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) +void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) { BOOL bParent = TRUE; Update(TRUE); @@ -519,7 +519,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) SvTreeListBox::RequestHelp(rHEvt); } -void SwGlobalTree::SelectHdl() +void SwGlobalTree::SelectHdl() { USHORT nSelCount = (USHORT)GetSelectionCount(); @@ -538,7 +538,7 @@ void SwGlobalTree::SelectHdl() } -void SwGlobalTree::DeselectHdl() +void SwGlobalTree::DeselectHdl() { SelectHdl(); } @@ -566,7 +566,7 @@ BOOL SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, USHORT nSource = (USHORT) _pModel->GetAbsPos(pSource); USHORT nDest = pTarget ? (USHORT) _pModel->GetAbsPos(pTarget) : pSwGlblDocContents->Count(); - if( pActiveShell->MoveGlobalDocContent( + if( pActiveShell->MoveGlobalDocContent( *pSwGlblDocContents, nSource, nSource + 1, nDest ) && Update( FALSE )) Display(); @@ -600,8 +600,8 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction ) } /*************************************************************************** - Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, - * dann soll die Basisfunktion des Controls gerufen werden + Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, + * dann soll die Basisfunktion des Controls gerufen werden ***************************************************************************/ void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -643,7 +643,7 @@ void SwGlobalTree::Clear() SvTreeListBox::Clear(); } -void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) +void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) { if(!bIsImageListInitialized) { @@ -666,7 +666,7 @@ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) { SetUpdateMode( FALSE ); SvLBoxEntry* pOldSelEntry = FirstSelected(); - String sEntryName; // Name des Eintrags + String sEntryName; // Name des Eintrags USHORT nSelPos = USHRT_MAX; if(pOldSelEntry) { @@ -751,7 +751,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF } } -void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) +void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) { USHORT nSlot = 0; switch( pCont->GetType() ) @@ -889,8 +889,8 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) } break; case CTX_INSERT_ANY_INDEX: -// case CTX_INSERT_CNTIDX: -// case CTX_INSERT_USRIDX: +// case CTX_INSERT_CNTIDX: +// case CTX_INSERT_USRIDX: { if(pContCopy) { @@ -1056,19 +1056,19 @@ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) } -void SwGlobalTree::ShowTree() +void SwGlobalTree::ShowTree() { aUpdateTimer.Start(); SvTreeListBox::Show(); } -void SwGlobalTree::HideTree() +void SwGlobalTree::HideTree() { aUpdateTimer.Stop(); SvTreeListBox::Hide(); } -void SwGlobalTree::ExecCommand(USHORT nCmd) +void SwGlobalTree::ExecCommand(USHORT nCmd) { SvLBoxEntry* pEntry = FirstSelected(); OSL_ENSURE(pEntry, "gleich knallt's"); @@ -1102,7 +1102,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd) } break; } - if( bMove && pActiveShell->MoveGlobalDocContent( + if( bMove && pActiveShell->MoveGlobalDocContent( *pSwGlblDocContents, nSource, nSource + 1, nDest ) && Update( FALSE )) Display(); @@ -1110,7 +1110,7 @@ void SwGlobalTree::ExecCommand(USHORT nCmd) } } -BOOL SwGlobalTree::Update(BOOL bHard) +BOOL SwGlobalTree::Update(BOOL bHard) { SwView* pActView = GetParentWindow()->GetCreateView(); BOOL bRet = FALSE; @@ -1225,7 +1225,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) +IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) { SvLBoxEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); @@ -1264,7 +1264,7 @@ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); const SwSection* pSect; if(pCont->GetType() == GLBLDOC_SECTION && - !(pSect = pCont->GetSection())->IsConnectFlag() ) + !(pSect = pCont->GetSection())->IsConnectFlag() ) { Font aOldFont( rDev.GetFont()); Font aFont(aOldFont); diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index c401cd2e05c2..afe8794333b8 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,10 +74,10 @@ SV_IMPL_PTRARR( TripleStrings, TripleStringPtr ) class SwGlossDecideDlg : public ModalDialog { - OKButton aOk; - CancelButton aCancel; - HelpButton aHelp; - ListBox aListLB; + OKButton aOk; + CancelButton aCancel; + HelpButton aHelp; + ListBox aListLB; FixedLine aFL; DECL_LINK(DoubleClickHdl, ListBox*); @@ -85,7 +85,7 @@ class SwGlossDecideDlg : public ModalDialog public: SwGlossDecideDlg(Window* pParent); - ListBox& GetListBox() {return aListLB;} + ListBox& GetListBox() {return aListLB;} }; /*-----------------21.01.97 13.25------------------- @@ -94,10 +94,10 @@ class SwGlossDecideDlg : public ModalDialog SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) : ModalDialog(pParent, SW_RES(DLG_GLOSSARY_DECIDE_DLG)), - aOk(this, SW_RES(PB_OK)), - aCancel(this, SW_RES(PB_CANCEL)), - aHelp(this, SW_RES(PB_HELP)), - aListLB(this, SW_RES(LB_LIST)), + aOk(this, SW_RES(PB_OK)), + aCancel(this, SW_RES(PB_CANCEL)), + aHelp(this, SW_RES(PB_HELP)), + aListLB(this, SW_RES(LB_LIST)), aFL(this, SW_RES(FL_GLOSS)) { FreeResource(); @@ -223,7 +223,7 @@ BOOL SwGlossaryList::GetShortName(const String& rLongName, ********************************************************************/ -USHORT SwGlossaryList::GetGroupCount() +USHORT SwGlossaryList::GetGroupCount() { if(!bFilled) Update(); @@ -257,7 +257,7 @@ String SwGlossaryList::GetGroupName(USHORT nPos, BOOL bNoPath, String* pTitle) ********************************************************************/ -USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) +USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) { OSL_ENSURE(aGroupArr.Count() > nGroup, "group not available"); if(nGroup < aGroupArr.Count()) @@ -273,7 +273,7 @@ USHORT SwGlossaryList::GetBlockCount(USHORT nGroup) ********************************************************************/ -String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName) +String SwGlossaryList::GetBlockName(USHORT nGroup, USHORT nBlock, String& rShortName) { OSL_ENSURE(aGroupArr.Count() > nGroup, "group not available"); if(nGroup < aGroupArr.Count()) @@ -421,7 +421,7 @@ void SwGlossaryList::Timeout() ********************************************************************/ -AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) +AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) { for(USHORT i = 0; i < aGroupArr.Count(); i++) { @@ -439,7 +439,7 @@ AutoTextGroup* SwGlossaryList::FindGroup(const String& rGroupName) void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) { - SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); + SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); pGroup->nCount = pBlock ? pBlock->GetCount() : 0; pGroup->sLongNames = pGroup->sShortNames = aEmptyStr; if(pBlock) @@ -492,7 +492,7 @@ BOOL SwGlossaryList::HasLongName(const String& rBegin, SvStringsISortDtor* pLong /******************************************************************** ********************************************************************/ -void SwGlossaryList::ClearGroups() +void SwGlossaryList::ClearGroups() { USHORT nCount = aGroupArr.Count(); for( USHORT i = 0; i < nCount; ++i ) diff --git a/sw/source/ui/utlui/gloslst.hrc b/sw/source/ui/utlui/gloslst.hrc index 6c89f1c5ac9c..0d3fe2b0f586 100644 --- a/sw/source/ui/utlui/gloslst.hrc +++ b/sw/source/ui/utlui/gloslst.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src index 78f96e85e741..1ccf855ffe0b 100644 --- a/sw/source/ui/utlui/gloslst.src +++ b/sw/source/ui/utlui/gloslst.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index dea456662b8e..9c755b8515eb 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ #include <unomid.h> /*-------------------------------------------------------------------- - Beschreibung: globale Pointer + Beschreibung: globale Pointer --------------------------------------------------------------------*/ -SwGlossaries* pGlossaries = 0; +SwGlossaries* pGlossaries = 0; // Liefert alle benoetigten Pfade. Wird durch UI initialisiert -SwGlossaryList* pGlossaryList = 0; +SwGlossaryList* pGlossaryList = 0; String* pOldGrfCat = 0; String* pOldTabCat = 0; @@ -90,11 +90,11 @@ void SetCurrGlosGroup(String* pStr) SvStringsDtor* pDBNameList = 0; -SvStringsDtor* pAuthFieldNameList = 0; -SvStringsDtor* pAuthFieldTypeList = 0; +SvStringsDtor* pAuthFieldNameList = 0; +SvStringsDtor* pAuthFieldTypeList = 0; /*-------------------------------------------------------------------- - Beschreibung: UI beenden + Beschreibung: UI beenden --------------------------------------------------------------------*/ void _FinitUI() @@ -122,7 +122,7 @@ void _FinitUI() } /*-------------------------------------------------------------------- - Beschreibung: Initialisierung + Beschreibung: Initialisierung --------------------------------------------------------------------*/ @@ -162,20 +162,20 @@ ShellResource::ShellResource() sDurationFormat( SW_RES( STR_DURATION_FORMAT )), aTOXIndexName( SW_RES(STR_TOI)), - aTOXUserName( SW_RES(STR_TOU)), - aTOXContentName( SW_RES(STR_TOC)), - aTOXIllustrationsName( SW_RES(STR_TOX_ILL)), - aTOXObjectsName( SW_RES(STR_TOX_OBJ)), - aTOXTablesName( SW_RES(STR_TOX_TBL)), - aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), + aTOXUserName( SW_RES(STR_TOU)), + aTOXContentName( SW_RES(STR_TOC)), + aTOXIllustrationsName( SW_RES(STR_TOX_ILL)), + aTOXObjectsName( SW_RES(STR_TOX_OBJ)), + aTOXTablesName( SW_RES(STR_TOX_TBL)), + aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), aHyperlinkClick( SW_RES( STR_HYPERLINK_CLICK)), pAutoFmtNameLst(0), - sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), - sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), + sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), + sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), sPageDescName( SW_RES(STR_PAGEDESC_NAME)) { const USHORT nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN; - + KeyCode aCode( KEY_SPACE ); KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 ); String aModStr( aModifiedCode.GetName() ); @@ -265,7 +265,7 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst ) FreeResource(); } -const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) +const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) { if(!pAuthFieldNameList) { @@ -279,7 +279,7 @@ const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) return *pAuthFieldNameList->GetObject( static_cast< USHORT >(eType) ); } -const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) +const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) { if(!pAuthFieldTypeList) { diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc index 367091fbd443..34d7e788c7b2 100644 --- a/sw/source/ui/utlui/initui.hrc +++ b/sw/source/ui/utlui/initui.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,37 +28,37 @@ #ifndef _INITUI_HRC #define _INITUI_HRC -#define BMP_FRAME_ANCHOR 1 -#define BMP_FRAME_DRAG_ANCHOR 2 +#define BMP_FRAME_ANCHOR 1 +#define BMP_FRAME_DRAG_ANCHOR 2 // lokale Resourcen fuer die Shells: -#define STR_POSTIT_PAGE 1 -#define STR_POSTIT_AUTHOR 2 -#define STR_CALC_SYNTAX 3 -#define STR_CALC_ZERODIV 4 -#define STR_CALC_BRACK 5 -#define STR_CALC_POW 6 -#define STR_CALC_VARNFND 7 -#define STR_CALC_OVERFLOW 8 -#define STR_CALC_WRONGTIME 9 -#define STR_CALC_DEFAULT 10 -#define STR_CALC_ERROR 11 -#define STR_GETREFFLD_UP 12 -#define STR_GETREFFLD_DOWN 13 -#define STR_ALLPAGE_HEADFOOT 14 -#define STR_TEMPLATE_NONE 15 -#define STR_POSTIT_LINE 16 -#define STR_FIELD_FIXED 17 -#define STR_TOI 18 +#define STR_POSTIT_PAGE 1 +#define STR_POSTIT_AUTHOR 2 +#define STR_CALC_SYNTAX 3 +#define STR_CALC_ZERODIV 4 +#define STR_CALC_BRACK 5 +#define STR_CALC_POW 6 +#define STR_CALC_VARNFND 7 +#define STR_CALC_OVERFLOW 8 +#define STR_CALC_WRONGTIME 9 +#define STR_CALC_DEFAULT 10 +#define STR_CALC_ERROR 11 +#define STR_GETREFFLD_UP 12 +#define STR_GETREFFLD_DOWN 13 +#define STR_ALLPAGE_HEADFOOT 14 +#define STR_TEMPLATE_NONE 15 +#define STR_POSTIT_LINE 16 +#define STR_FIELD_FIXED 17 +#define STR_TOI 18 #define STR_TOU 19 #define STR_TOC 20 #define STR_TOX_ILL 21 #define STR_TOX_OBJ 22 #define STR_TOX_TBL 23 #define STR_TOX_AUTH 24 -#define STR_PAGEDESC_NAME 25 -#define STR_PAGEDESC_FIRSTNAME 26 -#define STR_PAGEDESC_FOLLOWNAME 27 +#define STR_PAGEDESC_NAME 25 +#define STR_PAGEDESC_FIRSTNAME 26 +#define STR_PAGEDESC_FOLLOWNAME 27 #define STR_HYPERLINK_CLICK 28 #define STR_GETREFFLD_REFITEMNOTFOUND 29 #define STR_DURATION_FORMAT 30 diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index 3b08e771a309..619b208f3793 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index cbc89fb4bbf3..cac1ddd19503 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <swtypes.hxx> // fuer Pathfinder +#include <swtypes.hxx> // fuer Pathfinder #include <navicfg.hxx> #include <swcont.hxx> #include <osl/diagnose.h> @@ -47,7 +47,7 @@ Sequence<OUString> SwNavigationConfig::GetPropertyNames() { static const char* aPropNames[] = { - "RootType", //0 + "RootType", //0 "SelectedPosition", //1 "OutlineLevel", //2 "InsertMode", //3 @@ -77,7 +77,7 @@ SwNavigationConfig::SwNavigationConfig() : { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); -// EnableNotification(aNames); +// EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) @@ -88,12 +88,12 @@ SwNavigationConfig::SwNavigationConfig() : { switch(nProp) { - case 0: pValues[nProp] >>= nRootType; break; + case 0: pValues[nProp] >>= nRootType; break; case 1: pValues[nProp] >>= nSelectedPos; break; case 2: pValues[nProp] >>= nOutlineLevel; break; case 3: pValues[nProp] >>= nRegionMode; break; - case 4: pValues[nProp] >>= nActiveBlock; break; - case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break; + case 4: pValues[nProp] >>= nActiveBlock; break; + case 5: bIsSmall = *(sal_Bool*)pValues[nProp].getValue(); break; case 6: bIsGlobalActive = *(sal_Bool*)pValues[nProp].getValue(); break; } } @@ -116,13 +116,13 @@ void SwNavigationConfig::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= nRootType; break; + case 0: pValues[nProp] <<= nRootType; break; case 1: pValues[nProp] <<= nSelectedPos; break; case 2: pValues[nProp] <<= nOutlineLevel; break; case 3: pValues[nProp] <<= nRegionMode; break; - case 4: pValues[nProp] <<= nActiveBlock; break; - case 5: pValues[nProp].setValue(&bIsSmall, rType); break; - case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break; + case 4: pValues[nProp] <<= nActiveBlock; break; + case 5: pValues[nProp].setValue(&bIsSmall, rType); break; + case 6: pValues[nProp].setValue(&bIsGlobalActive, rType); break; } } PutProperties(aNames, aValues); diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 629f1d7807d5..20ef70a3dc4d 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/dockwin.hxx> #include <vcl/toolbox.hxx> -#include <swtypes.hxx> // fuer Pathfinder +#include <swtypes.hxx> // fuer Pathfinder #include <errhdl.hxx> #include <swmodule.hxx> #include <view.hxx> @@ -80,7 +80,7 @@ // Version fuer Konfiguration -#define NAVI_VERSION0 0 +#define NAVI_VERSION0 0 #define NAVI_VERSION1 1 #define NAVI_VERSION2 2 // bIsGlobalActive @@ -104,7 +104,7 @@ void SwNavigationPI::CleanEntry( String& rEntry ) *pStr = 0x20; } /*------------------------------------------------------------------------ - Beschreibung: Ausfuehrung der Drag-Operation + Beschreibung: Ausfuehrung der Drag-Operation mit und ohne Childs ------------------------------------------------------------------------*/ @@ -142,7 +142,7 @@ void SwNavigationPI::MoveOutline(USHORT nSource, USHORT nTarget, /*------------------------------------------------------------------------ - Beschreibung: Nach Goto einen Status Rahmenselektion aufheben + Beschreibung: Nach Goto einen Status Rahmenselektion aufheben ------------------------------------------------------------------------*/ @@ -156,7 +156,7 @@ void lcl_UnSelectFrm(SwWrtShell *pSh) } /*------------------------------------------------------------------------ - Beschreibung: Select der Documentanzeige + Beschreibung: Select der Documentanzeige ------------------------------------------------------------------------*/ @@ -185,7 +185,7 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox ) } /*------------------------------------------------------------------------ - Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente + Beschreibung: Fuellen der ListBox fuer Outline Sicht oder Dokumente Der PI wird auf volle Groesse gesetzt ------------------------------------------------------------------------*/ @@ -237,7 +237,7 @@ void SwNavigationPI::UsePage(SwWrtShell *pSh) } /*------------------------------------------------------------------------ - Beschreibung: SelectHandler der Toolboxen + Beschreibung: SelectHandler der Toolboxen ------------------------------------------------------------------------*/ @@ -380,7 +380,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox ) return TRUE; } /*------------------------------------------------------------------------ - Beschreibung: ClickHandler der Toolboxen + Beschreibung: ClickHandler der Toolboxen ------------------------------------------------------------------------*/ @@ -448,7 +448,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); pBox->SetItemDown( nCurrItemId, TRUE ); - pMenu->Execute( pBox, + pMenu->Execute( pBox, pBox->GetItemRect(FN_OUTLINE_LEVEL), POPUPMENU_EXECUTE_DOWN ); pBox->SetItemDown( nCurrItemId, FALSE ); @@ -520,7 +520,7 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) } /*------------------------------------------------------------------------ - Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn + Beschreibung: Action-Handler Edit; wechselt auf die Seite, wenn nicht Gliederungssicht angeschaltet ist. ------------------------------------------------------------------------*/ @@ -540,7 +540,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit ) } /*------------------------------------------------------------------------ - Beschreibung: Falls die Seite eingestellt werden kann, wird hier + Beschreibung: Falls die Seite eingestellt werden kann, wird hier das Maximum gesetzt. ------------------------------------------------------------------------*/ @@ -571,7 +571,7 @@ BOOL SwNavigationPI::Close() } /*------------------------------------------------------------------------ - Beschreibung: Setzen einer automatischen Marke + Beschreibung: Setzen einer automatischen Marke ------------------------------------------------------------------------*/ @@ -596,7 +596,7 @@ void SwNavigationPI::MakeMark() // this assumes that IDocumentMarkAccess generates Names in ascending order if(vNavMarkNames.size() == MAX_MARKS) pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx])); - + rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); SwView::SetActMark( nAutoMarkIdx ); @@ -795,8 +795,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, bPageCtrlsVisible = TRUE; -// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT); -// USHORT nWidth = 2 * (USHORT)aFirstRect.Left(); +// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT); +// USHORT nWidth = 2 * (USHORT)aFirstRect.Left(); //doppelte Separatoren sind nicht erlaubt, also muss //die passende Groesse anders ermittelt werden Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE); @@ -843,7 +843,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, if( ( aTmpParentSize.Width() < aMinSize.Width() || - aTmpParentSize.Height() < aMinSize.Height() + aTmpParentSize.Height() < aMinSize.Height() ) && ((SfxDockingWindow*)pParent)->GetFloatingWindow() && @@ -856,14 +856,14 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aContentTree.SetSpaceBetweenEntries(3); aContentTree.SetSelectionMode( SINGLE_SELECTION ); - aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | + aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY | SV_DRAGDROP_ENABLE_TOP ); aContentTree.EnableAsyncDrag(TRUE); aContentTree.ShowTree(); aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, TRUE); -// TreeListBox fuer Globaldokument +// TreeListBox fuer Globaldokument aGlobalTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION ); aGlobalTree.SetWindowBits( WB_HASBUTTONS|WB_HASBUTTONSATROOT| @@ -871,7 +871,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, Size aGlblSize(aGlobalToolBox.CalcWindowSizePixel()); aGlobalToolBox.SetSizePixel(aGlblSize); -// Handler +// Handler Link aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl); aContentToolBox.SetSelectHdl( aLk ); @@ -1089,7 +1089,7 @@ SfxChildAlignment eRetAlign; } /*-------------------------------------------------------------------- - Beschreibung: Benachrichtigung bei geaenderter DocInfo + Beschreibung: Benachrichtigung bei geaenderter DocInfo --------------------------------------------------------------------*/ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint ) @@ -1316,7 +1316,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) { INetURLObject aTemp( sFileName ); GraphicDescriptor aDesc( aTemp ); - if( !aDesc.Detect() ) // keine Grafiken annehmen + if( !aDesc.Detect() ) // keine Grafiken annehmen { if( STRING_NOTFOUND == sFileName.Search('#') && (!sContentFileName.Len() || sContentFileName != sFileName )) @@ -1371,7 +1371,7 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode) --------------------------------------------------*/ -BOOL SwNavigationPI::ToggleTree() +BOOL SwNavigationPI::ToggleTree() { BOOL bRet = TRUE; BOOL bGlobalDoc = IsGlobalDoc(); @@ -1407,7 +1407,7 @@ BOOL SwNavigationPI::ToggleTree() /*-----------------13.06.97 09:42------------------- --------------------------------------------------*/ -BOOL SwNavigationPI::IsGlobalDoc() const +BOOL SwNavigationPI::IsGlobalDoc() const { BOOL bRet = FALSE; SwView *pView = GetCreateView(); diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc index 8254e2dc92a9..e8a6dc2e39a6 100644 --- a/sw/source/ui/utlui/navipi.hrc +++ b/sw/source/ui/utlui/navipi.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,38 +24,38 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TB_1 1 -#define TB_2 2 -#define TB_3 3 -#define TB_4 4 -#define BT_UP 5 -#define BT_DOWN 6 +#define TB_1 1 +#define TB_2 2 +#define TB_3 3 +#define TB_4 4 +#define BT_UP 5 +#define BT_DOWN 6 #define IL_CONTENT 7 #define ILH_CONTENT 8 -#define FT_PAGE 10 -#define ED_PAGE 11 -#define LB_SELECT 22 -#define TL_SELECT 23 -#define TB_PAGE_TEXT 41 +#define FT_PAGE 10 +#define ED_PAGE 11 +#define LB_SELECT 22 +#define TL_SELECT 23 +#define TB_PAGE_TEXT 41 #define TB_PAGE_COUNT 42 -#define TB_CONTENT 50 -#define TL_CONTENT 51 -#define LB_DOCS 53 -#define NF_PAGE 54 +#define TB_CONTENT 50 +#define TL_CONTENT 51 +#define LB_DOCS 53 +#define NF_PAGE 54 #define TL_GLOBAL 55 #define TB_GLOBAL 56 //------------------------------------------------------------------- // Strings fuer Kontextmenue des ContentTree -#define ST_CONTEXT_FIRST 60 -#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST +#define ST_CONTEXT_FIRST 60 +#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST #define ST_DRAGMODE (ST_CONTEXT_FIRST + 1) #define ST_HYPERLINK (ST_CONTEXT_FIRST + 2) #define ST_LINK_REGION (ST_CONTEXT_FIRST + 3) #define ST_COPY_REGION (ST_CONTEXT_FIRST + 4) #define ST_DISPLAY (ST_CONTEXT_FIRST + 5) #define ST_ACTIVE_VIEW (ST_CONTEXT_FIRST + 6) -#define ST_STATUS_FIRST 67 +#define ST_STATUS_FIRST 67 #define ST_HIDDEN (ST_STATUS_FIRST ) #define ST_ACTIVE (ST_STATUS_FIRST + 1) #define ST_INACTIVE (ST_STATUS_FIRST + 2) @@ -63,8 +63,8 @@ #define ST_EDIT_ENTRY ST_MISC #define ST_DELETE_ENTRY (ST_MISC + 1) -#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1) -#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST ) +#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1) +#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST ) #define ST_EDIT_CONTENT (ST_GLOBAL_CONTEXT_FIRST + 1) #define ST_INSERT (ST_GLOBAL_CONTEXT_FIRST + 2) #define ST_INDEX (ST_GLOBAL_CONTEXT_FIRST + 3) @@ -76,7 +76,7 @@ #define ST_UPDATE_INDEX (ST_GLOBAL_CONTEXT_FIRST + 9) #define ST_UPDATE_LINK (ST_GLOBAL_CONTEXT_FIRST +10) #define ST_UPDATE_ALL (ST_GLOBAL_CONTEXT_FIRST +11) -#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12) +#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12) #define ST_EDIT_LINK (ST_GLOBAL_CONTEXT_FIRST +13) #define ST_REMOVE_INDEX (ST_GLOBAL_CONTEXT_FIRST +30) @@ -85,7 +85,7 @@ #define ST_READONLY_IDX (ST_GLOBAL_CONTEXT_FIRST +33) #define ST_INVISIBLE (ST_GLOBAL_CONTEXT_FIRST +34) -#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35) -#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36) -#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37) +#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35) +#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36) +#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37) diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src index 0c45e3203df0..fd83ec90675f 100644 --- a/sw/source/ui/utlui/navipi.src +++ b/sw/source/ui/utlui/navipi.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ Window DLG_NAVIGATION_PI OutputSize = TRUE ; DialogControl = TRUE ; SVLook = TRUE ; - // Size = MAP_PIXEL( 235, 195 ); - // ZoomInOutputSize = MAP_PIXEL(235, 56); + // Size = MAP_PIXEL( 235, 195 ); + // ZoomInOutputSize = MAP_PIXEL(235, 56); Size = MAP_PIXEL ( 282 , 59 ) ; // Closeable = TRUE ; // Zoomable = TRUE ; // Moveable = TRUE ; - // ZoomIn = FALSE; + // ZoomIn = FALSE; Hide = TRUE ; // HideWhenDeactivate = TRUE ; // Sizeable = TRUE ; @@ -120,7 +120,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_UP ; - // ItemBitmap = Bitmap { File = "navup.bmp"; }; + // ItemBitmap = Bitmap { File = "navup.bmp"; }; HelpID = HID_NAVI_TBX2 ; /* ### ACHTUNG: Neuer Text in Resource? Rückwärts : R³ckwõrts */ Text [ en-US ] = "Back" ; @@ -128,7 +128,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_DOWN ; - // ItemBitmap = Bitmap { File = "navdn.bmp"; }; + // ItemBitmap = Bitmap { File = "navdn.bmp"; }; HelpID = HID_NAVI_TBX3 ; /* ### ACHTUNG: Neuer Text in Resource? Vorwärts : Vorwõrts */ Text [ en-US ] = "Forward" ; @@ -148,7 +148,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_ITEM_UP ; - // ItemBitmap = Bitmap { File = "navchup.bmp"; }; + // ItemBitmap = Bitmap { File = "navchup.bmp"; }; HelpID = HID_NAVI_TBX5 ; Text [ en-US ] = "Promote Chapter" ; //HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up" @@ -156,7 +156,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_ITEM_DOWN ; - // ItemBitmap = Bitmap { File = "navchdn.bmp"; }; + // ItemBitmap = Bitmap { File = "navchdn.bmp"; }; HelpID = HID_NAVI_TBX6 ; Text [ en-US ] = "Demote Chapter" ; }; @@ -184,7 +184,7 @@ Window DLG_NAVIGATION_PI { Identifier = FN_SELECT_SET_AUTO_BOOKMARK ; HelpID = HID_NAVI_TBX9 ; - // ItemBitmap = Bitmap { File = "navstmp.bmp"; }; + // ItemBitmap = Bitmap { File = "navstmp.bmp"; }; Text [ en-US ] = "Set Reminder" ; }; ToolBoxItem @@ -194,14 +194,14 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_SELECT_HEADER ; - // ItemBitmap = Bitmap { File = "navhead.bmp"; }; + // ItemBitmap = Bitmap { File = "navhead.bmp"; }; HelpID = HID_NAVI_TBX10 ; Text [ en-US ] = "Header" ; }; ToolBoxItem { Identifier = FN_SELECT_FOOTER ; - // ItemBitmap = Bitmap { File = "navfoot.bmp"; }; + // ItemBitmap = Bitmap { File = "navfoot.bmp"; }; HelpID = HID_NAVI_TBX11 ; /* ### ACHTUNG: Neuer Text in Resource? Fußzeile : Fu˜zeile */ Text [ en-US ] = "Footer" ; @@ -210,7 +210,7 @@ Window DLG_NAVIGATION_PI ToolBoxItem { Identifier = FN_SELECT_FOOTNOTE ; - // ItemBitmap = Bitmap { File = "navnote.bmp"; }; + // ItemBitmap = Bitmap { File = "navnote.bmp"; }; HelpID = HID_NAVI_TBX12 ; Text [ en-US ] = "Anchor<->Text" ; /* ### ACHTUNG: Neuer Text in Resource? Springen zwischen Fußnotenankern und dem Fußnotentext : Springen zwischen Fu˜notenankern und dem Fu˜notentext */ @@ -235,13 +235,13 @@ Window DLG_NAVIGATION_PI { Identifier = FN_ITEM_LEFT ; HelpID = HID_NAVI_TBX14 ; - // ItemBitmap = Bitmap { File = "navchlf.bmp"; }; + // ItemBitmap = Bitmap { File = "navchlf.bmp"; }; Text [ en-US ] = "Promote Level" ; }; ToolBoxItem { Identifier = FN_ITEM_RIGHT ; - // ItemBitmap = Bitmap { File = "navchrg.bmp"; }; + // ItemBitmap = Bitmap { File = "navchrg.bmp"; }; HelpID = HID_NAVI_TBX15 ; Text [ en-US ] = "Demote Level" ; }; diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index 13aecfd2bbc4..cfdc2d7c4c17 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,12 +74,12 @@ using namespace ::com::sun::star::lang; NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId, short nFormatType, ULONG nDefFmt, BOOL bUsrFmts ) : - ListBox ( pWin, rResId ), - nCurrFormatType (-1), - nStdEntry (0), - bOneArea (FALSE), - nDefFormat (nDefFmt), - pVw (0), + ListBox ( pWin, rResId ), + nCurrFormatType (-1), + nStdEntry (0), + bOneArea (FALSE), + nDefFormat (nDefFmt), + pVw (0), pOwnFormatter (0), bShowLanguageControl(FALSE), bUseAutomaticLanguage(TRUE) @@ -90,12 +90,12 @@ NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId, NumFormatListBox::NumFormatListBox( Window* pWin, SwView* pView, const ResId& rResId, short nFormatType, ULONG nDefFmt, BOOL bUsrFmts ) : - ListBox ( pWin, rResId ), - nCurrFormatType (-1), - nStdEntry (0), - bOneArea (FALSE), - nDefFormat (nDefFmt), - pVw (pView), + ListBox ( pWin, rResId ), + nCurrFormatType (-1), + nStdEntry (0), + bOneArea (FALSE), + nDefFormat (nDefFmt), + pVw (pView), pOwnFormatter (0), bShowLanguageControl(FALSE), bUseAutomaticLanguage(TRUE) @@ -140,7 +140,7 @@ SwView* NumFormatListBox::GetView() void NumFormatListBox::SetFormatType(const short nFormatType) { if (nCurrFormatType == -1 || - (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime + (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime { SvNumberFormatter* pFormatter; @@ -156,7 +156,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType) pFormatter = rSh.GetNumberFormatter(); } - Clear(); // Alle Eintraege in der Listbox entfernen + Clear(); // Alle Eintraege in der Listbox entfernen NfIndexTableOffset eOffsetStart = NF_NUMBER_START; NfIndexTableOffset eOffsetEnd = NF_NUMBER_START; @@ -254,8 +254,8 @@ void NumFormatListBox::SetFormatType(const short nFormatType) pFormatter->GetOutputString( sTxt, nFormat, sValue, &pCol); } - if (nFormat != nSysNumFmt && - nFormat != nSysShortDateFmt && + if (nFormat != nSysNumFmt && + nFormat != nSysShortDateFmt && nFormat != nSysLongDateFmt) { nPos = InsertEntry( sValue ); @@ -413,7 +413,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( this, aCoreSet, GetView()->GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_SWNUMFMTDLG ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); @@ -471,7 +471,7 @@ double NumFormatListBox::GetDefValue(const short nFormatType) const case NUMBERFORMAT_TIME: fDefValue = SVX_NUMVAL_TIME; break; -/* { +/* { String sValue("31.8.1997 16:57:34"); ULONG nFormat = pFormatter->GetStandardFormat(nFormatType, LANGUAGE_GERMAN); pFormatter->IsNumberFormat( sValue, nFormat, fDefValue ); diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src index de3f74fb857d..e7bd9dd7d580 100644 --- a/sw/source/ui/utlui/poolfmt.src +++ b/sw/source/ui/utlui/poolfmt.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 406827818ad5..18a6ef611acd 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ // STATIC DATA ----------------------------------------------------------- PercentField::PercentField( Window* pWin, const ResId& rResId ) : - MetricField ( pWin, rResId ), + MetricField ( pWin, rResId ), nOldMax (0), - nOldMin (0), + nOldMin (0), nLastPercent(-1), nLastValue (-1), eOldUnit (FUNIT_NONE), @@ -101,7 +101,7 @@ void PercentField::ShowPercent(BOOL bPercent) } else MetricFormatter::SetValue(nLastPercent); -// SetValue(100, FUNIT_CUSTOM); +// SetValue(100, FUNIT_CUSTOM); } else { @@ -215,7 +215,7 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) { if (eInUnit == FUNIT_NONE) eInUnit = eOldUnit; -// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP)); +// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP)); } } @@ -281,7 +281,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e // Umrechnen in Metrik sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100; - if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig + if (eOutUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig return NormalizePercent(nTwipValue); else return ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); @@ -293,7 +293,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e sal_Int64 nAktWidth; nValue = DenormalizePercent(nValue); - if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig + if (eInUnit == FUNIT_TWIP) // Nur wandeln, wenn unbedingt notwendig nAktWidth = nValue; else nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/ui/utlui/shdwcrsr.cxx index d55216dbb44c..36f81c1a2174 100644 --- a/sw/source/ui/utlui/shdwcrsr.cxx +++ b/sw/source/ui/utlui/shdwcrsr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index a4f833645ac1..fed0cb21d72f 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx index db113e1697a7..69c6fbfa0ccb 100644 --- a/sw/source/ui/utlui/textcontrolcombo.cxx +++ b/sw/source/ui/utlui/textcontrolcombo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ TextControlCombo::TextControlCombo( Window* _pParent, const ResId& _rResId, Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ) - :Window ( _pParent, _rResId ) - ,mrCtrl ( _rCtrl ) - ,mrFTbefore ( _rFTbefore ) - ,mrFTafter ( _rFTafter ) + :Window ( _pParent, _rResId ) + ,mrCtrl ( _rCtrl ) + ,mrFTbefore ( _rFTbefore ) + ,mrFTafter ( _rFTafter ) { } @@ -48,35 +48,35 @@ TextControlCombo::~TextControlCombo() void TextControlCombo::Arrange( FixedText& _rFTcomplete, BOOL /*bShow*/ ) { - Point aBasePos( GetPosPixel() ); - Size aMetricVals( GetSizePixel() ); + Point aBasePos( GetPosPixel() ); + Size aMetricVals( GetSizePixel() ); - long nTextHeight = _rFTcomplete.GetSizePixel().Height(); - long nCtrlHeight = mrCtrl.GetSizePixel().Height(); + long nTextHeight = _rFTcomplete.GetSizePixel().Height(); + long nCtrlHeight = mrCtrl.GetSizePixel().Height(); // calc y positions / center vertical - long nYFT = aBasePos.Y(); - long nYCtrl = nYFT; + long nYFT = aBasePos.Y(); + long nYCtrl = nYFT; if( nCtrlHeight > nTextHeight ) nYFT += aMetricVals.Height(); else nYCtrl += aMetricVals.Height(); // separate text parts - const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) ); - String aTxtBefore( _rFTcomplete.GetText() ); - String aTxtAfter; - xub_StrLen nReplPos = aTxtBefore.Search( aReplStr ); + const String aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) ); + String aTxtBefore( _rFTcomplete.GetText() ); + String aTxtAfter; + xub_StrLen nReplPos = aTxtBefore.Search( aReplStr ); if( nReplPos != STRING_NOTFOUND ) { - xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len(); + xub_StrLen nStrStartAfter = nReplPos + aReplStr.Len(); aTxtAfter = String( aTxtBefore, nStrStartAfter, aTxtBefore.Len() - nStrStartAfter ); aTxtBefore.Erase( nReplPos ); } // arrange and fill Fixed Texts - long nX = aBasePos.X(); - long nWidth = GetTextWidth( aTxtBefore ); + long nX = aBasePos.X(); + long nWidth = GetTextWidth( aTxtBefore ); mrFTbefore.SetText( aTxtBefore ); mrFTbefore.SetPosSizePixel( nX, nYFT, nWidth, nTextHeight ); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index a5d71cedd89a..062875aee09b 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + USHORT GetCurId() const { return nCurId; } private: - USHORT nCurId; + USHORT nCurId; virtual void Select(); }; diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 65018fa90856..a7199d0426b8 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,11 +93,11 @@ int SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const SfxItemPresentation SwPageFtnInfoItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, - String& rText, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, + String& rText, const IntlWrapper* pIntl -) const +) const { switch ( ePres ) { diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 1c893ad9661e..cc7631040999 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit) } /*-------------------------------------------------------------------- - Beschreibung: Boxinfo-Attribut setzen + Beschreibung: Boxinfo-Attribut setzen --------------------------------------------------------------------*/ @@ -124,7 +124,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh) aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; // Tabellenvariante, wenn mehrere Tabellenzellen selektiert - rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert + rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1); // Abstandsfeld immer anzeigen aBoxInfo.SetDist ((BOOL) TRUE); @@ -139,7 +139,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh) } /*-------------------------------------------------------------------- - Beschreibung: Header Footer fuellen + Beschreibung: Header Footer fuellen --------------------------------------------------------------------*/ @@ -161,7 +161,7 @@ void FillHdFt(SwFrmFmt* pFmt, const SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: PageDesc <-> in Sets wandeln und zurueck + Beschreibung: PageDesc <-> in Sets wandeln und zurueck --------------------------------------------------------------------*/ @@ -225,7 +225,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rHeaderSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); } else - { // Header ausschalten + { // Header ausschalten // if(rMaster.GetHeader().IsActive()) { @@ -261,7 +261,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) rFooterSet.Get(SID_ATTR_PAGE_SHARED)).GetValue()); } else - { // Footer ausschalten + { // Footer ausschalten // if(rMaster.GetFooter().IsActive()) { @@ -312,7 +312,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) } } -void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) +void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) { const SwFrmFmt& rMaster = rPageDesc.GetMaster(); @@ -371,10 +371,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // HeaderInfo, Raender, Hintergrund, Umrandung // SfxItemSet aHeaderSet( *rSet.GetPool(), - SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_FRMATR_BEGIN, RES_FRMATR_END-1, 0); // dynamische oder feste Hoehe @@ -417,10 +417,10 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // FooterInfo, Raender, Hintergrund, Umrandung // SfxItemSet aFooterSet( *rSet.GetPool(), - SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_PAGE_ON, SID_ATTR_PAGE_SHARED, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_FRMATR_BEGIN, RES_FRMATR_END-1, 0); // dynamische oder feste Hoehe @@ -472,7 +472,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) /*-------------------------------------------------------------------- - Beschreibung: DefaultTabs setzen + Beschreibung: DefaultTabs setzen --------------------------------------------------------------------*/ @@ -487,7 +487,7 @@ void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs) } /*-------------------------------------------------------------------- - Beschreibung: Abstand zwischen zwei Tabs + Beschreibung: Abstand zwischen zwei Tabs --------------------------------------------------------------------*/ @@ -518,7 +518,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, FALSE, &pItem )) { const String& rDescName = ((SvxPageModelItem*)pItem)->GetValue(); - if( rDescName.Len() ) // kein Name -> PageDesc ausschalten! + if( rDescName.Len() ) // kein Name -> PageDesc ausschalten! { // nur loeschen, wenn PageDesc eingschaltet wird! rSet.ClearItem( RES_BREAK ); @@ -584,21 +584,21 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) } /*-------------------------------------------------------------------- - Beschreibung: Metric ermitteln + Beschreibung: Metric ermitteln --------------------------------------------------------------------*/ -FieldUnit GetDfltMetric(BOOL bWeb) +FieldUnit GetDfltMetric(BOOL bWeb) { return SW_MOD()->GetUsrPref(bWeb)->GetMetric(); } /*-------------------------------------------------------------------- - Beschreibung: Metric ermitteln + Beschreibung: Metric ermitteln --------------------------------------------------------------------*/ -void SetDfltMetric( FieldUnit eMetric, BOOL bWeb ) +void SetDfltMetric( FieldUnit eMetric, BOOL bWeb ) { SW_MOD()->ApplyUserMetric(eMetric, bWeb); } diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index e0d9a5ee7a10..a61579e16a73 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, // the controller is asynchronously set aLoadedTimer.SetTimeoutHdl(LINK(this, SwOneExampleFrame, TimeoutHdl)); -// aLoadedTimer.SetTimeout(500); +// aLoadedTimer.SetTimeout(500); aLoadedTimer.SetTimeout(200); rWin.Enable(sal_False); @@ -122,7 +122,7 @@ SwOneExampleFrame::~SwOneExampleFrame() DisposeControl(); } -void SwOneExampleFrame::CreateControl() +void SwOneExampleFrame::CreateControl() { if(_xControl.is()) return ; @@ -176,7 +176,7 @@ void SwOneExampleFrame::CreateControl() } } -void SwOneExampleFrame::DisposeControl() +void SwOneExampleFrame::DisposeControl() { _xCursor = 0; if(_xControl.is()) @@ -228,20 +228,20 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) if( !bIsInitialized ) { - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT )), aFalseSet); - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES )), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS )), aFalseSet); - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet); + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet); if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { @@ -387,8 +387,8 @@ static const sal_Int16 nZoomValues[] = 100 }; -#define ITEM_UP 100 -#define ITEM_DOWN 200 +#define ITEM_UP 100 +#define ITEM_DOWN 200 #define ITEM_ZOOM 300 void SwOneExampleFrame::CreatePopup(const Point& rPt) @@ -457,7 +457,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) }; SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, WinBits nBits, - SwOneExampleFrame* pFrame) : + SwOneExampleFrame* pFrame) : Window(pParent, nBits), pExampleFrame(pFrame) { diff --git a/sw/source/ui/utlui/unotools.hrc b/sw/source/ui/utlui/unotools.hrc index d68577036830..2213012bfc6a 100644 --- a/sw/source/ui/utlui/unotools.hrc +++ b/sw/source/ui/utlui/unotools.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,8 +34,8 @@ #define PB_HELP 5 #define PB_CANCEL 6 -#define ST_MENU_ZOOM 1 -#define ST_MENU_UP 2 +#define ST_MENU_ZOOM 1 +#define ST_MENU_UP 2 #define ST_MENU_DOWN 3 #endif diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src index ac805c9da947..aa4be8804cfb 100644 --- a/sw/source/ui/utlui/unotools.src +++ b/sw/source/ui/utlui/unotools.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,9 +88,9 @@ Resource RES_FRMEX_MENU { ItemList [ en-US ] = { - < "~Zoom" ; ST_MENU_ZOOM; > ; - < "~Upwards" ; ST_MENU_UP; > ; - < "Do~wnwards" ; ST_MENU_DOWN; > ; + < "~Zoom" ; ST_MENU_ZOOM; > ; + < "~Upwards" ; ST_MENU_UP; > ; + < "Do~wnwards" ; ST_MENU_DOWN; > ; }; }; }; diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index dfa3e07f9053..a48e36487c03 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,11 +94,11 @@ Resource RID_SHELLRES_AUTOFMTSTRS { Text [ en-US ] = "Set \"Text body\" Style"; }; - String STR_AUTOFMTREDL_SET_TMPL_INDENT +1 + String STR_AUTOFMTREDL_SET_TMPL_INDENT +1 { Text [ en-US ] = "Set \"Text body indent\" Style"; }; - String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1 + String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT +1 { Text [ en-US ] = "Set \"Hanging indent\" Style"; }; diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index 1b9700a5fe2d..16ada1f26afa 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 024f516e889c..a828c9d6cd9b 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |