diff options
107 files changed, 392 insertions, 402 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 diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 83d04f8bbd0e..bd402485d405 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -114,7 +114,7 @@ void SwHTMLParser::EndScript() if( !aBasicLib.isEmpty() ) aLibName = aBasicLib; else - aLibName = OUString("Standard"); + aLibName = "Standard"; // get module library container Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY ); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ac91fcc36762..5fea6b1ccf87 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -865,7 +865,7 @@ static void lcl_html_setEvents( rDesc.EventMethod = sMethod; rDesc.ScriptType = rType; rDesc.ScriptCode = sCode; - rDesc.AddListenerParam = OUString(); + rDesc.AddListenerParam = ""; if(!rUnoMacroParamTbl.empty()) { @@ -1013,7 +1013,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( uno::Reference< beans::XPropertySetInfo > xPropSetInfo = rFCompPropSet->getPropertySetInfo(); - OUString sPropName = OUString("BackgroundColor"); + OUString sPropName = "BackgroundColor"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_BACKGROUND, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1029,7 +1029,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( } - sPropName = OUString("TextColor"); + sPropName = "TextColor"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_COLOR, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1039,7 +1039,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontHeight"); + sPropName = "FontHeight"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONTSIZE, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1054,31 +1054,31 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( &pItem ) ) { const SvxFontItem *pFontItem = (SvxFontItem *)pItem; - sPropName = OUString("FontName"); + sPropName = "FontName"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= OUString( pFontItem->GetFamilyName() ); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontStyleName"); + sPropName = "FontStyleName"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= OUString( pFontItem->GetStyleName() ); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontFamily"); + sPropName = "FontFamily"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)pFontItem->GetFamily() ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontCharset"); + sPropName = "FontCharset"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)pFontItem->GetCharSet() ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontPitch"); + sPropName = "FontPitch"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp <<= (sal_Int16)pFontItem->GetPitch() ; @@ -1086,7 +1086,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( } } - sPropName = OUString("FontWeight"); + sPropName = "FontWeight"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_WEIGHT, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1097,7 +1097,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontSlant"); + sPropName = "FontSlant"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_POSTURE, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1106,7 +1106,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontUnderline"); + sPropName = "FontUnderline"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_UNDERLINE, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) @@ -1115,7 +1115,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( rFCompPropSet->setPropertyValue( sPropName, aTmp ); } - sPropName = OUString("FontStrikeout"); + sPropName = "FontStrikeout"; if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_CROSSEDOUT, sal_True, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index df928d1b1e02..6c6495834cd9 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -595,7 +595,7 @@ void SwHTMLWriter::OutHiddenControls( *(uno::Reference< form::XFormComponent > *)aTmp.getValue(); uno::Reference< beans::XPropertySet > xPropSet( xFC, uno::UNO_QUERY ); - OUString sPropName = OUString("ClassId"); + OUString sPropName = "ClassId"; if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) continue; @@ -1096,7 +1096,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) ); } } - sPropName = OUString("TextColor"); + sPropName = "TextColor"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1106,7 +1106,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) ); } } - sPropName = OUString("FontHeight"); + sPropName = "FontHeight"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1118,7 +1118,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxFontHeightItem( sal_Int16(nHeight * 20.), 100, RES_CHRATR_FONTSIZE ) ); } } - sPropName = OUString("FontName"); + sPropName = "FontName"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1132,7 +1132,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( !bEdit || aFName != aFixedFont.GetName() ) { FontFamily eFamily = FAMILY_DONTKNOW; - sPropName = OUString("FontFamily"); + sPropName = "FontFamily"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1144,7 +1144,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } } } - sPropName = OUString("FontWeight"); + sPropName = "FontWeight"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1156,7 +1156,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxWeightItem( eWeight, RES_CHRATR_WEIGHT ) ); } } - sPropName = OUString("FontSlant"); + sPropName = "FontSlant"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1167,7 +1167,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxPostureItem( eItalic, RES_CHRATR_POSTURE ) ); } } - sPropName = OUString("FontUnderline"); + sPropName = "FontUnderline"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1180,7 +1180,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxUnderlineItem( eUnderline, RES_CHRATR_UNDERLINE ) ); } } - sPropName = OUString("FontStrikeout"); + sPropName = "FontStrikeout"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index d0ec6f317893..26499cadc20d 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -4230,7 +4230,7 @@ void WW8RStyle::ImportOldFormatStyles() if (const sal_Char *pStr = GetEnglishNameFromSti(eSti)) sName = OUString(pStr, strlen(pStr), RTL_TEXTENCODING_ASCII_US); else - sName = OUString("Unknown"); + sName = "Unknown"; } else // user style { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 666a0e924325..695c81209445 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3210,7 +3210,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) if ( aIt != aPattern.end() ) { SwFormToken aNumberEntrySeparator( TOKEN_TEXT ); - aNumberEntrySeparator.sText = OUString(" "); + aNumberEntrySeparator.sText = " "; aPattern.insert( ++aIt, aNumberEntrySeparator ); pForm->SetPattern( nStyleLevel, aPattern ); } diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index a090ebf596da..2753b9621537 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -281,7 +281,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( pOrigFileName ) { PropertyValue *pProps = aProps.getArray(); - pProps->Name = OUString("FileName"); + pProps->Name = "FileName"; (pProps++)->Value <<= OUString( *pOrigFileName ); } diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index eec7ea2143d2..6d57f12336ec 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -915,7 +915,7 @@ OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const { OUString sServiceName; if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily ) - sServiceName = OUString("com.sun.star.style.FrameStyle"); + sServiceName = "com.sun.star.style.FrameStyle"; else sServiceName = SvXMLStylesContext::GetServiceName( nFamily ); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 98c516cc4667..fb968ac74155 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -570,7 +570,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext()); uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 ); - aMediaDescriptor[0].Name = OUString("URL"); + aMediaDescriptor[0].Name = "URL"; aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() ) { @@ -579,7 +579,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( if ( xInteraction.is() ) { aMediaDescriptor.realloc( 2 ); - aMediaDescriptor[1].Name = OUString( "InteractionHandler" ); + aMediaDescriptor[1].Name = "InteractionHandler"; aMediaDescriptor[1].Value <<= xInteraction; } } @@ -940,7 +940,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin( } catch ( uno::Exception& ) { - aParaName = OUString("PluginCommands"); + aParaName = "PluginCommands"; try { xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 1afff5892a25..05bbbafb7573 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -725,7 +725,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = OUString("RtfOutline"); + aArgs[0].Name = "RtfOutline"; aArgs[0].Value <<= aSeq; xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs ); } @@ -792,7 +792,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = OUString("RtfOutline"); + aArgs[0].Name = "RtfOutline"; aArgs[0].Value <<= aSeq; xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs ); } diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index cacedeb9b8fd..6b54023923b4 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -840,7 +840,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, xMailDispatcher.set( new MailDispatcher(rMergeDescriptor.xSmtpServer)); if(!rMergeDescriptor.bSendAsAttachment && rMergeDescriptor.bSendAsHTML) { - sBodyMimeType = OUString("text/html; charset="); + sBodyMimeType = "text/html; charset="; sBodyMimeType += OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); @@ -1195,7 +1195,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, while ( bDone ) { sBody += OStringToOUString(sLine, eEncoding); - sBody += OUString('\n'); + sBody += "\n"; bDone = pInStream->ReadLine( sLine ); } } @@ -1291,7 +1291,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions ); aOptions.realloc( 1 ); - aOptions[ 0 ].Name = OUString("Wait"); + aOptions[ 0 ].Name = "Wait"; aOptions[ 0 ].Value <<= sal_True ; // move print options const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); @@ -1810,7 +1810,7 @@ sal_Bool SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt1 { if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection ) { - rResult = OUString(); + rResult = ""; return sal_False; } @@ -2337,7 +2337,7 @@ OUString SwNewDBMgr::LoadAndRegisterDataSource() Reference<XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW); Reference<XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW); - OUString sOutputExt = OUString(".odb"); + OUString sOutputExt = ".odb"; OUString sTmpName; { utl::TempFile aTempFile(sNewName , &sOutputExt, &sHomePath); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 3f4ae03b8ce5..eb15e73d1592 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -856,9 +856,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) m_pWizard->enableButtons(WZB_CANCEL, sal_False); uno::Sequence < beans::PropertyValue > aProps( 2 ); - aProps[0]. Name = OUString("MonitorVisible"); + aProps[0]. Name = "MonitorVisible"; aProps[0].Value <<= sal_True; - aProps[1]. Name = OUString("Pages"); + aProps[1]. Name = "Pages"; aProps[1]. Value <<= sPages; pTargetView->ExecPrint( aProps, false, true ); diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 46435dbb4741..d1b2ee77e0a7 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -263,8 +263,8 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : notifier_ = n; } css::uno::Sequence< OUString > s(2); - s[0] = OUString("FontHeight"); - s[1] = OUString("FontName"); + s[0] = "FontHeight"; + s[1] = "FontName"; n->addPropertiesChangeListener(s, listener_.get()); } diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 64c5801ff3e3..ab91a25dbd80 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -311,9 +311,9 @@ SwField* SwFldMgr::GetCurFld() pCurFld = NULL; // initialise strings and format - aCurPar1 = OUString(); - aCurPar2 = OUString(); - sCurFrame = OUString(); + aCurPar1 = ""; + aCurPar2 = ""; + sCurFrame = ""; nCurFmt = 0; if(!pCurFld) @@ -1468,7 +1468,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, if( SVX_NUM_CHAR_SPECIAL == nFormat ) { ((SwPageNumberField*)pCurFld)->SetUserString( sPar2 ); - sPar2 = OUString('1'); + sPar2 = "1"; } else { @@ -1484,7 +1484,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, if( SVX_NUM_CHAR_SPECIAL == nFormat ) { ((SwPageNumberField*)pCurFld)->SetUserString( sPar2 ); - sPar2 = OUString("-1"); + sPar2 = "-1"; } else { diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 69916e6b1be7..40bb4b81eab3 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -1238,7 +1238,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index acba5599fa90..6d410e576692 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -315,7 +315,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 8a4d454bbcf1..c8e3c94ab190 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1349,7 +1349,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use - OUString aCurrentLang = OUString("*"); + OUString aCurrentLang = "*"; nLang = SwLangHelper::GetCurrentLanguage( rSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 19fd3b99ce17..a2654e21a1eb 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -157,9 +157,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) if( ! rWrtShell.IsTblComplexForChart()) { SwFrmFmt* pTblFmt = rWrtShell.GetTableFmt(); - aRangeString = pTblFmt->GetName(); - aRangeString += OUString( sal_Unicode('.') ); - aRangeString += rWrtShell.GetBoxNms(); + aRangeString = pTblFmt->GetName() + "." + rWrtShell.GetBoxNms(); // get table data provider xDataProvider.set( pView->GetDocShell()->getIDocumentChartDataProviderAccess()->GetChartDataProvider( true ) ); @@ -190,10 +188,10 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = OUString("ParentWindow"); + aParam1.Name = "ParentWindow"; aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = OUString("ChartModel"); + aParam2.Name = "ChartModel"; aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 05fa81f48fb0..b0dcfd387326 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -129,7 +129,7 @@ void SwView::ExecLingu(SfxRequest &rReq) Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = OUString("ParentWindow"); + aParam.Name = "ParentWindow"; aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 11d18599c46a..c10ddfd5812c 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -1254,9 +1254,9 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< OUString > aSeq( 3 ); - aSeq[0] = OUString("com.sun.star.document.Settings"); - aSeq[1] = OUString("com.sun.star.text.DocumentSettings"); - aSeq[2] = OUString("com.sun.star.text.PrintSettings"); + aSeq[0] = "com.sun.star.document.Settings"; + aSeq[1] = "com.sun.star.text.DocumentSettings"; + aSeq[2] = "com.sun.star.text.PrintSettings"; return aSeq; } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index c3b694807349..117a0c0cb257 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -349,7 +349,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor { // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("InputStream"); + lDescriptor[nPropertyCount].Name = "InputStream"; lDescriptor[nPropertyCount].Value <<= xStream; nPropertyCount++; } @@ -358,7 +358,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor { // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("UCBContent"); + lDescriptor[nPropertyCount].Name = "UCBContent"; lDescriptor[nPropertyCount].Value <<= xContent; nPropertyCount++; } @@ -368,7 +368,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( nIndexOfReadOnlyFlag == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("ReadOnly"); + lDescriptor[nPropertyCount].Name = "ReadOnly"; lDescriptor[nPropertyCount].Value <<= bReadOnly; nPropertyCount++; } @@ -379,7 +379,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( !bRepairPackage && bRepairAllowed ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("RepairPackage"); + lDescriptor[nPropertyCount].Name = "RepairPackage"; lDescriptor[nPropertyCount].Value <<= bRepairAllowed; nPropertyCount++; bOpenAsTemplate = sal_True; @@ -391,7 +391,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( nIndexOfTemplateFlag == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("AsTemplate"); + lDescriptor[nPropertyCount].Name = "AsTemplate"; lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate; nPropertyCount++; } @@ -405,7 +405,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( nIndexOfDocumentTitle == -1 ) { lDescriptor.realloc( nPropertyCount + 1 ); - lDescriptor[nPropertyCount].Name = OUString("DocumentTitle"); + lDescriptor[nPropertyCount].Name = "DocumentTitle"; lDescriptor[nPropertyCount].Value <<= aDocumentTitle; nPropertyCount++; } @@ -448,9 +448,9 @@ Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( Sequence< OUString > SwFilterDetect::impl_getStaticSupportedServiceNames() { Sequence< OUString > seqServiceNames( 3 ); - seqServiceNames.getArray() [0] = OUString("com.sun.star.frame.ExtendedTypeDetection" ); - seqServiceNames.getArray() [1] = OUString("com.sun.star.text.FormatDetector" ); - seqServiceNames.getArray() [2] = OUString("com.sun.star.text.W4WFormatDetector" ); + seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection"; + seqServiceNames.getArray() [1] = "com.sun.star.text.FormatDetector"; + seqServiceNames.getArray() [2] = "com.sun.star.text.W4WFormatDetector"; return seqServiceNames ; } diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 5ad584626976..a74cda6362e9 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -716,14 +716,14 @@ OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeExcept sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return OUString("com.sun.star.text.AutoTextGroup") == rServiceName; + return "com.sun.star.text.AutoTextGroup" == rServiceName; } uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString("com.sun.star.text.AutoTextGroup"); + pArray[0] = "com.sun.star.text.AutoTextGroup"; return aRet; } diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index 815a2bb82cc2..13a2238ab707 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -39,7 +39,7 @@ OUString SAL_CALL SwUnoModule_getImplementationName() throw( uno::RuntimeExcepti uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSeq( 1 ); - aSeq[0] = OUString("com.sun.star.text.ModuleDispatcher"); + aSeq[0] = "com.sun.star.text.ModuleDispatcher"; return aSeq; } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 3ca1c8b6d804..fcf1246eb57b 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1710,9 +1710,9 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic // Thus, a temporary service name is introduced to make this possible. OUString aTmpServiceName( rServiceName ); if ( bShape && - rServiceName.compareToAscii( "com.sun.star.drawing.temporaryForXMLImportOLE2Shape" ) == 0 ) + rServiceName.equalsAscii( "com.sun.star.drawing.temporaryForXMLImportOLE2Shape" ) ) { - aTmpServiceName = OUString("com.sun.star.drawing.OLE2Shape"); + aTmpServiceName = "com.sun.star.drawing.OLE2Shape"; } //here search for the draw service Reference< XInterface > xTmp = SvxFmMSFactory::createInstance(aTmpServiceName); @@ -2138,7 +2138,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) case WID_DOC_VBA_DOCOBJ: { beans::PropertyValue aProp; - aProp.Name = OUString("ThisWordDoc"); + aProp.Name = "ThisWordDoc"; aProp.Value <<= pDocShell->GetModel(); aAny <<= aProp; } @@ -2814,22 +2814,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( sal_Int32 nLen = 2; aRenderer.realloc(2); - aRenderer[0].Name = OUString( "PageSize" ); + aRenderer[0].Name = "PageSize"; aRenderer[0].Value <<= aPageSize; - aRenderer[1].Name = OUString( "PageIncludesNonprintableArea" ); + aRenderer[1].Name = "PageIncludesNonprintableArea"; aRenderer[1].Value <<= sal_True; if (aPreferredPageSize.Width && aPreferredPageSize.Height) { ++nLen; aRenderer.realloc( nLen ); - aRenderer[ nLen - 1 ].Name = OUString( "PreferredPageSize" ); + aRenderer[ nLen - 1 ].Name = "PreferredPageSize"; aRenderer[ nLen - 1 ].Value <<= aPreferredPageSize; } if (nPrinterPaperTray >= 0) { ++nLen; aRenderer.realloc( nLen ); - aRenderer[ nLen - 1 ].Name = OUString( "PrinterPaperTray" ); + aRenderer[ nLen - 1 ].Name = "PrinterPaperTray"; aRenderer[ nLen - 1 ].Value <<= nPrinterPaperTray; } } @@ -2850,22 +2850,22 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( aRenderer.realloc( nLen ); // put page print settings attribute into render data const sal_Int32 nRow = pPagePrintSettings->GetRow(); - aRenderer[ nRenderDataIdxStart + 0 ].Name = OUString( "NUpRows" ); + aRenderer[ nRenderDataIdxStart + 0 ].Name = "NUpRows"; aRenderer[ nRenderDataIdxStart + 0 ].Value <<= ( nRow > 1 ? nRow : 1 ); const sal_Int32 nCol = pPagePrintSettings->GetCol(); - aRenderer[ nRenderDataIdxStart + 1 ].Name = OUString( "NUpColumns" ); + aRenderer[ nRenderDataIdxStart + 1 ].Name = "NUpColumns"; aRenderer[ nRenderDataIdxStart + 1 ].Value <<= ( nCol > 1 ? nCol : 1 ); - aRenderer[ nRenderDataIdxStart + 2 ].Name = OUString( "NUpPageMarginLeft" ); + aRenderer[ nRenderDataIdxStart + 2 ].Name = "NUpPageMarginLeft"; aRenderer[ nRenderDataIdxStart + 2 ].Value <<= pPagePrintSettings->GetLeftSpace(); - aRenderer[ nRenderDataIdxStart + 3 ].Name = OUString( "NUpPageMarginRight" ); + aRenderer[ nRenderDataIdxStart + 3 ].Name = "NUpPageMarginRight"; aRenderer[ nRenderDataIdxStart + 3 ].Value <<= pPagePrintSettings->GetRightSpace(); - aRenderer[ nRenderDataIdxStart + 4 ].Name = OUString( "NUpPageMarginTop" ); + aRenderer[ nRenderDataIdxStart + 4 ].Name = "NUpPageMarginTop"; aRenderer[ nRenderDataIdxStart + 4 ].Value <<= pPagePrintSettings->GetTopSpace(); - aRenderer[ nRenderDataIdxStart + 5 ].Name = OUString( "NUpPageMarginBottom" ); + aRenderer[ nRenderDataIdxStart + 5 ].Name = "NUpPageMarginBottom"; aRenderer[ nRenderDataIdxStart + 5 ].Value <<= pPagePrintSettings->GetBottomSpace(); - aRenderer[ nRenderDataIdxStart + 6 ].Name = OUString( "NUpHorizontalSpacing" ); + aRenderer[ nRenderDataIdxStart + 6 ].Name = "NUpHorizontalSpacing"; aRenderer[ nRenderDataIdxStart + 6 ].Value <<= pPagePrintSettings->GetHorzSpace(); - aRenderer[ nRenderDataIdxStart + 7 ].Name = OUString( "NUpVerticalSpacing" ); + aRenderer[ nRenderDataIdxStart + 7 ].Name = "NUpVerticalSpacing"; aRenderer[ nRenderDataIdxStart + 7 ].Value <<= pPagePrintSettings->GetVertSpace(); { Printer* pPrinter = pDocShell->GetDoc()->getPrinter( false ); @@ -2881,7 +2881,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( { aNewPageSize = awt::Size( aPageSize.Height(), aPageSize.Width() ); } - aRenderer[ nRenderDataIdxStart + 8 ].Name = OUString( "NUpPaperSize" ); + aRenderer[ nRenderDataIdxStart + 8 ].Name = "NUpPaperSize"; aRenderer[ nRenderDataIdxStart + 8 ].Value <<= aNewPageSize; } } diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index ed6a5bda5d20..e25deec000cc 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -472,9 +472,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) for (sal_uInt16 i = 0; i < (sizeof(nZoomValues)/sizeof(nZoomValues[0])); ++i) { - OUString sTemp; - sTemp = OUString::number(nZoomValues[i]); - sTemp += " %"; + OUString sTemp = OUString::number(nZoomValues[i]) + " %"; aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp); if(nZoom == nZoomValues[i]) aSubPop1.CheckItem(ITEM_ZOOM + i + 1); diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index 336b953bf953..93c0a64a4a63 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -87,7 +87,7 @@ SwVbaAddin::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Addin" ); + aServiceNames[ 0 ] = "ooo.vba.word.Addin"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 6956f9384d0a..ab62eed64c3c 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -92,7 +92,7 @@ SwVbaAddins::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Addins"); + sNames[0] = "ooo.vba.word.Addins"; } return sNames; } diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 35e6d6ec60c2..ac67ee0760aa 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -184,7 +184,7 @@ SwVbaApplication::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Application" ); + aServiceNames[ 0 ] = "ooo.vba.word.Application"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index d55358bd333b..9ac6382fbbba 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -63,7 +63,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< text::XTextViewCursor > xTVCursor = word::getXTextViewCursor( xModel ); uno::Reference< text::XTextRange > xCurrentRange( xTC->getEnd(), uno::UNO_QUERY_THROW ); xTVCursor->gotoRange( xCurrentRange, sal_False ); - OUString url = OUString( ".uno:Delete"); + OUString url = ".uno:Delete"; dispatchRequests( xModel,url ); xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False ); } @@ -88,7 +88,7 @@ SwVbaAutoTextEntry::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.AutoTextEntry" ); + aServiceNames[ 0 ] = "ooo.vba.word.AutoTextEntry"; } return aServiceNames; } @@ -130,7 +130,7 @@ SwVbaAutoTextEntries::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.AutoTextEntries"); + sNames[0] = "ooo.vba.word.AutoTextEntries"; } return sNames; } diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 4aac8ef39484..bde45edaa4c8 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -96,7 +96,7 @@ SwVbaBookmark::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Bookmark" ); + aServiceNames[ 0 ] = "ooo.vba.word.Bookmark"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index da372179f2e3..1479a64ac277 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -217,7 +217,7 @@ SwVbaBookmarks::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Bookmarks"); + sNames[0] = "ooo.vba.word.Bookmarks"; } return sNames; } diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 1e2d8ff7e690..2559f3e4e868 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -148,7 +148,7 @@ protected: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Border" ); + aServiceNames[ 0 ] = "ooo.vba.word.Border"; } return aServiceNames; } @@ -361,7 +361,7 @@ SwVbaBorders::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Borders" ); + aServiceNames[ 0 ] = "ooo.vba.word.Borders"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 7756099e6423..2752a4249682 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -101,7 +101,7 @@ SwVbaCell::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Cell" ); + aServiceNames[ 0 ] = "ooo.vba.word.Cell"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 37028bfd6a16..fe5b050508ad 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -205,7 +205,7 @@ SwVbaCells::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Cells"); + sNames[0] = "ooo.vba.word.Cells"; } return sNames; } diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index 2093e4b9aae2..946fde9400b6 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -90,7 +90,7 @@ SwVbaColumn::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Column" ); + aServiceNames[ 0 ] = "ooo.vba.word.Column"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index f21c742ef449..344dbb6a03c0 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -142,7 +142,7 @@ SwVbaColumns::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Columns"); + sNames[0] = "ooo.vba.word.Columns"; } return sNames; } diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 73397041d631..1c8de59a088a 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -63,7 +63,7 @@ SwVbaDialog::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialog" ); + aServiceNames[ 0 ] = "ooo.vba.word.Dialog"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index db1f53019836..35707c0d3935 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -45,7 +45,7 @@ SwVbaDialogs::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialogs" ); + aServiceNames[ 0 ] = "ooo.vba.word.Dialogs"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index cb06a1e5e8e7..9752dde5c088 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -377,13 +377,13 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException) { - OUString url = OUString( ".uno:PrintPreview"); + OUString url = ".uno:PrintPreview"; dispatchRequests( mxModel,url ); } void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException) { - OUString url = OUString( ".uno:ClosePreview"); + OUString url = ".uno:ClosePreview"; dispatchRequests( mxModel,url ); } @@ -506,7 +506,7 @@ SwVbaDocument::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Document" ); + aServiceNames[ 0 ] = "ooo.vba.word.Document"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 9a3701a033c8..613b08b69e50 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -632,7 +632,7 @@ SwVbaBuiltInDocumentProperty::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperty" ); + aServiceNames[ 0 ] = "ooo.vba.word.DocumentProperty"; } return aServiceNames; } @@ -786,7 +786,7 @@ SwVbaBuiltinDocumentProperties::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperties" ); + aServiceNames[ 0 ] = "ooo.vba.word.DocumentProperties"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index e4fa861fd885..f79edda3baf5 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -163,7 +163,7 @@ SwVbaDocuments::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Documents"); + sNames[0] = "ooo.vba.word.Documents"; } return sNames; } diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 2a903040d95b..b2c34d08036f 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -62,7 +62,7 @@ SwVbaField::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Field" ); + aServiceNames[ 0 ] = "ooo.vba.word.Field"; } return aServiceNames; } @@ -459,7 +459,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { - sFieldService = OUString( "com.sun.star.text.textfield.docinfo.Custom" ); + sFieldService = "com.sun.star.text.textfield.docinfo.Custom"; } else if( sFieldService.isEmpty() ) { @@ -530,7 +530,7 @@ SwVbaFields::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Fields" ); + aServiceNames[ 0 ] = "ooo.vba.word.Fields"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 060ce939f0a1..52c32a9355d9 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -405,7 +405,7 @@ SwVbaFind::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Find" ); + aServiceNames[ 0 ] = "ooo.vba.word.Find"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 7866611bed55..96b935d35fd3 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -227,7 +227,7 @@ SwVbaFont::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Font" ); + aServiceNames[ 0 ] = "ooo.vba.word.Font"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index f8e86c210594..969187a29349 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -120,7 +120,7 @@ SwVbaFormField::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.FormField" ); + aServiceNames[ 0 ] = "ooo.vba.word.FormField"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index ba554fb07fd4..3a963f0c5472 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -187,7 +187,7 @@ SwVbaFormFields::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.FormFields"); + sNames[0] = "ooo.vba.word.FormFields"; } return sNames; } diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 4b1564dde8f1..ca37cde4c81c 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -56,7 +56,7 @@ SwVbaFrame::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Frame" ); + aServiceNames[ 0 ] = "ooo.vba.word.Frame"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 84863a268cd0..26316a1e643d 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -91,7 +91,7 @@ SwVbaFrames::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Frames"); + sNames[0] = "ooo.vba.word.Frames"; } return sNames; } diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 6772cd5384ff..94152662614b 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -41,7 +41,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = OUString("Application"); + aInitArgs[ 0 ].Name = "Application"; aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -151,7 +151,7 @@ SwVbaGlobals::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Globals" ); + aServiceNames[ 0 ] = "ooo.vba.word.Globals"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 9714e7623616..0b66b7c0e3d8 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -54,11 +54,11 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno OUString sPropsNameText; if( mbHeader ) { - sPropsNameText = OUString("HeaderText"); + sPropsNameText = "HeaderText"; } else { - sPropsNameText = OUString("FooterText"); + sPropsNameText = "FooterText"; } if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages ) { @@ -96,7 +96,7 @@ SwVbaHeaderFooter::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = "ooo.vba.word.Pane"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 4072b16ba56e..d68162cdf5f7 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -54,8 +54,8 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - OUString aPropIsShared = OUString("HeaderIsShared"); - OUString aPropText = OUString("HeaderText"); + OUString aPropIsShared = "HeaderIsShared"; + OUString aPropText = "HeaderText"; uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -64,9 +64,9 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = OUString("HeaderTextLeft"); + aPropText = "HeaderTextLeft"; else - aPropText = OUString("HeaderTextRight"); + aPropText = "HeaderTextRight"; } uno::Reference< text::XText > xHeaderText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -120,8 +120,8 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - OUString aPropIsShared = OUString("FooterIsShared"); - OUString aPropText = OUString("FooterText"); + OUString aPropIsShared = "FooterIsShared"; + OUString aPropText = "FooterText"; uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -130,9 +130,9 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = OUString("FooterTextLeft"); + aPropText = "FooterTextLeft"; else - aPropText = OUString("FooterTextRight"); + aPropText = "FooterTextRight"; } uno::Reference< text::XText > xFooterText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index b85be8af0fc8..69fa3f942d0f 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -132,7 +132,7 @@ SwVbaHeadersFooters::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.HeadersFooters"); + sNames[0] = "ooo.vba.word.HeadersFooters"; } return sNames; } diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 9cd8f49ea24d..25db7bf3add3 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -102,7 +102,7 @@ SwVbaListFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.ListFormat" ); + aServiceNames[ 0 ] = "ooo.vba.word.ListFormat"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index 8d05b7f20028..5178e49b32d4 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -97,7 +97,7 @@ SwVbaListGalleries::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.ListGalleries"); + sNames[0] = "ooo.vba.word.ListGalleries"; } return sNames; } diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index 812e930d73cb..e767c9b1f264 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -54,7 +54,7 @@ SwVbaListGallery::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.ListGallery" ); + aServiceNames[ 0 ] = "ooo.vba.word.ListGallery"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 72ea2fb902d4..030ae9a90ae4 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -381,7 +381,7 @@ SwVbaListLevel::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.ListLevel" ); + aServiceNames[ 0 ] = "ooo.vba.word.ListLevel"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index a53b6db6a975..edefd64f3ddd 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -100,7 +100,7 @@ SwVbaListLevels::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.ListLevels"); + sNames[0] = "ooo.vba.word.ListLevels"; } return sNames; } diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index d62f5962e8f9..1188f2297ad7 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -61,7 +61,7 @@ SwVbaListTemplate::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.ListTemplate" ); + aServiceNames[ 0 ] = "ooo.vba.word.ListTemplate"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index d2db3e81cfa1..749d92f644c5 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -94,7 +94,7 @@ SwVbaListTemplates::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.ListTemplates"); + sNames[0] = "ooo.vba.word.ListTemplates"; } return sNames; } diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index bdbcfb2d5812..0dcd5df92b06 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -45,39 +45,39 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) { case word::WdDefaultFilePath::wdDocumentsPath: { - msDefaultFilePath = OUString("Work"); + msDefaultFilePath = "Work"; break; } case word::WdDefaultFilePath::wdPicturesPath: { - msDefaultFilePath = OUString("Gallery"); + msDefaultFilePath = "Gallery"; break; } case word::WdDefaultFilePath::wdUserTemplatesPath: case word::WdDefaultFilePath::wdWorkgroupTemplatesPath: { - msDefaultFilePath = OUString("Template"); + msDefaultFilePath = "Template"; break; } case word::WdDefaultFilePath::wdStartupPath: { - msDefaultFilePath = OUString("Addin"); + msDefaultFilePath = "Addin"; break; } case word::WdDefaultFilePath::wdUserOptionsPath: { - msDefaultFilePath = OUString("UserConfig"); + msDefaultFilePath = "UserConfig"; break; } case word::WdDefaultFilePath::wdToolsPath: case word::WdDefaultFilePath::wdProgramPath: { - msDefaultFilePath = OUString("Module"); + msDefaultFilePath = "Module"; break; } case word::WdDefaultFilePath::wdTempFilePath: { - msDefaultFilePath = OUString("Temp"); + msDefaultFilePath = "Temp"; break; } default: @@ -268,7 +268,7 @@ SwVbaOptions::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Options" ); + aServiceNames[ 0 ] = "ooo.vba.word.Options"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index 190d12298e9f..eb734294342a 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -149,9 +149,9 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status OUString newStyle; if( status ) - newStyle = OUString("First Page"); + newStyle = "First Page"; else - newStyle = OUString("Standard"); + newStyle = "Standard"; uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); sal_Int32 nTopMargin = 0; @@ -256,7 +256,7 @@ SwVbaPageSetup::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.PageSetup" ); + aServiceNames[ 0 ] = "ooo.vba.word.PageSetup"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index 40b9e163c485..bf5d6c36a682 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -43,7 +43,7 @@ SwVbaPane::View() throw ( css::uno::RuntimeException ) void SAL_CALL SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) { - OUString url = OUString( ".uno:CloseWin"); + OUString url = ".uno:CloseWin"; dispatchRequests( mxModel,url ); } @@ -60,7 +60,7 @@ SwVbaPane::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = "ooo.vba.word.Pane"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index f7971f784260..8bf6b45ab87f 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -109,7 +109,7 @@ SwVbaPanes::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Panes"); + sNames[0] = "ooo.vba.word.Panes"; } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index abcb5484caba..c7547ef92eae 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -67,7 +67,7 @@ SwVbaParagraph::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Paragraph" ); + aServiceNames[ 0 ] = "ooo.vba.word.Paragraph"; } return aServiceNames; } @@ -170,7 +170,7 @@ SwVbaParagraphs::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Paragraphs"); + sNames[0] = "ooo.vba.word.Paragraphs"; } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index e47ddcc153f1..2bd8ed34aac9 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -183,7 +183,7 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx { sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText; OUString aHeading; - const OUString HEADING = OUString("Heading"); + const OUString HEADING = "Heading"; mxParaProps->getPropertyValue("ParaStyleName") >>= aHeading; if( aHeading.startsWith( HEADING ) ) { @@ -560,7 +560,7 @@ SwVbaParagraphFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.ParagraphFormat" ); + aServiceNames[ 0 ] = "ooo.vba.word.ParagraphFormat"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 86bbf607bb1e..c575567490fc 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -260,11 +260,11 @@ void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); if( ( xProp->getPropertyValue("CharStyleName") >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = OUString("CharacterStyles"); + aStyleType = "CharacterStyles"; } else if( ( xProp->getPropertyValue("ParaStyleName") >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = OUString("ParagraphStyles"); + aStyleType = "ParagraphStyles"; } if( aStyleType.isEmpty() ) { @@ -420,7 +420,7 @@ SwVbaRange::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Range" ); + aServiceNames[ 0 ] = "ooo.vba.word.Range"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index 13ace911d77f..f899020e426f 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -61,7 +61,7 @@ SwVbaReplacement::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Replacement" ); + aServiceNames[ 0 ] = "ooo.vba.word.Replacement"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index ae45f7473408..b98d4207b3ff 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -86,7 +86,7 @@ SwVbaRevision::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Revision" ); + aServiceNames[ 0 ] = "ooo.vba.word.Revision"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 8ad58e83468e..98bde2b12215 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -170,7 +170,7 @@ SwVbaRevisions::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Revisions"); + sNames[0] = "ooo.vba.word.Revisions"; } return sNames; } diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 19868dd7eeaa..fd3008ae22a7 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -117,7 +117,7 @@ SwVbaRow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Row" ); + aServiceNames[ 0 ] = "ooo.vba.word.Row"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index 4b51ffb1b72f..2600ac2efc15 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -361,7 +361,7 @@ SwVbaRows::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Rows"); + sNames[0] = "ooo.vba.word.Rows"; } return sNames; } diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 5fb2aff82661..95032bf4b3e1 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -78,7 +78,7 @@ SwVbaSection::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Section" ); + aServiceNames[ 0 ] = "ooo.vba.word.Section"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 18ef74a5812e..aa4d7bb72d4f 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -184,7 +184,7 @@ SwVbaSections::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Sections"); + sNames[0] = "ooo.vba.word.Sections"; } return sNames; } diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index fc30b2479ea3..676baf762c9f 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -219,7 +219,7 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( } } } - OUString url = OUString( ".uno:Delete"); + OUString url = ".uno:Delete"; dispatchRequests( mxModel,url ); } @@ -548,7 +548,7 @@ SwVbaSelection::getFont() throw ( uno::RuntimeException ) void SAL_CALL SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException ) { - OUString url = OUString( ".uno:SwBackspace"); + OUString url = ".uno:SwBackspace"; dispatchRequests( mxModel,url ); } @@ -1041,7 +1041,7 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run void SAL_CALL SwVbaSelection::Copy( ) throw (uno::RuntimeException) { - OUString url = OUString( ".uno:Copy"); + OUString url = ".uno:Copy"; dispatchRequests( mxModel,url ); } @@ -1053,7 +1053,7 @@ void SAL_CALL SwVbaSelection::CopyAsPicture( ) throw (uno::RuntimeException) void SAL_CALL SwVbaSelection::Paste( ) throw (uno::RuntimeException) { - OUString url = OUString( ".uno:Paste"); + OUString url = ".uno:Paste"; dispatchRequests( mxModel,url ); } @@ -1101,7 +1101,7 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException) // insert an empty line uno::Reference< text::XTextRange > xFirstCellRange = word::getFirstObjectPosition( xText ); mxTextViewCursor->gotoRange( xFirstCellRange, sal_False ); - OUString url = OUString( ".uno:InsertPara"); + OUString url = ".uno:InsertPara"; dispatchRequests( mxModel,url ); } } @@ -1175,7 +1175,7 @@ SwVbaSelection::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Selection" ); + aServiceNames[ 0 ] = "ooo.vba.word.Selection"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index b96dc992028b..53409662f52e 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -232,7 +232,7 @@ SwVbaStyle::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyle" ); + aServiceNames[ 0 ] = "ooo.vba.word.XStyle"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 728dcea48965..6a39e8ca7791 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -310,18 +310,18 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: case word::WdStyleType::wdStyleTypeParagraph: case word::WdStyleType::wdStyleTypeTable: { - aStyleType = OUString("ParagraphStyles"); + aStyleType = "ParagraphStyles"; break; } case word::WdStyleType::wdStyleTypeCharacter: { - aStyleType = OUString("CharacterStyles"); + aStyleType = "CharacterStyles"; break; } case word::WdStyleType::wdStyleTypeList: { // should use Paragraph style and set the property "NumberingStyleName" - aStyleType = OUString("ParagraphStyles"); + aStyleType = "ParagraphStyles"; break; } default: @@ -361,7 +361,7 @@ SwVbaStyles::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyles" ); + aServiceNames[ 0 ] = "ooo.vba.word.XStyles"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index f521227caee5..6ca213bce526 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -277,7 +277,7 @@ SwVbaSystem::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.System" ); + aServiceNames[ 0 ] = "ooo.vba.word.System"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 7b425c67b245..398422adcd5a 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -130,7 +130,7 @@ SwVbaTable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Table" ); + aServiceNames[ 0 ] = "ooo.vba.word.Table"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index fda2e0e95acf..49731cfea8be 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -106,7 +106,7 @@ SwVbaTableOfContents::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.TableOfContents" ); + aServiceNames[ 0 ] = "ooo.vba.word.TableOfContents"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index f08b965044bd..1dc799b5fb87 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -228,7 +228,7 @@ SwVbaTables::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Tables" ); + aServiceNames[ 0 ] = "ooo.vba.word.Tables"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index cf6e36d4961f..755d2a2cfdba 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -177,7 +177,7 @@ SwVbaTablesOfContents::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.TablesOfContents"); + sNames[0] = "ooo.vba.word.TablesOfContents"; } return sNames; } diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index d780309e6a2c..55b32f6ac1ab 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -44,7 +44,7 @@ SwVbaTabStop::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.TabStop" ); + aServiceNames[ 0 ] = "ooo.vba.word.TabStop"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index bdacbe2908ff..c4ea6eae7761 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -262,7 +262,7 @@ SwVbaTabStops::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.TabStops"); + sNames[0] = "ooo.vba.word.TabStops"; } return sNames; } diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index c641baa9b723..0da51fd934d9 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -127,7 +127,7 @@ SwVbaTemplate::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Template" ); + aServiceNames[ 0 ] = "ooo.vba.word.Template"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 0f2ef343533a..404fe6cdc5e9 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -88,7 +88,7 @@ SwVbaVariable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Variable" ); + aServiceNames[ 0 ] = "ooo.vba.word.Variable"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index c1a4b2d6deb6..ad93d0a188a3 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -87,7 +87,7 @@ SwVbaVariables::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = OUString("ooo.vba.word.Variables"); + sNames[0] = "ooo.vba.word.Variables"; } return sNames; } diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 6bc0569f4241..a00b1324a9c5 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -256,10 +256,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryFooter: case word::WdSeekView::wdSeekEvenPagesFooter: { - aPropIsOn = OUString("FooterIsOn"); - aPropIsShared = OUString("FooterIsShared"); - aPropBodyDistance = OUString("FooterBodyDistance"); - aPropText = OUString("FooterText"); + aPropIsOn = "FooterIsOn"; + aPropIsShared = "FooterIsShared"; + aPropBodyDistance = "FooterBodyDistance"; + aPropText = "FooterText"; break; } case word::WdSeekView::wdSeekCurrentPageHeader: @@ -267,10 +267,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryHeader: case word::WdSeekView::wdSeekEvenPagesHeader: { - aPropIsOn = OUString("HeaderIsOn"); - aPropIsShared = OUString("HeaderIsShared"); - aPropBodyDistance = OUString("HeaderBodyDistance"); - aPropText = OUString("HeaderText"); + aPropIsOn = "HeaderIsOn"; + aPropIsShared = "HeaderIsShared"; + aPropBodyDistance = "HeaderBodyDistance"; + aPropText = "HeaderText"; break; } } @@ -383,7 +383,7 @@ SwVbaView::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.View" ); + aServiceNames[ 0 ] = "ooo.vba.word.View"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index 9649402606f1..f57c329739bf 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -141,7 +141,7 @@ SwVbaWindow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.Window" ); + aServiceNames[ 0 ] = "ooo.vba.word.Window"; } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index eabbd835ac00..65e00efe5a1c 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -225,7 +225,7 @@ SwVbaWrapFormat::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = OUString("ooo.vba.word.WrapFormat" ); + aServiceNames[ 0 ] = "ooo.vba.word.WrapFormat"; } return aServiceNames; } |