diff options
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/doc/dbgoutsw.cxx | 248 | ||||
-rw-r--r-- | sw/source/core/doc/doc.cxx | 24 | ||||
-rw-r--r-- | sw/source/core/doc/docglbl.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/number.cxx | 30 | ||||
-rw-r--r-- | sw/source/core/docnode/finalthreadmanager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/retrieveinputstream.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/ole/ndole.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks1.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/txtftn.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/tox/tox.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/swunohelper.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unochart.cxx | 13 | ||||
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unofield.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj2.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/printdata.cxx | 26 |
19 files changed, 195 insertions, 201 deletions
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 233326a1a54a..f852557d91e1 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -115,130 +115,130 @@ map<sal_uInt16,OUString,CompareUShort> & GetItemWhichMap() if (! bInitialized) { - aItemWhichMap[RES_CHRATR_CASEMAP] = OUString("CHRATR_CASEMAP"); - aItemWhichMap[RES_CHRATR_CHARSETCOLOR] = OUString("CHRATR_CHARSETCOLOR"); - aItemWhichMap[RES_CHRATR_COLOR] = OUString("CHRATR_COLOR"); - aItemWhichMap[RES_CHRATR_CONTOUR] = OUString("CHRATR_CONTOUR"); - aItemWhichMap[RES_CHRATR_CROSSEDOUT] = OUString("CHRATR_CROSSEDOUT"); - aItemWhichMap[RES_CHRATR_ESCAPEMENT] = OUString("CHRATR_ESCAPEMENT"); - aItemWhichMap[RES_CHRATR_FONT] = OUString("CHRATR_FONT"); - aItemWhichMap[RES_CHRATR_FONTSIZE] = OUString("CHRATR_FONTSIZE"); - aItemWhichMap[RES_CHRATR_KERNING] = OUString("CHRATR_KERNING"); - aItemWhichMap[RES_CHRATR_LANGUAGE] = OUString("CHRATR_LANGUAGE"); - aItemWhichMap[RES_CHRATR_POSTURE] = OUString("CHRATR_POSTURE"); - aItemWhichMap[RES_CHRATR_PROPORTIONALFONTSIZE] = OUString("CHRATR_PROPORTIONALFONTSIZE"); - aItemWhichMap[RES_CHRATR_SHADOWED] = OUString("CHRATR_SHADOWED"); - aItemWhichMap[RES_CHRATR_UNDERLINE] = OUString("CHRATR_UNDERLINE"); - aItemWhichMap[RES_CHRATR_OVERLINE] = OUString("CHRATR_OVERLINE"); - aItemWhichMap[RES_CHRATR_WEIGHT] = OUString("CHRATR_WEIGHT"); - aItemWhichMap[RES_CHRATR_WORDLINEMODE] = OUString("CHRATR_WORDLINEMODE"); - aItemWhichMap[RES_CHRATR_AUTOKERN] = OUString("CHRATR_AUTOKERN"); - aItemWhichMap[RES_CHRATR_BLINK] = OUString("CHRATR_BLINK"); - aItemWhichMap[RES_CHRATR_NOHYPHEN] = OUString("CHRATR_NOHYPHEN"); - aItemWhichMap[RES_CHRATR_NOLINEBREAK] = OUString("CHRATR_NOLINEBREAK"); - aItemWhichMap[RES_CHRATR_BACKGROUND] = OUString("CHRATR_BACKGROUND"); - aItemWhichMap[RES_CHRATR_HIGHLIGHT] = OUString("CHRATR_HIGHLIGHT"); - aItemWhichMap[RES_CHRATR_CJK_FONT] = OUString("CHRATR_CJK_FONT"); - aItemWhichMap[RES_CHRATR_CJK_FONTSIZE] = OUString("CHRATR_CJK_FONTSIZE"); - aItemWhichMap[RES_CHRATR_CJK_LANGUAGE] = OUString("CHRATR_CJK_LANGUAGE"); - aItemWhichMap[RES_CHRATR_CJK_POSTURE] = OUString("CHRATR_CJK_POSTURE"); - aItemWhichMap[RES_CHRATR_CJK_WEIGHT] = OUString("CHRATR_CJK_WEIGHT"); - aItemWhichMap[RES_CHRATR_CTL_FONT] = OUString("CHRATR_CTL_FONT"); - aItemWhichMap[RES_CHRATR_CTL_FONTSIZE] = OUString("CHRATR_CTL_FONTSIZE"); - aItemWhichMap[RES_CHRATR_CTL_LANGUAGE] = OUString("CHRATR_CTL_LANGUAGE"); - aItemWhichMap[RES_CHRATR_CTL_POSTURE] = OUString("CHRATR_CTL_POSTURE"); - aItemWhichMap[RES_CHRATR_CTL_WEIGHT] = OUString("CHRATR_CTL_WEIGHT"); - aItemWhichMap[RES_CHRATR_ROTATE] = OUString("CHRATR_ROTATE"); - aItemWhichMap[RES_CHRATR_EMPHASIS_MARK] = OUString("CHRATR_EMPHASIS_MARK"); - aItemWhichMap[RES_CHRATR_TWO_LINES] = OUString("CHRATR_TWO_LINES"); - aItemWhichMap[RES_CHRATR_SCALEW] = OUString("CHRATR_SCALEW"); - aItemWhichMap[RES_CHRATR_RELIEF] = OUString("CHRATR_RELIEF"); - aItemWhichMap[RES_CHRATR_HIDDEN] = OUString("CHRATR_HIDDEN"); - aItemWhichMap[RES_CHRATR_BOX] = OUString("CHRATR_BOX"); - aItemWhichMap[RES_CHRATR_SHADOW] = OUString("CHRATR_SHADOW"); - aItemWhichMap[RES_TXTATR_AUTOFMT] = OUString("TXTATR_AUTOFMT"); - aItemWhichMap[RES_TXTATR_INETFMT] = OUString("TXTATR_INETFMT"); - aItemWhichMap[RES_TXTATR_REFMARK] = OUString("TXTATR_REFMARK"); - aItemWhichMap[RES_TXTATR_TOXMARK] = OUString("TXTATR_TOXMARK"); - aItemWhichMap[RES_TXTATR_CHARFMT] = OUString("TXTATR_CHARFMT"); - aItemWhichMap[RES_TXTATR_DUMMY5] = OUString("TXTATR_DUMMY5"); - aItemWhichMap[RES_TXTATR_CJK_RUBY] = OUString("TXTATR_CJK_RUBY"); - aItemWhichMap[RES_TXTATR_UNKNOWN_CONTAINER] = OUString("TXTATR_UNKNOWN_CONTAINER"); - aItemWhichMap[RES_TXTATR_META] = OUString("TXTATR_META"); - aItemWhichMap[RES_TXTATR_METAFIELD] = OUString("TXTATR_METAFIELD"); - aItemWhichMap[RES_TXTATR_FIELD] = OUString("TXTATR_FIELD"); - aItemWhichMap[RES_TXTATR_FLYCNT] = OUString("TXTATR_FLYCNT"); - aItemWhichMap[RES_TXTATR_FTN] = OUString("TXTATR_FTN"); - aItemWhichMap[RES_TXTATR_DUMMY4] = OUString("TXTATR_DUMMY4"); - aItemWhichMap[RES_TXTATR_DUMMY3] = OUString("TXTATR_DUMMY3"); - aItemWhichMap[RES_TXTATR_DUMMY1] = OUString("TXTATR_DUMMY1"); - aItemWhichMap[RES_TXTATR_DUMMY2] = OUString("TXTATR_DUMMY2"); - aItemWhichMap[RES_PARATR_LINESPACING] = OUString("PARATR_LINESPACING"); - aItemWhichMap[RES_PARATR_ADJUST] = OUString("PARATR_ADJUST"); - aItemWhichMap[RES_PARATR_SPLIT] = OUString("PARATR_SPLIT"); - aItemWhichMap[RES_PARATR_ORPHANS] = OUString("PARATR_ORPHANS"); - aItemWhichMap[RES_PARATR_WIDOWS] = OUString("PARATR_WIDOWS"); - aItemWhichMap[RES_PARATR_TABSTOP] = OUString("PARATR_TABSTOP"); - aItemWhichMap[RES_PARATR_HYPHENZONE] = OUString("PARATR_HYPHENZONE"); - aItemWhichMap[RES_PARATR_DROP] = OUString("PARATR_DROP"); - aItemWhichMap[RES_PARATR_REGISTER] = OUString("PARATR_REGISTER"); - aItemWhichMap[RES_PARATR_NUMRULE] = OUString("PARATR_NUMRULE"); - aItemWhichMap[RES_PARATR_SCRIPTSPACE] = OUString("PARATR_SCRIPTSPACE"); - aItemWhichMap[RES_PARATR_HANGINGPUNCTUATION] = OUString("PARATR_HANGINGPUNCTUATION"); - aItemWhichMap[RES_PARATR_FORBIDDEN_RULES] = OUString("PARATR_FORBIDDEN_RULES"); - aItemWhichMap[RES_PARATR_VERTALIGN] = OUString("PARATR_VERTALIGN"); - aItemWhichMap[RES_PARATR_SNAPTOGRID] = OUString("PARATR_SNAPTOGRID"); - aItemWhichMap[RES_PARATR_CONNECT_BORDER] = OUString("PARATR_CONNECT_BORDER"); - aItemWhichMap[RES_FILL_ORDER] = OUString("FILL_ORDER"); - aItemWhichMap[RES_FRM_SIZE] = OUString("FRM_SIZE"); - aItemWhichMap[RES_PAPER_BIN] = OUString("PAPER_BIN"); - aItemWhichMap[RES_LR_SPACE] = OUString("LR_SPACE"); - aItemWhichMap[RES_UL_SPACE] = OUString("UL_SPACE"); - aItemWhichMap[RES_PAGEDESC] = OUString("PAGEDESC"); - aItemWhichMap[RES_BREAK] = OUString("BREAK"); - aItemWhichMap[RES_CNTNT] = OUString("CNTNT"); - aItemWhichMap[RES_HEADER] = OUString("HEADER"); - aItemWhichMap[RES_FOOTER] = OUString("FOOTER"); - aItemWhichMap[RES_PRINT] = OUString("PRINT"); - aItemWhichMap[RES_OPAQUE] = OUString("OPAQUE"); - aItemWhichMap[RES_PROTECT] = OUString("PROTECT"); - aItemWhichMap[RES_SURROUND] = OUString("SURROUND"); - aItemWhichMap[RES_VERT_ORIENT] = OUString("VERT_ORIENT"); - aItemWhichMap[RES_HORI_ORIENT] = OUString("HORI_ORIENT"); - aItemWhichMap[RES_ANCHOR] = OUString("ANCHOR"); - aItemWhichMap[RES_BACKGROUND] = OUString("BACKGROUND"); - aItemWhichMap[RES_BOX] = OUString("BOX"); - aItemWhichMap[RES_SHADOW] = OUString("SHADOW"); - aItemWhichMap[RES_FRMMACRO] = OUString("FRMMACRO"); - aItemWhichMap[RES_COL] = OUString("COL"); - aItemWhichMap[RES_KEEP] = OUString("KEEP"); - aItemWhichMap[RES_URL] = OUString("URL"); - aItemWhichMap[RES_EDIT_IN_READONLY] = OUString("EDIT_IN_READONLY"); - aItemWhichMap[RES_LAYOUT_SPLIT] = OUString("LAYOUT_SPLIT"); - aItemWhichMap[RES_CHAIN] = OUString("CHAIN"); - aItemWhichMap[RES_TEXTGRID] = OUString("TEXTGRID"); - aItemWhichMap[RES_LINENUMBER ] = OUString("LINENUMBER "); - aItemWhichMap[RES_FTN_AT_TXTEND] = OUString("FTN_AT_TXTEND"); - aItemWhichMap[RES_END_AT_TXTEND] = OUString("END_AT_TXTEND"); - aItemWhichMap[RES_COLUMNBALANCE] = OUString("COLUMNBALANCE"); - aItemWhichMap[RES_FRAMEDIR] = OUString("FRAMEDIR"); - aItemWhichMap[RES_HEADER_FOOTER_EAT_SPACING] = OUString("HEADER_FOOTER_EAT_SPACING"); - aItemWhichMap[RES_ROW_SPLIT] = OUString("ROW_SPLIT"); - aItemWhichMap[RES_GRFATR_MIRRORGRF] = OUString("GRFATR_MIRRORGRF"); - aItemWhichMap[RES_GRFATR_CROPGRF] = OUString("GRFATR_CROPGRF"); - aItemWhichMap[RES_GRFATR_ROTATION] = OUString("GRFATR_ROTATION"); - aItemWhichMap[RES_GRFATR_LUMINANCE] = OUString("GRFATR_LUMINANCE"); - aItemWhichMap[RES_GRFATR_CONTRAST] = OUString("GRFATR_CONTRAST"); - aItemWhichMap[RES_GRFATR_CHANNELR] = OUString("GRFATR_CHANNELR"); - aItemWhichMap[RES_GRFATR_CHANNELG] = OUString("GRFATR_CHANNELG"); - aItemWhichMap[RES_GRFATR_CHANNELB] = OUString("GRFATR_CHANNELB"); - aItemWhichMap[RES_GRFATR_GAMMA] = OUString("GRFATR_GAMMA"); - aItemWhichMap[RES_GRFATR_INVERT] = OUString("GRFATR_INVERT"); - aItemWhichMap[RES_GRFATR_TRANSPARENCY] = OUString("GRFATR_TRANSPARENCY"); - aItemWhichMap[RES_GRFATR_DRAWMODE] = OUString("GRFATR_DRAWMODE"); - aItemWhichMap[RES_BOXATR_FORMAT] = OUString("BOXATR_FORMAT"); - aItemWhichMap[RES_BOXATR_FORMULA] = OUString("BOXATR_FORMULA"); - aItemWhichMap[RES_BOXATR_VALUE] = OUString("BOXATR_VALUE"); + aItemWhichMap[RES_CHRATR_CASEMAP] = "CHRATR_CASEMAP"; + aItemWhichMap[RES_CHRATR_CHARSETCOLOR] = "CHRATR_CHARSETCOLOR"; + aItemWhichMap[RES_CHRATR_COLOR] = "CHRATR_COLOR"; + aItemWhichMap[RES_CHRATR_CONTOUR] = "CHRATR_CONTOUR"; + aItemWhichMap[RES_CHRATR_CROSSEDOUT] = "CHRATR_CROSSEDOUT"; + aItemWhichMap[RES_CHRATR_ESCAPEMENT] = "CHRATR_ESCAPEMENT"; + aItemWhichMap[RES_CHRATR_FONT] = "CHRATR_FONT"; + aItemWhichMap[RES_CHRATR_FONTSIZE] = "CHRATR_FONTSIZE"; + aItemWhichMap[RES_CHRATR_KERNING] = "CHRATR_KERNING"; + aItemWhichMap[RES_CHRATR_LANGUAGE] = "CHRATR_LANGUAGE"; + aItemWhichMap[RES_CHRATR_POSTURE] = "CHRATR_POSTURE"; + aItemWhichMap[RES_CHRATR_PROPORTIONALFONTSIZE] = "CHRATR_PROPORTIONALFONTSIZE"; + aItemWhichMap[RES_CHRATR_SHADOWED] = "CHRATR_SHADOWED"; + aItemWhichMap[RES_CHRATR_UNDERLINE] = "CHRATR_UNDERLINE"; + aItemWhichMap[RES_CHRATR_OVERLINE] = "CHRATR_OVERLINE"; + aItemWhichMap[RES_CHRATR_WEIGHT] = "CHRATR_WEIGHT"; + aItemWhichMap[RES_CHRATR_WORDLINEMODE] = "CHRATR_WORDLINEMODE"; + aItemWhichMap[RES_CHRATR_AUTOKERN] = "CHRATR_AUTOKERN"; + aItemWhichMap[RES_CHRATR_BLINK] = "CHRATR_BLINK"; + aItemWhichMap[RES_CHRATR_NOHYPHEN] = "CHRATR_NOHYPHEN"; + aItemWhichMap[RES_CHRATR_NOLINEBREAK] = "CHRATR_NOLINEBREAK"; + aItemWhichMap[RES_CHRATR_BACKGROUND] = "CHRATR_BACKGROUND"; + aItemWhichMap[RES_CHRATR_HIGHLIGHT] = "CHRATR_HIGHLIGHT"; + aItemWhichMap[RES_CHRATR_CJK_FONT] = "CHRATR_CJK_FONT"; + aItemWhichMap[RES_CHRATR_CJK_FONTSIZE] = "CHRATR_CJK_FONTSIZE"; + aItemWhichMap[RES_CHRATR_CJK_LANGUAGE] = "CHRATR_CJK_LANGUAGE"; + aItemWhichMap[RES_CHRATR_CJK_POSTURE] = "CHRATR_CJK_POSTURE"; + aItemWhichMap[RES_CHRATR_CJK_WEIGHT] = "CHRATR_CJK_WEIGHT"; + aItemWhichMap[RES_CHRATR_CTL_FONT] = "CHRATR_CTL_FONT"; + aItemWhichMap[RES_CHRATR_CTL_FONTSIZE] = "CHRATR_CTL_FONTSIZE"; + aItemWhichMap[RES_CHRATR_CTL_LANGUAGE] = "CHRATR_CTL_LANGUAGE"; + aItemWhichMap[RES_CHRATR_CTL_POSTURE] = "CHRATR_CTL_POSTURE"; + aItemWhichMap[RES_CHRATR_CTL_WEIGHT] = "CHRATR_CTL_WEIGHT"; + aItemWhichMap[RES_CHRATR_ROTATE] = "CHRATR_ROTATE"; + aItemWhichMap[RES_CHRATR_EMPHASIS_MARK] = "CHRATR_EMPHASIS_MARK"; + aItemWhichMap[RES_CHRATR_TWO_LINES] = "CHRATR_TWO_LINES"; + aItemWhichMap[RES_CHRATR_SCALEW] = "CHRATR_SCALEW"; + aItemWhichMap[RES_CHRATR_RELIEF] = "CHRATR_RELIEF"; + aItemWhichMap[RES_CHRATR_HIDDEN] = "CHRATR_HIDDEN"; + aItemWhichMap[RES_CHRATR_BOX] = "CHRATR_BOX"; + aItemWhichMap[RES_CHRATR_SHADOW] = "CHRATR_SHADOW"; + aItemWhichMap[RES_TXTATR_AUTOFMT] = "TXTATR_AUTOFMT"; + aItemWhichMap[RES_TXTATR_INETFMT] = "TXTATR_INETFMT"; + aItemWhichMap[RES_TXTATR_REFMARK] = "TXTATR_REFMARK"; + aItemWhichMap[RES_TXTATR_TOXMARK] = "TXTATR_TOXMARK"; + aItemWhichMap[RES_TXTATR_CHARFMT] = "TXTATR_CHARFMT"; + aItemWhichMap[RES_TXTATR_DUMMY5] = "TXTATR_DUMMY5"; + aItemWhichMap[RES_TXTATR_CJK_RUBY] = "TXTATR_CJK_RUBY"; + aItemWhichMap[RES_TXTATR_UNKNOWN_CONTAINER] = "TXTATR_UNKNOWN_CONTAINER"; + aItemWhichMap[RES_TXTATR_META] = "TXTATR_META"; + aItemWhichMap[RES_TXTATR_METAFIELD] = "TXTATR_METAFIELD"; + aItemWhichMap[RES_TXTATR_FIELD] = "TXTATR_FIELD"; + aItemWhichMap[RES_TXTATR_FLYCNT] = "TXTATR_FLYCNT"; + aItemWhichMap[RES_TXTATR_FTN] = "TXTATR_FTN"; + aItemWhichMap[RES_TXTATR_DUMMY4] = "TXTATR_DUMMY4"; + aItemWhichMap[RES_TXTATR_DUMMY3] = "TXTATR_DUMMY3"; + aItemWhichMap[RES_TXTATR_DUMMY1] = "TXTATR_DUMMY1"; + aItemWhichMap[RES_TXTATR_DUMMY2] = "TXTATR_DUMMY2"; + aItemWhichMap[RES_PARATR_LINESPACING] = "PARATR_LINESPACING"; + aItemWhichMap[RES_PARATR_ADJUST] = "PARATR_ADJUST"; + aItemWhichMap[RES_PARATR_SPLIT] = "PARATR_SPLIT"; + aItemWhichMap[RES_PARATR_ORPHANS] = "PARATR_ORPHANS"; + aItemWhichMap[RES_PARATR_WIDOWS] = "PARATR_WIDOWS"; + aItemWhichMap[RES_PARATR_TABSTOP] = "PARATR_TABSTOP"; + aItemWhichMap[RES_PARATR_HYPHENZONE] = "PARATR_HYPHENZONE"; + aItemWhichMap[RES_PARATR_DROP] = "PARATR_DROP"; + aItemWhichMap[RES_PARATR_REGISTER] = "PARATR_REGISTER"; + aItemWhichMap[RES_PARATR_NUMRULE] = "PARATR_NUMRULE"; + aItemWhichMap[RES_PARATR_SCRIPTSPACE] = "PARATR_SCRIPTSPACE"; + aItemWhichMap[RES_PARATR_HANGINGPUNCTUATION] = "PARATR_HANGINGPUNCTUATION"; + aItemWhichMap[RES_PARATR_FORBIDDEN_RULES] = "PARATR_FORBIDDEN_RULES"; + aItemWhichMap[RES_PARATR_VERTALIGN] = "PARATR_VERTALIGN"; + aItemWhichMap[RES_PARATR_SNAPTOGRID] = "PARATR_SNAPTOGRID"; + aItemWhichMap[RES_PARATR_CONNECT_BORDER] = "PARATR_CONNECT_BORDER"; + aItemWhichMap[RES_FILL_ORDER] = "FILL_ORDER"; + aItemWhichMap[RES_FRM_SIZE] = "FRM_SIZE"; + aItemWhichMap[RES_PAPER_BIN] = "PAPER_BIN"; + aItemWhichMap[RES_LR_SPACE] = "LR_SPACE"; + aItemWhichMap[RES_UL_SPACE] = "UL_SPACE"; + aItemWhichMap[RES_PAGEDESC] = "PAGEDESC"; + aItemWhichMap[RES_BREAK] = "BREAK"; + aItemWhichMap[RES_CNTNT] = "CNTNT"; + aItemWhichMap[RES_HEADER] = "HEADER"; + aItemWhichMap[RES_FOOTER] = "FOOTER"; + aItemWhichMap[RES_PRINT] = "PRINT"; + aItemWhichMap[RES_OPAQUE] = "OPAQUE"; + aItemWhichMap[RES_PROTECT] = "PROTECT"; + aItemWhichMap[RES_SURROUND] = "SURROUND"; + aItemWhichMap[RES_VERT_ORIENT] = "VERT_ORIENT"; + aItemWhichMap[RES_HORI_ORIENT] = "HORI_ORIENT"; + aItemWhichMap[RES_ANCHOR] = "ANCHOR"; + aItemWhichMap[RES_BACKGROUND] = "BACKGROUND"; + aItemWhichMap[RES_BOX] = "BOX"; + aItemWhichMap[RES_SHADOW] = "SHADOW"; + aItemWhichMap[RES_FRMMACRO] = "FRMMACRO"; + aItemWhichMap[RES_COL] = "COL"; + aItemWhichMap[RES_KEEP] = "KEEP"; + aItemWhichMap[RES_URL] = "URL"; + aItemWhichMap[RES_EDIT_IN_READONLY] = "EDIT_IN_READONLY"; + aItemWhichMap[RES_LAYOUT_SPLIT] = "LAYOUT_SPLIT"; + aItemWhichMap[RES_CHAIN] = "CHAIN"; + aItemWhichMap[RES_TEXTGRID] = "TEXTGRID"; + aItemWhichMap[RES_LINENUMBER ] = "LINENUMBER "; + aItemWhichMap[RES_FTN_AT_TXTEND] = "FTN_AT_TXTEND"; + aItemWhichMap[RES_END_AT_TXTEND] = "END_AT_TXTEND"; + aItemWhichMap[RES_COLUMNBALANCE] = "COLUMNBALANCE"; + aItemWhichMap[RES_FRAMEDIR] = "FRAMEDIR"; + aItemWhichMap[RES_HEADER_FOOTER_EAT_SPACING] = "HEADER_FOOTER_EAT_SPACING"; + aItemWhichMap[RES_ROW_SPLIT] = "ROW_SPLIT"; + aItemWhichMap[RES_GRFATR_MIRRORGRF] = "GRFATR_MIRRORGRF"; + aItemWhichMap[RES_GRFATR_CROPGRF] = "GRFATR_CROPGRF"; + aItemWhichMap[RES_GRFATR_ROTATION] = "GRFATR_ROTATION"; + aItemWhichMap[RES_GRFATR_LUMINANCE] = "GRFATR_LUMINANCE"; + aItemWhichMap[RES_GRFATR_CONTRAST] = "GRFATR_CONTRAST"; + aItemWhichMap[RES_GRFATR_CHANNELR] = "GRFATR_CHANNELR"; + aItemWhichMap[RES_GRFATR_CHANNELG] = "GRFATR_CHANNELG"; + aItemWhichMap[RES_GRFATR_CHANNELB] = "GRFATR_CHANNELB"; + aItemWhichMap[RES_GRFATR_GAMMA] = "GRFATR_GAMMA"; + aItemWhichMap[RES_GRFATR_INVERT] = "GRFATR_INVERT"; + aItemWhichMap[RES_GRFATR_TRANSPARENCY] = "GRFATR_TRANSPARENCY"; + aItemWhichMap[RES_GRFATR_DRAWMODE] = "GRFATR_DRAWMODE"; + aItemWhichMap[RES_BOXATR_FORMAT] = "BOXATR_FORMAT"; + aItemWhichMap[RES_BOXATR_FORMULA] = "BOXATR_FORMULA"; + aItemWhichMap[RES_BOXATR_VALUE] = "BOXATR_VALUE"; bInitialized = true; } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 98992d69525a..600689e41352 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1356,9 +1356,7 @@ void SwDoc::CalculatePagesForPrinting( if (aPageRange.isEmpty()) // empty string -> print all { // set page range to print to 'all pages' - aPageRange = OUString::number( 1 ); - aPageRange += OUString( (sal_Unicode)'-'); - aPageRange += OUString::number( nDocPageCount ); + aPageRange = OUString::number( 1 ) + "-" + OUString::number( nDocPageCount ); } rData.SetPageRange( aPageRange ); @@ -1528,9 +1526,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting( if (aPageRange.isEmpty()) // empty string -> print all { // set page range to print to 'all pages' - aPageRange = OUString::number( 1 ); - aPageRange += OUString( (sal_Unicode)'-'); - aPageRange += OUString::number( nDocPageCount ); + aPageRange = OUString::number( 1 ) + "-" + OUString::number( nDocPageCount ); } StringRangeEnumerator aRange( aPageRange, 1, nDocPageCount, 0 ); @@ -1703,24 +1699,24 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields) com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7); sal_Int32 n=0; - aStat[n].Name = OUString("TableCount"); + aStat[n].Name = "TableCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl; - aStat[n].Name = OUString("ImageCount"); + aStat[n].Name = "ImageCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf; - aStat[n].Name = OUString("ObjectCount"); + aStat[n].Name = "ObjectCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nOLE; if ( mpDocStat->nPage ) { - aStat[n].Name = OUString("PageCount"); + aStat[n].Name = "PageCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nPage; } - aStat[n].Name = OUString("ParagraphCount"); + aStat[n].Name = "ParagraphCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nPara; - aStat[n].Name = OUString("WordCount"); + aStat[n].Name = "WordCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nWord; - aStat[n].Name = OUString("CharacterCount"); + aStat[n].Name = "CharacterCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nChar; - aStat[n].Name = OUString("NonWhitespaceCharacterCount"); + aStat[n].Name = "NonWhitespaceCharacterCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces; // For e.g. autotext documents there is no pSwgInfo (#i79945) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index cf611bad3e6a..c19ffc33d8ea 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -223,7 +223,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, { if( '.' != sExt[ 0 ] ) { - sExt = OUString(".") + sExt; + sExt = "." + sExt; } } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 6b992ab52763..e4f65e35f2b0 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1141,7 +1141,7 @@ namespace numfunc void SwDefBulletConfig::SetToDefault() { - msFontname = OUString("OpenSymbol"); + msFontname = "OpenSymbol"; mbUserDefinedFontname = false; meFontWeight = WEIGHT_DONTKNOW; meFontItalic = ITALIC_NONE; @@ -1162,19 +1162,19 @@ namespace numfunc { uno::Sequence<OUString> aPropNames(13); OUString* pNames = aPropNames.getArray(); - pNames[0] = OUString("BulletFont/FontFamilyname"); - pNames[1] = OUString("BulletFont/FontWeight"); - pNames[2] = OUString("BulletFont/FontItalic"); - pNames[3] = OUString("BulletCharLvl1"); - pNames[4] = OUString("BulletCharLvl2"); - pNames[5] = OUString("BulletCharLvl3"); - pNames[6] = OUString("BulletCharLvl4"); - pNames[7] = OUString("BulletCharLvl5"); - pNames[8] = OUString("BulletCharLvl6"); - pNames[9] = OUString("BulletCharLvl7"); - pNames[10] = OUString("BulletCharLvl8"); - pNames[11] = OUString("BulletCharLvl9"); - pNames[12] = OUString("BulletCharLvl10"); + pNames[0] = "BulletFont/FontFamilyname"; + pNames[1] = "BulletFont/FontWeight"; + pNames[2] = "BulletFont/FontItalic"; + pNames[3] = "BulletCharLvl1"; + pNames[4] = "BulletCharLvl2"; + pNames[5] = "BulletCharLvl3"; + pNames[6] = "BulletCharLvl4"; + pNames[7] = "BulletCharLvl5"; + pNames[8] = "BulletCharLvl6"; + pNames[9] = "BulletCharLvl7"; + pNames[10] = "BulletCharLvl8"; + pNames[11] = "BulletCharLvl9"; + pNames[12] = "BulletCharLvl10"; return aPropNames; } @@ -1344,7 +1344,7 @@ namespace numfunc { com::sun::star::uno::Sequence<OUString> aPropNames(1); OUString* pNames = aPropNames.getArray(); - pNames[0] = OUString("ChangeIndentOnTabAtFirstPosOfFirstListItem"); + pNames[0] = "ChangeIndentOnTabAtFirstPosOfFirstListItem"; return aPropNames; } diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 7ad4b57f2a23..2fdb442e6131 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -452,7 +452,7 @@ namespace comp_FinalThreadManager { css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { css::uno::Sequence< OUString > s(1); - s[0] = OUString("com.sun.star.util.JobManager"); + s[0] = "com.sun.star.util.JobManager"; return s; } diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index 1107dfb9cd89..050bd2645404 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -50,7 +50,7 @@ SwAsyncRetrieveInputStreamThread::~SwAsyncRetrieveInputStreamThread() void SwAsyncRetrieveInputStreamThread::threadFunction() { com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 1 ); - xProps[0].Name = OUString("URL"); + xProps[0].Name = "URL"; xProps[0].Value <<= OUString( mrLinkedURL ); comphelper::MediaDescriptor aMedium( xProps ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 3f624e0389e1..7d876058d231 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -555,7 +555,7 @@ sal_Bool SwOLENode::UpdateLinkURL_Impl() // TODO/LATER: there should be possible to get current mediadescriptor settings from the object uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= aNewLinkURL; xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); @@ -593,7 +593,7 @@ void SwOLENode::BreakFileLink_Impl() uno::Reference< embed::XLinkageSupport > xLinkSupport( aOLEObj.GetOleRef(), uno::UNO_QUERY_THROW ); xLinkSupport->breakLink( xStorage, aOLEObj.GetCurrentPersistName() ); DisconnectFileLink_Impl(); - maLinkURL = OUString(); + maLinkURL = ""; } catch( uno::Exception& ) { @@ -924,7 +924,7 @@ uno::Sequence< OUString > SwOLELRUCache::GetPropertyNames() { Sequence< OUString > aNames( 1 ); OUString* pNames = aNames.getArray(); - pNames[0] = OUString("Writer/OLE_Objects"); + pNames[0] = "Writer/OLE_Objects"; return aNames; } diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index c0b05cb7e432..c440aa0f1937 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -272,7 +272,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText sal_Bool bTextOnly = sal_True; OUString aFolderName = GeneratePackageName ( rShort ); OUString aStreamName = aFolderName + ".xml"; - rText = OUString(); + rText = ""; try { @@ -281,7 +281,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText if ( !xAccess->hasByName( aStreamName ) || !xRoot->isStreamElement( aStreamName ) ) { bTextOnly = sal_False; - aStreamName = OUString("content.xml"); + aStreamName = "content.xml"; } uno::Reference < io::XStream > xContents = xRoot->openStreamElement( aStreamName, embed::ElementModes::READ ); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 8f66acf877cb..e9476da74ff4 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1509,7 +1509,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf ) if( bFull ) { // zweiter Versuch, wir kuerzen den String: - aExpand = OUString("..."); + aExpand = "..."; bFull = SwFldPortion::Format( rInf ); SetLen( 0 ); if( bFull ) @@ -1584,7 +1584,7 @@ SwErgoSumPortion::SwErgoSumPortion(const OUString &rExp, const OUString& rStr) aExpand += rStr; // 7773: sinnvolle Massnahme: ein Blank Abstand zum Text - aExpand += OUString(' '); + aExpand += " "; SetWhichPor( POR_ERGOSUM ); } diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index d94ec5daddbb..45c6a6cb764e 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -100,10 +100,10 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER; aRet.push_back( aStartToken ); SwFormToken aSeparatorToken( TOKEN_TEXT ); - aSeparatorToken.sText = OUString(": "); + aSeparatorToken.sText = ": "; aRet.push_back( aSeparatorToken ); SwFormToken aTextToken( TOKEN_TEXT ); - aTextToken.sText = OUString(", "); + aTextToken.sText = ", "; for(sal_uInt16 i = 0; i < 5 ; i++) { diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 3b895574a0fd..cd592eb81204 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -200,9 +200,9 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1; ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize ); OUString* pProps = aProps.getArray(); - pProps[ 0 ] = OUString("Title"); + pProps[ 0 ] = "Title"; if( pDateTimeList ) - pProps[ 1 ] = OUString("DateModified"); + pProps[ 1 ] = "DateModified"; try { diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 6c441c774768..f5c86aa0b83c 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1319,7 +1319,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume for (sal_Int32 i = 0; i < nSortedRanges; ++i) { if (!aSortedCellRanges.isEmpty()) - aSortedCellRanges += OUString( (sal_Unicode) ';'); + aSortedCellRanges += ";"; aSortedCellRanges += pSortedRanges[i]; } @@ -1851,14 +1851,13 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML if (aCellRange.aTableName != aFirstFoundTable) throw lang::IllegalArgumentException(); - OUString aTmp( aCellRange.aTableName ); - aTmp += OUString((sal_Unicode) '.'); - aTmp += sw_GetCellName( aCellRange.aUpperLeft.nColumn, + OUString aTmp = aCellRange.aTableName + "." + + sw_GetCellName( aCellRange.aUpperLeft.nColumn, aCellRange.aUpperLeft.nRow ); // does cell range consist of more than a single cell? if (!aCellRange.aLowerRight.bIsEmpty) { - aTmp += OUString((sal_Unicode) ':'); + aTmp += ":"; aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn, aCellRange.aLowerRight.nRow ); } @@ -2173,12 +2172,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( OUString aNew; if (bUseCol) { - aRplc = OUString("%COLUMNLETTER"); + aRplc = "%COLUMNLETTER"; aNew = OUString(aCellName.getStr(), pBuf - aCellName.getStr()); } else { - aRplc = OUString("%ROWNUMBER"); + aRplc = "%ROWNUMBER"; aNew = OUString(pBuf, (aCellName.getStr() + nLen) - pBuf); } aTxt = aTxt.replaceFirst( aRplc, aNew ); diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 0705a1c25604..58f36a2cae11 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1607,7 +1607,7 @@ sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( Runt Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException ) { Sequence< OUString > aRet(1); - aRet[0] = OUString("com.sun.star.text.Bookmarks"); + aRet[0] = "com.sun.star.text.Bookmarks"; return aRet; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index beb33efb7c94..ef26f6f752a6 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2623,7 +2623,7 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName ) if( 2 <= nDotCount ) { // #i51815# - rName = OUString("DataBase.") + rName; + rName = "DataBase." + rName; nResId = RES_DBFLD; } } diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 713f299c64f7..35157a2bef29 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1187,7 +1187,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: pGrfObj = new GraphicObject; pGrfObj->SetUserData( sTmp ); pGrfObj->SetSwapState(); - sGrfName = OUString(); + sGrfName = ""; } else if( sTmp.startsWith(sGraphicObjectProtocol) ) { @@ -1195,7 +1195,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: sTmp.copy(sizeof(sGraphicObjectProtocol)-1), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); - sGrfName = OUString(); + sGrfName = ""; } else { @@ -2239,7 +2239,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan pGrfObj = new GraphicObject; pGrfObj->SetUserData( sGraphicURL ); pGrfObj->SetSwapState(); - sGraphicURL = OUString(); + sGraphicURL = ""; } else if( sGraphicURL.startsWith(sGraphicObjectProtocol) ) { @@ -2247,7 +2247,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); - sGraphicURL = OUString(); + sGraphicURL = ""; } } Graphic aGraphic; @@ -2318,7 +2318,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan if( !aClassName.MakeId( aCLSID ) ) { lang::IllegalArgumentException aExcept; - aExcept.Message = OUString("CLSID invalid"); + aExcept.Message = "CLSID invalid"; throw aExcept; } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 99fe888aa494..2db7aa13c841 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1416,11 +1416,11 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException) SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() ); if (m_pImpl->m_bIsDescriptor) { - uRet = OUString(m_pImpl->m_pProps->GetTOXBase().GetTOXName()); + uRet = m_pImpl->m_pProps->GetTOXBase().GetTOXName(); } else if(pSectionFmt) { - uRet = OUString(pSectionFmt->GetSection()->GetSectionName()); + uRet = pSectionFmt->GetSection()->GetSectionName(); } else { @@ -1730,7 +1730,7 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException) SwTOXType *const pType = m_pImpl->GetTOXType(); if (pType && m_pImpl->m_pTOXMark) { - sRet = OUString(m_pImpl->m_pTOXMark->GetAlternativeText()); + sRet = m_pImpl->m_pTOXMark->GetAlternativeText(); } else if (m_pImpl->m_bIsDescriptor) { @@ -2504,8 +2504,7 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException) if( TOX_CONTENT_SECTION == pSect->GetType() && pSect->GetFmt()->GetSectionNode()) { - pArray[nCnt++] = OUString( - static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()); + pArray[nCnt++] = static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName(); } } return aRet; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 0b07b547430b..6e20bf02e0df 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -3063,7 +3063,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString("com.sun.star.text.TextContent"); + pArray[0] = "com.sun.star.text.TextContent"; return aRet; } diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 67f0c7112b23..de3772c0c786 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1341,7 +1341,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString("com.sun.star.text.TextContent"); + pArray[0] = "com.sun.star.text.TextContent"; return aRet; } diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 631f75c3f547..192ae5a91135 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -196,7 +196,7 @@ SwPrintUIOptions::SwPrintUIOptions( int nIdx = 0; // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx].Name = "OptionsUIFile"; m_aUIProperties[nIdx++].Value <<= OUString("modules/swriter/ui/printeroptions.ui"); // create "writer" section (new tab page in dialog) @@ -271,7 +271,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for paper tray bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; - aPaperTrayOpt.maGroupHint = OUString( "OptionsPageOptGroup" ); + aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup"; m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox", "PrintPaperFromSetup", @@ -280,7 +280,7 @@ SwPrintUIOptions::SwPrintUIOptions( // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); + aPrintRangeOpt.maGroupHint = "PrintRange"; aPrintRangeOpt.mbInternalOnly = sal_True; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)), OUString(), @@ -294,15 +294,15 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< OUString > aWidgetIds( 3 ); aChoices[0] = aLocalizedStrings.GetString( 27 ); aChoicesDisabled[0] = sal_False; - aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0"; aWidgetIds[0] = "printallpages"; aChoices[1] = aLocalizedStrings.GetString( 28 ); aChoicesDisabled[1] = sal_False; - aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"; aWidgetIds[1] = "printpages"; aChoices[2] = aLocalizedStrings.GetString( 29 ); aChoicesDisabled[2] = sal_Bool(! bHasSelection); - aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"; aWidgetIds[2] = "printselection"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, @@ -317,7 +317,7 @@ SwPrintUIOptions::SwPrintUIOptions( aPageRangeOpt); // print content selection vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; - aContentsOpt.maGroupHint = OUString( "JobPage" ); + aContentsOpt.maGroupHint = "JobPage"; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)), OUString(), aContentsOpt); // create a list box for notes content @@ -328,8 +328,8 @@ SwPrintUIOptions::SwPrintUIOptions( aChoices[2] = aLocalizedStrings.GetString( 15 ); aChoices[3] = aLocalizedStrings.GetString( 16 ); aHelpIds.realloc( 2 ); - aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); - aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText"; + aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox"; vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", @@ -343,7 +343,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create subsection for Page settings vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt; - aPageSetOpt.maGroupHint = OUString( "LayoutPage" ); + aPageSetOpt.maGroupHint = "LayoutPage"; if (!bWeb) { @@ -354,7 +354,7 @@ SwPrintUIOptions::SwPrintUIOptions( aRLChoices[1] = aLocalizedStrings.GetString( 20 ); aRLChoices[2] = aLocalizedStrings.GetString( 21 ); uno::Sequence< OUString > aRLHelp( 1 ); - aRLHelp[0] = OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); + aRLHelp[0] = ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox"; // create a choice option for all/left/right pages // 0 : all pages (left & right) // 1 : left pages @@ -391,8 +391,8 @@ SwPrintUIOptions::SwPrintUIOptions( aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); uno::Sequence< OUString > aBRTLHelpIds( 1 ); - aBRTLHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); - aBrochureRTLOpt.maGroupHint = OUString( "LayoutPage" ); + aBRTLHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox"; + aBrochureRTLOpt.maGroupHint = "LayoutPage"; // RTL brochure choices // 0 : left-to-right // 1 : right-to-left |