diff options
Diffstat (limited to 'sw/source/ui/config')
25 files changed, 622 insertions, 622 deletions
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index 2ed843925e53..8c8ef2276744 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.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 @@ -42,11 +42,11 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -#define SEL_TYPE_TABLE_TEXT 0 +#define SEL_TYPE_TABLE_TEXT 0 #define SEL_TYPE_LIST_TEXT 1 #define SEL_TYPE_TABLE_LIST 2 #define SEL_TYPE_BEZIER 3 -#define SEL_TYPE_GRAPHIC 4 +#define SEL_TYPE_GRAPHIC 4 SwToolbarConfigItem::SwToolbarConfigItem( BOOL bWeb ) : ConfigItem(bWeb ? C2U("Office.WriterWeb/ObjectBar") : C2U("Office.Writer/ObjectBar"), @@ -113,8 +113,8 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames() "Selection/Table", // SEL_TYPE_TABLE_TEXT "Selection/NumberedList", // SEL_TYPE_LIST_TEXT "Selection/NumberedList_InTable", // SEL_TYPE_TABLE_LIST - "Selection/BezierObject", // SEL_TYPE_BEZIER - "Selection/Graphic" //SEL_TYPE_GRAPHIC + "Selection/BezierObject", // SEL_TYPE_BEZIER + "Selection/Graphic" //SEL_TYPE_GRAPHIC }; const int nCount = 5; Sequence<OUString> aNames(nCount); diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index 2470f379c1e9..ed5353015ff6 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.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,7 +35,7 @@ #include "numrule.hxx" #include "caption.hxx" -#define VERSION_01 1 +#define VERSION_01 1 #define CAPTION_VERSION VERSION_01 InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) : @@ -84,7 +84,7 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt ) BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const { return (eObjType == rOpt.eObjType && - aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt + aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt // werden koennen, auf nichts weiteres vergleichen diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 12d33d626c13..9afbcbb0745b 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,14 +52,14 @@ SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) : SfxPoolItem(_nWhich), aIndexBackgrndCol(COL_GRAY) { - bParagraphEnd = - bTab = - bSpace = - bNonbreakingSpace = - bSoftHyphen = + bParagraphEnd = + bTab = + bSpace = + bNonbreakingSpace = + bSoftHyphen = bFldHiddenText = bCharHiddenText = - bManualBreak = + bManualBreak = bShowHiddenPara = FALSE; }; @@ -76,18 +76,18 @@ SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ): SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) : SfxPoolItem( _nWhich ) { - bParagraphEnd = rVOpt.IsParagraph(TRUE); - bTab = rVOpt.IsTab(TRUE); - bSpace = rVOpt.IsBlank(TRUE); - bNonbreakingSpace = rVOpt.IsHardBlank(); - bSoftHyphen = rVOpt.IsSoftHyph(); + bParagraphEnd = rVOpt.IsParagraph(TRUE); + bTab = rVOpt.IsTab(TRUE); + bSpace = rVOpt.IsBlank(TRUE); + bNonbreakingSpace = rVOpt.IsHardBlank(); + bSoftHyphen = rVOpt.IsSoftHyph(); bCharHiddenText = rVOpt.IsShowHiddenChar(TRUE); bFldHiddenText = rVOpt.IsShowHiddenField(); - bManualBreak = rVOpt.IsLineBreak(TRUE); + bManualBreak = rVOpt.IsLineBreak(TRUE); bShowHiddenPara = rVOpt.IsShowHiddenPara(); } -SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const +SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const { return new SwDocDisplayItem( *this ); } @@ -98,40 +98,40 @@ int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const const SwDocDisplayItem& rItem = (SwDocDisplayItem&)rAttr; - return ( bParagraphEnd == rItem.bParagraphEnd && - bTab == rItem.bTab && - bSpace == rItem.bSpace && - bNonbreakingSpace == rItem.bNonbreakingSpace && - bSoftHyphen == rItem.bSoftHyphen && + return ( bParagraphEnd == rItem.bParagraphEnd && + bTab == rItem.bTab && + bSpace == rItem.bSpace && + bNonbreakingSpace == rItem.bNonbreakingSpace && + bSoftHyphen == rItem.bSoftHyphen && bCharHiddenText == rItem.bCharHiddenText && bFldHiddenText == rItem.bFldHiddenText && - bManualBreak == rItem.bManualBreak && + bManualBreak == rItem.bManualBreak && bShowHiddenPara == rItem.bShowHiddenPara ); } void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem) { - bParagraphEnd = rDocDisplayItem.bParagraphEnd ; - bTab = rDocDisplayItem.bTab ; - bSpace = rDocDisplayItem.bSpace ; - bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ; - bSoftHyphen = rDocDisplayItem.bSoftHyphen ; + bParagraphEnd = rDocDisplayItem.bParagraphEnd ; + bTab = rDocDisplayItem.bTab ; + bSpace = rDocDisplayItem.bSpace ; + bNonbreakingSpace = rDocDisplayItem.bNonbreakingSpace ; + bSoftHyphen = rDocDisplayItem.bSoftHyphen ; bCharHiddenText = rDocDisplayItem.bCharHiddenText ; bFldHiddenText = rDocDisplayItem.bFldHiddenText ; - bManualBreak = rDocDisplayItem.bManualBreak ; + bManualBreak = rDocDisplayItem.bManualBreak ; bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ; } void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const { - rVOpt.SetParagraph (bParagraphEnd ); - rVOpt.SetTab (bTab ); - rVOpt.SetBlank (bSpace ); - rVOpt.SetHardBlank (bNonbreakingSpace ); - rVOpt.SetSoftHyph (bSoftHyphen ); + rVOpt.SetParagraph (bParagraphEnd ); + rVOpt.SetTab (bTab ); + rVOpt.SetBlank (bSpace ); + rVOpt.SetHardBlank (bNonbreakingSpace ); + rVOpt.SetSoftHyph (bSoftHyphen ); rVOpt.SetShowHiddenChar(bCharHiddenText ); rVOpt.SetShowHiddenField(bFldHiddenText ); - rVOpt.SetLineBreak (bManualBreak ); + rVOpt.SetLineBreak (bManualBreak ); rVOpt.SetShowHiddenPara(bShowHiddenPara ); } @@ -142,16 +142,16 @@ SwElemItem::SwElemItem( USHORT _nWhich ) : bVertScrollbar = bAnyRuler = bHorzRuler = - bVertRuler = + bVertRuler = bVertRulerRight= - bCrosshair = - bHandles = - bBigHandles = + bCrosshair = + bHandles = + bBigHandles = bSmoothScroll = - bTable = - bGraphic = - bDrawing = - bFieldName = + bTable = + bGraphic = + bDrawing = + bFieldName = bNotes = FALSE; } @@ -164,21 +164,21 @@ SwElemItem::SwElemItem( const SwElemItem& rElemItem ): SwElemItem::SwElemItem(const SwViewOption& rVOpt, USHORT _nWhich) : SfxPoolItem( _nWhich ) { - bHorzScrollbar = rVOpt.IsViewHScrollBar(); - bVertScrollbar = rVOpt.IsViewVScrollBar(); + bHorzScrollbar = rVOpt.IsViewHScrollBar(); + bVertScrollbar = rVOpt.IsViewVScrollBar(); bAnyRuler = rVOpt.IsViewAnyRuler(); bHorzRuler = rVOpt.IsViewHRuler(TRUE); bVertRuler = rVOpt.IsViewVRuler(TRUE); bVertRulerRight = rVOpt.IsVRulerRight(); - bCrosshair = rVOpt.IsCrossHair(); - bHandles = rVOpt.IsSolidMarkHdl(); + bCrosshair = rVOpt.IsCrossHair(); + bHandles = rVOpt.IsSolidMarkHdl(); bBigHandles = rVOpt.IsBigMarkHdl(); - bSmoothScroll = rVOpt.IsSmoothScroll(); - bTable = rVOpt.IsTable(); - bGraphic = rVOpt.IsGraphic(); - bDrawing = rVOpt.IsDraw() && rVOpt.IsControl(); - bFieldName = rVOpt.IsFldName(); - bNotes = rVOpt.IsPostIts(); + bSmoothScroll = rVOpt.IsSmoothScroll(); + bTable = rVOpt.IsTable(); + bGraphic = rVOpt.IsGraphic(); + bDrawing = rVOpt.IsDraw() && rVOpt.IsControl(); + bFieldName = rVOpt.IsFldName(); + bNotes = rVOpt.IsPostIts(); } @@ -193,15 +193,15 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const const SwElemItem& rItem = (SwElemItem&)rAttr; - return ( bHorzScrollbar == rItem.bHorzScrollbar && - bVertScrollbar == rItem.bVertScrollbar && + return ( bHorzScrollbar == rItem.bHorzScrollbar && + bVertScrollbar == rItem.bVertScrollbar && bAnyRuler == rItem.bAnyRuler && bHorzRuler == rItem.bHorzRuler && - bVertRuler == rItem.bVertRuler && + bVertRuler == rItem.bVertRuler && bVertRulerRight == rItem.bVertRulerRight&& - bCrosshair == rItem.bCrosshair && - bHandles == rItem.bHandles && - bBigHandles == rItem.bBigHandles && + bCrosshair == rItem.bCrosshair && + bHandles == rItem.bHandles && + bBigHandles == rItem.bBigHandles && bSmoothScroll == rItem.bSmoothScroll && bTable == rItem.bTable && bGraphic == rItem.bGraphic && @@ -212,16 +212,16 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const void SwElemItem::operator=( const SwElemItem& rElemItem) { - bHorzScrollbar = rElemItem. bHorzScrollbar ; - bVertScrollbar = rElemItem. bVertScrollbar ; + bHorzScrollbar = rElemItem. bHorzScrollbar ; + bVertScrollbar = rElemItem. bVertScrollbar ; bAnyRuler = rElemItem. bAnyRuler; bHorzRuler = rElemItem. bHorzRuler ; - bVertRuler = rElemItem. bVertRuler ; + bVertRuler = rElemItem. bVertRuler ; bVertRulerRight = rElemItem. bVertRulerRight ; - bCrosshair = rElemItem. bCrosshair ; - bHandles = rElemItem. bHandles ; - bBigHandles = rElemItem. bBigHandles ; - bSmoothScroll = rElemItem. bSmoothScroll ; + bCrosshair = rElemItem. bCrosshair ; + bHandles = rElemItem. bHandles ; + bBigHandles = rElemItem. bBigHandles ; + bSmoothScroll = rElemItem. bSmoothScroll ; bTable = rElemItem.bTable ; bGraphic = rElemItem.bGraphic ; bDrawing = rElemItem.bDrawing ; @@ -237,16 +237,16 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetViewHRuler(bHorzRuler ); rVOpt.SetViewVRuler(bVertRuler ); rVOpt.SetVRulerRight(bVertRulerRight ); - rVOpt.SetCrossHair(bCrosshair ); - rVOpt.SetSolidMarkHdl(bHandles ); + rVOpt.SetCrossHair(bCrosshair ); + rVOpt.SetSolidMarkHdl(bHandles ); rVOpt.SetBigMarkHdl(bBigHandles ); rVOpt.SetSmoothScroll(bSmoothScroll); - rVOpt.SetTable (bTable ); - rVOpt.SetGraphic (bGraphic ); - rVOpt.SetDraw (bDrawing ); - rVOpt.SetControl (bDrawing ); - rVOpt.SetFldName (bFieldName ); - rVOpt.SetPostIts (bNotes ); + rVOpt.SetTable (bTable ); + rVOpt.SetGraphic (bGraphic ); + rVOpt.SetDraw (bDrawing ); + rVOpt.SetControl (bDrawing ); + rVOpt.SetFldName (bFieldName ); + rVOpt.SetPostIts (bNotes ); } /*-------------------------------------------------------------------- @@ -322,7 +322,7 @@ SfxPoolItem* SwShadowCursorItem::Clone( SfxItemPool* ) const int SwShadowCursorItem::operator==( const SfxPoolItem& rCmp ) const { - return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() && + return IsOn() == ((SwShadowCursorItem&)rCmp).IsOn() && GetMode() == ((SwShadowCursorItem&)rCmp).GetMode(); } diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc index 197e6482d7a1..e5a6ef2f9aaa 100644 --- a/sw/source/ui/config/config.hrc +++ b/sw/source/ui/config/config.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,30 +32,30 @@ // Dialoge fuer die Konfiguration // Strings fuer die Konfiguration -#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) -#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) -#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) -#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) -#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) -#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) -#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) -#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) -#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) -#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) -#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) -#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) -#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) +#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) +#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) +#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) +#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) +#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) +#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) +#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) +#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) +#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) +#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) +#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) +#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) +#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) -#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) -#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) -#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) -#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) -#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) +#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) +#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) +#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) +#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) +#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) #define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19) #define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20) -#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) +#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) #define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26) #define CONFIG_ACT_END STR_ARR_METRIC diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index bc80f4862ede..c49f4574843d 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.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/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 6b42b0e8d110..989477af1185 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.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 @@ -144,7 +144,7 @@ SwStdFontConfig::SwStdFontConfig() : } } -void SwStdFontConfig::Commit() +void SwStdFontConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 688a79e6aecc..0fbcfff5342d 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.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/config/mailconfigpage.hrc b/sw/source/ui/config/mailconfigpage.hrc index a7115878ccf5..0a52c9428715 100644 --- a/sw/source/ui/config/mailconfigpage.hrc +++ b/sw/source/ui/config/mailconfigpage.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/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src index 1ad1378222c0..f76f01ccaba1 100644 --- a/sw/source/ui/config/mailconfigpage.src +++ b/sw/source/ui/config/mailconfigpage.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 @@ -392,7 +392,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_INPASSWORD { - Pos = MAP_APPFONT ( 78 , 165 ) ; + Pos = MAP_APPFONT ( 78 , 165 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; PassWord = TRUE; diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index 4bce04870d93..bb84277ea18c 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.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,7 +54,7 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -#define GLOB_NAME_CALC 0 +#define GLOB_NAME_CALC 0 #define GLOB_NAME_IMPRESS 1 #define GLOB_NAME_DRAW 2 #define GLOB_NAME_MATH 3 @@ -169,9 +169,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) switch (c) { - case 'n': sReturn += '\n'; break; - case 't': sReturn += '\t'; break; - case '\\': sReturn += '\\'; break; + case 'n': sReturn += '\n'; break; + case 't': sReturn += '\t'; break; + case '\\': sReturn += '\\'; break; case 'x': { @@ -219,9 +219,9 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) switch (c) { - case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break; - case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break; - case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break; + case '\n': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\n")); break; + case '\t': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\t")); break; + case '\\': sReturn.AppendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\")); break; default: if( c <= 0x1f || c >= 0x7f ) @@ -246,14 +246,14 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames() aNames.realloc(nCount); static const char* aPropNames[] = { - "TextDisplay/Insert/Attribute", // 0 - "TextDisplay/Insert/Color", // 1 - "TextDisplay/Delete/Attribute", // 2 - "TextDisplay/Delete/Color", // 3 + "TextDisplay/Insert/Attribute", // 0 + "TextDisplay/Insert/Color", // 1 + "TextDisplay/Delete/Attribute", // 2 + "TextDisplay/Delete/Color", // 3 "TextDisplay/ChangedAttribute/Attribute", // 4 - "TextDisplay/ChangedAttribute/Color", // 5 - "LinesChanged/Mark", // 6 - "LinesChanged/Color" // 7 + "TextDisplay/ChangedAttribute/Color", // 5 + "LinesChanged/Mark", // 6 + "LinesChanged/Color" // 7 }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -288,7 +288,7 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) sal_Int32 nRet = 0; switch(rAttr.nItemId) { - case SID_ATTR_CHAR_WEIGHT: nRet = 1; break; + case SID_ATTR_CHAR_WEIGHT: nRet = 1; break; case SID_ATTR_CHAR_POSTURE: nRet = 2; break; case SID_ATTR_CHAR_UNDERLINE: nRet = UNDERLINE_SINGLE == rAttr.nAttr ? 3 : 4; break; case SID_ATTR_CHAR_STRIKEOUT: nRet = 3; break; @@ -322,12 +322,12 @@ void SwRevisionConfig::Commit() switch(nProp) { case 0 : nVal = lcl_ConvertAttrToCfg(aInsertAttr); break; - case 1 : nVal = aInsertAttr.nColor ; break; + case 1 : nVal = aInsertAttr.nColor ; break; case 2 : nVal = lcl_ConvertAttrToCfg(aDeletedAttr); break; case 3 : nVal = aDeletedAttr.nColor ; break; case 4 : nVal = lcl_ConvertAttrToCfg(aFormatAttr); break; - case 5 : nVal = aFormatAttr.nColor ; break; - case 6 : nVal = nMarkAlign ; break; + case 5 : nVal = aFormatAttr.nColor ; break; + case 6 : nVal = nMarkAlign ; break; case 7 : nVal = aMarkColor.GetColor(); break; } pValues[nProp] <<= nVal; @@ -340,7 +340,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet rAttr.nItemId = rAttr.nAttr = 0; switch(nVal) { - case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break; + case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT; rAttr.nAttr = WEIGHT_BOLD ; break; case 2: rAttr.nItemId = SID_ATTR_CHAR_POSTURE; rAttr.nAttr = ITALIC_NORMAL ; break; case 3: if(bDelete) { @@ -358,7 +358,7 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_GEMEINE ; break; case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_KAPITAELCHEN ; break; case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP; rAttr.nAttr = SVX_CASEMAP_TITEL ; break; - case 9: rAttr.nItemId = SID_ATTR_BRUSH; break; + case 9: rAttr.nItemId = SID_ATTR_BRUSH; break; } } void SwRevisionConfig::Load() @@ -378,11 +378,11 @@ void SwRevisionConfig::Load() switch(nProp) { case 0 : lcl_ConvertCfgToAttr(nVal, aInsertAttr); break; - case 1 : aInsertAttr.nColor = nVal; break; + case 1 : aInsertAttr.nColor = nVal; break; case 2 : lcl_ConvertCfgToAttr(nVal, aDeletedAttr, sal_True); break; - case 3 : aDeletedAttr.nColor = nVal; break; + case 3 : aDeletedAttr.nColor = nVal; break; case 4 : lcl_ConvertCfgToAttr(nVal, aFormatAttr); break; - case 5 : aFormatAttr.nColor = nVal; break; + case 5 : aFormatAttr.nColor = nVal; break; case 6 : nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break; case 7 : aMarkColor.SetColor(nVal); break; } @@ -487,7 +487,7 @@ enum InsertConfigProp INS_PROP_CAP_OBJECT_OLEMISC_POSITION, //91 INS_PROP_CAP_OBJECT_OLEMISC_CHARACTERSTYLE, //92 INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES //93 -}; +}; const Sequence<OUString>& SwInsertConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -590,7 +590,7 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames() "Caption/OfficeObject/OLEMisc/Settings/Position", //91 "Caption/OfficeObject/OLEMisc/Settings/CharacterStyle", //92 "Caption/OfficeObject/OLEMisc/Settings/ApplyAttributes" //93 - }; + }; const int nCount = INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES + 1; const int nWebCount = INS_PROP_TABLE_BORDER + 1; aNames.realloc(nCount); @@ -616,7 +616,7 @@ SwInsertConfig::SwInsertConfig(sal_Bool bWeb) : aInsTblOpts(0,0), bIsWeb(bWeb) { - aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID); + aGlobalNames[GLOB_NAME_CALC ] = SvGlobalName(SO3_SC_CLASSID); aGlobalNames[GLOB_NAME_IMPRESS] = SvGlobalName(SO3_SIMPRESS_CLASSID); aGlobalNames[GLOB_NAME_DRAW ] = SvGlobalName(SO3_SDRAW_CLASSID); aGlobalNames[GLOB_NAME_MATH ] = SvGlobalName(SO3_SM_CLASSID); @@ -708,7 +708,7 @@ void SwInsertConfig::Commit() } break;//"Table/Split", case INS_PROP_CAP_AUTOMATIC: pValues[nProp].setValue(&bInsWithCaption, rType);break;//"Caption/Automatic", - case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST: + case INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST: pValues[nProp] <<= bCaptionOrderNumberingFirst; break;//"Caption/CaptionOrderNumberingFirst" @@ -867,7 +867,7 @@ void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_I break;//CaptionText", case 5: { - OUString sTemp; + OUString sTemp; if(pValues[nProp] >>= sTemp) rOpt.SetSeparator(sTemp); } @@ -1137,14 +1137,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames() static Sequence<OUString> aNames(nCount); static const char* aPropNames[] = { - "Shift/Row", // 0 - "Shift/Column", // 1 - "Insert/Row", // 2 - "Insert/Column", // 3 - "Change/Effect", // 4 - "Input/NumberRecognition", // 5 + "Shift/Row", // 0 + "Shift/Column", // 1 + "Insert/Row", // 2 + "Insert/Column", // 3 + "Change/Effect", // 4 + "Input/NumberRecognition", // 5 "Input/NumberFormatRecognition",// 6 - "Input/Alignment" // 7 + "Input/Alignment" // 7 }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -1204,12 +1204,12 @@ void SwTableConfig::Load() sal_Int32 nTemp = 0; switch(nProp) { - case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row", + case 0 : pValues[nProp] >>= nTemp; nTblHMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Row", case 1 : pValues[nProp] >>= nTemp; nTblVMove = (USHORT)MM100_TO_TWIP(nTemp); break; //"Shift/Column", case 2 : pValues[nProp] >>= nTemp; nTblHInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Row", case 3 : pValues[nProp] >>= nTemp; nTblVInsert = (USHORT)MM100_TO_TWIP(nTemp); break; //"Insert/Column", case 4 : pValues[nProp] >>= nTemp; eTblChgMode = (TblChgMode)nTemp; break; //"Change/Effect", - case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition", + case 5 : bInsTblFormatNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberRecognition", case 6 : bInsTblChangeNumFormat = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/NumberFormatRecognition", case 7 : bInsTblAlignNum = *(sal_Bool*)pValues[nProp].getValue(); break; //"Input/Alignment" } @@ -1246,15 +1246,15 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() aNames.realloc(nCount); static const char* aPropNames[] = { - "Statistics/WordNumber/Delimiter", // 0 - "DefaultFont/Document", // 1 - "Index/ShowPreview", // 2 - "Misc/GraphicToGalleryAsLink", // 3 - "Numbering/Graphic/KeepRatio", // 4 + "Statistics/WordNumber/Delimiter", // 0 + "DefaultFont/Document", // 1 + "Index/ShowPreview", // 2 + "Misc/GraphicToGalleryAsLink", // 3 + "Numbering/Graphic/KeepRatio", // 4 "FormLetter/PrintOutput/SinglePrintJobs", // 5 - "FormLetter/MailingOutput/Format", // 6 + "FormLetter/MailingOutput/Format", // 6 "FormLetter/FileOutput/FileName/FromDatabaseField", // 7 - "FormLetter/FileOutput/Path", // 8 + "FormLetter/FileOutput/Path", // 8 "FormLetter/FileOutput/FileName/FromManualSetting", // 9 "FormLetter/FileOutput/FileName/Generation",//10 "FormLetter/PrintOutput/AskForMerge" //11 @@ -1284,14 +1284,14 @@ void SwMiscConfig::Commit() SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, sal_False)); break; case 1 : pValues[nProp].setValue(&bDefaultFontsInCurrDocOnly, rType); break; - case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break; - case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break; - case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break; - case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break; - case 6 : pValues[nProp] <<= nMailingFormats; break; + case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ; break; + case 3 : pValues[nProp].setValue(&bGrfToGalleryAsLnk, rType); break; + case 4 : pValues[nProp].setValue(&bNumAlignSize, rType); break; + case 5 : pValues[nProp].setValue(&bSinglePrintJob, rType); break; + case 6 : pValues[nProp] <<= nMailingFormats; break; case 7 : pValues[nProp] <<= OUString(sNameFromColumn); break; - case 8 : pValues[nProp] <<= OUString(sMailingPath); break; - case 9 : pValues[nProp] <<= OUString(sMailName); break; + case 8 : pValues[nProp] <<= OUString(sMailingPath); break; + case 9 : pValues[nProp] <<= OUString(sMailName); break; case 10: pValues[nProp].setValue(&bIsNameFromColumn, rType);break; case 11: pValues[nProp] <<= bAskForMailMergeInPrint; break; } @@ -1322,10 +1322,10 @@ void SwMiscConfig::Load() case 3 : bGrfToGalleryAsLnk = *(sal_Bool*)pValues[nProp].getValue(); break; case 4 : bNumAlignSize = *(sal_Bool*)pValues[nProp].getValue(); break; case 5 : bSinglePrintJob = *(sal_Bool*)pValues[nProp].getValue(); break; - case 6 : pValues[nProp] >>= nMailingFormats; ; break; + case 6 : pValues[nProp] >>= nMailingFormats; ; break; case 7 : pValues[nProp] >>= sTmp; sNameFromColumn = sTmp; break; - case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break; - case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break; + case 8 : pValues[nProp] >>= sTmp; sMailingPath = sTmp; break; + case 9 : pValues[nProp] >>= sTmp; sMailName = sTmp; break; case 10: bIsNameFromColumn = *(sal_Bool*)pValues[nProp].getValue(); break; case 11: pValues[nProp] >>= bAskForMailMergeInPrint; break; } diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index dc79305a2586..ad15ef4b43b5 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.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 @@ -57,30 +57,30 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; using namespace ::std; -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) ) -#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME -#define USER_ENTRY ASCII_STR( "_user" ) -#define BUTTON_BORDER 2 +#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM( s ) ) +#define DEFAULT_ENTRY COMPATIBILITY_DEFAULT_NAME +#define USER_ENTRY ASCII_STR( "_user" ) +#define BUTTON_BORDER 2 // struct CompatibilityItem ---------------------------------------------- struct CompatibilityItem { - String m_sName; - String m_sModule; - bool m_bUsePrtMetrics; - bool m_bAddSpacing; - bool m_bAddSpacingAtPages; - bool m_bUseOurTabStops; - bool m_bNoExtLeading; - bool m_bUseLineSpacing; - bool m_bAddTableSpacing; - bool m_bUseObjPos; - bool m_bUseOurTextWrapping; - bool m_bConsiderWrappingStyle; + String m_sName; + String m_sModule; + bool m_bUsePrtMetrics; + bool m_bAddSpacing; + bool m_bAddSpacingAtPages; + bool m_bUseOurTabStops; + bool m_bNoExtLeading; + bool m_bUseLineSpacing; + bool m_bAddTableSpacing; + bool m_bUseObjPos; + bool m_bUseOurTextWrapping; + bool m_bConsiderWrappingStyle; bool m_bExpandWordSpace; - bool m_bIsDefault; - bool m_bIsUser; + bool m_bIsDefault; + bool m_bIsUser; CompatibilityItem( const String& _rName, const String& _rModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -89,21 +89,21 @@ struct CompatibilityItem bool _bConsiderWrappingStyle, bool _bExpandWordSpace, bool _bIsDefault, bool _bIsUser ) : - m_sName ( _rName ), - m_sModule ( _rModule ), - m_bUsePrtMetrics ( _bUsePrtMetrics ), - m_bAddSpacing ( _bAddSpacing ), - m_bAddSpacingAtPages ( _bAddSpacingAtPages ), - m_bUseOurTabStops ( _bUseOurTabStops ), - m_bNoExtLeading ( _bNoExtLeading ), - m_bUseLineSpacing ( _bUseLineSpacing ), - m_bAddTableSpacing ( _bAddTableSpacing ), - m_bUseObjPos ( _bUseObjPos ), - m_bUseOurTextWrapping ( _bUseOurTextWrapping ), + m_sName ( _rName ), + m_sModule ( _rModule ), + m_bUsePrtMetrics ( _bUsePrtMetrics ), + m_bAddSpacing ( _bAddSpacing ), + m_bAddSpacingAtPages ( _bAddSpacingAtPages ), + m_bUseOurTabStops ( _bUseOurTabStops ), + m_bNoExtLeading ( _bNoExtLeading ), + m_bUseLineSpacing ( _bUseLineSpacing ), + m_bAddTableSpacing ( _bAddTableSpacing ), + m_bUseObjPos ( _bUseObjPos ), + m_bUseOurTextWrapping ( _bUseOurTextWrapping ), m_bConsiderWrappingStyle( _bConsiderWrappingStyle ), m_bExpandWordSpace ( _bExpandWordSpace ), - m_bIsDefault ( _bIsDefault ), - m_bIsUser ( _bIsUser ) {} + m_bIsDefault ( _bIsDefault ), + m_bIsUser ( _bIsUser ) {} }; #include <vector> @@ -112,7 +112,7 @@ struct SwCompatibilityOptPage_Impl { typedef vector< CompatibilityItem > SwCompatibilityItemList; - SwCompatibilityItemList m_aList; + SwCompatibilityItemList m_aList; }; // class SwCompatibilityOptPage ------------------------------------------ @@ -121,18 +121,18 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe SfxTabPage( pParent, SW_RES( TP_OPTCOMPATIBILITY_PAGE ), rSet ), - m_aMainFL ( this, SW_RES( FL_MAIN ) ), - m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ), - m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ), - m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ), - m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ), - m_aResetPB ( this, SW_RES( PB_RESET ) ), - m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ), - m_sUserEntry ( SW_RES( STR_USERENTRY ) ), - m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ), - m_pWrtShell ( NULL ), - m_pImpl ( new SwCompatibilityOptPage_Impl ), - m_nSavedOptions ( 0 ) + m_aMainFL ( this, SW_RES( FL_MAIN ) ), + m_aFormattingFT ( this, SW_RES( FT_FORMATTING ) ), + m_aFormattingLB ( this, SW_RES( LB_FORMATTING ) ), + m_aOptionsFT ( this, SW_RES( FT_OPTIONS ) ), + m_aOptionsLB ( this, SW_RES( LB_OPTIONS ) ), + m_aResetPB ( this, SW_RES( PB_RESET ) ), + m_aDefaultPB ( this, SW_RES( PB_DEFAULT ) ), + m_sUserEntry ( SW_RES( STR_USERENTRY ) ), + m_sUseAsDefaultQuery( SW_RES( STR_QRYBOX_USEASDEFAULT ) ), + m_pWrtShell ( NULL ), + m_pImpl ( new SwCompatibilityOptPage_Impl ), + m_nSavedOptions ( 0 ) { // init options strings with local resource ids -> so do it before FreeResource() @@ -424,7 +424,7 @@ IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG ) switch ( eOption ) { case COPT_USE_PRINTERDEVICE : pItem->m_bUsePrtMetrics = bChecked; break; - case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break; + case COPT_ADD_SPACING : pItem->m_bAddSpacing = bChecked; break; case COPT_ADD_SPACING_AT_PAGES : pItem->m_bAddSpacingAtPages = bChecked; break; case COPT_USE_OUR_TABSTOPS : pItem->m_bUseOurTabStops = bChecked; break; case COPT_NO_EXTLEADING : pItem->m_bNoExtLeading = bChecked; break; @@ -498,7 +498,7 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCompatibilityOptPage( pParent, rAttrSet ); } diff --git a/sw/source/ui/config/optcomp.hrc b/sw/source/ui/config/optcomp.hrc index 4219724a9106..f378ff739386 100644 --- a/sw/source/ui/config/optcomp.hrc +++ b/sw/source/ui/config/optcomp.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 @@ -27,29 +27,29 @@ // the controls -#define FL_MAIN 10 -#define FT_FORMATTING 11 -#define LB_FORMATTING 12 -#define FT_OPTIONS 13 -#define LB_OPTIONS 14 -#define PB_RESET 15 -#define PB_DEFAULT 16 +#define FL_MAIN 10 +#define FT_FORMATTING 11 +#define LB_FORMATTING 12 +#define FT_OPTIONS 13 +#define LB_OPTIONS 14 +#define PB_RESET 15 +#define PB_DEFAULT 16 // the option strings -#define STR_USERENTRY 10 -#define STR_QRYBOX_USEASDEFAULT 11 +#define STR_USERENTRY 10 +#define STR_QRYBOX_USEASDEFAULT 11 -#define STR_COMP_OPTIONS_START 100 -#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0) -#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1) -#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2) -#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3) -#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4) -#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5) -#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6) -#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7) -#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8) +#define STR_COMP_OPTIONS_START 100 +#define STR_PRINTER_METRICS (STR_COMP_OPTIONS_START + 0) +#define STR_MERGE_PARA_DIST (STR_COMP_OPTIONS_START + 1) +#define STR_MERGE_PARA_DIST_PAGESTART (STR_COMP_OPTIONS_START + 2) +#define STR_TAB_ALIGNMENT (STR_COMP_OPTIONS_START + 3) +#define STR_EXTERNAL_LEADING (STR_COMP_OPTIONS_START + 4) +#define STR_LINE_SPACING (STR_COMP_OPTIONS_START + 5) +#define STR_ADD_TABLESPACING (STR_COMP_OPTIONS_START + 6) +#define STR_USE_OBJPOSITIONING (STR_COMP_OPTIONS_START + 7) +#define STR_USE_OURTEXTWRAPPING (STR_COMP_OPTIONS_START + 8) #define STR_CONSIDER_WRAPPINGSTYLE (STR_COMP_OPTIONS_START + 9) #define STR_EXPAND_WORDSPACE (STR_COMP_OPTIONS_START + 10) #define STR_COMP_OPTIONS_END (STR_EXPAND_WORDSPACE + 1) diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src index 927eadc183a1..3682b49477d3 100644 --- a/sw/source/ui/config/optcomp.src +++ b/sw/source/ui/config/optcomp.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/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 4162b656d7e5..31f2e7041f5b 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.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 @@ -30,7 +30,7 @@ #define FL_NOPRINT 2 #define FL_WINDOW 3 -#define CB_GRF 1 +#define CB_GRF 1 #define CB_TBL 2 #define CB_DRWFAST 3 #define CB_FIELD 4 @@ -42,7 +42,7 @@ #define CB_FLD_HIDDEN 10 #define CB_BREAK 11 #define CB_ANY_RULER 12 -#define CB_CROSS 14 +#define CB_CROSS 14 #define CB_HSCROLL 15 #define CB_VSCROLL 16 #define CB_HRULER 17 @@ -57,29 +57,29 @@ #define FT_METRIC 28 //test tab page -#define CB_TEST1 25 -#define CB_TEST2 26 -#define CB_TEST3 27 -#define CB_TEST4 28 -#define CB_TEST5 29 -#define CB_TEST6 30 -#define CB_TEST7 31 -#define CB_TEST8 32 -#define CB_TEST9 33 -#define CB_TEST10 34 +#define CB_TEST1 25 +#define CB_TEST2 26 +#define CB_TEST3 27 +#define CB_TEST4 28 +#define CB_TEST5 29 +#define CB_TEST6 30 +#define CB_TEST7 31 +#define CB_TEST8 32 +#define CB_TEST9 33 +#define CB_TEST10 34 #define FL_TEST 35 #define CB_FLD_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben #define CB_SMOOTH_SCROLL 37 -#define BT_OK 38 -#define BT_CANCEL 39 -#define BT_MORE 40 -#define BT_GRID 41 -#define MF_HFRAME 42 -#define MF_VFRAME 43 +#define BT_OK 38 +#define BT_CANCEL 39 +#define BT_MORE 40 +#define BT_GRID 41 +#define MF_HFRAME 42 +#define MF_VFRAME 43 -#define CB_INDEX 44 +#define CB_INDEX 44 #define LB_COLOR 50 #define WIN_COLOR 52 @@ -89,12 +89,12 @@ #define BT_DELETE 57 #define BT_DEFAULT 58 #define CB_HANDLE 59 -#define CB_SECT_BOUNDS 60 +#define CB_SECT_BOUNDS 60 #define CB_CHAR_HIDDEN 61 // Print-Extra-Page #define CB_PGRF 61 //#define CB_PTAB 62 merged with CB_PGRF in printerpullpages -//#define CB_PDRAW 63 removed in printerpullpages +//#define CB_PDRAW 63 removed in printerpullpages #define CB_LEFTP 64 #define CB_RIGHTP 65 //#define CB_REVERSE 66 removed in printerpullpages @@ -107,7 +107,7 @@ #define FL_3 73 #define FL_4 74 #define FT_FAX 76 -#define CB_BACKGROUND 79 +#define CB_BACKGROUND 79 #define RB_NO 80 #define RB_ONLY 81 @@ -126,7 +126,7 @@ // Tabpage Grundschriften -#define FT_STANDARD 90 +#define FT_STANDARD 90 #define LB_STANDARD 91 #define FT_TITLE 92 #define LB_TITLE 93 @@ -161,31 +161,31 @@ #define FL_TABLE_INSERT 108 #define CB_NUMFMT_FORMATTING 109 #define FL_MOVE 110 -#define FT_ROWMOVE 111 -#define MF_ROWMOVE 112 -#define FT_COLMOVE 113 -#define MF_COLMOVE 114 +#define FT_ROWMOVE 111 +#define MF_ROWMOVE 112 +#define FT_COLMOVE 113 +#define MF_COLMOVE 114 #define FT_INSERT 115 #define FT_ROWINSERT 116 #define MF_ROWINSERT 117 #define FT_COLINSERT 118 #define MF_COLINSERT 119 #define FT_HANDLING 120 -#define RB_FIX 121 -#define RB_FIXPROP 122 -#define RB_VAR 123 -#define FT_FIX 124 -#define FT_FIXPROP 125 -#define FT_VAR 126 +#define RB_FIX 121 +#define RB_FIXPROP 122 +#define RB_VAR 123 +#define FT_FIX 124 +#define FT_FIXPROP 125 +#define FT_VAR 126 #define FT_MOVE 128 #define FL_COLOR 130 -#define FT_SGML 131 -#define LB_SGML 132 +#define FT_SGML 131 +#define LB_SGML 132 #define FT_COMMENT 133 #define LB_COMMENT 134 -#define FT_KEYWD 135 -#define LB_KEYWD 136 +#define FT_KEYWD 135 +#define LB_KEYWD 136 #define FT_UNKNOWN 137 #define LB_UNKNOWN 138 #define FL_TABLE_SEPARATOR 139 @@ -194,12 +194,12 @@ #define FL_SHDWCRSFLAG 1 #define CB_SHDWCRSONOFF 2 #define FL_SHDWCRSMODE 3 -#define FT_SHDWCRSFILLMODE 4 +#define FT_SHDWCRSFILLMODE 4 #define RB_SHDWCRSFILLMARGIN 5 #define RB_SHDWCRSFILLINDENT 6 #define RB_SHDWCRSFILLTAB 7 #define RB_SHDWCRSFILLSPACE 8 -#define CB_ALLOW_IN_PROT 12 +#define CB_ALLOW_IN_PROT 12 #define FL_CRSR_OPT 13 #define FL_SEPARATOR_SHDW 14 diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 97f903557bda..a2573ed3c1f2 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.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 @@ -38,7 +38,7 @@ /**************************************************************************/ /* */ -/* TabPage Ansicht/Inhalt */ +/* TabPage Ansicht/Inhalt */ /* */ /**************************************************************************/ TabPage TP_CONTENT_OPT @@ -220,7 +220,7 @@ TabPage TP_OPTPRINT_PAGE TabStop = TRUE ; Group = TRUE ; }; -/* +/* removed, tables now always get printed CheckBox CB_PTAB { @@ -229,7 +229,7 @@ TabPage TP_OPTPRINT_PAGE Text [ en-US ] = "~Tables" ; }; */ -/* +/* functionally merged with CB_PGRF (pictures and graphics) CheckBox CB_PDRAW { @@ -801,7 +801,7 @@ TabPage TP_OPTTABLE_PAGE }; /**************************************************************************/ /* */ -/* TabPage ShadowCursor */ +/* TabPage ShadowCursor */ /* */ /**************************************************************************/ TabPage TP_OPTSHDWCRSR @@ -965,7 +965,7 @@ StringArray STR_PRINTOPTUI < "Specifies whether to always print text in black."; >; < "Pages"; >; < "Print ~automatically inserted blank pages"; >; - < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >; + < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >; < "~Use only paper tray from printer preferences"; >; < "For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer."; >; < "Print"; >; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 3de0abb8b5cf..899ad9c419ed 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,9 +96,9 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ), aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ), - pWrtShell ( NULL ), + pWrtShell ( NULL ), bHTMLMode ( FALSE ), - nLastTab ( 0 ), + nLastTab ( 0 ), nOldLinkMode( MANUAL ) { @@ -134,7 +134,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : aTabFT.Hide(); aTabMF.Hide(); } - + SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsAsianTypographyEnabled()) { @@ -147,7 +147,7 @@ SwLoadOptPage::~SwLoadOptPage() { } -SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, +SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwLoadOptPage(pParent, rAttrSet ); @@ -214,7 +214,7 @@ BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); bRet = TRUE; } - + sal_Bool bIsSquaredPageModeFlag = aUseSquaredPageMode.IsChecked(); if ( bIsSquaredPageModeFlag != aUseSquaredPageMode.GetSavedValue() ) { @@ -256,9 +256,9 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) switch (nOldLinkMode) { - case NEVER: aNeverRB.Check(); break; - case MANUAL: aRequestRB.Check(); break; - case AUTOMATIC: aAlwaysRB.Check(); break; + case NEVER: aNeverRB.Check(); break; + case MANUAL: aRequestRB.Check(); break; + case AUTOMATIC: aAlwaysRB.Check(); break; } aAutoUpdateFields.SaveValue(); @@ -291,7 +291,7 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } - + //default page mode loading if(pWrtShell) { @@ -359,7 +359,7 @@ SwCaptionPreview::SwCaptionPreview( Window* pParent, const ResId& rResId ) { maDrawPos = Point( 4, 6 ); - Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); + Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); SetBackground( aBack ); SetFillColor( aBack.GetColor() ); SetLineColor( aBack.GetColor() ); @@ -388,47 +388,47 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_OPTCAPTION_PAGE), rSet), - aCheckFT (this, SW_RES(FT_OBJECTS )), - aCheckLB (this, SW_RES(CLB_OBJECTS )), + aCheckFT (this, SW_RES(FT_OBJECTS )), + aCheckLB (this, SW_RES(CLB_OBJECTS )), aFtCaptionOrder(this, SW_RES( FT_ORDER )), aLbCaptionOrder(this, SW_RES( LB_ORDER )), aPreview (this, SW_RES(WIN_PREVIEW )), - aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )), - aCategoryText (this, SW_RES(TXT_CATEGORY )), - aCategoryBox (this, SW_RES(BOX_CATEGORY )), - aFormatText (this, SW_RES(TXT_FORMAT )), - aFormatBox (this, SW_RES(BOX_FORMAT )), + aSettingsGroupFL(this, SW_RES(FL_SETTINGS_2 )), + aCategoryText (this, SW_RES(TXT_CATEGORY )), + aCategoryBox (this, SW_RES(BOX_CATEGORY )), + aFormatText (this, SW_RES(TXT_FORMAT )), + aFormatBox (this, SW_RES(BOX_FORMAT )), aNumberingSeparatorFT(this, SW_RES(FT_NUM_SEP )), aNumberingSeparatorED(this, SW_RES(ED_NUM_SEP )), - aTextText (this, SW_RES(TXT_TEXT )), - aTextEdit (this, SW_RES(EDT_TEXT )), - aPosText (this, SW_RES(TXT_POS )), - aPosBox (this, SW_RES(BOX_POS )), - aNumCaptFL (this, SW_RES(FL_NUMCAPT )), - aFtLevel (this, SW_RES(FT_LEVEL )), - aLbLevel (this, SW_RES(LB_LEVEL )), - aFtDelim (this, SW_RES(FT_SEPARATOR )), - aEdDelim (this, SW_RES(ED_SEPARATOR )), - aCategoryFL (this, SW_RES(FL_CATEGORY )), - aCharStyleFT (this, SW_RES(FT_CHARSTYLE )), - aCharStyleLB (this, SW_RES(LB_CHARSTYLE )), - aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)), - - sSWTable (SW_RES(STR_TABLE )), - sSWFrame (SW_RES(STR_FRAME )), - sSWGraphic (SW_RES(STR_GRAPHIC )), - sOLE (SW_RES(STR_OLE )), - - sBegin (SW_RESSTR(STR_BEGINNING )), - sEnd (SW_RESSTR(STR_END )), - sAbove (SW_RESSTR(STR_ABOVE )), - sBelow (SW_RESSTR(STR_CP_BELOW )), + aTextText (this, SW_RES(TXT_TEXT )), + aTextEdit (this, SW_RES(EDT_TEXT )), + aPosText (this, SW_RES(TXT_POS )), + aPosBox (this, SW_RES(BOX_POS )), + aNumCaptFL (this, SW_RES(FL_NUMCAPT )), + aFtLevel (this, SW_RES(FT_LEVEL )), + aLbLevel (this, SW_RES(LB_LEVEL )), + aFtDelim (this, SW_RES(FT_SEPARATOR )), + aEdDelim (this, SW_RES(ED_SEPARATOR )), + aCategoryFL (this, SW_RES(FL_CATEGORY )), + aCharStyleFT (this, SW_RES(FT_CHARSTYLE )), + aCharStyleLB (this, SW_RES(LB_CHARSTYLE )), + aApplyBorderCB (this, SW_RES(CB_APPLYBORDER)), + + sSWTable (SW_RES(STR_TABLE )), + sSWFrame (SW_RES(STR_FRAME )), + sSWGraphic (SW_RES(STR_GRAPHIC )), + sOLE (SW_RES(STR_OLE )), + + sBegin (SW_RESSTR(STR_BEGINNING )), + sEnd (SW_RESSTR(STR_END )), + sAbove (SW_RESSTR(STR_ABOVE )), + sBelow (SW_RESSTR(STR_CP_BELOW )), sNone (SW_RESSTR( STR_CATEGORY_NONE )), - pMgr (new SwFldMgr()), + pMgr (new SwFldMgr()), bHTMLMode(FALSE) { - Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); + Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() ); aPreview.SetBackground( aBack ); SwStyleNameMapper::FillUIName( RES_POOLCOLL_LABEL_ABB, sIllustration ); @@ -471,7 +471,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.InsertEntry(String::CreateFromInt32(i + 1)); sal_Unicode nLvl = MAXLEVEL; - String sDelim( String::CreateFromAscii( ": " ) ); + String sDelim( String::CreateFromAscii( ": " ) ); if (pSh) { @@ -494,11 +494,11 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) Link aLk = LINK( this, SwCaptionOptPage, ModifyHdl ); aCategoryBox.SetModifyHdl( aLk ); aNumberingSeparatorED.SetModifyHdl( aLk ); - aTextEdit .SetModifyHdl( aLk ); + aTextEdit .SetModifyHdl( aLk ); aLk = LINK(this, SwCaptionOptPage, SelectHdl); aCategoryBox.SetSelectHdl( aLk ); - aFormatBox .SetSelectHdl( aLk ); + aFormatBox .SetSelectHdl( aLk ); aLbCaptionOrder.SetSelectHdl( LINK(this, SwCaptionOptPage, OrderHdl)); @@ -513,7 +513,7 @@ SwCaptionOptPage::~SwCaptionOptPage() delete pMgr; } -SfxTabPage* SwCaptionOptPage::Create( Window* pParent, +SfxTabPage* SwCaptionOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCaptionOptPage(pParent, rAttrSet ); @@ -524,7 +524,7 @@ BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& ) BOOL bRet = FALSE; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); - SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen + SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen SvLBoxEntry* pEntry = aCheckLB.First(); @@ -739,8 +739,8 @@ IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) break; } aPosBox.SelectEntryPos(pOpt->GetPos()); - aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP && - pOpt->GetObjType() != OLE_CAP && + aPosBox.Enable( pOpt->GetObjType() != GRAPHIC_CAP && + pOpt->GetObjType() != OLE_CAP && aPosText.IsEnabled() ); aPosBox.SelectEntryPos(pOpt->GetPos()); diff --git a/sw/source/ui/config/optload.hrc b/sw/source/ui/config/optload.hrc index 201c83d2af51..12b7a3c3f6df 100644 --- a/sw/source/ui/config/optload.hrc +++ b/sw/source/ui/config/optload.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 @@ -27,57 +27,57 @@ // SwLoadOptPage -------------------------------- -#define FL_UPDATE 10 -#define FT_LINK 11 -#define RB_ALWAYS 12 -#define RB_REQUEST 13 -#define RB_NEVER 14 -#define FT_FIELD 15 -#define CB_AUTO_UPDATE_FIELDS 16 -#define CB_AUTO_UPDATE_CHARTS 17 -#define FL_SETTINGS 18 -#define LB_METRIC 19 -#define FT_METRIC 20 -#define FT_TAB 21 -#define MF_TAB 22 +#define FL_UPDATE 10 +#define FT_LINK 11 +#define RB_ALWAYS 12 +#define RB_REQUEST 13 +#define RB_NEVER 14 +#define FT_FIELD 15 +#define CB_AUTO_UPDATE_FIELDS 16 +#define CB_AUTO_UPDATE_CHARTS 17 +#define FL_SETTINGS 18 +#define LB_METRIC 19 +#define FT_METRIC 20 +#define FT_TAB 21 +#define MF_TAB 22 #define CB_USE_SQUARE_PAGE_MODE 23 -#define CB_USE_CHAR_UNIT 24 +#define CB_USE_CHAR_UNIT 24 // SwCaptionOptPage ----------------------------- -#define FT_OBJECTS 10 -#define CLB_OBJECTS 11 -#define FL_SETTINGS_2 12 -#define TXT_CATEGORY 13 -#define BOX_CATEGORY 14 -#define TXT_FORMAT 15 -#define BOX_FORMAT 16 -#define TXT_TEXT 17 -#define EDT_TEXT 18 -#define TXT_POS 19 -#define BOX_POS 20 -#define FL_NUMCAPT 21 -#define FT_LEVEL 22 -#define LB_LEVEL 23 -#define FT_SEPARATOR 24 -#define ED_SEPARATOR 25 -#define FL_CATEGORY 26 -#define FT_CHARSTYLE 27 -#define LB_CHARSTYLE 28 -#define CB_APPLYBORDER 29 -#define WIN_PREVIEW 30 +#define FT_OBJECTS 10 +#define CLB_OBJECTS 11 +#define FL_SETTINGS_2 12 +#define TXT_CATEGORY 13 +#define BOX_CATEGORY 14 +#define TXT_FORMAT 15 +#define BOX_FORMAT 16 +#define TXT_TEXT 17 +#define EDT_TEXT 18 +#define TXT_POS 19 +#define BOX_POS 20 +#define FL_NUMCAPT 21 +#define FT_LEVEL 22 +#define LB_LEVEL 23 +#define FT_SEPARATOR 24 +#define ED_SEPARATOR 25 +#define FL_CATEGORY 26 +#define FT_CHARSTYLE 27 +#define LB_CHARSTYLE 28 +#define CB_APPLYBORDER 29 +#define WIN_PREVIEW 30 #define STR_CATEGORY_NONE 31 #define LB_ORDER 32 #define FT_ORDER 33 #define FT_NUM_SEP 34 #define ED_NUM_SEP 35 -#define STR_TABLE 10 -#define STR_FRAME 11 -#define STR_GRAPHIC 12 -#define STR_OLE 13 -#define STR_BEGINNING 14 -#define STR_END 15 -#define STR_ABOVE 16 -#define STR_CP_BELOW 17 +#define STR_TABLE 10 +#define STR_FRAME 11 +#define STR_GRAPHIC 12 +#define STR_OLE 13 +#define STR_BEGINNING 14 +#define STR_END 15 +#define STR_ABOVE 16 +#define STR_CP_BELOW 17 diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index c53234b02d5a..a20d578f4729 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.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/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 56cd16c526ce..7979a4975f2d 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.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 @@ -88,27 +88,27 @@ SwContentOptPage::SwContentOptPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ), aLineFL ( this, SW_RES( FL_LINE ) ), - aCrossCB ( this, SW_RES( CB_CROSS ) ), - aSolidHandleCB( this, SW_RES( CB_HANDLE ) ), - aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ), + aCrossCB ( this, SW_RES( CB_CROSS ) ), + aSolidHandleCB( this, SW_RES( CB_HANDLE ) ), + aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ), aWindowFL ( this, SW_RES( FL_WINDOW ) ), - aHScrollBox ( this, SW_RES( CB_HSCROLL ) ), - aVScrollBox ( this, SW_RES( CB_VSCROLL ) ), + aHScrollBox ( this, SW_RES( CB_HSCROLL ) ), + aVScrollBox ( this, SW_RES( CB_VSCROLL ) ), aAnyRulerCB ( this, SW_RES( CB_ANY_RULER ) ), aHRulerCBox ( this, SW_RES( CB_HRULER ) ), aHMetric ( this, SW_RES( LB_HMETRIC ) ), - aVRulerCBox ( this, SW_RES( CB_VRULER ) ), + aVRulerCBox ( this, SW_RES( CB_VRULER ) ), aVRulerRightCBox( this, SW_RES( CB_VRULER_RIGHT ) ), aVMetric ( this, SW_RES( LB_VMETRIC ) ), aSmoothCBox ( this, SW_RES( CB_SMOOTH_SCROLL ) ), aDispFL ( this, SW_RES( FL_DISP ) ), - aGrfCB ( this, SW_RES( CB_GRF ) ), - aTblCB ( this, SW_RES( CB_TBL ) ), - aDrwCB ( this, SW_RES( CB_DRWFAST ) ), - aFldNameCB ( this, SW_RES( CB_FIELD ) ), - aPostItCB ( this, SW_RES( CB_POSTIT ) ), + aGrfCB ( this, SW_RES( CB_GRF ) ), + aTblCB ( this, SW_RES( CB_TBL ) ), + aDrwCB ( this, SW_RES( CB_DRWFAST ) ), + aFldNameCB ( this, SW_RES( CB_FIELD ) ), + aPostItCB ( this, SW_RES( CB_POSTIT ) ), aSettingsFL ( this, SW_RES( FL_SETTINGS ) ), aMetricFT ( this, SW_RES( FT_METRIC ) ), @@ -177,7 +177,7 @@ SwContentOptPage::~SwContentOptPage() { } -SfxTabPage* SwContentOptPage::Create( Window* pParent, +SfxTabPage* SwContentOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwContentOptPage(pParent, rAttrSet); @@ -313,11 +313,11 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet), aFL1 (this, SW_RES(FL_1)), aGrfCB (this, SW_RES(CB_PGRF)), -// aTabCB (this, SW_RES(CB_PTAB)), -// aDrawCB (this, SW_RES(CB_PDRAW)), +// aTabCB (this, SW_RES(CB_PTAB)), +// aDrawCB (this, SW_RES(CB_PDRAW)), aCtrlFldCB (this, SW_RES(CB_CTRLFLD)), aBackgroundCB (this, SW_RES(CB_BACKGROUND)), - aBlackFontCB (this, SW_RES(CB_BLACK_FONT)), + aBlackFontCB (this, SW_RES(CB_BLACK_FONT)), aPrintHiddenTextCB(this, SW_RES(CB_HIDDEN_TEXT)), aPrintTextPlaceholderCB(this, SW_RES(CB_TEXT_PLACEHOLDER)), aSeparatorLFL (this, SW_RES(FL_SEP_PRT_LEFT )), @@ -349,14 +349,14 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, aGrfCB.SetClickHdl( aLk ); aRightPageCB.SetClickHdl( aLk ); aLeftPageCB.SetClickHdl( aLk ); -// aTabCB.SetClickHdl( aLk ); -// aDrawCB.SetClickHdl( aLk ); +// aTabCB.SetClickHdl( aLk ); +// aDrawCB.SetClickHdl( aLk ); aCtrlFldCB.SetClickHdl( aLk ); aBackgroundCB.SetClickHdl( aLk ); aBlackFontCB.SetClickHdl( aLk ); aPrintHiddenTextCB.SetClickHdl( aLk ); aPrintTextPlaceholderCB.SetClickHdl( aLk ); -// aReverseCB.SetClickHdl( aLk ); +// aReverseCB.SetClickHdl( aLk ); aProspectCB.SetClickHdl( aLk ); aProspectCB_RTL.SetClickHdl( aLk ); aPaperFromSetupCB.SetClickHdl( aLk ); @@ -365,28 +365,28 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, aEndRB.SetClickHdl( aLk ); aOnlyRB.SetClickHdl( aLk ); aNoRB.SetClickHdl( aLk ); -// aSingleJobsCB.SetClickHdl( aLk ); +// aSingleJobsCB.SetClickHdl( aLk ); aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) ); const SfxPoolItem* pItem; if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { -// aDrawCB .Hide(); +// aDrawCB .Hide(); aLeftPageCB .Hide(); aRightPageCB .Hide(); aPrintHiddenTextCB.Hide(); aPrintTextPlaceholderCB.Hide(); -// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel()); +// aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel()); aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel()); Point aPt( aRightPageCB.GetPosPixel() ); aPt.setX(aPt.getX() + 15); // indent aProspectCB_RTL.SetPosPixel(aPt); -// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel()); +// aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel()); // aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel()); -// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel()); -// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel()); - +// aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel()); +// aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel()); + // hide aPrintEmptyPagesCB and move everything below up accordingly long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY(); aPrintEmptyPagesCB.Hide(); @@ -423,21 +423,21 @@ void SwAddPrinterTabPage::SetPreview(BOOL bPrev) } } -SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, +SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); } -BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) +BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER); - aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked(); - aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ + aAddPrinterAttr.bPrintGraphic = aGrfCB.IsChecked(); + aAddPrinterAttr.bPrintTable = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ aAddPrinterAttr.bPrintDraw = aGrfCB.IsChecked(); // UI merged with aGrfCB in CWS printerpullgpages /*aDrawCB.IsChecked()*/; - aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked(); + aAddPrinterAttr.bPrintControl = aCtrlFldCB.IsChecked(); aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked(); aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked(); aAddPrinterAttr.bPrintHiddenText = aPrintHiddenTextCB.IsChecked(); @@ -452,7 +452,7 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) aAddPrinterAttr.bPrintEmptyPages = aPrintEmptyPagesCB.IsChecked(); aAddPrinterAttr.bPrintSingleJobs = TRUE; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/; - if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = + if (aNoRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = POSTITS_NONE; if (aOnlyRB.IsChecked()) aAddPrinterAttr.nPrintPostIts = POSTITS_ONLY; @@ -468,30 +468,30 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) return bAttrModified; } -void SwAddPrinterTabPage::Reset( const SfxItemSet& ) +void SwAddPrinterTabPage::Reset( const SfxItemSet& ) { - const SfxItemSet& rSet = GetItemSet(); - const SwAddPrinterItem* pAddPrinterAttr = 0; + const SfxItemSet& rSet = GetItemSet(); + const SwAddPrinterItem* pAddPrinterAttr = 0; if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , FALSE, (const SfxPoolItem**)&pAddPrinterAttr )) { - aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw ); -// aTabCB.Check( pAddPrinterAttr->bPrintTable); + aGrfCB.Check( pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw ); +// aTabCB.Check( pAddPrinterAttr->bPrintTable); // aDrawCB.Check( pAddPrinterAttr->bPrintDraw); - aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl); + aCtrlFldCB.Check( pAddPrinterAttr->bPrintControl); aBackgroundCB.Check( pAddPrinterAttr->bPrintPageBackground); - aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont); + aBlackFontCB.Check( pAddPrinterAttr->bPrintBlackFont); aPrintHiddenTextCB.Check( pAddPrinterAttr->bPrintHiddenText); aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder); aLeftPageCB.Check( pAddPrinterAttr->bPrintLeftPages); aRightPageCB.Check( pAddPrinterAttr->bPrintRightPages); -// aReverseCB.Check( pAddPrinterAttr->bPrintReverse); +// aReverseCB.Check( pAddPrinterAttr->bPrintReverse); aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup); aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages); aProspectCB.Check( pAddPrinterAttr->bPrintProspect); aProspectCB_RTL.Check( pAddPrinterAttr->bPrintProspectRTL); -// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs); +// aSingleJobsCB.Check( pAddPrinterAttr->bPrintSingleJobs); aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ; aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ; @@ -511,7 +511,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& ) aProspectCB_RTL.Enable( FALSE ); } -void SwAddPrinterTabPage::Init() +void SwAddPrinterTabPage::Init() { } @@ -634,8 +634,8 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent, aStandardPB.SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl)); aStandardBox.SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); aListBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); - aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); - aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); + aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); + aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl)); Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl); aStandardBox.SetLoseFocusHdl( aFocusLink ); aTitleBox .SetLoseFocusHdl( aFocusLink ); @@ -659,7 +659,7 @@ SwStdFontTabPage::~SwStdFontTabPage() delete pPrt; } -SfxTabPage* SwStdFontTabPage::Create( Window* pParent, +SfxTabPage* SwStdFontTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwStdFontTabPage(pParent, rAttrSet); @@ -699,16 +699,16 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& ) BOOL bNotDocOnly = !aDocOnlyCB.IsChecked(); SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly); - String sStandard = aStandardBox.GetText(); - String sTitle = aTitleBox .GetText(); - String sList = aListBox .GetText(); - String sLabel = aLabelBox .GetText(); - String sIdx = aIdxBox .GetText(); - String sStandardBak = aStandardBox.GetSavedValue(); - String sTitleBak = aTitleBox .GetSavedValue(); - String sListBak = aListBox .GetSavedValue(); - String sLabelBak = aLabelBox .GetSavedValue(); - String sIdxBak = aIdxBox .GetSavedValue(); + String sStandard = aStandardBox.GetText(); + String sTitle = aTitleBox .GetText(); + String sList = aListBox .GetText(); + String sLabel = aLabelBox .GetText(); + String sIdx = aIdxBox .GetText(); + String sStandardBak = aStandardBox.GetSavedValue(); + String sTitleBak = aTitleBox .GetSavedValue(); + String sListBak = aListBox .GetSavedValue(); + String sLabelBak = aLabelBox .GetSavedValue(); + String sIdxBak = aIdxBox .GetSavedValue(); bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText(); bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText(); @@ -1199,7 +1199,7 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() { } -SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, +SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwTableOptionsTabPage(pParent, rAttrSet ); @@ -1312,9 +1312,9 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) switch(pModOpt->GetTblMode()) { - case TBLFIX_CHGABS: aFixRB.Check(); break; - case TBLFIX_CHGPROP: aFixPropRB.Check(); break; - case TBLVAR_CHGABS: aVarRB.Check(); break; + case TBLFIX_CHGABS: aFixRB.Check(); break; + case TBLFIX_CHGPROP: aFixPropRB.Check(); break; + case TBLVAR_CHGABS: aVarRB.Check(); break; } const SfxPoolItem* pItem; if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem)) @@ -1412,7 +1412,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem ) && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON) { - aTabCB .Hide(); + aTabCB .Hide(); aCharHiddenCB.Hide(); aFldHiddenCB .Hide(); aFldHiddenParaCB.Hide(); @@ -1439,7 +1439,7 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() { } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwShdwCrsrOptionsTabPage( pParent, rSet ); } @@ -1549,17 +1549,17 @@ struct CharAttr // Editieren entspricht Einfuegen-Attributen static CharAttr __FAR_DATA aRedlineAttr[] = { - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, - { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, - { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL }, - { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE }, - { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE }, - { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN }, - { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL }, - { SID_ATTR_BRUSH, 0 } + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, + { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, + { SID_ATTR_CHAR_POSTURE, ITALIC_NORMAL }, + { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_SINGLE }, + { SID_ATTR_CHAR_UNDERLINE, UNDERLINE_DOUBLE }, + { SID_ATTR_CHAR_STRIKEOUT, STRIKEOUT_SINGLE }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_VERSALIEN }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_GEMEINE }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_KAPITAELCHEN }, + { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_TITEL }, + { SID_ATTR_BRUSH, 0 } }; // Items from aRedlineAttr relevant for InsertAttr: strikethrough is // not used @@ -1660,23 +1660,23 @@ void SwMarkPreview::Paint(const Rectangle &/*rRect*/) switch (nMarkPos) { - case 1: // left + case 1: // left aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top())); break; - case 2: // right + case 2: // right aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top())); break; - case 3: // outside + case 3: // outside break; - case 4: // inside + case 4: // inside aLeftMark.SetPos(Point(aLeftPagePrtArea.Right() + 2, aLeftMark.Top())); aRightMark.SetPos(Point(aRightPagePrtArea.Left() - 2 - aRightMark.GetWidth(), aRightMark.Top())); break; - case 0: // none + case 0: // none default: return; } @@ -1696,8 +1696,8 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect) Rectangle aTextLine = rRect; aTextLine.SetSize(Size(aTextLine.GetWidth(), 2)); - aTextLine.Left() += nLTxtBorder; - aTextLine.Right() -= nRTxtBorder; + aTextLine.Left() += nLTxtBorder; + aTextLine.Right() -= nRTxtBorder; aTextLine.Move(0, nTTxtBorder); sal_Int32 nStep; @@ -1774,14 +1774,14 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, aChangedFL ( this, SW_RES( FL_LC )), - aMarkPosFT ( this, SW_RES( FT_MARKPOS )), - aMarkPosLB ( this, SW_RES( LB_MARKPOS )), - aMarkColorFT ( this, SW_RES( FT_LC_COL )), - aMarkColorLB ( this, SW_RES( LB_LC_COL )), - aMarkPreviewWN ( this, SW_RES( WIN_MARK )), + aMarkPosFT ( this, SW_RES( FT_MARKPOS )), + aMarkPosLB ( this, SW_RES( LB_MARKPOS )), + aMarkColorFT ( this, SW_RES( FT_LC_COL )), + aMarkColorLB ( this, SW_RES( LB_LC_COL )), + aMarkPreviewWN ( this, SW_RES( WIN_MARK )), sAuthor ( SW_RES( STR_AUTHOR )), - sNone ( SW_RES( STR_NOTHING )) + sNone ( SW_RES( STR_NOTHING )) { FreeResource(); @@ -1799,7 +1799,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, aChangedLB.RemoveEntry(5); aDeletedLB.RemoveEntry(4); aDeletedLB.RemoveEntry(3); - + Link aLk = LINK(this, SwRedlineOptionsTabPage, AttribHdl); aInsertLB.SetSelectHdl( aLk ); aDeletedLB.SetSelectHdl( aLk ); @@ -2044,14 +2044,14 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) aInsertLB.SelectEntryPos(0); aDeletedLB.SelectEntryPos(0); aChangedLB.SelectEntryPos(0); - + lcl_FillRedlineAttrListBox(aInsertLB, rInsertAttr, aInsertAttrMap, sizeof(aInsertAttrMap) / sizeof(USHORT)); lcl_FillRedlineAttrListBox(aDeletedLB, rDeletedAttr, aDeletedAttrMap, sizeof(aDeletedAttrMap) / sizeof(USHORT)); lcl_FillRedlineAttrListBox(aChangedLB, rChangedAttr, aChangedAttrMap, sizeof(aChangedAttrMap) / sizeof(USHORT)); - + USHORT nPos = 0; switch (pOpt->GetMarkAlignMode()) { @@ -2095,8 +2095,8 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) pPrev = &aChangedPreviewWN; } - SvxFont& rFont = pPrev->GetFont(); - SvxFont& rCJKFont = pPrev->GetCJKFont(); + SvxFont& rFont = pPrev->GetFont(); + SvxFont& rCJKFont = pPrev->GetCJKFont(); rFont.SetWeight(WEIGHT_NORMAL); rCJKFont.SetWeight(WEIGHT_NORMAL); @@ -2109,7 +2109,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) rFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED); rCJKFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED); - USHORT nPos = pColorLB->GetSelectEntryPos(); + USHORT nPos = pColorLB->GetSelectEntryPos(); switch( nPos ) { @@ -2132,7 +2132,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox *, pLB ) if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; - CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); + CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); //switch off preview background color pPrev->ResetColor(); switch (pAttr->nItemId) @@ -2202,13 +2202,13 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ColorListBox *, pColorLB ) pPrev = &aChangedPreviewWN; } - SvxFont& rFont = pPrev->GetFont(); - SvxFont& rCJKFont = pPrev->GetCJKFont(); - USHORT nPos = pLB->GetSelectEntryPos(); + SvxFont& rFont = pPrev->GetFont(); + SvxFont& rCJKFont = pPrev->GetCJKFont(); + USHORT nPos = pLB->GetSelectEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; - CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); + CharAttr* pAttr = ( CharAttr* ) pLB->GetEntryData( nPos ); if( pAttr->nItemId == SID_ATTR_BRUSH ) { @@ -2259,20 +2259,20 @@ IMPL_LINK( SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox *, EMPTYARG ) void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) { - const AllSettings& rAllSettings = Application::GetSettings(); - LanguageType eLangType = rAllSettings.GetUILanguage(); - Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() ); - SvxFont& rFont = rExampleWin.GetFont(); - SvxFont& rCJKFont = rExampleWin.GetCJKFont(); - SvxFont& rCTLFont = rExampleWin.GetCTLFont(); + const AllSettings& rAllSettings = Application::GetSettings(); + LanguageType eLangType = rAllSettings.GetUILanguage(); + Color aBackCol( rAllSettings.GetStyleSettings().GetWindowColor() ); + SvxFont& rFont = rExampleWin.GetFont(); + SvxFont& rCJKFont = rExampleWin.GetCJKFont(); + SvxFont& rCTLFont = rExampleWin.GetCTLFont(); - Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, + Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, + Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, + Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - const Size aDefSize( 0, 12 ); + const Size aDefSize( 0, 12 ); aFont.SetSize( aDefSize ); aCJKFont.SetSize( aDefSize ); aCTLFont.SetSize( aDefSize ); @@ -2289,7 +2289,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rCJKFont = aCJKFont; rCTLFont = aCTLFont; - const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 ); + const Size aNewSize( 0, rExampleWin.GetOutputSize().Height() * 2 / 3 ); rFont.SetSize( aNewSize ); rCJKFont.SetSize( aNewSize ); @@ -2297,7 +2297,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.UseResourceText(); - Wallpaper aWall( aBackCol ); + Wallpaper aWall( aBackCol ); rExampleWin.SetBackground( aWall ); rExampleWin.Invalidate(); } @@ -2316,30 +2316,30 @@ SwTestTabPage::SwTestTabPage( Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, WB_HIDE, rCoreSet), aTestFL ( this, WB_GROUP ), - aTest1CBox ( this, 0 ), - aTest2CBox ( this, 0 ), - aTest3CBox ( this, 0 ), - aTest4CBox ( this, 0 ), - aTest5CBox ( this, 0 ), - aTest6CBox ( this, 0 ), - aTest7CBox ( this, 0 ), - aTest8CBox ( this, 0 ), - aTest9CBox ( this, 0 ), - aTest10CBox ( this, 0 ), + aTest1CBox ( this, 0 ), + aTest2CBox ( this, 0 ), + aTest3CBox ( this, 0 ), + aTest4CBox ( this, 0 ), + aTest5CBox ( this, 0 ), + aTest6CBox ( this, 0 ), + aTest7CBox ( this, 0 ), + aTest8CBox ( this, 0 ), + aTest9CBox ( this, 0 ), + aTest10CBox ( this, 0 ), bAttrModified( FALSE ) { - lcl_SetPosSize(*this, Point(0,0), Size(260 , 135)); + lcl_SetPosSize(*this, Point(0,0), Size(260 , 135)); lcl_SetPosSize(aTestFL, Point(6,2), Size(209,8)); - lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10)); - lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10)); - lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10)); - lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10)); - lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10)); - lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10)); - lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10)); - lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10)); - lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10)); - lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10)); + lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10)); + lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10)); + lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10)); + lcl_SetPosSize(aTest4CBox , Point(12 , 53), Size(74 , 10)); + lcl_SetPosSize(aTest5CBox , Point(12 , 66), Size(74 , 10)); + lcl_SetPosSize(aTest6CBox , Point(116, 14), Size(74 , 10)); + lcl_SetPosSize(aTest7CBox , Point(116, 27), Size(74 , 10)); + lcl_SetPosSize(aTest8CBox , Point(116, 40), Size(74 , 10)); + lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10)); + lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10)); aTestFL.SetText( String(ByteString("Einstellungen nur f\xFCr Testzwecke" ), RTL_TEXTENCODING_MS_1252)); aTest1CBox .SetText( C2S("unused")); @@ -2367,13 +2367,13 @@ SwTestTabPage::SwTestTabPage( Window* pParent, } -SfxTabPage* SwTestTabPage::Create( Window* pParent, +SfxTabPage* SwTestTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwTestTabPage( pParent, rAttrSet ) ); } -BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) +BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index e3581484d66b..55a2f058e334 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,15 +51,15 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() { static const char* aPropNames[] = { - "Content/Graphic", // 0 - "Content/Table", // 1 - "Content/Control", // 2 - "Content/Background", // 3 - "Content/PrintBlack", // 4 - "Content/Note", // 5 + "Content/Graphic", // 0 + "Content/Table", // 1 + "Content/Control", // 2 + "Content/Background", // 3 + "Content/PrintBlack", // 4 + "Content/Note", // 5 "Page/Reversed", // 6 "Page/Brochure", // 7 - "Page/BrochureRightToLeft", // 8 + "Page/BrochureRightToLeft", // 8 "Output/SinglePrintJob", // 9 "Output/Fax", // 10 "Papertray/FromPrinterSetup", // 11 @@ -103,11 +103,11 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) : { switch(nProp) { - case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break; - case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break; - case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break; + case 0: bPrintGraphic = *(sal_Bool*)pValues[nProp].getValue(); break; + case 1: bPrintTable = *(sal_Bool*)pValues[nProp].getValue(); break; + case 2: bPrintControl = *(sal_Bool*)pValues[nProp].getValue() ; break; case 3: bPrintPageBackground= *(sal_Bool*)pValues[nProp].getValue(); break; - case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break; + case 4: bPrintBlackFont = *(sal_Bool*)pValues[nProp].getValue(); break; case 5: { sal_Int32 nTmp = 0; @@ -146,7 +146,7 @@ SwPrintOptions::~SwPrintOptions() void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -void SwPrintOptions::Commit() +void SwPrintOptions::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -160,10 +160,10 @@ void SwPrintOptions::Commit() switch(nProp) { case 0: bVal = bPrintGraphic; pValues[nProp].setValue(&bVal, rType);break; - case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break; - case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break; + case 1: bVal = bPrintTable ;pValues[nProp].setValue(&bVal, rType); break; + case 2: bVal = bPrintControl ; pValues[nProp].setValue(&bVal, rType); break; case 3: bVal = bPrintPageBackground; pValues[nProp].setValue(&bVal, rType); break; - case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break; + case 4: bVal = bPrintBlackFont ; pValues[nProp].setValue(&bVal, rType); break; case 5: pValues[nProp] <<= (sal_Int32)nPrintPostIts ; break; case 6: bVal = bPrintReverse ; pValues[nProp].setValue(&bVal, rType); break; case 7: bVal = bPrintProspect ; pValues[nProp].setValue(&bVal, rType); break; diff --git a/sw/source/ui/config/redlopt.hrc b/sw/source/ui/config/redlopt.hrc index 877f23d75c4c..f77f84b664d7 100644 --- a/sw/source/ui/config/redlopt.hrc +++ b/sw/source/ui/config/redlopt.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/config/redlopt.src b/sw/source/ui/config/redlopt.src index 4d6816dcec23..2d5da1977213 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.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/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 4986d1f1b745..a1695c1b7daa 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.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 @@ -45,7 +45,7 @@ #include <tools/resid.hxx> #include <fmtornt.hxx> -#include <swtypes.hxx> // Leerstring +#include <swtypes.hxx> // Leerstring #include <wrtsh.hxx> #include <uinums.hxx> #include <poolfmt.hxx> @@ -57,12 +57,12 @@ using namespace ::com::sun::star; -#define VERSION_30B ((USHORT)250) -#define VERSION_31B ((USHORT)326) -#define VERSION_40A ((USHORT)364) +#define VERSION_30B ((USHORT)250) +#define VERSION_31B ((USHORT)326) +#define VERSION_40A ((USHORT)364) #define VERSION_50A ((USHORT)373) #define VERSION_53A ((USHORT)596) -#define ACT_NUM_VERSION VERSION_53A +#define ACT_NUM_VERSION VERSION_53A #define NUMRULE_FILENAME "numrule.cfg" #define CHAPTER_FILENAME "chapter.cfg" @@ -73,8 +73,8 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* ) // SwNumRulesWithName ---------------------------------------------------- // PUBLIC METHODES ------------------------------------------------------- /*------------------------------------------------------------------------ - Beschreibung: Speichern einer Regel - Parameter: rCopy -- die zu speichernde Regel + Beschreibung: Speichern einer Regel + Parameter: rCopy -- die zu speichernde Regel nIdx -- Position, an der die Regel zu speichern ist. Eine alte Regel an dieser Position wird ueberschrieben. ------------------------------------------------------------------------*/ @@ -151,7 +151,7 @@ BOOL SwBaseNumRules::Store(SvStream &rStream) int SwBaseNumRules::Load(SvStream &rStream) { - int rc = 0; + int rc = 0; rStream >> nVersion; @@ -346,47 +346,47 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, BOOL bFlag; String sStr; - rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); + rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS ); if( VERSION_53A > nVersion ) { - rStream >> cChar; aFmt.SetBulletChar( cChar ); + rStream >> cChar; aFmt.SetBulletChar( cChar ); } else { - rStream >> nUS; aFmt.SetBulletChar( nUS ); + rStream >> nUS; aFmt.SetBulletChar( nUS ); } - rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); + rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag ); if( VERSION_30B == nVersion ) { long nL; - rStream >> cChar; aFmt.SetStart( (USHORT)cChar ); + rStream >> cChar; aFmt.SetStart( (USHORT)cChar ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nL; aFmt.SetLSpace( lNumIndent ); - rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nL; aFmt.SetLSpace( lNumIndent ); + rStream >> nL; aFmt.SetFirstLineOffset( (short)nL ); } - else // alter StartWert war ein Byte + else // alter StartWert war ein Byte { - rStream >> nUS; aFmt.SetStart( nUS ); + rStream >> nUS; aFmt.SetStart( nUS ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); - rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); - rStream >> nUS; aFmt.SetAbsLSpace( nUS ); - rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); - rStream >> nUS; aFmt.SetCharTextDistance( nUS ); - rStream >> nShort; aFmt.SetLSpace( nShort ); + rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); + rStream >> nUS; aFmt.SetAbsLSpace( nUS ); + rStream >> nShort; aFmt.SetFirstLineOffset( nShort ); + rStream >> nUS; aFmt.SetCharTextDistance( nUS ); + rStream >> nShort; aFmt.SetLSpace( nShort ); rStream >> bFlag; } - USHORT nFamily; + USHORT nFamily; USHORT nCharSet; short nWidth; short nHeight; @@ -573,7 +573,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh, else pFmt = rSh.GetCharFmtFromPool( nCharPoolId ); - if( !pFmt->GetDepends() ) // Attribute setzen + if( !pFmt->GetDepends() ) // Attribute setzen for( USHORT n = aItems.Count(); n; ) pFmt->SetFmtAttr( *aItems[ --n ] ); } diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 5dec6029969a..c54d9c6ade69 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.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 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() { static const char* aPropNames[] = { - "Display/GraphicObject", // 0 - "Display/Table", // 1 - "Display/DrawingControl", // 2 - "Display/FieldCode", // 3 - "Display/Note", // 4 + "Display/GraphicObject", // 0 + "Display/Table", // 1 + "Display/DrawingControl", // 2 + "Display/FieldCode", // 3 + "Display/Note", // 4 "Display/PreventTips", // 5 "NonprintingCharacter/MetaCharacters", // 6 "NonprintingCharacter/ParagraphEnd", // 7 @@ -155,11 +155,11 @@ void SwContentViewConfig::Commit() sal_Bool bVal = FALSE; switch(nProp) { - case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject", - case 1: bVal = rParent.IsTable(); break;// "Display/Table", - case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl", - case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode", - case 4: bVal = rParent.IsPostIts(); break;// "Display/Note", + case 0: bVal = rParent.IsGraphic(); break;// "Display/GraphicObject", + case 1: bVal = rParent.IsTable(); break;// "Display/Table", + case 2: bVal = rParent.IsDraw(); break;// "Display/DrawingControl", + case 3: bVal = rParent.IsFldName(); break;// "Display/FieldCode", + case 4: bVal = rParent.IsPostIts(); break;// "Display/Note", case 5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips" case 6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters" case 7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd", @@ -196,11 +196,11 @@ void SwContentViewConfig::Load() sal_Bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; switch(nProp) { - case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject", - case 1: rParent.SetTable(bSet); break;// "Display/Table", - case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl", - case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode", - case 4: rParent.SetPostIts(bSet); break;// "Display/Note", + case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject", + case 1: rParent.SetTable(bSet); break;// "Display/Table", + case 2: rParent.SetDraw(bSet); break;// "Display/DrawingControl", + case 3: rParent.SetFldName(bSet); break;// "Display/FieldCode", + case 4: rParent.SetPostIts(bSet); break;// "Display/Note", case 5: rParent.SetPreventTips(bSet); break;// "Display/PreventTips", case 6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters" case 7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd", @@ -412,13 +412,13 @@ Sequence<OUString> SwGridConfig::GetPropertyNames() { static const char* aPropNames[] = { - "Option/SnapToGrid", // 0 - "Option/VisibleGrid", // 1 - "Option/Synchronize", // 2 - "Resolution/XAxis", // 3 - "Resolution/YAxis", // 4 - "Subdivision/XAxis", // 5 - "Subdivision/YAxis" // 6 + "Option/SnapToGrid", // 0 + "Option/VisibleGrid", // 1 + "Option/Synchronize", // 2 + "Resolution/XAxis", // 3 + "Resolution/YAxis", // 4 + "Subdivision/XAxis", // 5 + "Subdivision/YAxis" // 6 }; const int nCount = 7; Sequence<OUString> aNames(nCount); @@ -454,7 +454,7 @@ void SwGridConfig::Commit() sal_Bool bSet; switch(nProp) { - case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid", + case 0: bSet = rParent.IsSnap(); break;// "Option/SnapToGrid", case 1: bSet = rParent.IsGridVisible(); break;//"Option/VisibleGrid", case 2: bSet = rParent.IsSynchronize(); break;// "Option/Synchronize", case 3: pValues[nProp] <<= (sal_Int32)TWIP_TO_MM100(rParent.GetSnapSize().Width()); break;// "Resolution/XAxis", @@ -487,7 +487,7 @@ void SwGridConfig::Load() pValues[nProp] >>= nSet; switch(nProp) { - case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid", + case 0: rParent.SetSnap(bSet); break;// "Option/SnapToGrid", case 1: rParent.SetGridVisible(bSet); break;//"Option/VisibleGrid", case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize", case 3: aSnap.Width() = MM100_TO_TWIP(nSet); break;// "Resolution/XAxis", @@ -507,8 +507,8 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames() { static const char* aPropNames[] = { - "DirectCursor/UseDirectCursor", // 0 - "DirectCursor/Insert", // 1 + "DirectCursor/UseDirectCursor", // 0 + "DirectCursor/Insert", // 1 "Option/ProtectedArea" // 2 }; const int nCount = 3; @@ -542,8 +542,8 @@ void SwCursorConfig::Commit() sal_Bool bSet; switch(nProp) { - case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor", - case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert", + case 0: bSet = rParent.IsShadowCursor(); break;// "DirectCursor/UseDirectCursor", + case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCrsrFillMode(); break;// "DirectCursor/Insert", case 2: bSet = rParent.IsCursorInProtectedArea(); break;// "Option/ProtectedArea" } if(nProp != 1 ) @@ -573,7 +573,7 @@ void SwCursorConfig::Load() pValues[nProp] >>= nSet; switch(nProp) { - case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor", + case 0: rParent.SetShadowCursor(bSet); break;// "DirectCursor/UseDirectCursor", case 1: rParent.SetShdwCrsrFillMode((BYTE)nSet); break;// "DirectCursor/Insert", case 2: rParent.SetCursorInProtectedArea(bSet); break;// "Option/ProtectedArea" } @@ -606,7 +606,7 @@ void SwWebColorConfig::Commit() { switch(nProp) { - case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color", + case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color", } } PutProperties(aPropNames, aValues); diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 239ec1a9cdc3..3ac5d135bc78 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.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 @@ -53,7 +53,7 @@ #include <editeng/acorrcfg.hxx> #if OSL_DEBUG_LEVEL > 1 -BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading +BOOL SwViewOption::bTest9 = FALSE; //DrawingLayerNotLoading #endif Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY); Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY); @@ -80,21 +80,21 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm #define LINEBREAK_SIZE 12, 8 #define TAB_SIZE 12, 6 -#define MIN_BLANKWIDTH 40 -#define MIN_BLANKHEIGHT 40 -#define MIN_TABWIDTH 120 -#define MIN_TABHEIGHT 200 +#define MIN_BLANKWIDTH 40 +#define MIN_BLANKHEIGHT 40 +#define MIN_TABWIDTH 120 +#define MIN_TABHEIGHT 200 static const char __FAR_DATA aPostItStr[] = " "; BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const { - return nCoreOptions == rOpt.nCoreOptions + return nCoreOptions == rOpt.nCoreOptions && nCore2Options == rOpt.nCore2Options - && aSnapSize == rOpt.aSnapSize + && aSnapSize == rOpt.aSnapSize && mnViewLayoutColumns == rOpt.mnViewLayoutColumns - && nDivisionX == rOpt.GetDivisionX() - && nDivisionY == rOpt.GetDivisionY() + && nDivisionX == rOpt.GetDivisionX() + && nDivisionY == rOpt.GetDivisionY() && nPagePrevRow == rOpt.GetPagePrevRow() && nPagePrevCol == rOpt.GetPagePrevCol() && aRetoucheColor == rOpt.GetRetoucheColor() @@ -160,7 +160,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo USHORT nPix = GetPixelTwips() * 2; if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix ) nPix = 0; - const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); + const Point aTopLeft( rRect.Left() + nPix, rRect.Top() + nPix ); const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix ); const SwRect aRect( aTopLeft, aBotRight ); DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() ); @@ -193,16 +193,16 @@ SwViewOption::SwViewOption() : nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH | VIEWOPT_1_REF | VIEWOPT_1_GRAPHIC | - VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL | + VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL | VIEWOPT_1_PAGEBACK | VIEWOPT_1_SOLIDMARKHDL | VIEWOPT_1_POSTITS; nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA; nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER; if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()) - aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2" + aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2" else - aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm + aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm nDivisionX = nDivisionY = 1; bSelectionInReadonly = SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly(); @@ -223,23 +223,23 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) // #114856# Formular view bFormView = rVOpt.bFormView; nZoom = rVOpt.nZoom ; - aSnapSize = rVOpt.aSnapSize ; + aSnapSize = rVOpt.aSnapSize ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; - nDivisionX = rVOpt.nDivisionX ; - nDivisionY = rVOpt.nDivisionY ; - nPagePrevRow = rVOpt.nPagePrevRow; - nPagePrevCol = rVOpt.nPagePrevCol; + nDivisionX = rVOpt.nDivisionX ; + nDivisionY = rVOpt.nDivisionY ; + nPagePrevRow = rVOpt.nPagePrevRow; + nPagePrevCol = rVOpt.nPagePrevCol; bIsPagePreview = rVOpt.bIsPagePreview; - eZoom = rVOpt.eZoom ; - nTblDest = rVOpt.nTblDest ; - nUIOptions = rVOpt.nUIOptions ; - nCoreOptions = rVOpt.nCoreOptions ; - nCore2Options = rVOpt.nCore2Options ; - aRetoucheColor = rVOpt.GetRetoucheColor(); - sSymbolFont = rVOpt.sSymbolFont; + eZoom = rVOpt.eZoom ; + nTblDest = rVOpt.nTblDest ; + nUIOptions = rVOpt.nUIOptions ; + nCoreOptions = rVOpt.nCoreOptions ; + nCore2Options = rVOpt.nCore2Options ; + aRetoucheColor = rVOpt.GetRetoucheColor(); + sSymbolFont = rVOpt.sSymbolFont; nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; bStarOneSetting = rVOpt.bStarOneSetting; - bBookview = rVOpt.bBookview; + bBookview = rVOpt.bBookview; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; @@ -262,24 +262,24 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) { // #114856# Formular view bFormView = rVOpt.bFormView ; - nZoom = rVOpt.nZoom ; - aSnapSize = rVOpt.aSnapSize ; + nZoom = rVOpt.nZoom ; + aSnapSize = rVOpt.aSnapSize ; mnViewLayoutColumns = rVOpt.mnViewLayoutColumns ; - nDivisionX = rVOpt.nDivisionX ; - nDivisionY = rVOpt.nDivisionY ; - nPagePrevRow = rVOpt.nPagePrevRow; - nPagePrevCol = rVOpt.nPagePrevCol; + nDivisionX = rVOpt.nDivisionX ; + nDivisionY = rVOpt.nDivisionY ; + nPagePrevRow = rVOpt.nPagePrevRow; + nPagePrevCol = rVOpt.nPagePrevCol; bIsPagePreview = rVOpt.bIsPagePreview; - eZoom = rVOpt.eZoom ; - nTblDest = rVOpt.nTblDest ; - nUIOptions = rVOpt.nUIOptions ; - nCoreOptions = rVOpt.nCoreOptions; - nCore2Options = rVOpt.nCore2Options; - aRetoucheColor = rVOpt.GetRetoucheColor(); - sSymbolFont = rVOpt.sSymbolFont; + eZoom = rVOpt.eZoom ; + nTblDest = rVOpt.nTblDest ; + nUIOptions = rVOpt.nUIOptions ; + nCoreOptions = rVOpt.nCoreOptions; + nCore2Options = rVOpt.nCore2Options; + aRetoucheColor = rVOpt.GetRetoucheColor(); + sSymbolFont = rVOpt.sSymbolFont; nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode; bStarOneSetting = rVOpt.bStarOneSetting; - bBookview = rVOpt.bBookview; + bBookview = rVOpt.bBookview; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; @@ -318,13 +318,13 @@ BOOL SwViewOption::IsAutoCompleteWords() const } AuthorCharAttr::AuthorCharAttr() : - nItemId (SID_ATTR_CHAR_UNDERLINE), - nAttr (UNDERLINE_SINGLE), - nColor (COL_TRANSPARENT) + nItemId (SID_ATTR_CHAR_UNDERLINE), + nAttr (UNDERLINE_SINGLE), + nColor (COL_TRANSPARENT) { } -USHORT GetHtmlMode(const SwDocShell* pShell) +USHORT GetHtmlMode(const SwDocShell* pShell) { USHORT nRet = 0; if(!pShell || PTR_CAST(SwWebDocShell, pShell)) |