summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sw/source
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/acccell.cxx1
-rw-r--r--sw/source/core/access/acccell.hxx8
-rw-r--r--sw/source/core/access/acccontext.cxx1
-rw-r--r--sw/source/core/access/accdoc.cxx1
-rw-r--r--sw/source/core/access/accdoc.hxx8
-rw-r--r--sw/source/core/access/accembedded.cxx1
-rw-r--r--sw/source/core/access/accembedded.hxx6
-rw-r--r--sw/source/core/access/accfootnote.cxx1
-rw-r--r--sw/source/core/access/accfootnote.hxx8
-rw-r--r--sw/source/core/access/accframebase.cxx1
-rw-r--r--sw/source/core/access/accgraphic.cxx1
-rw-r--r--sw/source/core/access/accgraphic.hxx6
-rw-r--r--sw/source/core/access/accheaderfooter.cxx1
-rw-r--r--sw/source/core/access/accheaderfooter.hxx8
-rw-r--r--sw/source/core/access/acchyperlink.cxx1
-rw-r--r--sw/source/core/access/acchyperlink.hxx2
-rw-r--r--sw/source/core/access/accmap.cxx1
-rw-r--r--sw/source/core/access/accnotextframe.cxx1
-rw-r--r--sw/source/core/access/accnotextframe.hxx10
-rw-r--r--sw/source/core/access/accpage.cxx1
-rw-r--r--sw/source/core/access/accpage.hxx8
-rw-r--r--sw/source/core/access/accpara.hxx58
-rw-r--r--sw/source/core/access/accportions.cxx2
-rw-r--r--sw/source/core/access/accportions.hxx6
-rw-r--r--sw/source/core/access/accpreview.cxx1
-rw-r--r--sw/source/core/access/accpreview.hxx6
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/acctable.hxx18
-rw-r--r--sw/source/core/access/acctextframe.cxx1
-rw-r--r--sw/source/core/access/acctextframe.hxx14
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx4
-rw-r--r--sw/source/core/attr/swatrset.cxx2
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/bastyp/swcache.cxx2
-rw-r--r--sw/source/core/crsr/crbm.cxx4
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx9
-rw-r--r--sw/source/core/crsr/crsrsh.cxx10
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx8
-rw-r--r--sw/source/core/doc/doc.cxx1
-rw-r--r--sw/source/core/doc/docbasic.cxx5
-rw-r--r--sw/source/core/doc/docbm.cxx44
-rw-r--r--sw/source/core/doc/docdde.cxx10
-rw-r--r--sw/source/core/doc/docdraw.cxx6
-rw-r--r--sw/source/core/doc/docedt.cxx10
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/doc/docglbl.cxx4
-rw-r--r--sw/source/core/doc/docglos.cxx2
-rw-r--r--sw/source/core/doc/doclay.cxx1
-rw-r--r--sw/source/core/doc/docnum.cxx2
-rw-r--r--sw/source/core/doc/doctxm.cxx6
-rw-r--r--sw/source/core/doc/docxforms.cxx1
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
-rw-r--r--sw/source/core/doc/swstylemanager.cxx14
-rw-r--r--sw/source/core/doc/tblafmt.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/docnode/ndtbl.cxx4
-rw-r--r--sw/source/core/docnode/nodedump.cxx4
-rw-r--r--sw/source/core/docnode/section.cxx6
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx2
-rw-r--r--sw/source/core/draw/drawdoc.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx28
-rw-r--r--sw/source/core/edit/edfldexp.cxx1
-rw-r--r--sw/source/core/edit/edglss.cxx8
-rw-r--r--sw/source/core/edit/editsh.cxx6
-rw-r--r--sw/source/core/edit/edtox.cxx6
-rw-r--r--sw/source/core/edit/edundo.cxx6
-rw-r--r--sw/source/core/edit/edws.cxx6
-rw-r--r--sw/source/core/fields/authfld.cxx11
-rw-r--r--sw/source/core/fields/cellfml.cxx14
-rw-r--r--sw/source/core/fields/dbfld.cxx21
-rw-r--r--sw/source/core/fields/ddefld.cxx13
-rw-r--r--sw/source/core/fields/docufld.cxx79
-rw-r--r--sw/source/core/fields/expfld.cxx29
-rw-r--r--sw/source/core/fields/fldbas.cxx12
-rw-r--r--sw/source/core/fields/flddat.cxx6
-rw-r--r--sw/source/core/fields/flddropdown.cxx43
-rw-r--r--sw/source/core/fields/macrofld.cxx15
-rw-r--r--sw/source/core/fields/reffld.cxx13
-rw-r--r--sw/source/core/fields/scrptfld.cxx9
-rw-r--r--sw/source/core/fields/tblcalc.cxx11
-rw-r--r--sw/source/core/fields/textapi.cxx2
-rw-r--r--sw/source/core/fields/usrfld.cxx11
-rw-r--r--sw/source/core/frmedt/fefly1.cxx1
-rw-r--r--sw/source/core/frmedt/fetab.cxx6
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
-rw-r--r--sw/source/core/inc/MarkManager.hxx24
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx22
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx4
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx26
-rw-r--r--sw/source/core/inc/UndoDraw.hxx2
-rw-r--r--sw/source/core/inc/UndoInsert.hxx4
-rw-r--r--sw/source/core/inc/UndoManager.hxx6
-rw-r--r--sw/source/core/inc/bookmrk.hxx38
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx22
-rw-r--r--sw/source/core/inc/dumpfilter.hxx6
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx10
-rw-r--r--sw/source/core/inc/fntcache.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx4
-rw-r--r--sw/source/core/inc/rolbck.hxx6
-rw-r--r--sw/source/core/inc/scriptinfo.hxx9
-rw-r--r--sw/source/core/inc/swblocks.hxx4
-rw-r--r--sw/source/core/inc/swcache.hxx4
-rw-r--r--sw/source/core/inc/txtfrm.hxx2
-rw-r--r--sw/source/core/inc/unobookmark.hxx42
-rw-r--r--sw/source/core/inc/unoevent.hxx12
-rw-r--r--sw/source/core/inc/unofield.hxx48
-rw-r--r--sw/source/core/inc/unoflatpara.hxx10
-rw-r--r--sw/source/core/inc/unofootnote.hxx22
-rw-r--r--sw/source/core/inc/unoidx.hxx46
-rw-r--r--sw/source/core/inc/unometa.hxx34
-rw-r--r--sw/source/core/inc/unoparaframeenum.hxx6
-rw-r--r--sw/source/core/inc/unoport.hxx64
-rw-r--r--sw/source/core/inc/unorefmark.hxx22
-rw-r--r--sw/source/core/inc/unosection.hxx38
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx12
-rw-r--r--sw/source/core/inc/wrong.hxx8
-rw-r--r--sw/source/core/layout/atrfrm.cxx1
-rw-r--r--sw/source/core/layout/dbg_lay.cxx34
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx1
-rw-r--r--sw/source/core/para/paratr.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockExport.cxx5
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx1
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx3
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx1
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx1
-rw-r--r--sw/source/core/swg/swblocks.cxx4
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx78
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/txthyph.cxx1
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/text/xmldump.cxx6
-rw-r--r--sw/source/core/tox/tox.cxx4
-rw-r--r--sw/source/core/tox/toxhlp.cxx4
-rw-r--r--sw/source/core/tox/txmsrt.cxx1
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx9
-rw-r--r--sw/source/core/txtnode/fntcache.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx4
-rw-r--r--sw/source/core/txtnode/thints.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx33
-rw-r--r--sw/source/core/undo/docundo.cxx14
-rw-r--r--sw/source/core/undo/rolbck.cxx2
-rw-r--r--sw/source/core/undo/undel.cxx10
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/core/undo/undobj1.cxx2
-rw-r--r--sw/source/core/undo/undraw.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx20
-rw-r--r--sw/source/core/undo/unovwr.cxx12
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx9
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx30
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx6
-rw-r--r--sw/source/core/unocore/swunohelper.cxx14
-rw-r--r--sw/source/core/unocore/unobkm.cxx21
-rw-r--r--sw/source/core/unocore/unochart.cxx15
-rw-r--r--sw/source/core/unocore/unocoll.cxx62
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx19
-rw-r--r--sw/source/core/unocore/unodraw.cxx89
-rw-r--r--sw/source/core/unocore/unoevent.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx9
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx41
-rw-r--r--sw/source/core/unocore/unoftn.cxx15
-rw-r--r--sw/source/core/unocore/unoidx.cxx33
-rw-r--r--sw/source/core/unocore/unomap.cxx1
-rw-r--r--sw/source/core/unocore/unoobj.cxx32
-rw-r--r--sw/source/core/unocore/unoobj2.cxx23
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx17
-rw-r--r--sw/source/core/unocore/unoport.cxx4
-rw-r--r--sw/source/core/unocore/unoredline.cxx30
-rw-r--r--sw/source/core/unocore/unoredlines.cxx7
-rw-r--r--sw/source/core/unocore/unorefmk.cxx75
-rw-r--r--sw/source/core/unocore/unosect.cxx55
-rw-r--r--sw/source/core/unocore/unosett.cxx10
-rw-r--r--sw/source/core/unocore/unostyle.cxx56
-rw-r--r--sw/source/core/unocore/unotbl.cxx22
-rw-r--r--sw/source/core/unocore/unotext.cxx45
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx18
-rw-r--r--sw/source/core/view/printdata.cxx81
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/filter/ascii/parasc.cxx8
-rw-r--r--sw/source/filter/basflt/fltini.cxx13
-rw-r--r--sw/source/filter/basflt/iodetect.cxx36
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx34
-rw-r--r--sw/source/filter/html/css1atr.cxx124
-rw-r--r--sw/source/filter/html/htmlatr.cxx36
-rw-r--r--sw/source/filter/html/htmlbas.cxx20
-rw-r--r--sw/source/filter/html/htmlcss1.cxx12
-rw-r--r--sw/source/filter/html/htmldraw.cxx4
-rw-r--r--sw/source/filter/html/htmlfldw.cxx12
-rw-r--r--sw/source/filter/html/htmlfly.cxx44
-rw-r--r--sw/source/filter/html/htmlform.cxx3
-rw-r--r--sw/source/filter/html/htmlforw.cxx21
-rw-r--r--sw/source/filter/html/htmlftn.cxx14
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/htmlnum.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx64
-rw-r--r--sw/source/filter/html/htmltabw.cxx12
-rw-r--r--sw/source/filter/html/parcss1.cxx18
-rw-r--r--sw/source/filter/html/swhtml.cxx20
-rw-r--r--sw/source/filter/html/swhtml.hxx6
-rw-r--r--sw/source/filter/html/wrthtml.cxx30
-rw-r--r--sw/source/filter/html/wrthtml.hxx14
-rw-r--r--sw/source/filter/inc/msfilter.hxx4
-rw-r--r--sw/source/filter/ww1/fltshell.cxx8
-rw-r--r--sw/source/filter/ww1/w1class.cxx10
-rw-r--r--sw/source/filter/ww1/w1filter.cxx4
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx12
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx48
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx8
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx8
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx42
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx8
-rw-r--r--sw/source/filter/ww8/docxexport.cxx26
-rw-r--r--sw/source/filter/ww8/docxexport.hxx18
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx10
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx4
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx26
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx20
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx20
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx4
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx4
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.cxx10
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.hxx10
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx10
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx16
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx10
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx14
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx48
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx20
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx10
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx54
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx36
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx10
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.cxx96
-rw-r--r--sw/source/filter/ww8/ww8par.hxx44
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx38
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx14
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx72
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx20
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx38
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx12
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx1
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx30
-rw-r--r--sw/source/filter/xml/swxml.cxx31
-rw-r--r--sw/source/filter/xml/wrtxml.cxx21
-rw-r--r--sw/source/filter/xml/wrtxml.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx1
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx5
-rw-r--r--sw/source/filter/xml/xmlexp.hxx10
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx2
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx2
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx5
-rw-r--r--sw/source/filter/xml/xmlimp.hxx24
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx3
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx6
-rw-r--r--sw/source/filter/xml/xmlitem.cxx3
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx11
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx1
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx1
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/filter/xml/xmlscript.cxx1
-rw-r--r--sw/source/filter/xml/xmltble.cxx2
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
-rw-r--r--sw/source/filter/xml/xmltbli.hxx34
-rw-r--r--sw/source/filter/xml/xmltext.cxx1
-rw-r--r--sw/source/filter/xml/xmltexte.cxx60
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.cxx64
-rw-r--r--sw/source/filter/xml/xmltexti.hxx44
-rw-r--r--sw/source/ui/app/apphdl.cxx2
-rw-r--r--sw/source/ui/app/applab.cxx7
-rw-r--r--sw/source/ui/app/appopt.cxx6
-rw-r--r--sw/source/ui/app/docsh.cxx35
-rw-r--r--sw/source/ui/app/docsh2.cxx37
-rw-r--r--sw/source/ui/app/docshini.cxx7
-rw-r--r--sw/source/ui/app/docst.cxx4
-rw-r--r--sw/source/ui/app/docstyle.cxx12
-rw-r--r--sw/source/ui/app/swdll.cxx6
-rw-r--r--sw/source/ui/app/swmodul1.cxx1
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx6
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx8
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/config/barcfg.cxx3
-rw-r--r--sw/source/ui/config/caption.cxx2
-rw-r--r--sw/source/ui/config/dbconfig.cxx3
-rw-r--r--sw/source/ui/config/fontcfg.cxx3
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx7
-rw-r--r--sw/source/ui/config/modcfg.cxx19
-rw-r--r--sw/source/ui/config/optcomp.cxx16
-rw-r--r--sw/source/ui/config/optload.cxx8
-rw-r--r--sw/source/ui/config/optpage.cxx10
-rw-r--r--sw/source/ui/config/prtopt.cxx3
-rw-r--r--sw/source/ui/config/uinums.cxx4
-rw-r--r--sw/source/ui/config/usrpref.cxx11
-rw-r--r--sw/source/ui/config/viewopt.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx40
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx7
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx122
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx122
-rw-r--r--sw/source/ui/dbui/dbtree.cxx26
-rw-r--r--sw/source/ui/dbui/dbui.cxx6
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx5
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx12
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx87
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx74
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx20
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx209
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx6
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx36
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx36
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx86
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx20
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx1
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx12
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx10
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx4
-rw-r--r--sw/source/ui/dialog/regionsw.cxx2
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx12
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx12
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx6
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx26
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx2
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx12
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx4
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx4
-rw-r--r--sw/source/ui/docvw/edtwin.cxx14
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx4
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx12
-rw-r--r--sw/source/ui/envelp/envimg.cxx7
-rw-r--r--sw/source/ui/envelp/label1.cxx14
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx12
-rw-r--r--sw/source/ui/envelp/labelexp.cxx9
-rw-r--r--sw/source/ui/envelp/labfmt.cxx9
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/envelp/labimg.cxx5
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx19
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx6
-rw-r--r--sw/source/ui/fldui/changedb.cxx4
-rw-r--r--sw/source/ui/fldui/flddb.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.cxx10
-rw-r--r--sw/source/ui/fldui/flddinf.hxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx5
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx9
-rw-r--r--sw/source/ui/fldui/fldpage.cxx8
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx6
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/fldui/xfldui.cxx4
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/cption.cxx10
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx1
-rw-r--r--sw/source/ui/inc/HeaderFooterWin.hxx2
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx16
-rw-r--r--sw/source/ui/inc/actctrl.hxx4
-rw-r--r--sw/source/ui/inc/barcfg.hxx4
-rw-r--r--sw/source/ui/inc/caption.hxx6
-rw-r--r--sw/source/ui/inc/cfgitems.hxx2
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/conttree.hxx2
-rw-r--r--sw/source/ui/inc/dbconfig.hxx4
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/ui/inc/edtwin.hxx2
-rw-r--r--sw/source/ui/inc/envimg.hxx8
-rw-r--r--sw/source/ui/inc/fldmgr.hxx2
-rw-r--r--sw/source/ui/inc/fontcfg.hxx4
-rw-r--r--sw/source/ui/inc/glosbib.hxx2
-rw-r--r--sw/source/ui/inc/glosdoc.hxx8
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx8
-rw-r--r--sw/source/ui/inc/label.hxx6
-rw-r--r--sw/source/ui/inc/labelcfg.hxx14
-rw-r--r--sw/source/ui/inc/labimg.hxx90
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx98
-rw-r--r--sw/source/ui/inc/mailmrge.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx78
-rw-r--r--sw/source/ui/inc/navicfg.hxx4
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx2
-rw-r--r--sw/source/ui/inc/olmenu.hxx16
-rw-r--r--sw/source/ui/inc/stmenu.hxx2
-rw-r--r--sw/source/ui/inc/tablemgr.hxx2
-rw-r--r--sw/source/ui/inc/unoatxt.hxx72
-rw-r--r--sw/source/ui/inc/unodispatch.hxx2
-rw-r--r--sw/source/ui/inc/unomailmerge.hxx56
-rw-r--r--sw/source/ui/inc/unomod.hxx18
-rw-r--r--sw/source/ui/inc/unotxvw.hxx48
-rw-r--r--sw/source/ui/inc/usrpref.hxx20
-rw-r--r--sw/source/ui/inc/wrtsh.hxx6
-rw-r--r--sw/source/ui/index/cntex.cxx23
-rw-r--r--sw/source/ui/index/cnttab.cxx37
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx1
-rw-r--r--sw/source/ui/lingu/hyp.cxx1
-rw-r--r--sw/source/ui/lingu/olmenu.cxx13
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx1
-rw-r--r--sw/source/ui/misc/bookmark.cxx4
-rw-r--r--sw/source/ui/misc/glosbib.cxx6
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx5
-rw-r--r--sw/source/ui/misc/linenum.cxx8
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx3
-rw-r--r--sw/source/ui/misc/outline.cxx6
-rw-r--r--sw/source/ui/misc/pggrid.cxx6
-rw-r--r--sw/source/ui/misc/redlndlg.cxx4
-rw-r--r--sw/source/ui/misc/srtdlg.cxx5
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx10
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx19
-rw-r--r--sw/source/ui/shells/annotsh.cxx8
-rw-r--r--sw/source/ui/shells/basesh.cxx4
-rw-r--r--sw/source/ui/shells/beziersh.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drformsh.cxx5
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx10
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/grfsh.cxx2
-rw-r--r--sw/source/ui/shells/grfshex.cxx5
-rw-r--r--sw/source/ui/shells/langhelper.cxx14
-rw-r--r--sw/source/ui/shells/listsh.cxx2
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/navsh.cxx2
-rw-r--r--sw/source/ui/shells/olesh.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx2
-rw-r--r--sw/source/ui/shells/textdrw.cxx3
-rw-r--r--sw/source/ui/shells/textfld.cxx8
-rw-r--r--sw/source/ui/shells/textsh.cxx39
-rw-r--r--sw/source/ui/shells/textsh1.cxx22
-rw-r--r--sw/source/ui/shells/textsh2.cxx4
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx18
-rw-r--r--sw/source/ui/table/chartins.cxx11
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
-rw-r--r--sw/source/ui/table/tablemgr.cxx12
-rw-r--r--sw/source/ui/uiview/pview.cxx2
-rw-r--r--sw/source/ui/uiview/srcview.cxx19
-rw-r--r--sw/source/ui/uiview/view.cxx6
-rw-r--r--sw/source/ui/uiview/view0.cxx3
-rw-r--r--sw/source/ui/uiview/view2.cxx9
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx4
-rw-r--r--sw/source/ui/uiview/viewling.cxx25
-rw-r--r--sw/source/ui/uiview/viewport.cxx2
-rw-r--r--sw/source/ui/uiview/viewprt.cxx2
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx2
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx7
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx6
-rw-r--r--sw/source/ui/uno/SwXFilterOptions.cxx28
-rw-r--r--sw/source/ui/uno/detreg.cxx1
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx1
-rw-r--r--sw/source/ui/uno/swdet2.cxx4
-rw-r--r--sw/source/ui/uno/swdetect.hxx2
-rw-r--r--sw/source/ui/uno/unoatxt.cxx1
-rw-r--r--sw/source/ui/uno/unodispatch.cxx1
-rw-r--r--sw/source/ui/uno/unodoc.cxx36
-rw-r--r--sw/source/ui/uno/unofreg.cxx5
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx5
-rw-r--r--sw/source/ui/uno/unomod.cxx8
-rw-r--r--sw/source/ui/uno/unomodule.hxx8
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx33
-rw-r--r--sw/source/ui/uno/unotxvw.cxx13
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx2
-rw-r--r--sw/source/ui/utlui/condedit.cxx1
-rw-r--r--sw/source/ui/utlui/content.cxx28
-rw-r--r--sw/source/ui/utlui/glbltree.cxx5
-rw-r--r--sw/source/ui/utlui/initui.cxx8
-rw-r--r--sw/source/ui/utlui/navicfg.cxx2
-rw-r--r--sw/source/ui/utlui/navipi.cxx10
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx4
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx1
-rw-r--r--sw/source/ui/utlui/uitool.cxx2
-rw-r--r--sw/source/ui/utlui/unotools.cxx65
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx22
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx14
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx16
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx15
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx6
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx32
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx8
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx18
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx12
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx34
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx12
-rw-r--r--sw/source/ui/vba/vbaborders.cxx26
-rw-r--r--sw/source/ui/vba/vbaborders.hxx4
-rw-r--r--sw/source/ui/vba/vbacell.cxx10
-rw-r--r--sw/source/ui/vba/vbacell.hxx4
-rw-r--r--sw/source/ui/vba/vbacells.cxx10
-rw-r--r--sw/source/ui/vba/vbacells.hxx4
-rw-r--r--sw/source/ui/vba/vbacheckbox.cxx18
-rw-r--r--sw/source/ui/vba/vbacheckbox.hxx4
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx18
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx14
-rw-r--r--sw/source/ui/vba/vbacolumns.hxx4
-rw-r--r--sw/source/ui/vba/vbadialog.cxx16
-rw-r--r--sw/source/ui/vba/vbadialog.hxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx10
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx46
-rw-r--r--sw/source/ui/vba/vbadocument.hxx16
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx120
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx10
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx16
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx6
-rw-r--r--sw/source/ui/vba/vbaeventshelper.cxx4
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx2
-rw-r--r--sw/source/ui/vba/vbafield.cxx50
-rw-r--r--sw/source/ui/vba/vbafield.hxx12
-rw-r--r--sw/source/ui/vba/vbafind.cxx56
-rw-r--r--sw/source/ui/vba/vbafind.hxx12
-rw-r--r--sw/source/ui/vba/vbafont.cxx14
-rw-r--r--sw/source/ui/vba/vbafont.hxx4
-rw-r--r--sw/source/ui/vba/vbaformfield.cxx26
-rw-r--r--sw/source/ui/vba/vbaformfield.hxx8
-rw-r--r--sw/source/ui/vba/vbaformfields.cxx26
-rw-r--r--sw/source/ui/vba/vbaformfields.hxx4
-rw-r--r--sw/source/ui/vba/vbaframe.cxx10
-rw-r--r--sw/source/ui/vba/vbaframe.hxx4
-rw-r--r--sw/source/ui/vba/vbaframes.cxx10
-rw-r--r--sw/source/ui/vba/vbaframes.hxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx26
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx8
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.cxx18
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx4
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx22
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx10
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.hxx4
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx18
-rw-r--r--sw/source/ui/vba/vbalistformat.hxx4
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx12
-rw-r--r--sw/source/ui/vba/vbalistgalleries.hxx4
-rw-r--r--sw/source/ui/vba/vbalistgallery.cxx10
-rw-r--r--sw/source/ui/vba/vbalistgallery.hxx4
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx244
-rw-r--r--sw/source/ui/vba/vbalisthelper.hxx6
-rw-r--r--sw/source/ui/vba/vbalistlevel.cxx68
-rw-r--r--sw/source/ui/vba/vbalistlevel.hxx12
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx12
-rw-r--r--sw/source/ui/vba/vbalistlevels.hxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplate.cxx12
-rw-r--r--sw/source/ui/vba/vbalisttemplate.hxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx12
-rw-r--r--sw/source/ui/vba/vbalisttemplates.hxx4
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx40
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx6
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx102
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx6
-rw-r--r--sw/source/ui/vba/vbapane.cxx12
-rw-r--r--sw/source/ui/vba/vbapane.hxx4
-rw-r--r--sw/source/ui/vba/vbapanes.cxx10
-rw-r--r--sw/source/ui/vba/vbapanes.hxx4
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx24
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx8
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx104
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx4
-rw-r--r--sw/source/ui/vba/vbarange.cxx56
-rw-r--r--sw/source/ui/vba/vbarange.hxx10
-rw-r--r--sw/source/ui/vba/vbarangehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx2
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx14
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx8
-rw-r--r--sw/source/ui/vba/vbarevision.cxx10
-rw-r--r--sw/source/ui/vba/vbarevision.hxx4
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx10
-rw-r--r--sw/source/ui/vba/vbarevisions.hxx4
-rw-r--r--sw/source/ui/vba/vbarow.cxx24
-rw-r--r--sw/source/ui/vba/vbarow.hxx4
-rw-r--r--sw/source/ui/vba/vbarows.cxx46
-rw-r--r--sw/source/ui/vba/vbarows.hxx4
-rw-r--r--sw/source/ui/vba/vbasection.cxx10
-rw-r--r--sw/source/ui/vba/vbasection.hxx4
-rw-r--r--sw/source/ui/vba/vbasections.cxx14
-rw-r--r--sw/source/ui/vba/vbasections.hxx4
-rw-r--r--sw/source/ui/vba/vbaselection.cxx102
-rw-r--r--sw/source/ui/vba/vbaselection.hxx12
-rw-r--r--sw/source/ui/vba/vbastyle.cxx58
-rw-r--r--sw/source/ui/vba/vbastyle.hxx14
-rw-r--r--sw/source/ui/vba/vbastyles.cxx42
-rw-r--r--sw/source/ui/vba/vbastyles.hxx4
-rw-r--r--sw/source/ui/vba/vbasystem.cxx46
-rw-r--r--sw/source/ui/vba/vbasystem.hxx14
-rw-r--r--sw/source/ui/vba/vbatable.cxx12
-rw-r--r--sw/source/ui/vba/vbatable.hxx6
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx12
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx6
-rw-r--r--sw/source/ui/vba/vbatableofcontents.cxx22
-rw-r--r--sw/source/ui/vba/vbatableofcontents.hxx4
-rw-r--r--sw/source/ui/vba/vbatables.cxx24
-rw-r--r--sw/source/ui/vba/vbatables.hxx4
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx14
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.hxx4
-rw-r--r--sw/source/ui/vba/vbatabstop.cxx10
-rw-r--r--sw/source/ui/vba/vbatabstop.hxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx16
-rw-r--r--sw/source/ui/vba/vbatabstops.hxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx28
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx12
-rw-r--r--sw/source/ui/vba/vbavariable.cxx18
-rw-r--r--sw/source/ui/vba/vbavariable.hxx12
-rw-r--r--sw/source/ui/vba/vbavariables.cxx14
-rw-r--r--sw/source/ui/vba/vbavariables.hxx6
-rw-r--r--sw/source/ui/vba/vbaview.cxx72
-rw-r--r--sw/source/ui/vba/vbaview.hxx4
-rw-r--r--sw/source/ui/vba/vbawindow.cxx12
-rw-r--r--sw/source/ui/vba/vbawindow.hxx4
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx44
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx8
-rw-r--r--sw/source/ui/vba/wordvbahelper.cxx16
-rw-r--r--sw/source/ui/web/wgrfsh.cxx2
-rw-r--r--sw/source/ui/web/wlistsh.cxx2
-rw-r--r--sw/source/ui/web/wolesh.cxx2
-rw-r--r--sw/source/ui/web/wtabsh.cxx2
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx4
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx26
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx14
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx3
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx4
662 files changed, 4809 insertions, 4983 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8ac279b4e555..5cd3ba1c956c 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -41,7 +41,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
using namespace sw::access;
const sal_Char sServiceName[] = "com.sun.star.table.AccessibleCellView";
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index d62e21c13727..88e2f4948efc 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -55,25 +55,25 @@ public:
// XAccessibleContext
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
// XServiceInfo
// Returns an identifier for the implementation of this object.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 80e3c4d570a0..e80e97b91cb0 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -49,7 +49,6 @@
using namespace sw::access;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
void SwAccessibleContext::InitStates()
{
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 18476894e3e5..78981f851050 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -43,7 +43,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
using lang::IndexOutOfBoundsException;
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 617bebfe43f7..ed2b160aab21 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -72,7 +72,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
// XAccessibleComponent
@@ -126,18 +126,18 @@ public:
// XServiceInfo
// Returns an identifier for the implementation of this object.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 3f480b958530..899443878938 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextEmbeddedObject";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmbeddedObject";
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 402b757cdffd..5341a4e4c678 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -35,18 +35,18 @@ public:
// XServiceInfo
// Returns an identifier for the implementation of this object.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index e289450fb6b3..5556dacf1ed8 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
const sal_Char sServiceNameFootnote[] = "com.sun.star.text.AccessibleFootnoteView";
const sal_Char sServiceNameEndnote[] = "com.sun.star.text.AccessibleEndnoteView";
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 123c32ebe455..316ce6d5b59b 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -44,25 +44,25 @@ public:
// XAccessibleContext
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index c688991413f5..4953bb3acb5f 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -36,7 +36,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
sal_Bool SwAccessibleFrameBase::IsSelected()
{
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 58beaff334de..d5abfff1efed 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextGraphicObject";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleGraphic";
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index a7595313cecb..8e1eff5112bf 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -35,18 +35,18 @@ public:
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 079d7b403616..862a7a86e9e6 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
const sal_Char sServiceNameHeader[] = "com.sun.star.text.AccessibleHeaderView";
const sal_Char sServiceNameFooter[] = "com.sun.star.text.AccessibleFooterView";
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index deb6d148947a..81ec1099c53b 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -41,25 +41,25 @@ public:
// XAccessibleContext
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 3d0a05d1b5bf..75e227c49c01 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
SwAccessibleHyperlink::SwAccessibleHyperlink( sal_uInt16 nHPos,
SwAccessibleParagraph *p, sal_Int32 nStt, sal_Int32 nEnd ) :
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index e23c5d2bb809..28f11652a77c 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -52,7 +52,7 @@ public:
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(
+ virtual OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 68eba19b837a..54359617c343 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -66,7 +66,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
using namespace ::sw::access;
struct SwFrmFunc
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 98cb88759698..1cbf2f6b7ec9 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const
{
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 19329fc577c1..d41a7d5533ab 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -28,8 +28,8 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
public ::com::sun::star::accessibility::XAccessibleImage
{
SwDepend aDepend;
- ::rtl::OUString msTitle; // #i73249#
- ::rtl::OUString msDesc;
+ OUString msTitle; // #i73249#
+ OUString msDesc;
protected:
@@ -48,12 +48,12 @@ public:
// XAccessibleContext
// #i73249# - Return the object's current name.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException);
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
@@ -75,7 +75,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
// XAccessibleImage
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleImageDescription( )
throw ( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 861e557bbb50..287ba7be6423 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::accessibility;
using uno::Reference;
using uno::RuntimeException;
using uno::Sequence;
-using ::rtl::OUString;
const sal_Char sServiceName[] = "com.sun.star.text.AccessiblePageView";
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 077c567e1ab3..aa0c6b927783 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -59,17 +59,17 @@ public:
// XAccessibleContext methods that need to be overridden
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void)
+ virtual OUString SAL_CALL getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+ virtual OUString SAL_CALL getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService (
- const ::rtl::OUString& sServiceName)
+ const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index a1b426e2cc3d..ba8e5e2c72d7 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -44,10 +44,10 @@ namespace com { namespace sun { namespace star {
namespace accessibility { class XAccessibleHyperlink; }
} } }
-typedef ::boost::unordered_map< ::rtl::OUString,
+typedef ::boost::unordered_map< OUString,
::com::sun::star::beans::PropertyValue,
- ::rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > tAccParaPropValMap;
class SwAccessibleParagraph :
public SwClient, // #i108125#
@@ -61,7 +61,7 @@ class SwAccessibleParagraph :
{
friend class SwAccessibleHyperlink;
- ::rtl::OUString sDesc; // protected by base classes mutex
+ OUString sDesc; // protected by base classes mutex
// data for this paragraph's text portions; this contains the
// mapping from the core 'model string' to the accessible text
@@ -86,9 +86,9 @@ class SwAccessibleParagraph :
const SwTxtNode* GetTxtNode() const;
/// get the (accessible) text string (requires frame; check before)
- ::rtl::OUString GetString();
+ OUString GetString();
- ::rtl::OUString GetDescription();
+ OUString GetDescription();
// get the current care position
sal_Int32 GetCaretPos();
@@ -133,12 +133,12 @@ class SwAccessibleParagraph :
// #i63870#
void _getDefaultAttributesImpl(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
+ const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rDefAttrSeq,
const bool bOnlyCharAttrs = false );
void _getRunAttributesImpl(
const sal_Int32 nIndex,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
+ const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rRunAttrSeq );
public:
@@ -183,31 +183,31 @@ protected:
//helpers for word boundaries
sal_Bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
sal_Bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos );
// get boundaries of word/sentence/etc. for specified text type
// Does all argument checking, and then delegates to helper methods above.
sal_Bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound,
- const rtl::OUString& rText,
+ const OUString& rText,
sal_Int32 nPos,
sal_Int16 aTextType )
throw (
@@ -229,7 +229,7 @@ public:
// XAccessibleContext
// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
@@ -258,18 +258,18 @@ public:
// XServiceInfo
// Returns an identifier for the implementation of this object.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -298,16 +298,16 @@ public:
virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -317,10 +317,10 @@ public:
virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException);
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
@@ -401,8 +401,8 @@ public:
// #i63870#
// XAccesibleTextAttributes
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
};
inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *()
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 1720053da77b..ecda713ac17f 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -54,8 +54,6 @@
using namespace ::com::sun::star;
-using rtl::OUString;
-using rtl::OUStringBuffer;
using i18n::Boundary;
// 'portion type' for terminating portions
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 021b338813a9..7b4fcd597a50 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -40,13 +40,13 @@ class SwAccessiblePortionData : public SwPortionHandler
const SwTxtNode* pTxtNode;
// variables used while collecting the data
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
sal_Int32 nModelPosition;
sal_Bool bFinished;
const SwViewOption* pViewOptions;
// the accessible string
- rtl::OUString sAccessibleString;
+ OUString sAccessibleString;
// positions array
// instances of Position_t must always include the minimum and
@@ -104,7 +104,7 @@ public:
// access to the portion data
/// get the text string, as presented by the layout
- const rtl::OUString& GetAccessibleString() const;
+ const OUString& GetAccessibleString() const;
/// get the start & end positions of the sentence
void GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 79a496eefac6..9eeb588d1b9d 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -29,7 +29,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc
using ::com::sun::star::lang::IndexOutOfBoundsException;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
// SwAccessiblePreview
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index c699054ea7a8..f699ce931b98 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -43,20 +43,20 @@ public:
/** Returns an identifier for the implementation of this object.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index d7258858a36c..8992690826ec 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -49,8 +49,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::sw::access;
const sal_Char sServiceName[] = "com.sun.star.table.AccessibleTableView";
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 3db34e492382..36a91b0544da 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -39,7 +39,7 @@ class SwAccessibleTable :
public SwClient
{
SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex
- ::rtl::OUString sDesc;
+ OUString sDesc;
const SwSelBoxes *GetSelBoxes() const;
void FireTableChangeEvent( const SwAccessibleTableData_Impl& rTableData );
@@ -60,7 +60,7 @@ protected:
virtual ~SwAccessibleTable();
// #i77106#
- inline void SetDesc( ::rtl::OUString sNewDesc )
+ inline void SetDesc( OUString sNewDesc )
{
sDesc = sNewDesc;
}
@@ -108,7 +108,7 @@ public:
//===== XAccessibleContext ==============================================
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
@@ -118,11 +118,11 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getAccessibleColumnCount( )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription(
+ virtual OUString SAL_CALL getAccessibleRowDescription(
sal_Int32 nRow )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription(
+ virtual OUString SAL_CALL getAccessibleColumnDescription(
sal_Int32 nColumn )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
@@ -186,20 +186,20 @@ public:
/** Returns an identifier for the implementation of this object.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -311,7 +311,7 @@ public:
/** Returns an identifier for the implementation of this object.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 10f9b513bd01..17e1a42cfbbe 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-using ::rtl::OUString;
using utl::AccessibleRelationSetHelper;
using ::com::sun::star::accessibility::XAccessibleContext;
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index e81a2f0d2661..7d6b13eb3dda 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -30,8 +30,8 @@ class SwAccessibleTextFrame : public SwAccessibleFrameBase
{
private:
// #i73249#
- ::rtl::OUString msTitle;
- ::rtl::OUString msDesc;
+ OUString msTitle;
+ OUString msDesc;
protected:
@@ -46,11 +46,11 @@ public:
//===== XAccessibleContext ==============================================
// #i73249# - Return the object's current name.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException);
/// Return this object's description.
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
@@ -58,20 +58,20 @@ public:
/** Returns an identifier for the implementation of this object.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
+ supportsService (const OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index 70d5b97ef3f8..b20e7894416e 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -135,7 +135,7 @@ namespace {
? nTxtFrmTextEndPos
: nTxtNodeChangeTrackEnd;
- pMarkupList->Insert( rtl::OUString(), 0,
+ pMarkupList->Insert( OUString(), 0,
nTxtFrmChangeTrackStart,
nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart,
pMarkupList->Count() );
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index a7118d32108f..c3aa81a79a4b 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -136,7 +136,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
pTextMarkupList->GetElement( static_cast<sal_uInt16>(nTextMarkupIndex) );
if ( pTextMarkup )
{
- const ::rtl::OUString rText = mrPortionData.GetAccessibleString();
+ const OUString rText = mrPortionData.GetAccessibleString();
const sal_Int32 nStartPos =
mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos );
const sal_Int32 nEndPos =
@@ -180,7 +180,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups;
if ( pTextMarkupList )
{
- const ::rtl::OUString rText = mrPortionData.GetAccessibleString();
+ const OUString rText = mrPortionData.GetAccessibleString();
const sal_uInt16 nTextMarkupCount = pTextMarkupList->Count();
for ( sal_uInt16 nTextMarkupIdx = 0; nTextMarkupIdx < nTextMarkupCount; ++nTextMarkupIdx )
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index fe0de02476e2..bdf8b003e7a7 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -41,7 +41,7 @@
// ----------
SwAttrPool::SwAttrPool( SwDoc* pD )
- : SfxItemPool( rtl::OUString("SWG"),
+ : SfxItemPool( OUString("SWG"),
POOLATTR_BEGIN, POOLATTR_END-1,
aSlotTab, aAttrTab ),
pDoc( pD )
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 10a53fa2ae2a..4dc6242326f5 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -95,7 +95,7 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang )
m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() );
}
-sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const
+sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const
{
createBreakIterator();
sal_uInt16 nScript = i18n::ScriptType::WEAK;
@@ -137,7 +137,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32
return nScript;
}
-sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const
+sal_uInt16 SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
{
const sal_uInt16 coAllScripts = ( SCRIPTTYPE_LATIN |
SCRIPTTYPE_ASIAN |
@@ -170,7 +170,7 @@ sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const
return nRet;
}
-sal_Int32 SwBreakIt::getGraphemeCount(const rtl::OUString& rText,
+sal_Int32 SwBreakIt::getGraphemeCount(const OUString& rText,
sal_Int32 nStart, sal_Int32 nEnd) const
{
sal_Int32 nGraphemeCount = 0;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index b8fbcfc858f4..5d013e3b000d 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -548,7 +548,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins )
if( 0 != ( pFnd = Find( sDBNum, VarTable, TBLSZ ) ) )
nTmpRec = ((SwCalcExp*)pFnd)->nValue.GetULong();
- rtl::OUString sResult;
+ OUString sResult;
double nNumber = DBL_MAX;
long nLang = pLclData->getLanguageTag().getLanguageType();
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 7fc890930c0f..bd0d54384b79 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -68,7 +68,7 @@ void SwCache::Check()
SwCache::SwCache( const sal_uInt16 nInitSize
#ifdef DBG_UTIL
- , const rtl::OString &rNm
+ , const OString &rNm
#endif
) :
m_aCacheObjects(),
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 8716f1836a80..8c094120200a 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -84,8 +84,8 @@ namespace
// at CurCrsr.SPoint
::sw::mark::IMark* SwCrsrShell::SetBookmark(
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName,
+ const OUString& rName,
+ const OUString& rShortName,
IDocumentMarkAccess::MarkType eMark)
{
StartAction();
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 0e8a08d83818..1cc7aea1abfd 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -21,7 +21,6 @@
#include <crossrefbookmark.hxx>
#include <ndtxt.hxx>
-using ::rtl::OUString;
namespace sw { namespace mark
{
CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
@@ -67,10 +66,10 @@ namespace sw { namespace mark
const KeyCode& rCode,
const OUString& rName,
const OUString& rShortName)
- : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefHeadingBookmark_NamePrefix))
+ : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefHeadingBookmark_NamePrefix))
{ }
- bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName)
+ bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName)
{
return rName.match(CrossRefHeadingBookmark_NamePrefix);
}
@@ -81,10 +80,10 @@ namespace sw { namespace mark
const KeyCode& rCode,
const OUString& rName,
const OUString& rShortName)
- : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefNumItemBookmark_NamePrefix))
+ : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefNumItemBookmark_NamePrefix))
{ }
- bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName)
+ bool CrossRefNumItemBookmark::IsLegalName(const OUString& rName)
{
return rName.match(CrossRefNumItemBookmark_NamePrefix);
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e0e2ab8e770d..d5999cd591b0 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3153,12 +3153,12 @@ String SwCrsrShell::GetCrsrDescr() const
// SMARTTAGS
-static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes,
+static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes,
uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
const SwWrongList& rSmartTagList, xub_StrLen nCurrent )
{
// Insert smart tag information
- std::vector< rtl::OUString > aSmartTagTypes;
+ std::vector< OUString > aSmartTagTypes;
std::vector< uno::Reference< container::XStringKeyMap > > aStringKeyMaps;
for ( sal_uInt16 i = 0; i < rSmartTagList.Count(); ++i )
@@ -3182,7 +3182,7 @@ static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTyp
rSmartTagTypes.realloc( aSmartTagTypes.size() );
rStringKeyMaps.realloc( aSmartTagTypes.size() );
- std::vector< rtl::OUString >::const_iterator aTypesIter = aSmartTagTypes.begin();
+ std::vector< OUString >::const_iterator aTypesIter = aSmartTagTypes.begin();
sal_uInt16 i = 0;
for ( aTypesIter = aSmartTagTypes.begin(); aTypesIter != aSmartTagTypes.end(); ++aTypesIter )
rSmartTagTypes[i++] = *aTypesIter;
@@ -3211,7 +3211,7 @@ static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
rRange = xRange;
}
-void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagTypes,
+void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
uno::Reference< text::XTextRange>& rRange ) const
{
@@ -3249,7 +3249,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagType
// see also SwEditShell::GetCorrection( const Point* pPt, SwRect& rSelectRect )
void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
- uno::Sequence< rtl::OUString >& rSmartTagTypes,
+ uno::Sequence< OUString >& rSmartTagTypes,
uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
uno::Reference<text::XTextRange>& rRange )
{
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index b3ff53c18222..6e9d24d2446e 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1788,7 +1788,7 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
case FILL_TAB:
case FILL_SPACE:
{
- rtl::OUStringBuffer sInsert;
+ OUStringBuffer sInsert;
if (aFPos.nTabCnt)
comphelper::string::padToLength(sInsert, aFPos.nTabCnt, '\t');
if (aFPos.nSpaceCnt)
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 41d47d37fa6b..ac3643817a8f 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -47,7 +47,7 @@
using namespace std;
-static rtl::OString aDbgOutResult;
+static OString aDbgOutResult;
bool bDbgOutStdErr = false;
bool bDbgOutPrintAttrSet = false;
@@ -92,7 +92,7 @@ SW_DLLPUBLIC const char * dbg_out(const void * pVoid)
SW_DLLPUBLIC const char * dbg_out(const String & aStr)
{
- aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
+ aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
if (bDbgOutStdErr)
fprintf(stderr, "%s", aDbgOutResult.getStr());
@@ -100,9 +100,9 @@ SW_DLLPUBLIC const char * dbg_out(const String & aStr)
return aDbgOutResult.getStr();
}
-SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr)
+SW_DLLPUBLIC const char * dbg_out(const OUString & aStr)
{
- aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
+ aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
return aDbgOutResult.getStr();
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 907ff63528c7..7ca4fa9eae72 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -133,7 +133,6 @@
#include <layouter.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
/* IInterface */
sal_Int32 SwDoc::acquire()
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 8b3e48ba4821..1437e6135e15 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -33,7 +33,6 @@
#include <swevent.hxx>
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs )
{
@@ -117,7 +116,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::ExecMacro URL is %s", rtl::OUStringToOString( rMacro.GetMacName(),
+ OSL_TRACE( "SwDoc::ExecMacro URL is %s", OUStringToOString( rMacro.GetMacName(),
RTL_TEXTENCODING_UTF8).getStr() );
eErr = mpDocShell->CallXScript(
@@ -229,7 +228,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::CallEvent URL is %s", rtl::OUStringToOString(
+ OSL_TRACE( "SwDoc::CallEvent URL is %s", OUStringToOString(
rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() );
nRet += 0 == mpDocShell->CallXScript(
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 93c212d7b793..7d6f59cc97d5 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -187,7 +187,7 @@ namespace
if(ppCurrentMark->get() == rpMarkToFind.get())
{
//OSL_TRACE("found mark named '%s'",
- // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
+ // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
return ppCurrentMark;
}
++ppCurrentMark;
@@ -216,7 +216,7 @@ namespace
if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType)
{
//OSL_TRACE("found mark named '%s'",
- // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
+ // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
return ppCurrentMark;
}
}
@@ -226,14 +226,14 @@ namespace
};
static IDocumentMarkAccess::const_iterator_t lcl_FindMarkByName(
- const ::rtl::OUString& rName,
+ const OUString& rName,
IDocumentMarkAccess::const_iterator_t ppMarksBegin,
IDocumentMarkAccess::const_iterator_t ppMarksEnd)
{
return find_if(
ppMarksBegin,
ppMarksEnd,
- boost::bind(&::rtl::OUString::equals, boost::bind(&IMark::GetName, _1), rName));
+ boost::bind(&OUString::equals, boost::bind(&IMark::GetName, _1), rName));
}
#if 0
@@ -245,7 +245,7 @@ namespace
ppMark++)
{
IMark* pMark = ppMark->get();
- ::rtl::OString sName = ::rtl::OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
+ OString sName = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8);
const SwPosition* const pStPos = &pMark->GetMarkStart();
const SwPosition* const pEndPos = &pMark->GetMarkEnd();
OSL_TRACE("%s %s %d,%d %d,%d",
@@ -294,12 +294,12 @@ namespace sw { namespace mark
: m_pDoc(&rDoc)
{ }
::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
- const ::rtl::OUString& rName,
+ const OUString& rName,
const IDocumentMarkAccess::MarkType eType)
{
#if 0
{
- ::rtl::OString sName = ::rtl::OUStringToOString(rName, RTL_TEXTENCODING_UTF8);
+ OString sName = OUStringToOString(rName, RTL_TEXTENCODING_UTF8);
const SwPosition* const pPos1 = rPaM.GetPoint();
const SwPosition* pPos2 = pPos1;
if(rPaM.HasMark())
@@ -337,16 +337,16 @@ namespace sw { namespace mark
pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM));
break;
case IDocumentMarkAccess::BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+ pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::DDE_BOOKMARK:
pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM));
break;
case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+ pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+ pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::UNO_BOOKMARK:
pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM));
@@ -399,8 +399,8 @@ namespace sw { namespace mark
}
::sw::mark::IFieldmark* MarkManager::makeFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType )
+ const OUString& rName,
+ const OUString& rType )
{
sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::TEXT_FIELDMARK );
@@ -411,8 +411,8 @@ namespace sw { namespace mark
}
::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType)
+ const OUString& rName,
+ const OUString& rType)
{
sw::mark::IMark* pMark = makeMark( rPaM, rName,
IDocumentMarkAccess::CHECKBOX_FIELDMARK );
@@ -431,7 +431,7 @@ namespace sw { namespace mark
if(ppExistingMark != m_vBookmarks.end())
return ppExistingMark->get();
const SwPaM aPaM(aPos);
- return makeMark(aPaM, ::rtl::OUString(), eType);
+ return makeMark(aPaM, OUString(), eType);
}
void MarkManager::repositionMark( ::sw::mark::IMark* const io_pMark,
@@ -453,7 +453,7 @@ namespace sw { namespace mark
sortMarks();
}
- bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName)
+ bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName)
{
OSL_PRECOND(io_pMark->GetMarkPos().GetDoc() == m_pDoc,
"<MarkManager::renameMark(..)>"
@@ -789,12 +789,12 @@ namespace sw { namespace mark
m_vMarks.clear();
}
- IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const ::rtl::OUString& rName) const
+ IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const OUString& rName) const
{
return lcl_FindMarkByName(rName, m_vMarks.begin(), m_vMarks.end());
}
- IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const ::rtl::OUString& rName) const
+ IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const OUString& rName) const
{
return lcl_FindMarkByName(rName, m_vBookmarks.begin(), m_vBookmarks.end());
}
@@ -834,14 +834,14 @@ namespace sw { namespace mark
{ return dynamic_cast<IFieldmark*>(lcl_getMarkBefore(m_vFieldmarks, rPos)); }
- ::rtl::OUString MarkManager::getUniqueMarkName(const ::rtl::OUString& rName) const
+ OUString MarkManager::getUniqueMarkName(const OUString& rName) const
{
OSL_ENSURE(!rName.isEmpty(),
"<MarkManager::getUniqueMarkName(..)>"
" - a name should be proposed");
if(!hasMark(rName)) return rName;
- ::rtl::OUStringBuffer sBuf;
- ::rtl::OUString sTmp;
+ OUStringBuffer sBuf;
+ OUString sTmp;
// try the name "<rName>XXX" (where XXX is a number starting from 1) unless there is
// a unused name. Due to performance-reasons (especially in mailmerge-Szenarios) there
@@ -868,7 +868,7 @@ namespace sw { namespace mark
sort(m_vFieldmarks.begin(), m_vFieldmarks.end(), &lcl_MarkOrderingByStart);
}
- bool MarkManager::hasMark(const ::rtl::OUString& rName) const
+ bool MarkManager::hasMark(const OUString& rName) const
{
return (m_aMarkNamesSet.find(rName) != m_aMarkNamesSet.end());
}
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 20677cf0d9f8..ae7437fc14f5 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -43,10 +43,10 @@ using namespace ::com::sun::star;
namespace
{
- static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const rtl::OUString& rName, bool bCaseSensitive)
+ static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const OUString& rName, bool bCaseSensitive)
{
//Iterating over all bookmarks, checking DdeBookmarks
- const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName);
+ const OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName);
for(IDocumentMarkAccess::const_iterator_t ppMark = rMarkAccess.getMarksBegin();
ppMark != rMarkAccess.getMarksEnd();
++ppMark)
@@ -133,7 +133,7 @@ static bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem )
-bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType,
+bool SwDoc::GetData( const OUString& rItem, const String& rMimeType,
uno::Any & rValue ) const
{
// search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
@@ -178,7 +178,7 @@ bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType,
-bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
+bool SwDoc::SetData( const OUString& rItem, const String& rMimeType,
const uno::Any & rValue )
{
// search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
@@ -224,7 +224,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
-::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const rtl::OUString& rItem)
+::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const OUString& rItem)
{
SwServerObject* pObj = NULL;
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 6ff4c1a155bb..bcd931ebd77e 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -252,7 +252,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
pObj->NbcMove( Size( aAnchorPos.X(), aAnchorPos.Y() ) );
}
- pFmt = MakeDrawFrmFmt( rtl::OUString("DrawObject"),
+ pFmt = MakeDrawFrmFmt( OUString("DrawObject"),
GetDfltFrmFmt() );
pFmt->SetFmtAttr( aAnch );
// #i36010# - set layout direction of the position
@@ -317,7 +317,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
if( !pMyObj->GetUpGroup() )
{
- rtl::OUString sDrwFmtNm("DrawObject");
+ OUString sDrwFmtNm("DrawObject");
for ( sal_uInt16 i = 0; i < nMarkCount; ++i )
{
SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
@@ -913,7 +913,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
else
{
OSL_FAIL("unknown field command");
- pInfo->SetRepresentation( rtl::OUString( '?' ) );
+ pInfo->SetRepresentation( OUString( '?' ) );
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 67252d931e8b..7351b1dcb447 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -771,7 +771,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
// start behind the characters (to fix the attributes!)
if (nStart < pNode->GetTxt().getLength())
++rIdx;
- pNode->InsertText( rtl::OUString(c), rIdx, INS_EMPTYEXPAND );
+ pNode->InsertText( OUString(c), rIdx, INS_EMPTYEXPAND );
if( nStart+1 < rIdx.GetIndex() )
{
rIdx = nStart;
@@ -1930,7 +1930,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
uno::Reference< lang::XComponent > xDoc( ((SwDocShell*)GetDocShell())->GetBaseModel(), uno::UNO_QUERY );
// Expand the string:
const ModelToViewHelper aConversionMap(*(SwTxtNode*)pNd);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
// get XFlatParagraph to use...
uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *((SwTxtNode*)pNd), aExpandText, aConversionMap );
@@ -2137,7 +2137,7 @@ static bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, bool bRegExpRpl
if( bRegExpRplc )
{
xub_StrLen nPos = 0;
- rtl::OUString sPara("\\n");
+ OUString sPara("\\n");
while( STRING_NOTFOUND != ( nPos = rStr.Search( sPara, nPos )) )
{
// Has this been escaped?
@@ -2283,7 +2283,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
// If any Redline will change (split!) the node
- const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
+ const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
//JP 06.01.98: MUSS noch optimiert werden!!!
SetRedlineMode(
@@ -2375,7 +2375,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
// If any Redline will change (split!) the node
- const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
+ const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
SwIndex& rIdx = aDelPam.GetPoint()->nContent;
rIdx.Assign( 0, 0 );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 8474c968f359..a4539972320e 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2285,11 +2285,11 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
}
}
- rtl::OUString sTrue("TRUE"), sFalse("FALSE");
+ OUString sTrue("TRUE"), sFalse("FALSE");
bool bIsDBMgr = 0 != rDoc.GetNewDBMgr();
sal_uInt16 nWhich, n;
- const rtl::OUString* pFormel = 0;
+ const OUString* pFormel = 0;
const SfxPoolItem* pItem;
sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_FIELD );
for( n = 0; n < nMaxItems; ++n )
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index e69c47d61850..ddac41e81653 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -198,11 +198,11 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
switch( eDocType )
{
case SPLITDOC_TO_HTML:
- pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString("HTML"));
+ pFilter = SwIoSystem::GetFilterOfFormat(OUString("HTML"));
break;
default:
- pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString(FILTER_XML));
+ pFilter = SwIoSystem::GetFilterOfFormat(OUString(FILTER_XML));
eDocType = SPLITDOC_TO_GLOBALDOC;
break;
}
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index dbce466caee0..9593bf8039c8 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -86,7 +86,7 @@ static void lcl_copyDocumentProperties(
= xSourceUDSet->getPropertySetInfo();
uno::Sequence<beans::Property> srcprops = xSetInfo->getProperties();
for (sal_Int32 i = 0; i < srcprops.getLength(); ++i) {
- ::rtl::OUString name = srcprops[i].Name;
+ OUString name = srcprops[i].Name;
xTargetUD->addProperty(name, srcprops[i].Attributes,
xSourceUDSet->getPropertyValue(name));
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 3759b6eb6207..d14e1991a3ec 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -96,7 +96,6 @@
#include <vector>
using namespace ::com::sun::star;
-using ::rtl::OUString;
#define DEF_FLY_WIDTH 2268 // Default width for FlyFrms (2268 == 4cm)
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 2e4ae8187393..32cf8e3f8785 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -106,7 +106,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
}
mpOutlineRule->SetRuleType( OUTLINE_RULE );
- mpOutlineRule->SetName( rtl::OUString::createFromAscii(
+ mpOutlineRule->SetName( OUString::createFromAscii(
SwNumRule::GetOutlineRuleName() ),
*this);
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 6d15761c3897..a706b180f349 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1734,7 +1734,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
size_t nSize = rBase.aTOXSources.size();
if (nSize > 0)
{
- String aInsStr = rtl::OUString(cNumRepl);
+ String aInsStr = OUString(cNumRepl);
for (size_t i = 1; i < nSize; ++i)
{
aInsStr.AppendAscii( sPageDeli );
@@ -2005,10 +2005,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
// collect starts end ends of main entry character style
std::vector<sal_uInt16>* pCharStyleIdx = pMainEntryNums ? new std::vector<sal_uInt16> : 0;
- rtl::OUString sSrchStr = rtl::OUStringBuffer().append(cNumRepl).
+ OUString sSrchStr = OUStringBuffer().append(cNumRepl).
append(sPageDeli).append(cNumRepl).makeStringAndClear();
sal_Int32 nStartPos = pNd->GetTxt().indexOf(sSrchStr);
- sSrchStr = rtl::OUStringBuffer().append(cNumRepl).
+ sSrchStr = OUStringBuffer().append(cNumRepl).
append(cEndPageNum).makeStringAndClear();
sal_Int32 nEndPos = pNd->GetTxt().indexOf(sSrchStr);
sal_uInt16 i;
diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx
index 6841e9730822..11d264b44eb4 100644
--- a/sw/source/core/doc/docxforms.cxx
+++ b/sw/source/core/doc/docxforms.cxx
@@ -41,7 +41,6 @@ using container::XNameContainer;
using xforms::XModel2;
using frame::XModule;
using xforms::XFormsUIHelper1;
-using ::rtl::OUString;
Reference<XNameContainer> SwDoc::getXForms() const
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index c42d80201065..23252d6ebe07 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -98,7 +98,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText,
pFont = new Font();
pFont->SetWeight( WEIGHT_BOLD );
pFont->SetStyleName( aEmptyStr );
- pFont->SetName(rtl::OUString("Arial Unicode"));
+ pFont->SetName(OUString("Arial Unicode"));
pFont->SetFamily( FAMILY_SWISS );
pFont->SetTransparent( sal_True );
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 7c36432c29ea..6d4a0ea1584a 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1928,7 +1928,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
pNewRule->Set( 1, aFmt );
aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
- aFmt.SetSuffix(rtl::OUString(static_cast<sal_Unicode>(')')));
+ aFmt.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
aFmt.SetIncludeUpperLevels( 1 );
aFmt.SetStart( 3 );
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index 49c0d3396a92..0ad79d78649c 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -26,10 +26,10 @@
#include <swtypes.hxx>
#include <istyleaccess.hxx>
-typedef ::boost::unordered_map< const ::rtl::OUString,
+typedef ::boost::unordered_map< const OUString,
StylePool::SfxItemSet_Pointer_t,
- ::rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > SwStyleNameCache;
+ OUStringHash,
+ ::std::equal_to< OUString > > SwStyleNameCache;
class SwStyleCache
{
@@ -39,7 +39,7 @@ public:
void addStyleName( StylePool::SfxItemSet_Pointer_t pStyle )
{ mMap[ StylePool::nameOf(pStyle) ] = pStyle; }
void addCompletePool( StylePool& rPool );
- StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName ) { return mMap[rName]; }
+ StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName ) { return mMap[rName]; }
};
void SwStyleCache::addCompletePool( StylePool& rPool )
@@ -48,7 +48,7 @@ void SwStyleCache::addCompletePool( StylePool& rPool )
StylePool::SfxItemSet_Pointer_t pStyle = pIter->getNext();
while( pStyle.get() )
{
- rtl::OUString aName( StylePool::nameOf(pStyle) );
+ OUString aName( StylePool::nameOf(pStyle) );
mMap[ aName ] = pStyle;
pStyle = pIter->getNext();
}
@@ -73,7 +73,7 @@ public:
virtual ~SwStyleManager();
virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet,
IStyleAccess::SwAutoStyleFamily eFamily );
- virtual StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName,
+ virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName,
IStyleAccess::SwAutoStyleFamily eFamily );
virtual void getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t> &rStyles,
IStyleAccess::SwAutoStyleFamily eFamily );
@@ -121,7 +121,7 @@ StylePool::SfxItemSet_Pointer_t SwStyleManager::cacheAutomaticStyle( const SfxIt
return pStyle;
}
-StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const rtl::OUString& rName,
+StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const OUString& rName,
IStyleAccess::SwAutoStyleFamily eFamily )
{
StylePool& rAutoPool = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? aAutoCharPool : aAutoParaPool;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 976273306639..516df7ae7867 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1119,7 +1119,7 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
sal_Bool SwTableAutoFmtTbl::Load()
{
sal_Bool bRet = sal_False;
- String sNm(rtl::OUString(sAutoTblFmtName));
+ String sNm(OUString(sAutoTblFmtName));
SvtPathOptions aOpt;
if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
{
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 065bb3fe6ccb..38a558849628 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -679,7 +679,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
// The LinkFileName could only consist of separators
- String sCompareString = rtl::OUString(sfx2::cTokenSeperator);
+ String sCompareString = OUString(sfx2::cTokenSeperator);
sCompareString += sfx2::cTokenSeperator;
const bool bUpdate =
(!pSection->IsLinkType() && rNewData.IsLinkType())
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 95237af5b484..5cad0d70ea8e 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1523,7 +1523,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
// Inserting the separator
SwIndex aCntIdx( pDelPara->pLastNd,
pDelPara->pLastNd->GetTxt().getLength());
- pDelPara->pLastNd->InsertText( rtl::OUString(pDelPara->cCh), aCntIdx,
+ pDelPara->pLastNd->InsertText( OUString(pDelPara->cCh), aCntIdx,
IDocumentContentOperations::INS_EMPTYEXPAND );
if( pDelPara->pUndo )
pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx, aDelRg.aEnd.GetIndex(),
@@ -4196,7 +4196,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
if ( pUndo )
pUndo->AddNode( *pTxtNode , sal_False );
SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone();
- pNewItem->SetValue(rtl::OUString());
+ pNewItem->SetValue(OUString());
rSet.Put( *pNewItem );
pTxtNode->SetAttr( rSet );
delete pNewItem;
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index ca2efd4fc7c5..ffeb80517b1c 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -268,10 +268,10 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
writer.startElement( "text" );
writer.writeFormatAttribute( "ptr", "%p", this );
writer.writeFormatAttribute( "index", "%lu", GetIndex() );
- rtl::OUString txt = GetTxt();
+ OUString txt = GetTxt();
for( int i = 0; i < 32; ++i )
txt = txt.replace( i, '*' );
- rtl::OString txt8 = ::rtl::OUStringToOString( txt, RTL_TEXTENCODING_UTF8 );
+ OString txt8 = OUStringToOString( txt, RTL_TEXTENCODING_UTF8 );
xmlTextWriterWriteString( writer, BAD_CAST( txt8.getStr()));
writer.endElement();
}
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 40db3665646c..56239af0f94f 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1140,7 +1140,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
SwBaseLink* pBLink;
String sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE ));
uno::Any aValue;
- aValue <<= ::rtl::OUString( sName ); // Arbitrary name
+ aValue <<= OUString( sName ); // Arbitrary name
const ::sfx2::SvBaseLinks& rLnks = pDoc->GetLinkManager().GetLinks();
for( sal_uInt16 n = rLnks.size(); n; )
@@ -1243,7 +1243,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh,
const SfxFilter* pSfxFlt = 0;
if( !pMed->GetError() )
{
- String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
+ String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
SfxFilterMatcher aMatcher( sFactory );
// No Filter, so search for it. Else test if the one passed is a valid one
@@ -1344,7 +1344,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh,
SwSection& rSection = pSectNd->GetSection();
rSection.SetConnectFlag(false);
- ::rtl::OUString sNewFileName;
+ OUString sNewFileName;
Reader* pRead = 0;
switch( nDataFormat )
{
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 6dcee9022f1e..ae8ed8a5cde5 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -105,7 +105,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
nFmt == sfx2::LinkManager::RegisterStatusInfoId() )
{
// Only a status change - serve Events?
- ::rtl::OUString sState;
+ OUString sState;
if( rValue.hasValue() && ( rValue >>= sState ))
{
sal_uInt16 nEvent = 0;
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 5b0d25255c5f..0ebf8e9b8c0d 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -133,7 +133,7 @@ SwDrawDocument::~SwDrawDocument()
SdrPage* SwDrawDocument::AllocPage(bool bMasterPage)
{
SwDPage* pPage = new SwDPage(*this, 0 != bMasterPage);
- pPage->SetName(rtl::OUString("Controls"));
+ pPage->SetName(OUString("Controls"));
return pPage;
}
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 1508ab6aecf9..5cb58fd7df5b 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -298,7 +298,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
}
#if OSL_DEBUG_LEVEL > 0
else
- sTxt = rtl::OUString("Action-Text fehlt");
+ sTxt = OUString("Action-Text fehlt");
#endif
pDoc->SetAutoFmtRedlineComment( &sTxt, nSeqNo );
@@ -1258,7 +1258,7 @@ void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks )
DeleteSel( *pNxt );
if( !bHasBlnks )
{
- pDoc->InsertString( *pNxt, rtl::OUString(' ') );
+ pDoc->InsertString( *pNxt, OUString(' ') );
}
}
@@ -1317,7 +1317,7 @@ void SwAutoFormat::BuildIndent()
IsSentenceAtEnd( *pNxtNd );
if( DeleteAktNxtPara( pNxtNd->GetTxt() ))
{
- pDoc->InsertString( aDelPam, rtl::OUString(' ') );
+ pDoc->InsertString( aDelPam, OUString(' ') );
}
if( bBreak )
break;
@@ -1358,7 +1358,7 @@ void SwAutoFormat::BuildTextIndent()
IsSentenceAtEnd( *pNxtNd );
if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
{
- pDoc->InsertString( aDelPam, rtl::OUString(' ') );
+ pDoc->InsertString( aDelPam, OUString(' ') );
}
if( bBreak )
break;
@@ -1394,7 +1394,7 @@ void SwAutoFormat::BuildText()
IsSentenceAtEnd( *pNxtNd );
if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
{
- pDoc->InsertString( aDelPam, rtl::OUString(' ') );
+ pDoc->InsertString( aDelPam, OUString(' ') );
}
if( bBreak )
break;
@@ -1503,8 +1503,8 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
aFmt.SetBulletChar( cBullChar );
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
- aFmt.SetPrefix(::rtl::OUString());
- aFmt.SetSuffix(::rtl::OUString());
+ aFmt.SetPrefix(OUString());
+ aFmt.SetSuffix(OUString());
aFmt.SetFirstLineOffset( lBullFirstLineOffset );
aFmt.SetAbsLSpace( nAbsPos );
if( !aFmt.GetCharFmt() )
@@ -1666,7 +1666,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
if( !aFlags.bSetNumRule )
{
- String sChgStr = rtl::OUString('\t');
+ String sChgStr = OUString('\t');
if( bChgBullet )
sChgStr.Insert( aFlags.cBullet, 0 );
pDoc->InsertString( aDelPam, sChgStr );
@@ -1710,7 +1710,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
IsSentenceAtEnd( *pNxtNd );
if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
{
- pDoc->InsertString( aDelPam, rtl::OUString(' ') );
+ pDoc->InsertString( aDelPam, OUString(' ') );
}
if( bBreak )
break;
@@ -1780,7 +1780,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
DeleteSel( aDelPam );
if( bInsTab )
{
- pDoc->InsertString( aDelPam, rtl::OUString('\t') );
+ pDoc->InsertString( aDelPam, OUString('\t') );
}
}
}
@@ -1800,7 +1800,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
IsSentenceAtEnd( *pNxtNd );
if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
{
- pDoc->InsertString( aDelPam, rtl::OUString(' ') );
+ pDoc->InsertString( aDelPam, OUString(' ') );
}
if( bBreak )
break;
@@ -1818,7 +1818,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
{
String sTxt(ViewShell::GetShellRes()->GetAutoFmtNameLst()[
STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] );
- sTxt.SearchAndReplace( rtl::OUString("$(ARG1)"),
+ sTxt.SearchAndReplace( OUString("$(ARG1)"),
OUString::number( nLvl + 1 ) );
pDoc->SetAutoFmtRedlineComment( &sTxt );
}
@@ -1931,7 +1931,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
aDelPam.DeleteMark();
if( bSetHardBlank )
{
- pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) );
+ pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) );
++nPos;
}
}
@@ -1986,7 +1986,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
if( bSetHardBlank )
{
aDelPam.GetPoint()->nContent = nPos;
- pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) );
+ pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) );
aDelPam.GetPoint()->nContent = ++nPos;
}
}
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 7d1fc81d3e72..290666c61688 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -34,7 +34,6 @@
#include <switerator.hxx>
using namespace com::sun::star;
-using ::rtl::OUString;
sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const
{
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 210ce3f3ee53..f63912efa299 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -288,7 +288,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk )
#if defined(UNX)
rBuf += '\012';
#else
- rBuf += rtl::OUString("\015\012");
+ rBuf += OUString("\015\012");
#endif
}
}
@@ -301,7 +301,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk )
aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
#endif
WriterRef xWrt;
- SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT), String(), xWrt );
+ SwReaderWriter::GetWriter( OUString(FILTER_TEXT), String(), xWrt );
if( xWrt.Is() )
{
// Selektierte Bereiche in ein ASCII Dokument schreiben
@@ -336,7 +336,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk )
const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer();
if( p )
- rBuf = rtl::OUString(p);
+ rBuf = OUString(p);
else
{
rtl_uString *pStr = rtl_uString_alloc(lLen / sizeof( sal_Unicode ));
@@ -344,7 +344,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk )
aStream.ResetError();
//endian specific?, yipes!
aStream.Read(pStr->buffer, lLen);
- rBuf = rtl::OUString(pStr, SAL_NO_ACQUIRE);
+ rBuf = OUString(pStr, SAL_NO_ACQUIRE);
}
}
}
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 2b33da081222..8185efb40488 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -72,7 +72,7 @@ void SwEditShell::Insert( sal_Unicode c, sal_Bool bOnlyCurrCrsr )
StartAllAction();
FOREACHPAM_START(this)
- const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, rtl::OUString(c));
+ const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, OUString(c));
OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
(void) bSuccess;
@@ -508,7 +508,7 @@ const SwFmtRefMark* SwEditShell::GetRefMark( const String& rName ) const
}
// returne die Namen aller im Doc gesetzten Referenzen
-sal_uInt16 SwEditShell::GetRefMarks( std::vector<rtl::OUString>* pStrings ) const
+sal_uInt16 SwEditShell::GetRefMarks( std::vector<OUString>* pStrings ) const
{
return GetDoc()->GetRefMarks( pStrings );
}
@@ -1062,7 +1062,7 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, sal_Bool bInsText
String sRet;
if( pDel )
{
- rtl::OUString sTmp;
+ OUString sTmp;
SwUnoCursorHelper::GetTextFromPam(*pDel, sTmp);
sRet = sTmp;
SET_CURR_SHELL( this );
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 598547f6abfb..7bd4337ff35f 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -361,7 +361,7 @@ void SwEditShell::ApplyAutoMark()
nSrchFlags |= (SearchFlags::REG_NOT_BEGINOFLINE |
SearchFlags::REG_NOT_ENDOFLINE );
//
- rtl::OUString sEmpty;
+ OUString sEmpty;
SearchOptions aSearchOpt(
SearchAlgorithms_ABSOLUTE, nSrchFlags,
sEmpty, sEmpty,
@@ -371,7 +371,7 @@ void SwEditShell::ApplyAutoMark()
while( !rStrm.GetError() && !rStrm.IsEof() )
{
- rtl::OString aRdLine;
+ OString aRdLine;
rStrm.ReadLine( aRdLine );
// # -> comment
@@ -380,7 +380,7 @@ void SwEditShell::ApplyAutoMark()
// Leading and trailing blanks are ignored
if( !aRdLine.isEmpty() && '#' != aRdLine[0] )
{
- String sLine(rtl::OStringToOUString(aRdLine, eChrSet));
+ String sLine(OStringToOUString(aRdLine, eChrSet));
sal_Int32 nTokenPos = 0;
String sToSelect( sLine.GetToken(0, ';', nTokenPos ) );
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 1f807160c790..5baad3c8a2e2 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -136,7 +136,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
}
} catch (const ::com::sun::star::uno::Exception & e) {
OSL_TRACE("SwEditShell::Undo(): exception caught:\n %s",
- ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
.getStr());
}
@@ -191,7 +191,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
}
} catch (const ::com::sun::star::uno::Exception & e) {
OSL_TRACE("SwEditShell::Redo(): exception caught:\n %s",
- ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
.getStr());
}
@@ -221,7 +221,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount)
|| bRet;
} catch (const ::com::sun::star::uno::Exception & e) {
OSL_TRACE("SwEditShell::Repeat(): exception caught:\n %s",
- ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)
.getStr());
}
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 5490252b8282..c99ea28290e9 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -284,14 +284,14 @@ SwUndoId SwEditShell::EndUndo(SwUndoId eUndoId,
{ return GetDoc()->GetIDocumentUndoRedo().EndUndo(eUndoId, pRewriter); }
-bool SwEditShell::GetLastUndoInfo(::rtl::OUString *const o_pStr,
+bool SwEditShell::GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId) const
{ return GetDoc()->GetIDocumentUndoRedo().GetLastUndoInfo(o_pStr, o_pId); }
-bool SwEditShell::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const
+bool SwEditShell::GetFirstRedoInfo(OUString *const o_pStr) const
{ return GetDoc()->GetIDocumentUndoRedo().GetFirstRedoInfo(o_pStr); }
-SwUndoId SwEditShell::GetRepeatInfo(::rtl::OUString *const o_pStr) const
+SwUndoId SwEditShell::GetRepeatInfo(OUString *const o_pStr) const
{ return GetDoc()->GetIDocumentUndoRedo().GetRepeatInfo(o_pStr); }
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 8870c4e4710e..ab369586a8f7 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -43,7 +43,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-using rtl::OUString;
SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
@@ -396,8 +395,8 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) const
{
Sequence<PropertyValues> aRet(m_SortKeyArr.size());
PropertyValues* pValues = aRet.getArray();
- OUString sProp1( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ),
- sProp2( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
+ OUString sProp1( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ),
+ sProp2( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
for(sal_uInt16 i = 0; i < m_SortKeyArr.size(); i++)
{
const SwTOXSortKey* pKey = &m_SortKeyArr[i];
@@ -580,7 +579,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
return pEntry->GetAuthorField( eField );
}
-void SwAuthorityField::SetPar1(const rtl::OUString& rStr)
+void SwAuthorityField::SetPar1(const OUString& rStr)
{
SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp();
pInitType->RemoveField(m_nHandle);
@@ -638,7 +637,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const
PropertyValue* pValues = aRet.getArray();
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
{
- pValues[i].Name = rtl::OUString::createFromAscii(aFieldNames[i]);
+ pValues[i].Name = OUString::createFromAscii(aFieldNames[i]);
const String& rField = pAuthEntry->GetAuthorField((ToxAuthorityField) i);
if(i == AUTH_FIELD_AUTHORITY_TYPE)
pValues[i].Value <<= sal_Int16(rField.ToInt32());
@@ -667,7 +666,7 @@ bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
if(!(rAny >>= aParam))
return false;
- rtl::OUStringBuffer sBuf;
+ OUStringBuffer sBuf;
comphelper::string::padToLength(sBuf, AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER);
String sToSet(sBuf.makeStringAndClear());
const PropertyValue* pParam = aParam.getConstArray();
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 44ca2e3323dd..1eb50c940dbe 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -411,7 +411,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
rNewStr += ':';
@@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
}
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
@@ -506,13 +506,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
pBox = rTbl.GetTblBox( *pLastBox );
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
rNewStr += ':';
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pBox = rTbl.GetTblBox( rFirstBox );
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
// Kennung fuer Box erhalten
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
@@ -827,7 +827,7 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
// in die Externe Darstellung umwandeln.
SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.ToInt64()));
if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() )
- return rtl::OUString('?');
+ return OUString('?');
sTmp = pBox->GetName();
}
@@ -1175,8 +1175,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
}
if( pLastBox )
- ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
- ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
+ ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
+ ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index bea128ecd751..c3c63381b527 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -42,7 +42,6 @@
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen
@@ -70,7 +69,7 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData&
{
if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty())
{
- sName = rtl::OUStringBuffer(aDBData.sDataSource).append(DB_DELIM).
+ sName = OUStringBuffer(aDBData.sDataSource).append(DB_DELIM).
append(aDBData.sCommand).append(DB_DELIM).makeStringAndClear();
}
sName += GetColumnName();
@@ -88,7 +87,7 @@ SwFieldType* SwDBFieldType::Copy() const
}
//------------------------------------------------------------------------------
-const rtl::OUString& SwDBFieldType::GetName() const
+const OUString& SwDBFieldType::GetName() const
{
return sName;
}
@@ -205,7 +204,7 @@ void SwDBField::InitContent()
{
if (!IsInitialized())
{
- aContent = rtl::OUStringBuffer().append('<')
+ aContent = OUStringBuffer().append('<')
.append(((const SwDBFieldType*)GetTyp())->GetColumnName())
.append('>').makeStringAndClear();
}
@@ -364,7 +363,7 @@ void SwDBField::Evaluate()
Beschreibung: Namen erfragen
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBField::GetPar1() const
+const OUString& SwDBField::GetPar1() const
{
return ((const SwDBFieldType*)GetTyp())->GetName();
}
@@ -640,12 +639,12 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc)
Beschreibung: Bedingung
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBNextSetField::GetPar1() const
+const OUString& SwDBNextSetField::GetPar1() const
{
return aCond;
}
-void SwDBNextSetField::SetPar1(const rtl::OUString& rStr)
+void SwDBNextSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
@@ -743,12 +742,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
Beschreibung: LogDBName
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBNumSetField::GetPar1() const
+const OUString& SwDBNumSetField::GetPar1() const
{
return aCond;
}
-void SwDBNumSetField::SetPar1(const rtl::OUString& rStr)
+void SwDBNumSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
@@ -757,12 +756,12 @@ void SwDBNumSetField::SetPar1(const rtl::OUString& rStr)
Beschreibung: Bedingung
--------------------------------------------------------------------*/
-rtl::OUString SwDBNumSetField::GetPar2() const
+OUString SwDBNumSetField::GetPar2() const
{
return aPar2;
}
-void SwDBNumSetField::SetPar2(const rtl::OUString& rStr)
+void SwDBNumSetField::SetPar2(const OUString& rStr)
{
aPar2 = rStr;
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index e11c113c1fb7..5f79e3c7823a 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -32,7 +32,6 @@
#include <unofldmid.h>
#include <hints.hxx>
-using rtl::OUString;
using namespace ::com::sun::star;
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
@@ -263,7 +262,7 @@ SwFieldType* SwDDEFieldType::Copy() const
return pType;
}
-const rtl::OUString& SwDDEFieldType::GetName() const
+const OUString& SwDDEFieldType::GetName() const
{
return aName;
}
@@ -333,7 +332,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR5:
- rVal <<= ::rtl::OUString(aExpansion);
+ rVal <<= OUString(aExpansion);
break;
default:
OSL_FAIL("illegal property");
@@ -358,7 +357,7 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
break;
case FIELD_PROP_PAR5:
{
- ::rtl::OUString sTemp;
+ OUString sTemp;
rVal >>= sTemp;
aExpansion = sTemp;
}
@@ -411,7 +410,7 @@ SwField* SwDDEField::Copy() const
Beschreibung: Parameter des Typen erfragen
Name
--------------------------------------------------------------------*/
-const rtl::OUString& SwDDEField::GetPar1() const
+const OUString& SwDDEField::GetPar1() const
{
return ((const SwDDEFieldType*)GetTyp())->GetName();
}
@@ -420,12 +419,12 @@ const rtl::OUString& SwDDEField::GetPar1() const
Beschreibung: Parameter des Typen erfragen
Commando
--------------------------------------------------------------------*/
-rtl::OUString SwDDEField::GetPar2() const
+OUString SwDDEField::GetPar2() const
{
return ((const SwDDEFieldType*)GetTyp())->GetCmd();
}
-void SwDDEField::SetPar2(const rtl::OUString& rStr)
+void SwDDEField::SetPar2(const OUString& rStr)
{
((SwDDEFieldType*)GetTyp())->SetCmd(rStr);
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 98bb00f9f77d..5783b506aae9 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -96,7 +96,6 @@
#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace nsSwDocInfoSubType;
@@ -236,12 +235,12 @@ SwField* SwPageNumberField::Copy() const
return pTmp;
}
-rtl::OUString SwPageNumberField::GetPar2() const
+OUString SwPageNumberField::GetPar2() const
{
return OUString::number(nOffset);
}
-void SwPageNumberField::SetPar2(const rtl::OUString& rStr)
+void SwPageNumberField::SetPar2(const OUString& rStr)
{
nOffset = (short)rStr.toInt32();
}
@@ -394,7 +393,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
break;
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString(GetContent());
+ rAny <<= OUString(GetContent());
break;
default:
@@ -951,7 +950,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
break;
case DI_CUSTOM:
{
- ::rtl::OUString sVal;
+ OUString sVal;
try
{
uno::Any aAny;
@@ -1109,7 +1108,7 @@ String SwDocInfoField::Expand() const
if ( !IsFixed() )
{
// if the field is "fixed" we don't update it from the property
- ::rtl::OUString sVal;
+ OUString sVal;
uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(comphelper::getProcessComponentContext()) );
util::Date aDate;
util::DateTime aDateTime;
@@ -1130,14 +1129,14 @@ String SwDocInfoField::Expand() const
}
else if( aAny >>= aDuration )
{
- String sText = aDuration.Negative ? rtl::OUString('-') : rtl::OUString('+');
+ String sText = aDuration.Negative ? OUString('-') : OUString('+');
sText += ViewShell::GetShellRes()->sDurationFormat;
- sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( aDuration.Years ) );
- sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( aDuration.Months ) );
- sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( aDuration.Days ) );
- sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( aDuration.Hours ) );
- sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( aDuration.Minutes) );
- sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( aDuration.Seconds) );
+ sText.SearchAndReplace(OUString("%1"), OUString::number( aDuration.Years ) );
+ sText.SearchAndReplace(OUString("%2"), OUString::number( aDuration.Months ) );
+ sText.SearchAndReplace(OUString("%3"), OUString::number( aDuration.Days ) );
+ sText.SearchAndReplace(OUString("%4"), OUString::number( aDuration.Hours ) );
+ sText.SearchAndReplace(OUString("%5"), OUString::number( aDuration.Minutes) );
+ sText.SearchAndReplace(OUString("%6"), OUString::number( aDuration.Seconds) );
sVal = sText;
}
else
@@ -1243,7 +1242,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR3:
- rAny <<= rtl::OUString(Expand());
+ rAny <<= OUString(Expand());
break;
case FIELD_PROP_BOOL2:
{
@@ -1488,13 +1487,13 @@ SwField* SwHiddenTxtField::Copy() const
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwHiddenTxtField::SetPar1(const rtl::OUString& rStr)
+void SwHiddenTxtField::SetPar1(const OUString& rStr)
{
aCond = rStr;
bCanToggle = aCond.getLength() > 0;
}
-const rtl::OUString& SwHiddenTxtField::GetPar1() const
+const OUString& SwHiddenTxtField::GetPar1() const
{
return aCond;
}
@@ -1503,7 +1502,7 @@ const rtl::OUString& SwHiddenTxtField::GetPar1() const
Beschreibung: True/False Text
--------------------------------------------------------------------*/
-void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr)
+void SwHiddenTxtField::SetPar2(const OUString& rStr)
{
if (nSubType == TYP_CONDTXTFLD)
{
@@ -1520,7 +1519,7 @@ void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr)
aTRUETxt = rStr;
}
-rtl::OUString SwHiddenTxtField::GetPar2() const
+OUString SwHiddenTxtField::GetPar2() const
{
String aRet(aTRUETxt);
if(nSubType == TYP_CONDTXTFLD)
@@ -1538,7 +1537,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const
bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
{
- const rtl::OUString* pOut = 0;
+ const OUString* pOut = 0;
switch( nWhichId )
{
case FIELD_PROP_PAR1:
@@ -1573,7 +1572,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
case FIELD_PROP_PAR1:
{
- rtl::OUString sVal;
+ OUString sVal;
rAny >>= sVal;
SetPar1(sVal);
}
@@ -1710,12 +1709,12 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwHiddenParaField::SetPar1(const rtl::OUString& rStr)
+void SwHiddenParaField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
-const rtl::OUString& SwHiddenParaField::GetPar1() const
+const OUString& SwHiddenParaField::GetPar1() const
{
return aCond;
}
@@ -1800,12 +1799,12 @@ SwField* SwPostItField::Copy() const
Beschreibung: Author setzen
--------------------------------------------------------------------*/
-void SwPostItField::SetPar1(const rtl::OUString& rStr)
+void SwPostItField::SetPar1(const OUString& rStr)
{
sAuthor = rStr;
}
-const rtl::OUString& SwPostItField::GetPar1() const
+const OUString& SwPostItField::GetPar1() const
{
return sAuthor;
}
@@ -1814,27 +1813,27 @@ const rtl::OUString& SwPostItField::GetPar1() const
Beschreibung: Text fuers PostIt setzen
--------------------------------------------------------------------*/
-void SwPostItField::SetPar2(const rtl::OUString& rStr)
+void SwPostItField::SetPar2(const OUString& rStr)
{
sTxt = rStr;
}
-rtl::OUString SwPostItField::GetPar2() const
+OUString SwPostItField::GetPar2() const
{
return sTxt;
}
-const rtl::OUString& SwPostItField::GetInitials() const
+const OUString& SwPostItField::GetInitials() const
{
return sInitials;
}
-void SwPostItField::SetName(const rtl::OUString& rName)
+void SwPostItField::SetName(const OUString& rName)
{
sName = rName;
}
-const rtl::OUString& SwPostItField::GetName() const
+const OUString& SwPostItField::GetName() const
{
return sName;
}
@@ -2146,12 +2145,12 @@ SwField* SwRefPageSetField::Copy() const
return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn );
}
-rtl::OUString SwRefPageSetField::GetPar2() const
+OUString SwRefPageSetField::GetPar2() const
{
return OUString::number(GetOffset());
}
-void SwRefPageSetField::SetPar2(const rtl::OUString& rStr)
+void SwRefPageSetField::SetPar2(const OUString& rStr)
{
SetOffset( (short) rStr.toInt32() );
}
@@ -2477,7 +2476,7 @@ SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm,
String SwJumpEditField::Expand() const
{
- return rtl::OUStringBuffer().append('<').
+ return OUStringBuffer().append('<').
append(sTxt).append('>').makeStringAndClear();
}
@@ -2489,24 +2488,24 @@ SwField* SwJumpEditField::Copy() const
// Platzhalter-Text
-const rtl::OUString& SwJumpEditField::GetPar1() const
+const OUString& SwJumpEditField::GetPar1() const
{
return sTxt;
}
-void SwJumpEditField::SetPar1(const rtl::OUString& rStr)
+void SwJumpEditField::SetPar1(const OUString& rStr)
{
sTxt = rStr;
}
// HinweisText
-rtl::OUString SwJumpEditField::GetPar2() const
+OUString SwJumpEditField::GetPar2() const
{
return sHelp;
}
-void SwJumpEditField::SetPar2(const rtl::OUString& rStr)
+void SwJumpEditField::SetPar2(const OUString& rStr)
{
sHelp = rStr;
}
@@ -2610,12 +2609,12 @@ SwField* SwCombinedCharField::Copy() const
sCharacters );
}
-const rtl::OUString& SwCombinedCharField::GetPar1() const
+const OUString& SwCombinedCharField::GetPar1() const
{
return sCharacters;
}
-void SwCombinedCharField::SetPar1(const rtl::OUString& rStr)
+void SwCombinedCharField::SetPar1(const OUString& rStr)
{
sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS));
}
@@ -2626,7 +2625,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny,
switch( nWhichId )
{
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString( sCharacters );
+ rAny <<= OUString( sCharacters );
break;
default:
OSL_FAIL("illegal property");
@@ -2641,7 +2640,7 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny,
{
case FIELD_PROP_PAR1:
{
- rtl::OUString sTmp;
+ OUString sTmp;
rAny >>= sTmp;
SetPar1(sTmp);
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 4407919bb519..fd7e96a12000 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -57,7 +57,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
-using ::rtl::OUString;
//-----------------------------------------------------------------------------
static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType)
@@ -386,12 +385,12 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
}
}
-rtl::OUString SwGetExpField::GetPar2() const
+OUString SwGetExpField::GetPar2() const
{
return GetFormula();
}
-void SwGetExpField::SetPar2(const rtl::OUString& rStr)
+void SwGetExpField::SetPar2(const OUString& rStr)
{
SetFormula(rStr);
}
@@ -443,7 +442,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR4:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
default:
return SwField::QueryValue(rAny, nWhichId);
@@ -495,7 +494,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt1
: SwValueFieldType( pDc, RES_SETEXPFLD ),
sName( rName ),
pOutlChgNd( 0 ),
- sDelim( rtl::OUString(".") ),
+ sDelim( OUString(".") ),
nType(nTyp), nLevel( UCHAR_MAX ),
bDeleted( sal_False )
{
@@ -513,7 +512,7 @@ SwFieldType* SwSetExpFieldType::Copy() const
return pNew;
}
-const rtl::OUString& SwSetExpFieldType::GetName() const
+const OUString& SwSetExpFieldType::GetName() const
{
return sName;
}
@@ -674,7 +673,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
if( ::GetString( rAny, sTmp ).Len() )
SetDelimiter( sTmp );
else
- SetDelimiter(rtl::OUString(" "));
+ SetDelimiter(OUString(" "));
}
break;
case FIELD_PROP_SHORT1:
@@ -944,12 +943,12 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc
Beschreibung: Parameter setzen
--------------------------------------------------------------------*/
-const rtl::OUString& SwSetExpField::GetPar1() const
+const OUString& SwSetExpField::GetPar1() const
{
return ((const SwSetExpFieldType*)GetTyp())->GetName();
}
-rtl::OUString SwSetExpField::GetPar2() const
+OUString SwSetExpField::GetPar2() const
{
sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType();
@@ -958,7 +957,7 @@ rtl::OUString SwSetExpField::GetPar2() const
return GetExpandedFormula();
}
-void SwSetExpField::SetPar2(const rtl::OUString& rStr)
+void SwSetExpField::SetPar2(const OUString& rStr)
{
sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType();
@@ -1084,12 +1083,12 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwInputField::SetPar1(const rtl::OUString& rStr)
+void SwInputField::SetPar1(const OUString& rStr)
{
aContent = rStr;
}
-const rtl::OUString& SwInputField::GetPar1() const
+const OUString& SwInputField::GetPar1() const
{
return aContent;
}
@@ -1098,12 +1097,12 @@ const rtl::OUString& SwInputField::GetPar1() const
Beschreibung: True/False Text
--------------------------------------------------------------------*/
-void SwInputField::SetPar2(const rtl::OUString& rStr)
+void SwInputField::SetPar2(const OUString& rStr)
{
aPText = rStr;
}
-rtl::OUString SwInputField::GetPar2() const
+OUString SwInputField::GetPar2() const
{
return aPText;
}
@@ -1200,7 +1199,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR4:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
default:
return SwField::QueryValue(rAny, nWhichId);
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 93532197dbdf..da56d0dd1446 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -141,7 +141,7 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId )
{
}
-const rtl::OUString& SwFieldType::GetName() const
+const OUString& SwFieldType::GetName() const
{
return aEmptyOUStr;
}
@@ -257,14 +257,14 @@ String SwField::GetFieldName() const
Beschreibung: Parameter setzen auslesen
--------------------------------------------------------------------*/
-const rtl::OUString& SwField::GetPar1() const
+const OUString& SwField::GetPar1() const
{
return aEmptyOUStr;
}
-rtl::OUString SwField::GetPar2() const
+OUString SwField::GetPar2() const
{
- return rtl::OUString();
+ return OUString();
}
String SwField::GetFormula() const
@@ -272,10 +272,10 @@ String SwField::GetFormula() const
return GetPar2();
}
-void SwField::SetPar1(const rtl::OUString& )
+void SwField::SetPar1(const OUString& )
{}
-void SwField::SetPar2(const rtl::OUString& )
+void SwField::SetPar2(const OUString& )
{}
sal_uInt16 SwField::GetSubType() const
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 3d841e4be409..ddd92926b508 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -106,16 +106,16 @@ void SwDateTimeField::SetSubType(sal_uInt16 nType)
nSubType = nType;
}
-void SwDateTimeField::SetPar2(const rtl::OUString& rStr)
+void SwDateTimeField::SetPar2(const OUString& rStr)
{
nOffset = rStr.toInt32();
}
-rtl::OUString SwDateTimeField::GetPar2() const
+OUString SwDateTimeField::GetPar2() const
{
if (nOffset)
return OUString::number(nOffset);
- return rtl::OUString();
+ return OUString();
}
void SwDateTimeField::SetDateTime(const DateTime& rDT)
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 31cd495d0c2e..417f5e6aa236 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -28,7 +28,6 @@
using namespace com::sun::star;
-using rtl::OUString;
using std::vector;
static String aEmptyString;
@@ -68,7 +67,7 @@ String SwDropDownField::Expand() const
String sSelect = GetSelectedItem();
if(!sSelect.Len())
{
- vector<rtl::OUString>::const_iterator aIt = aValues.begin();
+ vector<OUString>::const_iterator aIt = aValues.begin();
if ( aIt != aValues.end())
sSelect = *aIt;
}
@@ -83,27 +82,27 @@ SwField * SwDropDownField::Copy() const
return new SwDropDownField(*this);
}
-const rtl::OUString & SwDropDownField::GetPar1() const
+const OUString & SwDropDownField::GetPar1() const
{
return GetSelectedItem();
}
-rtl::OUString SwDropDownField::GetPar2() const
+OUString SwDropDownField::GetPar2() const
{
return GetName();
}
-void SwDropDownField::SetPar1(const rtl::OUString & rStr)
+void SwDropDownField::SetPar1(const OUString & rStr)
{
SetSelectedItem(rStr);
}
-void SwDropDownField::SetPar2(const rtl::OUString & rName)
+void SwDropDownField::SetPar2(const OUString & rName)
{
SetName(rName);
}
-void SwDropDownField::SetItems(const vector<rtl::OUString> & rItems)
+void SwDropDownField::SetItems(const vector<OUString> & rItems)
{
aValues = rItems;
aSelectedItem = aEmptyString;
@@ -125,7 +124,7 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
uno::Sequence<OUString> aSeq( aValues.size() );
OUString* pSeq = aSeq.getArray();
int i = 0;
- vector<rtl::OUString>::const_iterator aIt;
+ vector<OUString>::const_iterator aIt;
for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt)
{
@@ -136,50 +135,50 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
return aSeq;
}
-const rtl::OUString & SwDropDownField::GetSelectedItem() const
+const OUString & SwDropDownField::GetSelectedItem() const
{
return aSelectedItem;
}
-const rtl::OUString & SwDropDownField::GetName() const
+const OUString & SwDropDownField::GetName() const
{
return aName;
}
-const rtl::OUString & SwDropDownField::GetHelp() const
+const OUString & SwDropDownField::GetHelp() const
{
return aHelp;
}
-const rtl::OUString & SwDropDownField::GetToolTip() const
+const OUString & SwDropDownField::GetToolTip() const
{
return aToolTip;
}
-sal_Bool SwDropDownField::SetSelectedItem(const rtl::OUString & rItem)
+sal_Bool SwDropDownField::SetSelectedItem(const OUString & rItem)
{
- vector<rtl::OUString>::const_iterator aIt =
+ vector<OUString>::const_iterator aIt =
std::find(aValues.begin(), aValues.end(), rItem);
if (aIt != aValues.end())
aSelectedItem = *aIt;
else
- aSelectedItem = rtl::OUString();
+ aSelectedItem = OUString();
return (aIt != aValues.end());
}
-void SwDropDownField::SetName(const rtl::OUString & rName)
+void SwDropDownField::SetName(const OUString & rName)
{
aName = rName;
}
-void SwDropDownField::SetHelp(const rtl::OUString & rHelp)
+void SwDropDownField::SetHelp(const OUString & rHelp)
{
aHelp = rHelp;
}
-void SwDropDownField::SetToolTip(const rtl::OUString & rToolTip)
+void SwDropDownField::SetToolTip(const OUString & rToolTip)
{
aToolTip = rToolTip;
}
@@ -219,7 +218,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
{
case FIELD_PROP_PAR1:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetSelectedItem(aTmpStr);
@@ -228,7 +227,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR2:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetName(aTmpStr);
@@ -237,7 +236,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR3:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetHelp(aTmpStr);
@@ -246,7 +245,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR4:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetToolTip(aTmpStr);
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index c4a7e580bec3..d62f72a56d4d 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: MacroFeldtypen
@@ -137,13 +136,13 @@ SvxMacro SwMacroField::GetSvxMacro() const
Beschreibung: LibName und MacroName
--------------------------------------------------------------------*/
-void SwMacroField::SetPar1(const rtl::OUString& rStr)
+void SwMacroField::SetPar1(const OUString& rStr)
{
aMacro = rStr;
bIsScriptURL = isScriptURL(aMacro);
}
-const rtl::OUString& SwMacroField::GetPar1() const
+const OUString& SwMacroField::GetPar1() const
{
return aMacro;
}
@@ -152,12 +151,12 @@ const rtl::OUString& SwMacroField::GetPar1() const
Beschreibung: Macrotext
--------------------------------------------------------------------*/
-void SwMacroField::SetPar2(const rtl::OUString& rStr)
+void SwMacroField::SetPar2(const OUString& rStr)
{
aText = rStr;
}
-rtl::OUString SwMacroField::GetPar2() const
+OUString SwMacroField::GetPar2() const
{
return aText;
}
@@ -186,7 +185,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
- rtl::OUString sTmp;
+ OUString sTmp;
switch( nWhichId )
{
case FIELD_PROP_PAR1:
@@ -213,14 +212,14 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
// create an internally used macro name from the library and macro name parts
void SwMacroField::CreateMacroString(
- rtl::OUString& rMacro,
+ OUString& rMacro,
const String& rMacroName,
const String& rLibraryName )
{
// concatenate library and name; use dot only if both strings have content
rMacro = rLibraryName;
if ( rLibraryName.Len() > 0 && rMacroName.Len() > 0 )
- rMacro += rtl::OUString('.');
+ rMacro += OUString('.');
rMacro += rMacroName;
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 43eae4b57bd3..68a00d7a47a4 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -65,7 +65,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
@@ -294,7 +293,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
return ;
}
// where is the category name (e.g. "Illustration")?
- rtl::OUString const Text = pTxtNd->GetTxt();
+ OUString const Text = pTxtNd->GetTxt();
unsigned const nCatStart = Text.indexOf(sSetRefName);
unsigned const nCatEnd = nCatStart == unsigned(-1) ?
unsigned(-1) : nCatStart + sSetRefName.getLength();
@@ -585,19 +584,19 @@ SwField* SwGetRefField::Copy() const
--------------------------------------------------------------------*/
-const rtl::OUString& SwGetRefField::GetPar1() const
+const OUString& SwGetRefField::GetPar1() const
{
return sSetRefName;
}
-void SwGetRefField::SetPar1( const rtl::OUString& rName )
+void SwGetRefField::SetPar1( const OUString& rName )
{
sSetRefName = rName;
}
-rtl::OUString SwGetRefField::GetPar2() const
+OUString SwGetRefField::GetPar2() const
{
return Expand();
}
@@ -658,11 +657,11 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
break;
}
}
- rAny <<= rtl::OUString(sTmp);
+ rAny <<= OUString(sTmp);
}
break;
case FIELD_PROP_PAR3:
- rAny <<= rtl::OUString(Expand());
+ rAny <<= OUString(Expand());
break;
case FIELD_PROP_SHORT1:
rAny <<= (sal_Int16)nSeqNo;
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 4aa7bcc04841..8432bad839c0 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -23,7 +23,6 @@
#include <tools/resid.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: ScriptField
--------------------------------------------------------------------*/
@@ -68,12 +67,12 @@ SwField* SwScriptField::Copy() const
Beschreibung: Type setzen
--------------------------------------------------------------------*/
-void SwScriptField::SetPar1( const rtl::OUString& rStr )
+void SwScriptField::SetPar1( const OUString& rStr )
{
sType = rStr;
}
-const rtl::OUString& SwScriptField::GetPar1() const
+const OUString& SwScriptField::GetPar1() const
{
return sType;
}
@@ -82,13 +81,13 @@ const rtl::OUString& SwScriptField::GetPar1() const
Beschreibung: Code setzen
--------------------------------------------------------------------*/
-void SwScriptField::SetPar2( const rtl::OUString& rStr )
+void SwScriptField::SetPar2( const OUString& rStr )
{
sCode = rStr;
}
-rtl::OUString SwScriptField::GetPar2() const
+OUString SwScriptField::GetPar2() const
{
return sCode;
}
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index e2af9eccd654..8b425e03996b 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -30,7 +30,6 @@
#include <unofldmid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr)
@@ -64,7 +63,7 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel,
: SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ),
nSubType(nType)
{
- sExpand = rtl::OUString('0');
+ sExpand = OUString('0');
}
@@ -160,13 +159,13 @@ void SwTblField::SetValue( const double& rVal )
--------------------------------------------------------------------*/
-rtl::OUString SwTblField::GetPar2() const
+OUString SwTblField::GetPar2() const
{
return SwTableFormula::GetFormula();
}
-void SwTblField::SetPar2(const rtl::OUString& rStr)
+void SwTblField::SetPar2(const OUString& rStr)
{
SetFormula( rStr );
}
@@ -181,7 +180,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
sal_uInt16 nOldSubType = nSubType;
SwTblField* pThis = (SwTblField*)this;
pThis->nSubType |= nsSwExtendedSubType::SUB_CMD;
- rAny <<= rtl::OUString( Expand() );
+ rAny <<= OUString( Expand() );
pThis->nSubType = nOldSubType;
}
break;
@@ -192,7 +191,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
case FIELD_PROP_FORMAT:
rAny <<= (sal_Int32)GetFormat();
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 0ae5e2eb4541..fdc145ae461e 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -39,7 +39,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0,0,0,0,0}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index aa5c181ebb77..df7253b60bcb 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -34,7 +34,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: Benutzerfelder
@@ -86,7 +85,7 @@ void SwUserField::SetValue( const double& rVal )
Beschreibung: Name
--------------------------------------------------------------------*/
-const rtl::OUString& SwUserField::GetPar1() const
+const OUString& SwUserField::GetPar1() const
{
return ((const SwUserFieldType*)GetTyp())->GetName();
}
@@ -95,12 +94,12 @@ const rtl::OUString& SwUserField::GetPar1() const
Beschreibung: Content
--------------------------------------------------------------------*/
-rtl::OUString SwUserField::GetPar2() const
+OUString SwUserField::GetPar2() const
{
return ((SwUserFieldType*)GetTyp())->GetContent(GetFormat());
}
-void SwUserField::SetPar2(const rtl::OUString& rStr)
+void SwUserField::SetPar2(const OUString& rStr)
{
((SwUserFieldType*)GetTyp())->SetContent(rStr, GetFormat());
}
@@ -212,7 +211,7 @@ SwFieldType* SwUserFieldType::Copy() const
return pTmp;
}
-const rtl::OUString& SwUserFieldType::GetName() const
+const OUString& SwUserFieldType::GetName() const
{
return aName;
}
@@ -301,7 +300,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
rAny <<= (double) nValue;
break;
case FIELD_PROP_PAR2:
- rAny <<= rtl::OUString(aContent);
+ rAny <<= OUString(aContent);
break;
case FIELD_PROP_BOOL1:
{
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 9ab687510da2..2819819160b5 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -69,7 +69,6 @@
#include <ndole.hxx>
#include <editeng/opaqitem.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
// To register Flys in Flys in ...
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 0c0ce9494592..72a0a8920478 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2353,7 +2353,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const
if( !pTab )
return sal_False;
- rFml = rtl::OUString::createFromAscii( sCalc_Sum );
+ rFml = OUString::createFromAscii( sCalc_Sum );
SwCellFrms aCells;
if( ::GetAutoSumSel( *this, aCells ))
@@ -2383,7 +2383,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const
// restore previous spaces!
for( size_t i = aCells.size(); n+1 < i; )
{
- String sTmp(rtl::OUString("|<"));
+ String sTmp(OUString("|<"));
sTmp += aCells[ --i ]->GetTabBox()->GetName();
sTmp += '>';
rFml.Insert( sTmp, nInsPos );
@@ -2420,7 +2420,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const
// restore previous spaces!
for( size_t i = aCells.size(); n+1 < i; )
{
- String sTmp(rtl::OUString("|<" ));
+ String sTmp(OUString("|<" ));
sTmp += aCells[ --i ]->GetTabBox()->GetName();
sTmp += '>';
rFml.Insert( sTmp, nInsPos );
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 96365a4519a1..5b52817bc967 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -885,7 +885,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
String aExtStr = _aStrmName.Copy( nExtPos );
if ( GetGrfObj().GetType() != GRAPHIC_NONE )
{
- _aStrmName = rtl::OStringToOUString(GetGrfObj().GetUniqueID(),
+ _aStrmName = OStringToOUString(GetGrfObj().GetUniqueID(),
RTL_TEXTENCODING_ASCII_US);
_aStrmName += aExtStr;
}
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index cf19e6037049..e5f08b342c27 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -27,7 +27,7 @@
namespace sw {
namespace mark {
- typedef boost::unordered_map<rtl::OUString, sal_Int32, rtl::OUStringHash> MarkBasenameMapUniqueOffset_t;
+ typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> MarkBasenameMapUniqueOffset_t;
class MarkManager
: private ::boost::noncopyable
@@ -36,19 +36,19 @@ namespace sw {
public:
MarkManager(/*[in/out]*/ SwDoc& rDoc);
// IDocumentMarkAccess
- virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
+ virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark);
virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType);
+ const OUString& rName,
+ const OUString& rType);
virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType);
+ const OUString& rName,
+ const OUString& rType);
virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
- virtual bool renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName);
+ virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName);
virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset);
virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset);
@@ -64,14 +64,14 @@ namespace sw {
virtual const_iterator_t getMarksBegin() const;
virtual const_iterator_t getMarksEnd() const;
virtual sal_Int32 getMarksCount() const;
- virtual const_iterator_t findMark(const ::rtl::OUString& rName) const;
- virtual bool hasMark(const ::rtl::OUString& rName) const;
+ virtual const_iterator_t findMark(const OUString& rName) const;
+ virtual bool hasMark(const OUString& rName) const;
// bookmarks
virtual const_iterator_t getBookmarksBegin() const;
virtual const_iterator_t getBookmarksEnd() const;
virtual sal_Int32 getBookmarksCount() const;
- virtual const_iterator_t findBookmark(const ::rtl::OUString& rName) const;
+ virtual const_iterator_t findBookmark(const OUString& rName) const;
// Fieldmarks
virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const;
@@ -81,13 +81,13 @@ namespace sw {
void dumpAsXml(xmlTextWriterPtr w);
private:
// make names
- ::rtl::OUString getUniqueMarkName(const ::rtl::OUString& rName) const;
+ OUString getUniqueMarkName(const OUString& rName) const;
void sortMarks();
container_t m_vMarks;
container_t m_vBookmarks;
container_t m_vFieldmarks;
- boost::unordered_set<rtl::OUString, rtl::OUStringHash> m_aMarkNamesSet;
+ boost::unordered_set<OUString, OUStringHash> m_aMarkNamesSet;
mutable MarkBasenameMapUniqueOffset_t m_aMarkBasenameMapUniqueOffset;
SwDoc * const m_pDoc;
};
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index 10597655f56e..ff3c637b649a 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -34,7 +34,7 @@ public:
SwXMLBlockListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
SwXMLTextBlocks & rBlocks,
- const rtl::OUString &rFileName,
+ const OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLBlockListExport ( void ) {}
@@ -53,7 +53,7 @@ public:
SwXMLTextBlockExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
SwXMLTextBlocks & rBlocks,
- const rtl::OUString &rFileName,
+ const OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLTextBlockExport ( void ) {}
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 27b470143fb1..bbe47d578c31 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -33,7 +33,7 @@ protected:
// This method is called after the namespace map has been updated, but
// before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
@@ -59,7 +59,7 @@ protected:
// This method is called after the namespace map has been updated, but
// before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 3fd001aff5cf..204de9a0cffc 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -33,12 +33,12 @@ private:
public:
SwXMLBlockListContext( SwXMLBlockListImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLBlockListContext ( void );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
@@ -49,7 +49,7 @@ class SwXMLBlockContext : public SvXMLImportContext
public:
SwXMLBlockContext( SwXMLBlockListImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLBlockContext ( void );
@@ -63,11 +63,11 @@ private:
public:
SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockDocumentContext ( void );
@@ -81,11 +81,11 @@ private:
public:
SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockBodyContext ( void );
@@ -99,11 +99,11 @@ private:
public:
SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
~SwXMLTextBlockTextContext ( void );
@@ -117,10 +117,10 @@ private:
public:
SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport,
sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
- virtual void Characters( const ::rtl::OUString& rChars );
+ virtual void Characters( const OUString& rChars );
~SwXMLTextBlockParContext ( void );
};
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index df6aefd52bd1..36486638d61b 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -39,7 +39,7 @@ protected:
sal_Bool bBlock;
SfxObjectShellRef xDocShellRef;
sal_uInt16 nFlags;
- rtl::OUString aPackageName;
+ OUString aPackageName;
SfxMediumRef xMedium;
void ReadInfo();
@@ -55,7 +55,7 @@ public:
SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile );
void AddName( const String&, const String&, const String&, sal_Bool bOnlyTxt = sal_False );
virtual void AddName( const String&, const String&, sal_Bool bOnlyTxt = sal_False );
- rtl::OUString GeneratePackageName ( const String& rShort );
+ OUString GeneratePackageName ( const String& rShort );
virtual ~SwXMLTextBlocks();
//virtual sal_Bool IsOld() const;
virtual sal_uLong Delete( sal_uInt16 );
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 3bf50a620518..6df0bc2cb547 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -44,33 +44,33 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue )
+ virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName )
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+ virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
};
#endif
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 3e85c4d2be8e..54f335cd4d9d 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -45,7 +45,7 @@ public:
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
};
class SwUndoDrawGroup : public SwUndo
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index d24359bbdee5..e16644ce5811 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -81,14 +81,14 @@ public:
SwRewriter SW_DLLPRIVATE
MakeUndoReplaceRewriter(sal_uLong const ocurrences,
- ::rtl::OUString const& sOld, ::rtl::OUString const& sNew);
+ OUString const& sOld, OUString const& sNew);
class SwUndoReplace
: public SwUndo
{
public:
SwUndoReplace(SwPaM const& rPam,
- ::rtl::OUString const& rInsert, bool const bRegExp);
+ OUString const& rInsert, bool const bRegExp);
virtual ~SwUndoReplace();
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 693deaafd48c..14696b380477 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -58,15 +58,15 @@ public:
virtual SwUndoId EndUndo(SwUndoId const eUndoId,
SwRewriter const*const pRewriter);
virtual void DelAllUndoObj();
- virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr,
+ virtual bool GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId) const;
virtual SwUndoComments_t GetUndoComments() const;
- virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const;
+ virtual bool GetFirstRedoInfo(OUString *const o_pStr) const;
virtual SwUndoComments_t GetRedoComments() const;
virtual bool Repeat(::sw::RepeatContext & rContext,
sal_uInt16 const nRepeatCnt);
- virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const;
+ virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const;
virtual void AppendUndo(SwUndo *const pUndo);
virtual void ClearRedo();
virtual bool IsUndoNodes(SwNodes const& rNodes) const;
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 54dc9722d1ec..37f32ee19e17 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -49,7 +49,7 @@ namespace sw {
public:
virtual SwPosition& GetMarkPos() const
{ return *m_pPos1; }
- virtual const ::rtl::OUString& GetName() const
+ virtual const OUString& GetName() const
{ return m_aName; }
virtual SwPosition& GetOtherMarkPos() const
{
@@ -77,14 +77,14 @@ namespace sw {
virtual bool IsExpanded() const
{ return static_cast< bool >(m_pPos2); }
- virtual void SetName(const ::rtl::OUString& rName)
+ virtual void SetName(const OUString& rName)
{ m_aName = rName; }
virtual void SetMarkPos(const SwPosition& rNewPos);
virtual void SetOtherMarkPos(const SwPosition& rNewPos);
virtual void ClearOtherMarkPos()
{ m_pPos2.reset(); }
- virtual rtl::OUString ToString( ) const;
+ virtual OUString ToString( ) const;
virtual void Swap()
{
@@ -109,11 +109,11 @@ namespace sw {
// SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
- MarkBase(const SwPaM& rPaM, const ::rtl::OUString& rName);
+ MarkBase(const SwPaM& rPaM, const OUString& rName);
::boost::scoped_ptr<SwPosition> m_pPos1;
::boost::scoped_ptr<SwPosition> m_pPos2;
- ::rtl::OUString m_aName;
- static ::rtl::OUString GenerateNewName(const ::rtl::OUString& rPrefix);
+ OUString m_aName;
+ static OUString GenerateNewName(const OUString& rPrefix);
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextContent> m_wXBookmark;
@@ -164,15 +164,15 @@ namespace sw {
public:
Bookmark(const SwPaM& rPaM,
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName);
+ const OUString& rName,
+ const OUString& rShortName);
virtual void InitDoc(SwDoc* const io_Doc);
- virtual const ::rtl::OUString& GetShortName() const
+ virtual const OUString& GetShortName() const
{ return m_sShortName; }
virtual const KeyCode& GetKeyCode() const
{ return m_aCode; }
- virtual void SetShortName(const ::rtl::OUString& rShortName)
+ virtual void SetShortName(const OUString& rShortName)
{ m_sShortName = rShortName; }
virtual void SetKeyCode(const KeyCode& rCode)
{ m_aCode = rCode; }
@@ -187,7 +187,7 @@ namespace sw {
private:
KeyCode m_aCode;
- ::rtl::OUString m_sShortName;
+ OUString m_sShortName;
};
class Fieldmark
@@ -197,9 +197,9 @@ namespace sw {
public:
Fieldmark(const SwPaM& rPaM);
- virtual ::rtl::OUString GetFieldname() const
+ virtual OUString GetFieldname() const
{ return m_aFieldname; }
- virtual ::rtl::OUString GetFieldHelptext() const
+ virtual OUString GetFieldHelptext() const
{ return m_aFieldHelptext; }
virtual IFieldmark::parameter_map_t* GetParameters()
@@ -208,19 +208,19 @@ namespace sw {
virtual const IFieldmark::parameter_map_t* GetParameters() const
{ return &m_vParams; }
- virtual void SetFieldname(const ::rtl::OUString& aFieldname)
+ virtual void SetFieldname(const OUString& aFieldname)
{ m_aFieldname = aFieldname; }
- virtual void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext)
+ virtual void SetFieldHelptext(const OUString& aFieldHelptext)
{ m_aFieldHelptext = aFieldHelptext; }
virtual void ReleaseDoc(SwDoc* const) = 0;
virtual void Invalidate();
- virtual rtl::OUString ToString() const;
+ virtual OUString ToString() const;
private:
- ::rtl::OUString m_aFieldname;
- ::rtl::OUString m_aFieldHelptext;
+ OUString m_aFieldname;
+ OUString m_aFieldHelptext;
IFieldmark::parameter_map_t m_vParams;
};
@@ -244,7 +244,7 @@ namespace sw {
bool IsChecked() const;
void SetChecked(bool checked);
- virtual rtl::OUString toString( ) const;
+ virtual OUString toString( ) const;
};
}
}
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index de96ad8f7f0e..314cdf83fdb5 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -32,9 +32,9 @@ namespace sw {
public:
CrossRefBookmark(const SwPaM& rPaM,
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName,
- const ::rtl::OUString& rPrefix);
+ const OUString& rName,
+ const OUString& rShortName,
+ const OUString& rPrefix);
virtual SwPosition& GetOtherMarkPos() const;
virtual SwPosition& GetMarkStart() const
@@ -65,10 +65,10 @@ namespace sw {
public:
CrossRefHeadingBookmark(const SwPaM& rPaM,
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName);
- static ::rtl::OUString GenerateNewName();
- static bool IsLegalName(const ::rtl::OUString& rName);
+ const OUString& rName,
+ const OUString& rShortName);
+ static OUString GenerateNewName();
+ static bool IsLegalName(const OUString& rName);
};
class CrossRefNumItemBookmark
@@ -77,10 +77,10 @@ namespace sw {
public:
CrossRefNumItemBookmark(const SwPaM& rPaM,
const KeyCode& rCode,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName);
- static ::rtl::OUString GenerateNewName();
- static bool IsLegalName(const ::rtl::OUString& rName);
+ const OUString& rName,
+ const OUString& rShortName);
+ static OUString GenerateNewName();
+ static bool IsLegalName(const OUString& rName);
};
}
}
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index 1a6dc5ce4b29..53890928a549 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -71,11 +71,11 @@ namespace sw {
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index 4a44f7df7088..b0df0acdc808 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -38,8 +38,8 @@ class SwPauseThreadStarting;
namespace comp_FinalThreadManager {
// component and service helper functions:
-::rtl::OUString SAL_CALL _getImplementationName();
-com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
+OUString SAL_CALL _getImplementationName();
+com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context );
@@ -53,9 +53,9 @@ public:
explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context);
// ::com::sun::star::lang::XServiceInfo:
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
// ::com::sun::star::util::XJobManager:
virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 1757c9ab7096..12d8fa3d5cdc 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -39,7 +39,7 @@ class SwFntCache : public SwCache
public:
inline SwFntCache() : SwCache(50
#ifdef DBG_UTIL
- , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache"))
+ , OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache"))
#endif
) {}
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index ecf78a659e46..5117481f86ea 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -58,8 +58,8 @@ namespace sw { namespace mark
{ return m_eOrigBkmType; }
private:
- ::rtl::OUString m_aName;
- ::rtl::OUString m_aShortName;
+ OUString m_aName;
+ OUString m_aShortName;
KeyCode m_aCode;
bool m_bSavePos;
bool m_bSaveOtherPos;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 3343747e680f..138c177840d2 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -257,11 +257,11 @@ class SwHistoryBookmark : public SwHistoryHint
virtual void SetInDoc(SwDoc * pDoc, bool);
bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk);
- const ::rtl::OUString& GetName() const;
+ const OUString& GetName() const;
private:
- const ::rtl::OUString m_aName;
- ::rtl::OUString m_aShortName;
+ const OUString m_aName;
+ OUString m_aShortName;
KeyCode m_aKeycode;
const sal_uLong m_nNode;
const sal_uLong m_nOtherNode;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index bb05d1dae161..f9ebf7be32b5 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -23,8 +23,7 @@
#include <list>
#include <deque>
#include "swscanner.hxx"
-
-namespace rtl { class OUStringBuffer; }
+#include <rtl/ustrbuf.hxx>
class SwTxtNode;
class Point;
@@ -194,7 +193,7 @@ public:
If set, the hidden ranges will be deleted from the text node.
*/
static sal_uInt16 MaskHiddenRanges(
- const SwTxtNode& rNode, ::rtl::OUStringBuffer& rText,
+ const SwTxtNode& rNode, OUStringBuffer& rText,
const xub_StrLen nStt, const xub_StrLen nEnd,
const sal_Unicode cChar );
@@ -288,7 +287,7 @@ public:
Start index of the text
@return Returns if the language is an Arabic language
*/
- static bool IsArabicText( const rtl::OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen );
+ static bool IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen );
/** Performes a thai justification on the kerning array
@@ -308,7 +307,7 @@ public:
The value which has to be added to the cells.
@return The number of extra spaces in the given range
*/
- static sal_Int32 ThaiJustify( const rtl::OUString& rTxt, sal_Int32* pKernArray,
+ static sal_Int32 ThaiJustify( const OUString& rTxt, sal_Int32* pKernArray,
sal_Int32* pScrArray, sal_Int32 nIdx,
sal_Int32 nLen, sal_Int32 nNumberOfBlanks = 0,
long nSpaceAdd = 0 );
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 74f7f716c79a..e3a58653655b 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -38,7 +38,7 @@ class SwBlockName
public:
String aShort; // Short name
String aLong; // Long name
- rtl::OUString aPackageName; // Package name
+ OUString aPackageName; // Package name
sal_Bool bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig?
sal_Bool bIsOnlyTxt : 1; // unformatted text
sal_Bool bInPutMuchBlocks : 1; // put serveral block entries
@@ -96,7 +96,7 @@ public:
sal_uInt16 GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln
const String& GetShortName( sal_uInt16 ) const; // Kurzname fuer Index zurueck
const String& GetLongName( sal_uInt16 ) const; // Langname fuer Index zurueck
- rtl::OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck
+ OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck
const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern
void SetName( const String& rName ) // logic name
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index a2b5bfae3622..6899521853f7 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -72,7 +72,7 @@ class SwCache
void DeleteObj( SwCacheObj *pObj );
#ifdef DBG_UTIL
- rtl::OString m_aName;
+ OString m_aName;
long m_nAppend; /// number of entries appended
long m_nInsertFree; /// number of entries inserted on freed position
long m_nReplace; /// number of LRU replacements
@@ -94,7 +94,7 @@ public:
//nur sal_uInt8 hineinstecken!!!
#ifdef DBG_UTIL
- SwCache( const sal_uInt16 nInitSize, const rtl::OString &rNm );
+ SwCache( const sal_uInt16 nInitSize, const OString &rNm );
#else
SwCache( const sal_uInt16 nInitSize );
#endif
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 9a28e020292e..fc127574107f 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -205,7 +205,7 @@ class SwTxtFrm: public SwCntntFrm
void _CalcHeightOfLastLine( const bool _bUseFont = false );
// ST2
- SwWrongList* _SmartTagScan ( ::rtl::OUString aTxtToScan, SwWrongList *pSmartTagList,
+ SwWrongList* _SmartTagScan ( OUString aTxtToScan, SwWrongList *pSmartTagList,
xub_StrLen nBegin,xub_StrLen nEnd,
xub_StrLen nInsertPos, xub_StrLen nActPos,
xub_StrLen &nChgStart, xub_StrLen &nChgEnd,
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index ca43a7992bdb..74354448568d 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -106,12 +106,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -133,7 +133,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -141,33 +141,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -175,9 +175,9 @@ public:
::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+ virtual void SAL_CALL setName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
// XTextContent
@@ -203,14 +203,14 @@ class SwXFieldmarkParameters
}
// XNameContainer
- virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XNameReplace
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException);
@@ -245,14 +245,14 @@ public:
::com::sun::star::text::XTextRange > & xTextRange)
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getFieldType(void)
+ virtual OUString SAL_CALL getFieldType(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setFieldType(const ::rtl::OUString& description )
+ virtual void SAL_CALL setFieldType(const OUString& description )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -261,7 +261,7 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index a35756e1ea42..94926455e1aa 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -36,10 +36,10 @@ class SwFmtINetFmt;
class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
{
- const ::rtl::OUString sImplName;
+ const OUString sImplName;
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
virtual ~SwHyperlinkEventDescriptor();
@@ -66,7 +66,7 @@ public:
// All these objects are an SwXFrame, so they can use a common implementation
class SwFrameEventDescriptor : public SvEventDescriptor
{
- ::rtl::OUString sSwFrameEventDescriptor;
+ OUString sSwFrameEventDescriptor;
SwXFrame& rFrame;
@@ -77,7 +77,7 @@ public:
~SwFrameEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
@@ -88,7 +88,7 @@ protected:
class SwFrameStyleEventDescriptor : public SvEventDescriptor
{
- ::rtl::OUString sSwFrameStyleEventDescriptor;
+ OUString sSwFrameStyleEventDescriptor;
SwXFrameStyle& rStyle;
@@ -97,7 +97,7 @@ public:
~SwFrameStyleEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 63ebb68a6dfb..f83fcd8bfac8 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -93,12 +93,12 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XComponent
virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -106,12 +106,12 @@ public:
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- static rtl::OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc);
- static rtl::OUString LocalizeFormula(const SwSetExpField& rFld, const rtl::OUString& rFormula, sal_Bool bQuery);
+ static OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc);
+ static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, sal_Bool bQuery);
SwFieldType* GetFldType(sal_Bool bDontCreate = sal_False) const;
SwDoc* GetDoc() {return m_pDoc;}
@@ -171,7 +171,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTextFieldMaster(void) throw( ::com::sun::star::uno::RuntimeException );
//XTextField
- virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException );
//XTextContent
virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -184,17 +184,17 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//XUpdatable
virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException);
@@ -235,9 +235,9 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
};
#endif
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 6de6eae6a81f..ff499abe71aa 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -50,7 +50,7 @@ class SwXFlatParagraph:
public SwXTextMarkup
{
public:
- SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rConversionMap );
+ SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rConversionMap );
virtual ~SwXFlatParagraph();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
@@ -62,16 +62,16 @@ public:
// text::XTextMarkup:
virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException);
- virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException);
// text::XFlatParagraph:
- virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException);
virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException);
virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
- virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
+ virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException);
@@ -87,7 +87,7 @@ private:
SwXFlatParagraph( const SwXFlatParagraph & ); // not defined
SwXFlatParagraph & operator = ( const SwXFlatParagraph & ); // not defined
- rtl::OUString maExpandText;
+ OUString maExpandText;
};
/******************************************************************************
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index c16c237c681b..da579dc0516c 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -103,12 +103,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -130,7 +130,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -138,33 +138,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -194,9 +194,9 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XFootnote
- virtual ::rtl::OUString SAL_CALL getLabel()
+ virtual OUString SAL_CALL getLabel()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLabel(const ::rtl::OUString& rLabel)
+ virtual void SAL_CALL setLabel(const OUString& rLabel)
throw (::com::sun::star::uno::RuntimeException);
// XSimpleText
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index b924bf10c6a5..c975617695cd 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -89,12 +89,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -116,7 +116,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -124,33 +124,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -158,9 +158,9 @@ public:
::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+ virtual void SAL_CALL setName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
// XRefreshable
@@ -187,7 +187,7 @@ public:
// XDocumentIndex
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL update()
throw (::com::sun::star::uno::RuntimeException);
@@ -233,12 +233,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -260,7 +260,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -268,33 +268,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -312,9 +312,9 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XDocumentIndexMark
- virtual rtl::OUString SAL_CALL getMarkEntry()
+ virtual OUString SAL_CALL getMarkEntry()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setMarkEntry(const rtl::OUString& rIndexEntry)
+ virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry)
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index ff39750518f9..01f1d12401ef 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -125,12 +125,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -188,9 +188,9 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
throw (::com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getString()
+ virtual OUString SAL_CALL getString()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setString(const rtl::OUString& rString)
+ virtual void SAL_CALL setString(const OUString& rString)
throw (::com::sun::star::uno::RuntimeException);
// XSimpleText
@@ -207,7 +207,7 @@ public:
virtual void SAL_CALL insertString(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & xRange,
- const rtl::OUString& aString, sal_Bool bAbsorb)
+ const OUString& aString, sal_Bool bAbsorb)
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertControlCharacter(
const ::com::sun::star::uno::Reference<
@@ -267,12 +267,12 @@ public:
SwXMetaField(SwDoc *const pDoc);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& ServiceName)
+ const OUString& ServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
@@ -294,7 +294,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -302,33 +302,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL
- getPropertyValue(const ::rtl::OUString& rPropertyName)
+ getPropertyValue(const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -346,7 +346,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XTextField
- virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
+ virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
throw (::com::sun::star::uno::RuntimeException);
};
@@ -357,7 +357,7 @@ void getPrefixAndSuffix(
::com::sun::star::frame::XModel>& xModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable>& xMetaField,
- ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix);
+ OUString *const o_pPrefix, OUString *const o_pSuffix);
#endif // SW_UNOMETA_HXX
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index bd1d02ded56e..54d2313eacdd 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -91,12 +91,12 @@ public:
const enum ParaFrameMode eParaFrameMode, SwFrmFmt *const pFmt = 0);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 0eacbb0ddef3..be32d74647b2 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -132,14 +132,14 @@ private:
protected:
void SAL_CALL SetPropertyValues_Impl(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- void GetPropertyValues( const ::rtl::OUString *pPropertyNames,
+ void GetPropertyValues( const OUString *pPropertyNames,
::com::sun::star::uno::Any *pValues,
sal_Int32 nLength );
@@ -147,7 +147,7 @@ protected:
const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
- const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames,
sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
virtual ~SwXTextPortion();
@@ -170,35 +170,35 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
//XTolerantMultiPropertySet
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
//XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XTextContent
virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -214,13 +214,13 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
//XContentEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const rtl::OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException );
void SetRefMark( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > xMark)
@@ -297,11 +297,11 @@ public:
::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException );
protected:
@@ -339,7 +339,7 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 98bd60eb902b..6aa02a2311d9 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -72,12 +72,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -99,7 +99,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -107,33 +107,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -141,9 +141,9 @@ public:
::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+ virtual void SAL_CALL setName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
// XTextContent
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 26ea51c3d26c..a7a178e9ee8d 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -88,12 +88,12 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& rServiceName)
+ const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -115,7 +115,7 @@ public:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rValue)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
@@ -123,33 +123,33 @@ public:
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& xListener)
throw (::com::sun::star::beans::UnknownPropertyException,
@@ -158,29 +158,29 @@ public:
// XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL
- getPropertyState(const ::rtl::OUString& rPropertyName)
+ getPropertyState(const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL
getPropertyStates(
const ::com::sun::star::uno::Sequence<
- ::rtl::OUString >& rPropertyNames)
+ OUString >& rPropertyNames)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyToDefault(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// XMultiPropertySet
virtual void SAL_CALL setPropertyValues(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& rValues)
@@ -190,11 +190,11 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL getPropertyValues(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertiesChangeListener(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
@@ -204,16 +204,16 @@ public:
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL firePropertiesChangeEvent(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertiesChangeListener >& xListener)
throw (::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+ virtual void SAL_CALL setName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
// XTextContent
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index de7aa158399c..8a5b3c7eb362 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -52,7 +52,7 @@ public:
// ::com::sun::star::text::XTextMarkup:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException);
// ::com::sun::star::text::XMultiTextMarkup:
virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -80,11 +80,11 @@ public:
SwXStringKeyMap();
// ::com::sun::star::container::XStringKeyMap:
- virtual ::com::sun::star::uno::Any SAL_CALL getValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException);
- virtual ::sal_Bool SAL_CALL hasValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertValue(const ::rtl::OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException);
+ virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException);
virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
+ virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
private:
@@ -93,7 +93,7 @@ private:
virtual ~SwXStringKeyMap() {}
- std::map< rtl::OUString, ::com::sun::star::uno::Any > maMap;
+ std::map< OUString, ::com::sun::star::uno::Any > maMap;
};
#endif
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 6b90bb26a085..a2add8569bcd 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -32,14 +32,14 @@ class SwWrongList;
class SwWrongArea
{
public:
- rtl::OUString maType;
+ OUString maType;
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxPropertyBag;
xub_StrLen mnPos;
xub_StrLen mnLen;
SwWrongList* mpSubList;
SwWrongArea() : mnPos(0), mnLen(0), mpSubList(NULL) {}
- SwWrongArea( const rtl::OUString& rType,
+ SwWrongArea( const OUString& rType,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
xub_StrLen nPos,
xub_StrLen nLen,
@@ -122,7 +122,7 @@ public:
inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); }
- inline void Insert( const rtl::OUString& rType,
+ inline void Insert( const OUString& rType,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
xub_StrLen nNewPos, xub_StrLen nNewLen, sal_uInt16 nWhere )
{
@@ -134,7 +134,7 @@ public:
maList.insert(i, SwWrongArea( rType, xPropertyBag, nNewPos, nNewLen, 0 ) );
}
- void Insert( const rtl::OUString& rType,
+ void Insert( const OUString& rType,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
xub_StrLen nNewPos, xub_StrLen nNewLen );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 8a4aef86e7cb..447f55d4b44a 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -103,7 +103,6 @@
#endif
using namespace ::com::sun::star;
-using ::rtl::OUString;
TYPEINIT1(SwFmtVertOrient, SfxPoolItem);
TYPEINIT1(SwFmtHoriOrient, SfxPoolItem);
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 9f383dca58b3..5b61015cbfc2 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -184,7 +184,7 @@ class SwImplProtocol
SvFileStream *pStream; // output stream
std::set<sal_uInt16> *pFrmIds; // which FrmIds shall be logged ( NULL == all)
std::vector<long> aVars; // variables
- rtl::OStringBuffer aLayer; // indentation of output (" " per start/end)
+ OStringBuffer aLayer; // indentation of output (" " per start/end)
sal_uInt16 nTypes; // which types shall be logged
sal_uInt16 nLineCount; // printed lines
sal_uInt16 nMaxLines; // max lines to be printed
@@ -192,8 +192,8 @@ class SwImplProtocol
sal_uInt8 nTestMode; // special for test formating, logging may only be done in test formating.
void _Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam );
bool NewStream();
- void CheckLine( rtl::OString& rLine );
- void SectFunc( rtl::OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam );
+ void CheckLine( OString& rLine );
+ void SectFunc( OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam );
public:
SwImplProtocol();
~SwImplProtocol();
@@ -292,7 +292,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct,
void SwProtocol::Init()
{
nRecord = 0;
- rtl::OUString aName("dbg_lay.go");
+ OUString aName("dbg_lay.go");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
@@ -325,7 +325,7 @@ SwImplProtocol::SwImplProtocol()
bool SwImplProtocol::NewStream()
{
- rtl::OUString aName("dbg_lay.out");
+ OUString aName("dbg_lay.out");
nLineCount = 0;
pStream = new SvFileStream( aName, STREAM_WRITE | STREAM_TRUNC );
if( pStream->GetError() )
@@ -352,7 +352,7 @@ SwImplProtocol::~SwImplProtocol()
* SwImplProtocol::CheckLine analyzes a line in the INI file
* --------------------------------------------------*/
-void SwImplProtocol::CheckLine( rtl::OString& rLine )
+void SwImplProtocol::CheckLine( OString& rLine )
{
rLine = rLine.toAsciiLowerCase(); // upper/lower case is the same
rLine = rLine.replace( '\t', ' ' );
@@ -360,7 +360,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
return;
if( '[' == rLine[0] ) // section: FrmIds, type or funciton
{
- rtl::OString aTmp = comphelper::string::getToken(rLine, 0, ']');
+ OString aTmp = comphelper::string::getToken(rLine, 0, ']');
if (aTmp == "[frmid") // section FrmIds
{
nInitFile = 1;
@@ -401,7 +401,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
sal_Int32 nIndex = 0;
do
{
- rtl::OString aTok = rLine.getToken( 0, ' ', nIndex );
+ OString aTok = rLine.getToken( 0, ' ', nIndex );
bool bNo = false;
if( '!' == aTok[0] )
{
@@ -457,11 +457,11 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
* --------------------------------------------------*/
void SwImplProtocol::FileInit()
{
- rtl::OUString aName("dbg_lay.ini");
+ OUString aName("dbg_lay.ini");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
- rtl::OString aLine;
+ OString aLine;
nInitFile = 0;
while( aStream.good() )
{
@@ -472,10 +472,10 @@ void SwImplProtocol::FileInit()
aLine = aLine.trim();
if( !aLine.isEmpty() )
CheckLine( aLine ); // evaluate line
- aLine = rtl::OString();
+ aLine = OString();
}
else
- aLine = rtl::OString(c);
+ aLine = OString(c);
}
if( !aLine.isEmpty() )
CheckLine( aLine ); // evaluate last line
@@ -487,7 +487,7 @@ void SwImplProtocol::FileInit()
* lcl_Start enables indentation by two spaces during ACT_START and disables
* it again at ACT_END.
* --------------------------------------------------*/
-static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAction)
+static void lcl_Start(OStringBuffer& rOut, OStringBuffer& rLay, sal_uLong nAction)
{
if( nAction == ACT_START )
{
@@ -510,7 +510,7 @@ static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uL
* of the frame; "+" stands for valid, "-" stands for invalid.
* --------------------------------------------------*/
-static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm)
+static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm)
{
rOut.append(" Sz");
rOut.append(pFrm->GetValidSizeFlag() ? '+' : '-');
@@ -524,7 +524,7 @@ static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm)
* lcl_FrameType outputs the type of the frame as clear text.
* --------------------------------------------------*/
-static void lcl_FrameType( rtl::OStringBuffer& rOut, const SwFrm* pFrm )
+static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm )
{
if( pFrm->IsTxtFrm() )
rOut.append("Txt ");
@@ -602,7 +602,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
if( 1 == nTestMode && nFunction != PROT_TESTFORMAT )
return; // we may only log inside a test formating
sal_Bool bTmp = sal_False;
- rtl::OStringBuffer aOut(aLayer);
+ OStringBuffer aOut(aLayer);
aOut.append(static_cast<sal_Int64>(lcl_GetFrameId(pFrm)));
aOut.append(' ');
lcl_FrameType( aOut, pFrm ); // then the frame type
@@ -739,7 +739,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
* here we handle the output of the SectionFrms.
* --------------------------------------------------*/
-void SwImplProtocol::SectFunc(rtl::OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam)
+void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam)
{
bool bTmp = false;
switch( nAct )
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 6c982fc006e2..865193ebe844 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -465,7 +465,7 @@ void InitCurrShells( SwRootFrm *pRoot )
SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
- rtl::OUString("Root"), pFmt ), 0 ),
+ OUString("Root"), pFmt ), 0 ),
maPagesArea(),
mnViewWidth( -1 ),
mnColumns( 0 ),
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a261fb4026e0..3e5f308c0a02 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3566,7 +3566,7 @@ void SwColumnFrm::PaintBreak( ) const
aSeq.realloc( aSeq.getLength( ) + 1 );
// Add the text above
- rtl::OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK);
+ OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK);
basegfx::B2DVector aFontSize;
OutputDevice* pOut = pGlobalShell->GetOut();
@@ -6892,7 +6892,7 @@ const Font& SwPageFrm::GetEmptyPageFont()
pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt
pEmptyPgFont->SetWeight( WEIGHT_BOLD );
pEmptyPgFont->SetStyleName( aEmptyStr );
- pEmptyPgFont->SetName(rtl::OUString("Helvetica"));
+ pEmptyPgFont->SetName(OUString("Helvetica"));
pEmptyPgFont->SetFamily( FAMILY_SWISS );
pEmptyPgFont->SetTransparent( sal_True );
pEmptyPgFont->SetColor( COL_GRAY );
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 062c3c52683d..46f7dd7754d8 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -54,7 +54,6 @@
#include <vcl/graphicfilter.hxx>
#include <comcore.hrc>
-using ::rtl::OUString;
using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star;
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 1db5303764c6..a93423e8c448 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -152,7 +152,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_DROPCAP_CHAR_STYLE_NAME :
{
- rtl::OUString sName;
+ OUString sName;
if(GetCharFmt())
sName = SwStyleNameMapper::GetProgName(
GetCharFmt()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
@@ -240,14 +240,14 @@ int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
bool SwNumRuleItem::QueryValue( uno::Any& rVal, sal_uInt8 ) const
{
- rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE );
+ OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE );
rVal <<= sRet;
return true;
}
bool SwNumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 )
{
- rtl::OUString uName;
+ OUString uName;
rVal >>= uName;
SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE));
return true;
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index d35b5cf40323..15dd5d95ab29 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -25,13 +25,12 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-using ::rtl::OUString;
// #110680#
SwXMLBlockListExport::SwXMLBlockListExport(
const uno::Reference< uno::XComponentContext > xContext,
SwXMLTextBlocks & rBlocks,
- const rtl::OUString &rFileName,
+ const OUString &rFileName,
uno::Reference< xml::sax::XDocumentHandler> &rHandler)
: SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ),
rBlockList(rBlocks)
@@ -82,7 +81,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum )
SwXMLTextBlockExport::SwXMLTextBlockExport(
const uno::Reference< uno::XComponentContext > xContext,
SwXMLTextBlocks & rBlocks,
- const rtl::OUString &rFileName,
+ const OUString &rFileName,
uno::Reference< xml::sax::XDocumentHandler> &rHandler)
: SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ),
rBlockList(rBlocks)
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index f8258c533ad0..c007cd871e57 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-using ::rtl::OUString;
sal_Char const sXML_np__block_list[] = "_block-list";
sal_Char const sXML_np__office[] = "_ooffice";
diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx
index 586a43d4b7d3..c1bf14ee2a2a 100644
--- a/sw/source/core/swg/SwXMLBlockListContext.cxx
+++ b/sw/source/core/swg/SwXMLBlockListContext.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-using ::rtl::OUString;
SwXMLBlockListContext::SwXMLBlockListContext(
SwXMLBlockListImport& rImport,
@@ -223,7 +222,7 @@ SwXMLTextBlockParContext::SwXMLTextBlockParContext(
{
}
-void SwXMLTextBlockParContext::Characters( const ::rtl::OUString& rChars )
+void SwXMLTextBlockParContext::Characters( const OUString& rChars )
{
rLocalRef.m_rText.Append ( rChars.getStr());
}
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 0406e20b0170..d1e1028d65d9 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -24,7 +24,6 @@
#include <vector>
using namespace ::com::sun::star;
-using ::rtl::OUString;
using namespace ::xmloff::token;
sal_Char const sXML_np__office[] = "_ooffice";
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 0d3b03a23e1f..7012180acccb 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -561,8 +561,8 @@ OUString SwXMLTextBlocks::GeneratePackageName ( const String& rShort )
String aRet = rShort;
xub_StrLen nPos = 0;
sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 };
- rtl::OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7));
- aRet = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US);
+ OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7));
+ aRet = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US);
while( STRING_NOTFOUND != ( nPos = aRet.SearchChar( pDelims, nPos )))
{
aRet.SetChar( nPos, '_' );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 1b6ef4ea75c3..b0822d251452 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -44,7 +44,6 @@ const char XMLN_BLOCKLIST[] = "BlockList.xml";
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-using ::rtl::OUString;
using ::xmloff::token::XML_BLOCK_LIST;
using ::xmloff::token::XML_UNFORMATTED_TEXT;
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index e122e511778f..574d04ecc560 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -175,11 +175,11 @@ const String& SwImpBlocks::GetLongName( sal_uInt16 n ) const
return aEmptyStr;
}
-rtl::OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const
+OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const
{
if( n < aNames.size() )
return aNames[n]->aPackageName;
- return rtl::OUString();
+ return OUString();
}
void SwImpBlocks::AddName( const String& rShort, const String& rLong,
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 515037c3d956..393383787d1d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -289,7 +289,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
else if ( mpPorInfo )
BeginInlineStructureElements();
else
- BeginTag( vcl::PDFWriter::NonStructElement, rtl::OUString() );
+ BeginTag( vcl::PDFWriter::NonStructElement, OUString() );
#if OSL_DEBUG_LEVEL > 1
nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
@@ -424,7 +424,7 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const String& rString )
{
// write new tag
- const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) );
+ const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, OUString( rString ) );
++nEndStructureElement;
#if OSL_DEBUG_LEVEL > 1
@@ -982,12 +982,12 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
const bool bNewItemTag = bNewListTag || pTxtNd->IsCountedInList(); // If the text node is not counted, we do not start a new list item:
if ( bNewListTag )
- BeginTag( vcl::PDFWriter::List, rtl::OUString(aListString) );
+ BeginTag( vcl::PDFWriter::List, OUString(aListString) );
if ( bNewItemTag )
{
- BeginTag( vcl::PDFWriter::ListItem, rtl::OUString(aListItemString) );
- BeginTag( vcl::PDFWriter::LIBody, rtl::OUString(aListBodyString) );
+ BeginTag( vcl::PDFWriter::ListItem, OUString(aListItemString) );
+ BeginTag( vcl::PDFWriter::LIBody, OUString(aListBodyString) );
}
}
@@ -1023,7 +1023,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
// Document: Document
//
nPDFType = vcl::PDFWriter::Document;
- aPDFType = rtl::OUString(aDocumentString);
+ aPDFType = OUString(aDocumentString);
break;
case FRM_HEADER :
@@ -1039,7 +1039,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
// Footnote container: Division
//
nPDFType = vcl::PDFWriter::Division;
- aPDFType = rtl::OUString(aDivString);
+ aPDFType = OUString(aDivString);
break;
case FRM_FTN :
@@ -1049,7 +1049,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
// Note: vcl::PDFWriter::Note is actually a ILSE. Nevertheless
// we treat it like a grouping element!
nPDFType = vcl::PDFWriter::Note;
- aPDFType = rtl::OUString(aNoteString);
+ aPDFType = OUString(aNoteString);
break;
case FRM_SECTION :
@@ -1067,19 +1067,19 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( TOX_INDEX == pTOXBase->GetType() )
{
nPDFType = vcl::PDFWriter::Index;
- aPDFType = rtl::OUString(aIndexString);
+ aPDFType = OUString(aIndexString);
}
else
{
nPDFType = vcl::PDFWriter::TOC;
- aPDFType = rtl::OUString(aTOCString);
+ aPDFType = OUString(aTOCString);
}
}
}
else if ( CONTENT_SECTION == pSection->GetType() )
{
nPDFType = vcl::PDFWriter::Section;
- aPDFType = rtl::OUString(aSectString);
+ aPDFType = OUString(aSectString);
}
}
break;
@@ -1116,7 +1116,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( sStyleName.EqualsAscii(aQuotations) )
{
nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::BlockQuote);
- aPDFType = rtl::OUString(aBlockQuoteString);
+ aPDFType = OUString(aBlockQuoteString);
}
//
@@ -1125,7 +1125,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
else if ( sStyleName.EqualsAscii(aCaption) )
{
nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption);
- aPDFType = rtl::OUString(aCaptionString);
+ aPDFType = OUString(aCaptionString);
}
//
@@ -1134,7 +1134,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
else if ( sParentStyleName.EqualsAscii(aCaption) )
{
nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Caption);
- aPDFType = sStyleName.Append(rtl::OUString(aCaptionString));
+ aPDFType = sStyleName.Append(OUString(aCaptionString));
}
//
@@ -1143,7 +1143,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
else if ( sStyleName.EqualsAscii(aHeading) )
{
nPDFType = static_cast<sal_uInt16>(vcl::PDFWriter::Heading);
- aPDFType = rtl::OUString(aHString);
+ aPDFType = OUString(aHString);
}
//
@@ -1159,22 +1159,22 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
switch(nRealLevel)
{
case 0 :
- aPDFType = rtl::OUString(aH1String);
+ aPDFType = OUString(aH1String);
break;
case 1 :
- aPDFType = rtl::OUString(aH2String);
+ aPDFType = OUString(aH2String);
break;
case 2 :
- aPDFType = rtl::OUString(aH3String);
+ aPDFType = OUString(aH3String);
break;
case 3 :
- aPDFType = rtl::OUString(aH4String);
+ aPDFType = OUString(aH4String);
break;
case 4 :
- aPDFType = rtl::OUString(aH5String);
+ aPDFType = OUString(aH5String);
break;
default:
- aPDFType = rtl::OUString(aH6String);
+ aPDFType = OUString(aH6String);
break;
}
}
@@ -1194,7 +1194,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( pTOXBase && TOX_INDEX != pTOXBase->GetType() )
{
// Special case: Open additional TOCI tag:
- BeginTag( vcl::PDFWriter::TOCI, rtl::OUString(aTOCIString) );
+ BeginTag( vcl::PDFWriter::TOCI, OUString(aTOCIString) );
}
}
}
@@ -1206,7 +1206,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
// TabFrm: Table
//
nPDFType = vcl::PDFWriter::Table;
- aPDFType = rtl::OUString(aTableString);
+ aPDFType = OUString(aTableString);
{
// set up table column data:
@@ -1260,7 +1260,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( !static_cast<const SwRowFrm*>(pFrm)->IsRepeatedHeadline() )
{
nPDFType = vcl::PDFWriter::TableRow;
- aPDFType = rtl::OUString(aTRString);
+ aPDFType = OUString(aTRString);
}
else
{
@@ -1277,12 +1277,12 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( pTable->IsInHeadline( *pFrm ) || lcl_IsHeadlineCell( *static_cast<const SwCellFrm*>(pFrm) ) )
{
nPDFType = vcl::PDFWriter::TableHeader;
- aPDFType = rtl::OUString(aTHString);
+ aPDFType = OUString(aTHString);
}
else
{
nPDFType = vcl::PDFWriter::TableData;
- aPDFType = rtl::OUString(aTDString);
+ aPDFType = OUString(aTDString);
}
}
break;
@@ -1314,18 +1314,18 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
if ( bFormula )
{
nPDFType = vcl::PDFWriter::Formula;
- aPDFType = rtl::OUString(aFormulaString);
+ aPDFType = OUString(aFormulaString);
}
else
{
nPDFType = vcl::PDFWriter::Figure;
- aPDFType = rtl::OUString(aFigureString);
+ aPDFType = OUString(aFigureString);
}
}
else
{
nPDFType = vcl::PDFWriter::Division;
- aPDFType = rtl::OUString(aDivString);
+ aPDFType = OUString(aDivString);
}
}
break;
@@ -1377,7 +1377,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
case POR_HYPHSTR :
case POR_SOFTHYPHSTR :
nPDFType = vcl::PDFWriter::Span;
- aPDFType = rtl::OUString(aSpanString);
+ aPDFType = OUString(aSpanString);
break;
case POR_LAY :
@@ -1404,18 +1404,18 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
if( pInetFmtAttr )
{
nPDFType = vcl::PDFWriter::Link;
- aPDFType = rtl::OUString(aLinkString);
+ aPDFType = OUString(aLinkString);
}
// Check for Quote/Code character style:
else if ( sStyleName.EqualsAscii(aQuotation) )
{
nPDFType = vcl::PDFWriter::Quote;
- aPDFType = rtl::OUString(aQuoteString);
+ aPDFType = OUString(aQuoteString);
}
else if ( sStyleName.EqualsAscii(aSourceText) )
{
nPDFType = vcl::PDFWriter::Code;
- aPDFType = rtl::OUString(aCodeString);
+ aPDFType = OUString(aCodeString);
}
else
{
@@ -1436,7 +1436,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
if ( sStyleName.Len() > 0 )
aPDFType = sStyleName;
else
- aPDFType = rtl::OUString(aSpanString);
+ aPDFType = OUString(aSpanString);
}
}
}
@@ -1444,7 +1444,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
case POR_FTN :
nPDFType = vcl::PDFWriter::Link;
- aPDFType = rtl::OUString(aLinkString);
+ aPDFType = OUString(aLinkString);
break;
case POR_FLD :
@@ -1461,12 +1461,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
if ( RES_GETREFFLD == pFld->Which() )
{
nPDFType = vcl::PDFWriter::Link;
- aPDFType = rtl::OUString(aLinkString);
+ aPDFType = OUString(aLinkString);
}
else if ( RES_AUTHORITY == pFld->Which() )
{
nPDFType = vcl::PDFWriter::BibEntry;
- aPDFType = rtl::OUString(aBibEntryString);
+ aPDFType = OUString(aBibEntryString);
}
}
}
@@ -1500,7 +1500,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
*/
SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
OutputDevice& rOut,
- const rtl::OUString& rPageRange,
+ const OUString& rPageRange,
bool bSkipEmptyPages,
bool bEditEngineOnly )
: mrSh( rSh ),
@@ -2060,7 +2060,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
//get the name
const ::sw::mark::IMark* pBkmk = ppMark->get();
mrSh.SwCrsrShell::ClearMark();
- rtl::OUString sBkName = pBkmk->GetName();
+ OUString sBkName = pBkmk->GetName();
//jump to it
JumpToSwMark( &mrSh, sBkName );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 8b51fc953f6d..13f723f1fbcb 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1095,7 +1095,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
OSL_TRACE("Found Fieldmark");
#if OSL_DEBUG_LEVEL > 1
OUString str = pFieldmark->ToString( );
- fprintf( stderr, "%s\n", rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
+ fprintf( stderr, "%s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
#endif
}
if(bIsStartMark) OSL_TRACE("Found StartMark");
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index c4dee6e1e77b..fdf965d36d6a 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -30,7 +30,6 @@
#include <guess.hxx> //
#include <splargs.hxx> // SwInterHyphInfo
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index c6eda0a7f6d3..c12355bb5495 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -619,7 +619,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
{
// 6864: always with kerning, also on printer!
KSHORT nChar = Width() / nCharWidth;
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
comphelper::string::padToLength(aBuf, nChar, ' ');
rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
}
@@ -638,7 +638,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
KSHORT nChar = Width() / nCharWidth;
if ( cFill == '_' )
++nChar; // to avoid gaps (Bug 13430)
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
comphelper::string::padToLength(aBuf, nChar, cFill);
rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
}
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 2cf0fca2f1c3..5f0918d0bc33 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -178,7 +178,7 @@ class XmlPortionDumper:public SwPortionHandler
BAD_CAST( "nType" ),
"%s", getTypeName( nType ) );
OUString sText( rText );
- OString sText8 =::rtl::OUStringToOString( sText,
+ OString sText8 =OUStringToOString( sText,
RTL_TEXTENCODING_UTF8 );
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "rText" ),
"%s", sText8.getStr( ) );
@@ -335,7 +335,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer )
{
aTxt = aTxt.replace( i, '*' );
}
- OString aTxt8 =::rtl::OUStringToOString( aTxt,
+ OString aTxt8 =OUStringToOString( aTxt,
RTL_TEXTENCODING_UTF8 );
xmlTextWriterWriteString( writer,
( const xmlChar * ) aTxt8.getStr( ) );
@@ -388,7 +388,7 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this;
OUString aFmtName = pHeadFootFrm->GetFmt()->GetName();
- xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(rtl::OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr()));
+ xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr()));
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt());
}
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 21e0fb208446..677d84fe920d 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -121,10 +121,10 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId)
aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER;
aRet.push_back( aStartToken );
SwFormToken aSeparatorToken( TOKEN_TEXT );
- aSeparatorToken.sText = rtl::OUString(": ");
+ aSeparatorToken.sText = OUString(": ");
aRet.push_back( aSeparatorToken );
SwFormToken aTextToken( TOKEN_TEXT );
- aTextToken.sText = rtl::OUString(", ");
+ aTextToken.sText = OUString(", ");
for(sal_uInt16 i = 0; i < 5 ; i++)
{
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index bdee756d557d..9c58de47f79e 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -72,10 +72,10 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
return sRet;
}
-::com::sun::star::uno::Sequence< ::rtl::OUString >
+::com::sun::star::uno::Sequence< OUString >
IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const
{
- uno::Sequence< ::rtl::OUString > sRet;
+ uno::Sequence< OUString > sRet;
try {
sRet = xIES->getAlgorithmList( rLcl );
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 942d2399e750..106ef4741f91 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -48,7 +48,6 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos,
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Initialize strings
--------------------------------------------------------------------*/
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 3035a93c952b..d174d803b48c 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -52,7 +52,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem);
TYPEINIT1_AUTOFACTORY(SwFmtAutoFmt, SfxPoolItem);
@@ -369,9 +368,9 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
else
{
// all string properties:
- if(rVal.getValueType() != ::getCppuType((rtl::OUString*)0))
+ if(rVal.getValueType() != ::getCppuType((OUString*)0))
return false;
- XubString sVal = *(rtl::OUString*)rVal.getValue();
+ XubString sVal = *(OUString*)rVal.getValue();
switch(nMemberId)
{
case MID_URL_URL:
@@ -767,7 +766,7 @@ MetaField::MetaField(SwFmtMeta * const i_pFmt,
}
void MetaField::GetPrefixAndSuffix(
- ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix)
+ OUString *const o_pPrefix, OUString *const o_pSuffix)
{
try
{
@@ -789,7 +788,7 @@ void MetaField::GetPrefixAndSuffix(
}
}
-sal_uInt32 MetaField::GetNumberFormat(::rtl::OUString const & rContent) const
+sal_uInt32 MetaField::GetNumberFormat(OUString const & rContent) const
{
//TODO: this probably lacks treatment for some special cases
sal_uInt32 nNumberFormat( m_nNumberFormat );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index de510714e6bf..40369b05b7f7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -646,8 +646,8 @@ static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar )
static bool lcl_IsMonoSpaceFont( const OutputDevice& rOut )
{
- const rtl::OUString aStr1( sal_Unicode( 0x3008 ) );
- const rtl::OUString aStr2( sal_Unicode( 0x307C ) );
+ const OUString aStr1( sal_Unicode( 0x3008 ) );
+ const OUString aStr2( sal_Unicode( 0x307C ) );
const long nWidth1 = rOut.GetTextWidth( aStr1 );
const long nWidth2 = rOut.GetTextWidth( aStr2 );
return nWidth1 == nWidth2;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6421edd675cd..248255a863ef 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1470,7 +1470,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
{
// #i111677# cache expansion of source (for clipboard)
pDest->m_pNumStringCache.reset(
- new ::rtl::OUString(this->GetNumString()));
+ new OUString(this->GetNumString()));
}
if( !nLen )
@@ -3157,7 +3157,7 @@ struct containsPos
ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode)
{
- const rtl::OUString& rNodeText = rNode.GetTxt();
+ const OUString& rNodeText = rNode.GetTxt();
m_aRetText = rNodeText;
if (eMode == PASSTHROUGH)
@@ -3223,7 +3223,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode)
const sal_Int32 nHiddenStart = i->m_nStart;
const sal_Int32 nHiddenLen = i->m_nLen;
- m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, rtl::OUString() );
+ m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, OUString() );
m_aMap.push_back( ConversionMapEntry( nHiddenStart, nOffset + nHiddenStart ) );
nOffset -= nHiddenLen;
}
@@ -3233,7 +3233,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode)
{
const SwTxtAttr* pAttr = *j;
xub_StrLen nFieldPos = *pAttr->GetStart();
- rtl::OUString aExpand;
+ OUString aExpand;
switch (pAttr->Which())
{
case RES_TXTATR_FIELD:
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 95e199c267ed..54fe4ce5ba8c 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -797,7 +797,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
{
xub_StrLen nOldIdx(rInf.GetIdx());
xub_StrLen nOldLen(rInf.GetLen());
- rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART);
+ OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART);
rInf.SetText( aNewText );
rInf.SetIdx( 0 );
rInf.SetLen( aNewText.getLength() );
@@ -809,7 +809,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
{
xub_StrLen nOldIdx(rInf.GetIdx());
xub_StrLen nOldLen(rInf.GetLen());
- rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND);
+ OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND);
rInf.SetText( aNewText );
rInf.SetIdx( 0 );
rInf.SetLen( aNewText.getLength() );
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 96ff07de161f..0c767c22bc28 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1253,7 +1253,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
(const SfxPoolItem**)&pAnchor );
SwIndex aIdx( this, *pAttr->GetStart() );
- const rtl::OUString c(GetCharOfTxtAttr(*pAttr));
+ const OUString c(GetCharOfTxtAttr(*pAttr));
OUString const ins( InsertText(c, aIdx, nInsertFlags) );
if (ins.isEmpty())
{
@@ -1378,7 +1378,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
// entstehen koennen und das Attribut im _SortArr_ am
// Dokument nicht eingetrage wird.
SwIndex aNdIdx( this, *pAttr->GetStart() );
- const rtl::OUString c(GetCharOfTxtAttr(*pAttr));
+ const OUString c(GetCharOfTxtAttr(*pAttr));
OUString const ins( InsertText(c, aNdIdx, nInsertFlags) );
if (ins.isEmpty())
{
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index bfc312f09ed0..38b52f597df2 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -76,7 +76,6 @@
#include <vector>
#include <utility>
-using rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::i18n;
@@ -643,7 +642,7 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
aBndry.endPos - aBndry.startPos);
}
-SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
+SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
const LanguageType* pLang, const ModelToViewHelper& rConvMap,
sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClp )
: rNode( rNd )
@@ -666,8 +665,8 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
//additional ones can be added in under tools->options
if (nWordType == i18n::WordType::WORD_COUNT)
{
- rtl::OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get();
- rtl::OUStringBuffer aBuf(aPreDashReplacementText);
+ OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get();
+ OUStringBuffer aBuf(aPreDashReplacementText);
for (sal_Int32 i = nStartPos; i < nEndPos; ++i)
{
sal_Unicode cChar = aBuf[i];
@@ -699,7 +698,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
namespace
{
//fdo#45271 for Asian words count characters instead of words
- sal_Int32 forceEachAsianCodePointToWord(const rtl::OUString &rText, sal_Int32 nBegin, sal_Int32 nLen)
+ sal_Int32 forceEachAsianCodePointToWord(const OUString &rText, sal_Int32 nBegin, sal_Int32 nLen)
{
if (nLen > 1)
{
@@ -760,7 +759,7 @@ sal_Bool SwScanner::NextWord()
if ( nWordType != i18n::WordType::WORD_COUNT )
{
rCC.setLanguageTag( LanguageTag( pBreakIt->GetLocale( aCurrLang )) );
- if ( rCC.isLetterNumeric(rtl::OUString(aText[nBegin])) )
+ if ( rCC.isLetterNumeric(OUString(aText[nBegin])) )
break;
}
else
@@ -814,7 +813,7 @@ sal_Bool SwScanner::NextWord()
// restrict boundaries to script boundaries and nEndPos
const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, nBegin );
- rtl::OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin );
+ OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin );
const sal_Int32 nScriptEnd = nBegin +
pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
@@ -837,7 +836,7 @@ sal_Bool SwScanner::NextWord()
else
{
const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, aBound.startPos );
- rtl::OUString aTmpWord = aText.copy( aBound.startPos,
+ OUString aTmpWord = aText.copy( aBound.startPos,
aBound.endPos - aBound.startPos );
const sal_Int32 nScriptEnd = aBound.startPos +
pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
@@ -1056,7 +1055,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
? m_Text.getLength()
: ::std::min<xub_StrLen>(rArgs.pEndIdx->GetIndex(), m_Text.getLength());
- rArgs.aConvText = rtl::OUString();
+ rArgs.aConvText = OUString();
// modify string according to redline information and hidden text
const OUString aOldTxt( m_Text );
@@ -1302,7 +1301,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
}
if( pNode->GetWrong()->Fresh( nChgStart, nChgEnd,
nBegin, nLen, nInsertPos, nActPos ) )
- pNode->GetWrong()->Insert( rtl::OUString(), 0, nBegin, nLen, nInsertPos++ );
+ pNode->GetWrong()->Insert( OUString(), 0, nBegin, nLen, nInsertPos++ );
else
{
nInvStart = nBegin;
@@ -1375,7 +1374,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
{
SwRect aRet;
SwTxtNode *pNode = GetTxtNode();
- const rtl::OUString& rText = pNode->GetTxt();
+ const OUString& rText = pNode->GetTxt();
// Iterate over language portions
SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get();
@@ -1420,7 +1419,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
{
// Expand the string:
const ModelToViewHelper aConversionMap(*pNode);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
// Ownership ov ConversionMap is passed to SwXTextMarkup object!
com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup > xTextMarkup =
@@ -1918,7 +1917,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
// count words in numbering string if started at beginning of para:
bool bCountNumbering = nStt == 0;
bool bHasBullet = false, bHasNumbering = false;
- rtl::OUString sNumString;
+ OUString sNumString;
if (bCountNumbering)
{
sNumString = GetNumString();
@@ -1949,7 +1948,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
// ConversionMap to expand fields, remove invisible and redline deleted text for scanner
const ModelToViewHelper aConversionMap(*this, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
// map start and end points onto the ConversionMap
const sal_uInt32 nExpandBegin = aConversionMap.ConvertToViewPosition( nStt );
@@ -1979,7 +1978,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
nExpandBegin, nExpandEnd, true );
// used to filter out scanner returning almost empty strings (len=1; unichar=0x0001)
- const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD );
+ const OUString aBreakWord( CH_TXTATR_BREAKWORD );
while ( aScanner.NextWord() )
{
@@ -1987,7 +1986,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
if( 1 != aExpandText.match(aBreakWord, aScanner.GetBegin() ))
{
++nTmpWords;
- const rtl::OUString &rWord = aScanner.GetWord();
+ const OUString &rWord = aScanner.GetWord();
if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN)
++nTmpAsianWords;
nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord);
@@ -2015,7 +2014,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat,
while ( aScanner.NextWord() )
{
++nTmpWords;
- const rtl::OUString &rWord = aScanner.GetWord();
+ const OUString &rWord = aScanner.GetWord();
if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN)
++nTmpAsianWords;
nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord);
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index cc506f62f87b..f38cd4c47528 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -279,7 +279,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter)
bool
UndoManager::GetLastUndoInfo(
- ::rtl::OUString *const o_pStr, SwUndoId *const o_pId) const
+ OUString *const o_pStr, SwUndoId *const o_pId) const
{
// this is actually expected to work on the current level,
// but that was really not obvious from the previous implementation...
@@ -311,7 +311,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const
sal_uInt16 const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel));
for (sal_uInt16 n = 0; n < nUndoCount; ++n)
{
- ::rtl::OUString const comment(
+ OUString const comment(
SfxUndoManager::GetUndoActionComment(n, TopLevel));
ret.push_back(comment);
}
@@ -321,7 +321,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const
/**************** REDO ******************/
-bool UndoManager::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const
+bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr) const
{
if (!SfxUndoManager::GetRedoActionCount(CurrentLevel))
{
@@ -346,7 +346,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const
sal_uInt16 const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel));
for (sal_uInt16 n = 0; n < nRedoCount; ++n)
{
- ::rtl::OUString const comment(
+ OUString const comment(
SfxUndoManager::GetRedoActionComment(n, TopLevel));
ret.push_back(comment);
}
@@ -356,7 +356,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const
/**************** REPEAT ******************/
-SwUndoId UndoManager::GetRepeatInfo(::rtl::OUString *const o_pStr) const
+SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const
{
SwUndoId nRepeatId(UNDO_EMPTY);
GetLastUndoInfo(o_pStr, & nRepeatId);
@@ -535,8 +535,8 @@ UndoManager::Repeat(::sw::RepeatContext & rContext,
return false;
}
- ::rtl::OUString const comment(pRepeatAction->GetComment());
- ::rtl::OUString const rcomment(pRepeatAction->GetRepeatComment(rContext));
+ OUString const comment(pRepeatAction->GetComment());
+ OUString const rcomment(pRepeatAction->GetRepeatComment(rContext));
sal_uInt16 const nId(pRepeatAction->GetId());
if (DoesUndo())
{
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index b90c9a127d2c..ced76e507c80 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -663,7 +663,7 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk)
&& m_aName == rBkmk.GetName();
}
-const ::rtl::OUString& SwHistoryBookmark::GetName() const
+const OUString& SwHistoryBookmark::GetName() const
{
return m_aName;
}
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 8cf6e1886cf6..2fbe933c3cb0 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -460,7 +460,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ];
CharClass& rCC = GetAppCharClass();
if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) ||
- rCC.isLetterNumeric( rtl::OUString( cDelChar ), 0 ) !=
+ rCC.isLetterNumeric( OUString( cDelChar ), 0 ) !=
rCC.isLetterNumeric( *pSttStr, nUChrPos ) )
return sal_False;
@@ -579,7 +579,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart,
case CH_TXTATR_INWORD:
case CH_TXTATR_BREAKWORD:
- aResult = rtl::OUString(UNDO_ARG2);
+ aResult = OUString(UNDO_ARG2);
break;
@@ -638,7 +638,7 @@ String DenoteSpecialCharacters(const String & rStr)
aResult += lcl_DenotedPortion(rStr, nStart, rStr.Len());
}
else
- aResult = rtl::OUString(UNDO_ARG2);
+ aResult = OUString(UNDO_ARG2);
return aResult;
}
@@ -686,7 +686,7 @@ SwRewriter SwUndoDelete::GetRewriter() const
}
else
{
- aStr = rtl::OUString(UNDO_ARG2);
+ aStr = OUString(UNDO_ARG2);
}
}
@@ -1084,7 +1084,7 @@ void SwUndoDelete::SetTableName(const String & rName)
String SwRewriter::Apply(const String & rStr) const
{
- rtl::OUString aResult = rStr;
+ OUString aResult = rStr;
std::vector<SwRewriteRule>::const_iterator aIt;
for (aIt = mRules.begin(); aIt != mRules.end(); ++aIt)
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index d6fb9fd6091e..30a86778525f 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -267,7 +267,7 @@ bool SwUndo::CanRepeatImpl( ::sw::RepeatContext & ) const
return ((REPEAT_START <= GetId()) && (GetId() < REPEAT_END));
}
-rtl::OUString SwUndo::GetComment() const
+OUString SwUndo::GetComment() const
{
String aResult;
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index b2791fae0930..c99c19e97aab 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -332,7 +332,7 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext)
}
// #111827#
-rtl::OUString SwUndoInsLayFmt::GetComment() const
+OUString SwUndoInsLayFmt::GetComment() const
{
String aResult;
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index f725c29fe212..e9ba3a388cbc 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -107,7 +107,7 @@ void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext)
rContext.SetSelections(0, pMarkList);
}
-rtl::OUString SwSdrUndo::GetComment() const
+OUString SwSdrUndo::GetComment() const
{
return pSdrUndo->GetComment();
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 18951111bc3e..4ac9ecb76ba1 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -128,7 +128,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
{
if( !bIsAppend && bIsWordDelim ==
- !GetAppCharClass().isLetterNumeric( rtl::OUString( cIns )) )
+ !GetAppCharClass().isLetterNumeric( OUString( cIns )) )
{
nLen++;
nCntnt++;
@@ -433,7 +433,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
// TODO/MBA: seems that here a physical copy is done - not as in drawing layer! Testing!
// TODO/LATER: Copying through the container would copy the replacement image as well
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aName = aCnt.CreateUniqueObjectName();
+ OUString aName = aCnt.CreateUniqueObjectName();
if ( aCnt.StoreEmbeddedObject( rSwOLE.GetOleRef(), aName, sal_True ) )
{
uno::Reference < embed::XEmbeddedObject > aNew = aCnt.GetEmbeddedObject( aName );
@@ -486,8 +486,8 @@ SwRewriter SwUndoInsert::GetRewriter() const
class SwUndoReplace::Impl
: private SwUndoSaveCntnt
{
- ::rtl::OUString m_sOld;
- ::rtl::OUString m_sIns;
+ OUString m_sOld;
+ OUString m_sIns;
sal_uLong m_nSttNd, m_nEndNd, m_nOffset;
xub_StrLen m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd;
bool m_bSplitNext : 1;
@@ -497,7 +497,7 @@ class SwUndoReplace::Impl
::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
public:
- Impl(SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp);
+ Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp);
virtual ~Impl()
{
}
@@ -507,13 +507,13 @@ public:
void SetEnd(SwPaM const& rPam);
- ::rtl::OUString const& GetOld() const { return m_sOld; }
- ::rtl::OUString const& GetIns() const { return m_sIns; }
+ OUString const& GetOld() const { return m_sOld; }
+ OUString const& GetIns() const { return m_sIns; }
};
SwUndoReplace::SwUndoReplace(SwPaM const& rPam,
- ::rtl::OUString const& rIns, bool const bRegExp)
+ OUString const& rIns, bool const bRegExp)
: SwUndo( UNDO_REPLACE )
, m_pImpl(new Impl(rPam, rIns, bRegExp))
{
@@ -535,7 +535,7 @@ void SwUndoReplace::RedoImpl(::sw::UndoRedoContext & rContext)
SwRewriter
MakeUndoReplaceRewriter(sal_uLong const occurrences,
- ::rtl::OUString const& sOld, ::rtl::OUString const& sNew)
+ OUString const& sOld, OUString const& sNew)
{
SwRewriter aResult;
@@ -593,7 +593,7 @@ void SwUndoReplace::SetEnd(SwPaM const& rPam)
}
SwUndoReplace::Impl::Impl(
- SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp)
+ SwPaM const& rPam, OUString const& rIns, bool const bRegExp)
: m_sIns( rIns )
, m_nOffset( 0 )
, m_bRegExp(bRegExp)
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index c317354a5148..b223846b6eaf 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -76,7 +76,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
pTxtNd->SetIgnoreDontExpand( true );
- pTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent,
+ pTxtNd->InsertText( OUString(cIns), rPos.nContent,
IDocumentContentOperations::INS_EMPTYEXPAND );
aInsStr.Insert( cIns );
@@ -116,7 +116,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
// ask the char that should be inserted
if (( CH_TXTATR_BREAKWORD == cIns || CH_TXTATR_INWORD == cIns ) ||
- rCC.isLetterNumeric( rtl::OUString( cIns ), 0 ) !=
+ rCC.isLetterNumeric( OUString( cIns ), 0 ) !=
rCC.isLetterNumeric( aInsStr, aInsStr.Len()-1 ) )
return sal_False;
@@ -200,7 +200,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
if( aDelStr.Len() )
{
- String aTmpStr = rtl::OUString('1');
+ String aTmpStr = OUString('1');
sal_Unicode* pTmpStr = aTmpStr.GetBufferAccess();
bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
@@ -248,10 +248,10 @@ void SwUndoOverwrite::RepeatImpl(::sw::RepeatContext & rContext)
{
::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
- rDoc.Overwrite(*pAktPam, rtl::OUString(aInsStr.GetChar(0)));
+ rDoc.Overwrite(*pAktPam, OUString(aInsStr.GetChar(0)));
}
for( xub_StrLen n = 1; n < aInsStr.Len(); ++n )
- rDoc.Overwrite( *pAktPam, rtl::OUString(aInsStr.GetChar(n)) );
+ rDoc.Overwrite( *pAktPam, OUString(aInsStr.GetChar(n)) );
}
void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
@@ -282,7 +282,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
{
// do it individually, to keep the attributes!
OUString const ins(
- pTxtNd->InsertText( rtl::OUString(aInsStr.GetChar(n)), rIdx,
+ pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx,
IDocumentContentOperations::INS_EMPTYEXPAND) );
assert(ins.getLength() == 1); // cannot fail
if( n < aDelStr.Len() )
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 7cec5d8ef2c5..25293cc4b227 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-using rtl::OUString;
SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc ) :
@@ -241,22 +240,22 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
}
-rtl::OUString SAL_CALL SwXTextDefaults::getImplementationName( )
+OUString SAL_CALL SwXTextDefaults::getImplementationName( )
throw (RuntimeException)
{
return OUString("SwXTextDefaults");
}
-sal_Bool SAL_CALL SwXTextDefaults::supportsService( const ::rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName )
throw (RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSeq(getSupportedServiceNames());
+ uno::Sequence< OUString > aSeq(getSupportedServiceNames());
return std::find(comphelper::stl_begin(aSeq), comphelper::stl_end(aSeq), rServiceName) != comphelper::stl_end(aSeq);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( )
throw (RuntimeException)
{
uno::Sequence< OUString > aRet(7);
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 25026ed1ad19..471a0c3cc583 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -25,8 +25,6 @@
#include <algorithm>
#include <functional>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ================================================================================
@@ -39,7 +37,7 @@ namespace
class lcl_Escape : public ::std::unary_function< sal_Unicode, void >
{
public:
- lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+ lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
void operator() ( sal_Unicode aChar )
{
static const sal_Unicode m_aQuote( '\'' );
@@ -52,7 +50,7 @@ public:
}
private:
- ::rtl::OUStringBuffer & m_aResultBuffer;
+ OUStringBuffer & m_aResultBuffer;
};
// ----------------------------------------
@@ -64,7 +62,7 @@ private:
class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void >
{
public:
- lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+ lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
void operator() ( sal_Unicode aChar )
{
static const sal_Unicode m_aBackslash( '\\' );
@@ -74,12 +72,12 @@ public:
}
private:
- ::rtl::OUStringBuffer & m_aResultBuffer;
+ OUStringBuffer & m_aResultBuffer;
};
// ----------------------------------------
-void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output )
+void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output )
{
OSL_ASSERT(output != 0);
@@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, r
}
void lcl_getSingleCellAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
/*::chart::*/XMLRangeHelper::Cell & rOutCell )
{
@@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString(
static const sal_Unicode aDollar( '$' );
static const sal_Unicode aLetterA( 'A' );
- ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
+ OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
const sal_Unicode* pStrArray = aCellStr.getStr();
sal_Int32 nLength = aCellStr.getLength();
sal_Int32 i = nLength - 1, nColumn = 0;
@@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString(
}
bool lcl_getCellAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
/*::chart::*/XMLRangeHelper::Cell & rOutCell,
- ::rtl::OUString& rOutTableName )
+ OUString& rOutTableName )
{
static const sal_Unicode aDot( '.' );
static const sal_Unicode aQuote( '\'' );
@@ -193,7 +191,7 @@ bool lcl_getCellAddressFromXMLString(
{
// there is a table name before the address
- ::rtl::OUStringBuffer aTableNameBuffer;
+ OUStringBuffer aTableNameBuffer;
const sal_Unicode * pTableName = rXMLString.getStr();
// remove escapes from table name
@@ -206,7 +204,7 @@ bool lcl_getCellAddressFromXMLString(
if( pBuf[ 0 ] == aQuote &&
pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote )
{
- ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear();
+ OUString aName = aTableNameBuffer.makeStringAndClear();
rOutTableName = aName.copy( 1, aName.getLength() - 2 );
}
else
@@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString(
}
bool lcl_getCellRangeAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
/*::chart::*/XMLRangeHelper::CellRange & rOutRange )
{
@@ -270,7 +268,7 @@ bool lcl_getCellRangeAddressFromXMLString(
bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nDelimiterPos - 1,
rOutRange.aUpperLeft,
rOutRange.aTableName );
- ::rtl::OUString sTableSecondName;
+ OUString sTableSecondName;
if( bResult )
{
bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos,
@@ -353,7 +351,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
static const sal_Unicode aSpace( ' ' );
static const sal_Unicode aQuote( '\'' );
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
if( !rRange.aTableName.isEmpty())
{
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 2857c4d8ead5..18f692fccb5a 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -55,12 +55,12 @@ struct CellRange
{
Cell aUpperLeft;
Cell aLowerRight;
- ::rtl::OUString aTableName;
+ OUString aTableName;
};
-CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString );
+CellRange getCellRangeFromXMLString( const OUString & rXMLString );
-::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange );
+OUString getXMLStringFromCellRange( const CellRange & rRange );
} // namespace XMLRangeHelper
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 78b195f3855a..98d076bac5e1 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -63,7 +63,7 @@ sal_Bool UCB_DeleteFile( const String& rURL )
ucbhelper::Content aTempContent( rURL,
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aTempContent.executeCommand(rtl::OUString("delete"),
+ aTempContent.executeCommand(OUString("delete"),
::com::sun::star::uno::makeAny( sal_True ) );
bRemoved = sal_True;
}
@@ -96,7 +96,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy
aInfo.SourceURL = rURL;
aInfo.MoveData = bCopyIsMove;
aAny <<= aInfo;
- aTempContent.executeCommand( rtl::OUString("transfer"),
+ aTempContent.executeCommand( OUString("transfer"),
aAny );
}
catch( ::com::sun::star::uno::Exception& )
@@ -142,7 +142,7 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL )
{
ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
::com::sun::star::uno::Any aAny = aCnt.getPropertyValue(
- rtl::OUString("IsReadOnly"));
+ OUString("IsReadOnly"));
if(aAny.hasValue())
bIsReadOnly = *(sal_Bool*)aAny.getValue();
}
@@ -198,11 +198,11 @@ bool UCB_GetFileListOfFolder( const String& rURL,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
- ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
- rtl::OUString* pProps = aProps.getArray();
- pProps[ 0 ] = rtl::OUString("Title");
+ ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize );
+ OUString* pProps = aProps.getArray();
+ pProps[ 0 ] = OUString("Title");
if( pDateTimeList )
- pProps[ 1 ] = rtl::OUString("DateModified");
+ pProps[ 1 ] = OUString("DateModified");
try
{
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 365425fcdc93..dd832ddb14eb 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -41,7 +41,6 @@
using namespace ::sw::mark;
using namespace ::com::sun::star;
-using ::rtl::OUString;
namespace
@@ -50,7 +49,7 @@ namespace
{
static const OUString sStart = OUString(String(SW_RES(STR_START_QUOTE)));
static const OUString sEnd = OUString(String(SW_RES(STR_END_QUOTE)));
- ::rtl::OUStringBuffer sBuf(64);
+ OUStringBuffer sBuf(64);
return sBuf.append(sStart).append(rName).append(sEnd).makeStringAndClear();
}
}
@@ -70,7 +69,7 @@ public:
::cppu::OInterfaceContainerHelper m_EventListeners;
SwDoc * m_pDoc;
::sw::mark::IMark * m_pRegisteredBookmark;
- ::rtl::OUString m_sMarkName;
+ OUString m_sMarkName;
Impl( SwXBookmark & rThis,
@@ -440,7 +439,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
uno::RuntimeException)
{
// nothing to set here
- throw lang::IllegalArgumentException( ::rtl::OUString("Property is read-only: ")
+ throw lang::IllegalArgumentException( OUString("Property is read-only: ")
+ PropertyName, static_cast< cppu::OWeakObject * >(this), 0 );
}
@@ -463,7 +462,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXBookmark::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -473,7 +472,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXBookmark::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -483,7 +482,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXBookmark::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -493,7 +492,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXBookmark::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -607,7 +606,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe
( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) );
}
-::rtl::OUString SwXFieldmark::getFieldType(void)
+OUString SwXFieldmark::getFieldType(void)
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -617,7 +616,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe
return pBkm->GetFieldname();
}
-void SwXFieldmark::setFieldType(const::rtl::OUString & fieldType)
+void SwXFieldmark::setFieldType(const OUString & fieldType)
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -667,7 +666,7 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark & rMark)
SwXFieldmark::getCheckboxFieldmark()
{
::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL;
- if ( getFieldType() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) )
+ if ( getFieldType() == OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) )
{
// evil #TODO #FIXME casting away the const-ness
pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark()));
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index bfcb64724693..7fe2b3ee85ab 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -52,7 +52,6 @@
#define SN_LABELED_DATA_SEQUENCE "com.sun.star.chart2.data.LabeledDataSequence"
using namespace ::com::sun::star;
-using ::rtl::OUString;
// from unotbl.cxx
extern void sw_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow);
@@ -1751,7 +1750,7 @@ void SwChartDataProvider::AddRowCols(
}
// XRangeXMLConversion ---------------------------------------------------
-rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUString& rRangeRepresentation )
+OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation )
throw ( uno::RuntimeException, lang::IllegalArgumentException )
{
SolarMutexGuard aGuard;
@@ -1819,7 +1818,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri
return aRes;
}
-rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUString& rXMLRange )
+OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXMLRange )
throw ( uno::RuntimeException, lang::IllegalArgumentException )
{
SolarMutexGuard aGuard;
@@ -1832,7 +1831,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt
// multiple ranges are delimeted by a ' ' like in
// "Table1.$A$1:.$A$4 Table1.$C$2:.$C$5" the same table must be used in all ranges!
xub_StrLen nNumRanges = comphelper::string::getTokenCount(aXMLRange, ' ');
- rtl::OUString aFirstFoundTable; // to check that only one table will be used
+ OUString aFirstFoundTable; // to check that only one table will be used
for (sal_uInt16 i = 0; i < nNumRanges; ++i)
{
String aRange( aXMLRange.GetToken(i, ' ') );
@@ -2169,13 +2168,13 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
String aNew;
if (bUseCol)
{
- aRplc = rtl::OUString("%COLUMNLETTER");
- aNew = rtl::OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer());
+ aRplc = OUString("%COLUMNLETTER");
+ aNew = OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer());
}
else
{
- aRplc = rtl::OUString("%ROWNUMBER");
- aNew = rtl::OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf);
+ aRplc = OUString("%ROWNUMBER");
+ aNew = OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf);
}
xub_StrLen nPos = aTxt.Search( aRplc );
if (nPos != STRING_NOTFOUND)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index a55f2fb56753..eb7d5b86b07a 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -79,7 +79,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceasvector.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::uno;
@@ -87,25 +86,24 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-using rtl::OUString;
#ifndef DISABLE_SCRIPTING
class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
{
SwDocShell* mpDocShell;
- rtl::OUString msThisDocumentCodeName;
+ OUString msThisDocumentCodeName;
public:
SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
// XCodeNameQuery
- rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException )
+ OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException )
{
// not implemented...
- return rtl::OUString();
+ return OUString();
}
- rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
+ OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
{
// Initialise the code name
if ( msThisDocumentCodeName.isEmpty() )
@@ -113,14 +111,14 @@ public:
try
{
uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString("BasicLibraries") ), uno::UNO_QUERY_THROW );
- rtl::OUString sProjectName( "Standard");
+ uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( OUString("BasicLibraries") ), uno::UNO_QUERY_THROW );
+ OUString sProjectName( "Standard");
if ( !mpDocShell->GetBasicManager()->GetName().isEmpty() )
{
sProjectName = mpDocShell->GetBasicManager()->GetName();
}
uno::Reference< container::XNameAccess > xLib( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
- uno::Sequence< rtl::OUString > sModuleNames = xLib->getElementNames();
+ uno::Sequence< OUString > sModuleNames = xLib->getElementNames();
uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
@@ -138,7 +136,7 @@ public:
{
}
}
- rtl::OUString sCodeName;
+ OUString sCodeName;
if ( mpDocShell )
{
OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
@@ -173,7 +171,7 @@ public:
}
};
-typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap;
+typedef boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
{
StringHashMap mTemplateToProject;
@@ -181,19 +179,19 @@ public:
SwVbaProjectNameProvider()
{
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
{
return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
}
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
return uno::makeAny( mTemplateToProject.find( aName )->second );
}
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() );
+ uno::Sequence< OUString > aElements( mTemplateToProject.size() );
StringHashMap::iterator it_end = mTemplateToProject.end();
sal_Int32 index = 0;
for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index )
@@ -201,24 +199,24 @@ public:
return aElements;
}
- virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException )
+ virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException )
{
- rtl::OUString sProjectName;
+ OUString sProjectName;
aElement >>= sProjectName;
OSL_TRACE("** Template cache inserting template name %s with project %s"
- , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr()
- , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ , OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr()
+ , OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() );
mTemplateToProject[ aName ] = sProjectName;
}
- virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
{
if ( !hasByName( Name ) )
throw container::NoSuchElementException();
mTemplateToProject.erase( Name );
}
- virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
+ virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
@@ -227,7 +225,7 @@ public:
// XElemenAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
{
- return ::getCppuType((const rtl::OUString*)0);
+ return ::getCppuType((const OUString*)0);
}
virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException )
{
@@ -246,7 +244,7 @@ public:
// #FIXME #TODO is the code name for ThisDocument read anywhere?
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
{
// #FIXME #TODO we really need to be checking against the codename for
// ThisDocument
@@ -255,7 +253,7 @@ public:
return sal_False;
}
- ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
@@ -266,9 +264,9 @@ public:
OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
return uno::makeAny( xDocObj );
}
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > aNames;
+ uno::Sequence< OUString > aNames;
return aNames;
}
// XElemenAccess
@@ -484,7 +482,7 @@ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType)
OUString sRet;
sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]);
if(nObjectType < nEntries)
- sRet = rtl::OUString::createFromAscii(aProvNamesId[nObjectType].pName);
+ sRet = OUString::createFromAscii(aProvNamesId[nObjectType].pName);
return sRet;
}
@@ -496,7 +494,7 @@ uno::Sequence<OUString> SwXServiceProvider::GetAllServiceNames()
sal_uInt16 n = 0;
for(sal_uInt16 i = 0; i < nEntries; i++)
{
- String sProv(rtl::OUString::createFromAscii(aProvNamesId[i].pName));
+ String sProv(OUString::createFromAscii(aProvNamesId[i].pName));
if(sProv.Len())
{
pArray[n] = sProv;
@@ -612,7 +610,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
{
uno::Sequence< uno::Any > aArgs(1);
aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel();
- aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString("ooo.vba.word.Globals"), aArgs );
+ aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString("ooo.vba.word.Globals"), aArgs );
pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
}
aGlobs >>= xRet;
@@ -1683,7 +1681,7 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
throw IndexOutOfBoundsException();
}
-uno::Any SwXBookmarks::getByName(const rtl::OUString& rName)
+uno::Any SwXBookmarks::getByName(const OUString& rName)
throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1709,7 +1707,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void)
if(!IsValid())
throw uno::RuntimeException();
- ::comphelper::SequenceAsVector< ::rtl::OUString > ret;
+ ::comphelper::SequenceAsVector< OUString > ret;
IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
for (IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess->getBookmarksBegin();
@@ -1997,7 +1995,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R
uno::Sequence<OUString> aRet;
if(IsValid())
{
- std::vector<rtl::OUString> aStrings;
+ std::vector<OUString> aStrings;
sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings );
aRet.realloc(nCount);
OUString* pNames = aRet.getArray();
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 28ab19a9bfac..d949481bb89e 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -90,7 +90,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
namespace SwUnoCursorHelper
{
@@ -678,7 +677,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
nPaMStart = nPaMEnd;
nPaMEnd = nTmp;
}
- Sequence< ::rtl::OUString> aCharStyles;
+ Sequence< OUString> aCharStyles;
SwpHints* pHints = pTxtNode->GetpSwpHints();
for(sal_uInt16 nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ )
{
@@ -960,8 +959,8 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SwDoc* pDoc = pUnoCrsr->GetDoc();
SwDocShell* pDocSh = pDoc->GetDocShell();
comphelper::MediaDescriptor aMediaDescriptor( rOptions );
- ::rtl::OUString sFileName = rURL;
- ::rtl::OUString sFilterName, sFilterOptions, sPassword, sBaseURL;
+ OUString sFileName = rURL;
+ OUString sFilterName, sFilterOptions, sPassword, sBaseURL;
uno::Reference < io::XStream > xStream;
uno::Reference < io::XInputStream > xInputStream;
@@ -1163,7 +1162,7 @@ bool DocInsertStringSplitCR(
}
void makeRedline( SwPaM& rPaM,
- const ::rtl::OUString& rRedlineType,
+ const OUString& rRedlineType,
const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
@@ -1182,15 +1181,15 @@ void makeRedline( SwPaM& rPaM,
//todo: what about REDLINE_FMTCOLL?
comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
uno::Any aAuthorValue;
- aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineAuthor"), aAuthorValue);
+ aAuthorValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineAuthor"), aAuthorValue);
sal_uInt16 nAuthor = 0;
- ::rtl::OUString sAuthor;
+ OUString sAuthor;
if( aAuthorValue >>= sAuthor )
nAuthor = pRedlineAccess->InsertRedlineAuthor(sAuthor);
- ::rtl::OUString sComment;
+ OUString sComment;
uno::Any aCommentValue;
- aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineComment"), aCommentValue);
+ aCommentValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineComment"), aCommentValue);
SwRedlineData aRedlineData( eType, nAuthor );
if( aCommentValue >>= sComment )
@@ -1198,7 +1197,7 @@ void makeRedline( SwPaM& rPaM,
::util::DateTime aStamp;
uno::Any aDateTimeValue;
- aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineDateTime"), aDateTimeValue);
+ aDateTimeValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineDateTime"), aDateTimeValue);
if( aDateTimeValue >>= aStamp )
{
aRedlineData.SetTimeStamp(
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index c86eabaa25cb..7540b1640ab8 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -61,7 +61,6 @@
#include <com/sun/star/drawing/PointSequence.hpp>
#include <switerator.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, SwShapeImplementationIdMap );
@@ -450,20 +449,20 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) t
new SwXShapesEnumeration(this));
}
-rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException )
+OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException )
{
return OUString("SwXDrawPage");
}
-sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
return rServiceName == "com.sun.star.drawing.GenericDrawPage";
}
-uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException )
+uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aRet(1);
- rtl::OUString* pArray = aRet.getArray();
+ uno::Sequence< OUString > aRet(1);
+ OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.drawing.GenericDrawPage";
return aRet;
}
@@ -1041,7 +1040,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx
if( xAggShape.is() )
{
- const rtl::OUString aShapeType( xAggShape->getShapeType() );
+ const OUString aShapeType( xAggShape->getShapeType() );
// did we already compute an implementation id for the agregated shape type?
SwShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) );
if( aIter == aImplementationIdMap.end() )
@@ -1095,7 +1094,7 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) th
return aRet;
}
-void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::Any& aValue)
+void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
throw( beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1108,7 +1107,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
//mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert
if(pFmt)
{
@@ -1465,7 +1464,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
}
}
-uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
+uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
{
@@ -1541,7 +1540,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::Transformation>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("Transformation") );
+ aRet = _getPropAtAggrObj( OUString("Transformation") );
}
else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID )
{
@@ -1552,13 +1551,13 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") );
+ aRet = _getPropAtAggrObj( OUString("StartPosition") );
}
else if ( FN_SHAPE_ENDPOSITION_IN_HORI_L2R == pEntry->nWID )
{
// get property <::drawing::Shape::EndPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") );
+ aRet = _getPropAtAggrObj( OUString("EndPosition") );
}
else
{
@@ -1618,7 +1617,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::Transformation>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("Transformation") );
+ aRet = _getPropAtAggrObj( OUString("Transformation") );
}
break;
case FN_SHAPE_POSITION_LAYOUT_DIR:
@@ -1631,14 +1630,14 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") );
+ aRet = _getPropAtAggrObj( OUString("StartPosition") );
}
break;
case FN_SHAPE_ENDPOSITION_IN_HORI_L2R:
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") );
+ aRet = _getPropAtAggrObj( OUString("EndPosition") );
}
break;
}
@@ -1685,7 +1684,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
return aRet;
}
-uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
+uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
{
@@ -1705,19 +1704,19 @@ uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
return aRet;
}
-beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyName )
+beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- uno::Sequence< rtl::OUString > aNames(1);
- rtl::OUString* pStrings = aNames.getArray();
+ uno::Sequence< OUString > aNames(1);
+ OUString* pStrings = aNames.getArray();
pStrings[0] = rPropertyName;
uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aNames);
return aStates.getConstArray()[0];
}
uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
- const uno::Sequence< rtl::OUString >& aPropertyNames )
+ const uno::Sequence< OUString >& aPropertyNames )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1734,7 +1733,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
bGroupMember = pObject->GetUpGroup() != 0;
bFormControl = pObject->GetObjInventor() == FmFormInventor;
}
- const rtl::OUString* pNames = aPropertyNames.getConstArray();
+ const OUString* pNames = aPropertyNames.getConstArray();
beans::PropertyState* pRet = aRet.getArray();
uno::Reference< XPropertyState > xShapePrState;
for(sal_Int32 nProperty = 0; nProperty < aPropertyNames.getLength(); nProperty++)
@@ -1818,7 +1817,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
return aRet;
}
-void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
+void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1829,7 +1828,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw uno::RuntimeException( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pFmt)
{
const SfxItemSet& rSet = pFmt->GetAttrSet();
@@ -1880,7 +1879,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
throw uno::RuntimeException();
}
-uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName )
+uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
{
@@ -1917,13 +1916,13 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName )
}
void SwXShape::addPropertyChangeListener(
- const rtl::OUString& _propertyName,
+ const OUString& _propertyName,
const uno::Reference< beans::XPropertyChangeListener > & _listener )
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
{
if ( !xShapeAgg.is() )
- throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this );
+ throw uno::RuntimeException( OUString( "no shape aggregate" ), *this );
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
@@ -1932,13 +1931,13 @@ void SwXShape::addPropertyChangeListener(
}
void SwXShape::removePropertyChangeListener(
- const rtl::OUString& _propertyName,
+ const OUString& _propertyName,
const uno::Reference< beans::XPropertyChangeListener > & _listener)
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
{
if ( !xShapeAgg.is() )
- throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this );
+ throw uno::RuntimeException( OUString( "no shape aggregate" ), *this );
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
@@ -1947,7 +1946,7 @@ void SwXShape::removePropertyChangeListener(
}
void SwXShape::addVetoableChangeListener(
- const rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ )
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
@@ -1956,7 +1955,7 @@ void SwXShape::addVetoableChangeListener(
}
void SwXShape::removeVetoableChangeListener(
- const rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
throw( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException )
@@ -2125,12 +2124,12 @@ void SwXShape::removeEventListener(
pSvxShape->removeEventListener(aListener);
}
-rtl::OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException )
+OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException )
{
return OUString("SwXShape");
}
-sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
sal_Bool bRet = sal_False;
if(COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.drawing.Shape"))
@@ -2144,9 +2143,9 @@ sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno
return bRet;
}
-uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException )
+uno::Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSeq;
+ uno::Sequence< OUString > aSeq;
if(xShapeAgg.is())
{
uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY);
@@ -2327,9 +2326,9 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
}
// #i31698#
// implementation of virtual methods from drawing::XShapeDescriptor
-::rtl::OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException )
+OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException )
{
- ::rtl::OUString aType;
+ OUString aType;
if ( mxShape.is() )
{
aType = mxShape->getShapeType();
@@ -2367,9 +2366,9 @@ awt::Point SwXShape::_GetAttrPosition()
{
awt::Point aAttrPos;
- uno::Any aHoriPos( getPropertyValue( rtl::OUString("HoriOrientPosition") ) );
+ uno::Any aHoriPos( getPropertyValue( OUString("HoriOrientPosition") ) );
aHoriPos >>= aAttrPos.X;
- uno::Any aVertPos( getPropertyValue( rtl::OUString("VertOrientPosition") ) );
+ uno::Any aVertPos( getPropertyValue( OUString("VertOrientPosition") ) );
aVertPos >>= aAttrPos.Y;
// #i35798# - fallback, if attribute position is (0,0)
// and no anchor position is applied to the drawing object
@@ -2392,7 +2391,7 @@ awt::Point SwXShape::_GetAttrPosition()
text::TextContentAnchorType eTextAnchorType =
text::TextContentAnchorType_AT_PARAGRAPH;
{
- rtl::OUString sAnchorType( "AnchorType" );
+ OUString sAnchorType( "AnchorType" );
uno::Any aAny = getPropertyValue( sAnchorType );
aAny >>= eTextAnchorType;
}
@@ -2521,14 +2520,14 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
text::TextContentAnchorType eTextAnchorType =
text::TextContentAnchorType_AT_PARAGRAPH;
{
- rtl::OUString sAnchorType( "AnchorType" );
+ OUString sAnchorType( "AnchorType" );
uno::Any aAny = getPropertyValue( sAnchorType );
aAny >>= eTextAnchorType;
}
if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER )
{
// determine current x-postion
- rtl::OUString aHoriPosPropStr("HoriOrientPosition");
+ OUString aHoriPosPropStr("HoriOrientPosition");
uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) );
sal_Int32 dCurrX = 0;
aHoriPos >>= dCurrX;
@@ -2537,7 +2536,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
{
// adjust x-position orientation to text::HoriOrientation::NONE, if needed
// Note: has to be done before setting x-position attribute
- rtl::OUString aHoriOrientPropStr("HoriOrient");
+ OUString aHoriOrientPropStr("HoriOrient");
uno::Any aHoriOrient( getPropertyValue( aHoriOrientPropStr ) );
sal_Int16 eHoriOrient;
if (aHoriOrient >>= eHoriOrient) // may be void
@@ -2558,7 +2557,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
// handle y-position
{
// determine current y-postion
- rtl::OUString aVertPosPropStr("VertOrientPosition");
+ OUString aVertPosPropStr("VertOrientPosition");
uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) );
sal_Int32 dCurrY = 0;
aVertPos >>= dCurrY;
@@ -2567,7 +2566,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
{
// adjust y-position orientation to text::VertOrientation::NONE, if needed
// Note: has to be done before setting y-position attribute
- rtl::OUString aVertOrientPropStr("VertOrient");
+ OUString aVertOrientPropStr("VertOrient");
uno::Any aVertOrient( getPropertyValue( aVertOrientPropStr ) );
sal_Int16 eVertOrient;
if (aVertOrient >>= eVertOrient) // may be void
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index a5695cae9bc9..a9683f74fb5b 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -42,8 +42,6 @@ using ::com::sun::star::lang::WrappedTargetException;
using ::com::sun::star::lang::XServiceInfo;
using ::com::sun::star::beans::PropertyValue;
using ::cppu::WeakImplHelper2;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
//
// tables of allowed events for specific objects
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 130e668a810e..53a3de7ebb79 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -88,7 +88,6 @@
#include <vector>
#include <xmloff/odffields.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace nsSwDocInfoSubType;
@@ -447,7 +446,7 @@ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( un
}
if( pEntry )
{
- rtl::OString aTmp = rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(
+ OString aTmp = OStringBuffer(RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.text.fieldmaster.")).append(pEntry).
makeStringAndClear();
bRet = rServiceName.equalsAsciiL(aTmp.getStr(), aTmp.getLength());
@@ -613,7 +612,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
{
SwSetExpFieldType aType(m_pDoc, sTypeName);
if(sParam1.Len())
- aType.SetDelimiter(rtl::OUString(sParam1.GetChar(0)));
+ aType.SetDelimiter(OUString(sParam1.GetChar(0)));
if(nParam1 > -1 && nParam1 < MAXLEVEL)
aType.SetOutlineLvl(nParam1);
pType2 = m_pDoc->InsertFldType(aType);
@@ -1218,7 +1217,7 @@ OUString SwXTextField::getPresentation(sal_Bool bShowCommand) throw( uno::Runtim
{
throw uno::RuntimeException();
}
- ::rtl::OUString const ret( (bShowCommand)
+ OUString const ret( (bShowCommand)
? pField->GetFieldName()
: pField->ExpandField(true) );
return ret;
@@ -1665,7 +1664,7 @@ void SwXTextField::attachToRange(
case SW_SERVICE_FIELDTYPE_MACRO:
{
SwFieldType* pFldType = pDoc->GetSysFldType(RES_MACROFLD);
- rtl::OUString aName;
+ OUString aName;
// support for Scripting Framework macros
if (m_pProps->sPar4.Len() != 0)
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index ae666e0c19c4..2c3696a1bf77 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -61,7 +61,7 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const nTextMarkupType,
* SwXFlatParagraph
******************************************************************************/
-SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rMap ) :
+SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rMap ) :
SwXTextMarkup( rTxtNode, rMap ),
maExpandText( aExpandText )
{
@@ -119,14 +119,14 @@ css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph::
return SwXTextMarkup::getMarkupInfoContainer();
}
-void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException)
+void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException)
{
SolarMutexGuard aGuard;
SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer );
}
// text::XFlatParagraph:
-::rtl::OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException)
+OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException)
{
return maExpandText;
}
@@ -201,7 +201,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo
}
// text::XFlatParagraph:
-void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
+void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
{
SolarMutexGuard aGuard;
@@ -419,7 +419,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
{
// Expand the string:
const ModelToViewHelper aConversionMap(*pRet);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
xRet = new SwXFlatParagraph( *pRet, aExpandText, aConversionMap );
// keep hard references...
@@ -471,7 +471,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co
{
// Expand the string:
const ModelToViewHelper aConversionMap(*pNextTxtNode);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
xRet = new SwXFlatParagraph( *pNextTxtNode, aExpandText, aConversionMap );
// keep hard references...
@@ -517,7 +517,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(c
{
// Expand the string:
const ModelToViewHelper aConversionMap(*pPrevTxtNode);
- rtl::OUString aExpandText = aConversionMap.getViewText();
+ OUString aExpandText = aConversionMap.getViewText();
xRet = new SwXFlatParagraph( *pPrevTxtNode, aExpandText, aConversionMap );
// keep hard references...
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 0990c4fc9890..e2f223d3d8fb 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -115,7 +115,6 @@
extern sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet );
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::frame::XModel;
using ::com::sun::star::container::XNameAccess;
@@ -1189,7 +1188,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
else if( sTmp.EqualsAscii( sGraphicObjectProtocol,
0, sizeof(sGraphicObjectProtocol)-1 ) )
{
- rtl::OString sId(rtl::OUStringToOString(
+ OString sId(OUStringToOString(
sTmp.Copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
@@ -1256,10 +1255,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
// the package URL based graphics are handled in different way currently
// TODO/LATER: actually this is the correct place to handle them
- ::rtl::OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) );
+ OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) );
if( aGrfUrl.startsWith( aGraphicProtocol ) )
{
- rtl::OString sId(rtl::OUStringToOString(
+ OString sId(OUStringToOString(
aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
@@ -1289,7 +1288,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
{
svt::EmbeddedObjectRef &rObj = pOleNode->GetOLEObj().GetObject();
- ::rtl::OUString aMediaType;
+ OUString aMediaType;
rObj.SetGraphic( aGraphic, aMediaType );
}
}
@@ -1565,8 +1564,8 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
}
else
{
- rtl::OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) );
- rtl::OUString sId(rtl::OStringToOUString(
+ OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) );
+ OUString sId(OStringToOUString(
pGrfNode->GetGrfObj().GetUniqueID(),
RTL_TEXTENCODING_ASCII_US));
sGrfName = sPrefix + sId;
@@ -1740,7 +1739,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
aAny <<= aHexCLSID;
else if(FN_UNO_STREAM_NAME == pEntry->nWID)
{
- aAny <<= ::rtl::OUString(pOleNode->GetOLEObj().GetCurrentPersistName());
+ aAny <<= OUString(pOleNode->GetOLEObj().GetCurrentPersistName());
}
else if(FN_EMBEDDED_OBJECT == pEntry->nWID)
{
@@ -2247,7 +2246,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
else if( sGraphicURL.EqualsAscii( sGraphicObjectProtocol,
0, sizeof(sGraphicObjectProtocol)-1 ) )
{
- rtl::OString sId(rtl::OUStringToOString(
+ OString sId(OUStringToOString(
sGraphicURL.Copy( sizeof(sGraphicObjectProtocol)-1 ),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
@@ -2290,19 +2289,19 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
const ::uno::Any* pSurroundContour;
if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUR, pSurroundContour))
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour);
const ::uno::Any* pContourOutside;
if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUROUTSIDE, pContourOutside))
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside);
const ::uno::Any* pContourPoly;
if(pProps->GetProperty(FN_PARAM_COUNTOUR_PP, 0, pContourPoly))
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly);
const ::uno::Any* pPixelContour;
if(pProps->GetProperty(FN_UNO_IS_PIXEL_CONTOUR, 0, pPixelContour))
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour);
const ::uno::Any* pAutoContour;
if(pProps->GetProperty(FN_UNO_IS_AUTOMATIC_CONTOUR, 0, pAutoContour))
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour);
}
else
{
@@ -2329,7 +2328,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
pCnt.reset( new comphelper::EmbeddedObjectContainer );
- ::rtl::OUString aName;
+ OUString aName;
xIPObj = pCnt->CreateEmbeddedObject( aClassName.GetByteSequence(), aName );
}
if ( xIPObj.is() )
@@ -2394,7 +2393,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
else if( pStreamName )
{
- ::rtl::OUString sStreamName;
+ OUString sStreamName;
(*pStreamName) >>= sStreamName;
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
@@ -2421,7 +2420,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY );
if ( xChild.is() )
xChild->setParent( mrPers.GetModel() );
- ::rtl::OUString rName;
+ OUString rName;
mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
SwFlyFrmFmt* pFrmFmt = 0;
@@ -2436,21 +2435,21 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
GetOrCreateSdrObject( pFmt );
const ::uno::Any* pOrder;
if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) )
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder);
const ::uno::Any* pReplacement;
if( pProps->GetProperty(FN_UNO_REPLACEMENT_GRAPHIC, 0, pReplacement) )
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement);
// new attribute Title
const ::uno::Any* pTitle;
if ( pProps->GetProperty(FN_UNO_TITLE, 0, pTitle) )
{
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle);
}
// new attribute Description
const ::uno::Any* pDescription;
if ( pProps->GetProperty(FN_UNO_DESCRIPTION, 0, pDescription) )
{
- setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription);
+ setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription);
}
}
else
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 0e9ef54b7856..69526c940758 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -41,7 +41,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/******************************************************************
* SwXFootnote
@@ -59,7 +58,7 @@ public:
::cppu::OInterfaceContainerHelper m_EventListeners;
bool m_bIsDescriptor;
const SwFmtFtn * m_pFmtFtn;
- ::rtl::OUString m_sLabel;
+ OUString m_sLabel;
Impl( SwXFootnote & rThis,
SwDoc *const pDoc, SwFmtFtn const*const pFootnote,
@@ -255,7 +254,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
- ::rtl::OUString sRet;
+ OUString sRet;
SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat();
if(pFmt)
{
@@ -523,7 +522,7 @@ throw (uno::RuntimeException)
}
void SAL_CALL
-SwXFootnote::setPropertyValue(const ::rtl::OUString&, const uno::Any&)
+SwXFootnote::setPropertyValue(const OUString&, const uno::Any&)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -574,7 +573,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXFootnote::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -584,7 +583,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXFootnote::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -594,7 +593,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXFootnote::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -604,7 +603,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXFootnote::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 03a8c9216b15..395f05af840d 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -60,7 +60,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
static OUString
lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException)
@@ -196,12 +195,12 @@ public:
StyleAccess_Impl(SwXDocumentIndex& rParentIdx);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (uno::RuntimeException);
virtual sal_Bool SAL_CALL
- supportsService(const ::rtl::OUString& rServiceName)
+ supportsService(const OUString& rServiceName)
throw (uno::RuntimeException);
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (uno::RuntimeException);
// XElementAccess
@@ -242,12 +241,12 @@ public:
TokenAccess_Impl(SwXDocumentIndex& rParentIdx);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (uno::RuntimeException);
virtual sal_Bool SAL_CALL
- supportsService(const ::rtl::OUString& rServiceName)
+ supportsService(const OUString& rServiceName)
throw (uno::RuntimeException);
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (uno::RuntimeException);
// XElementAccess
@@ -1201,7 +1200,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndex::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1211,7 +1210,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndex::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1221,7 +1220,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndex::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1231,7 +1230,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndex::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1926,7 +1925,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
// deshalb hier ein Leerzeichen - ob das die ideale Loesung ist?
if (!bMark && !rMark.GetAlternativeText().Len())
{
- rMark.SetAlternativeText( rtl::OUString(' ') );
+ rMark.SetAlternativeText( OUString(' ') );
}
const bool bForceExpandHints( (!bMark && pTextCursor)
@@ -1975,7 +1974,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
if (!pTxtAttr)
{
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
"SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute")),
0);
}
@@ -2314,7 +2313,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndexMark::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2324,7 +2323,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndexMark::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2334,7 +2333,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndexMark::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2344,7 +2343,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXDocumentIndexMark::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 0aacac71dd86..5f3cfc282fec 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
using namespace ::comphelper;
#define SW_PROP_NMID(id) ((const char*)id), 0
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 050b9cbbc20c..1771cdc1d3e3 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -109,8 +109,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
/****************************************************************************
Hilfsklassen
@@ -178,7 +176,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
#endif
WriterRef xWrt;
// TODO/MBA: looks like a BaseURL doesn't make sense here
- SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT_DLG), String(), xWrt );
+ SwReaderWriter::GetWriter( OUString(FILTER_TEXT_DLG), String(), xWrt );
if( xWrt.Is() )
{
SwWriter aWriter( aStream, rPam );
@@ -205,7 +203,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
long lUniLen = (lLen / sizeof( sal_Unicode ));
rtl_uString *pStr = rtl_uString_alloc(lUniLen);
aStream.Read(pStr->buffer, lUniLen * sizeof(sal_Unicode));
- rBuffer = rtl::OUString(pStr, SAL_NO_ACQUIRE);
+ rBuffer = OUString(pStr, SAL_NO_ACQUIRE);
}
xWrt->bShowProgress = bOldShowProgress;
}
@@ -546,7 +544,7 @@ throw (lang::IllegalArgumentException)
// #i91601#
else if (FN_UNO_LIST_ID == rEntry.nWID)
{
- ::rtl::OUString sListId;
+ OUString sListId;
if (rValue >>= sListId)
{
pTxtNd->SetListId( sListId );
@@ -825,7 +823,7 @@ SwXTextCursor::~SwXTextCursor()
{
}
-void SwXTextCursor::DeleteAndInsert(const ::rtl::OUString& rText,
+void SwXTextCursor::DeleteAndInsert(const OUString& rText,
const bool bForceExpandHints)
{
SwUnoCrsr *const pUnoCrsr = m_pImpl->GetCursor();
@@ -1879,7 +1877,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
return;
SwDoc *const pDoc = rPaM.GetDoc();
- rtl::OUString aUnknownExMsg, aPropertyVetoExMsg;
+ OUString aUnknownExMsg, aPropertyVetoExMsg;
// Build set of attributes we want to fetch
std::vector<sal_uInt16> aWhichPairs;
@@ -1887,7 +1885,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
aEntries.reserve(rPropertyValues.getLength());
for (sal_Int32 i = 0; i < rPropertyValues.getLength(); ++i)
{
- const rtl::OUString &rPropertyName = rPropertyValues[i].Name;
+ const OUString &rPropertyName = rPropertyValues[i].Name;
SfxItemPropertySimpleEntry const* pEntry =
rPropSet.getPropertyMap().getByName(rPropertyName);
@@ -2249,7 +2247,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextCursor::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2259,7 +2257,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextCursor::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2269,7 +2267,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextCursor::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2279,7 +2277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextCursor::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -2333,7 +2331,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
void SAL_CALL SwXTextCursor::setPropertyValues(
- const uno::Sequence< ::rtl::OUString >& aPropertyNames,
+ const uno::Sequence< OUString >& aPropertyNames,
const uno::Sequence< uno::Any >& aValues )
throw (
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
@@ -2369,7 +2367,7 @@ void SAL_CALL SwXTextCursor::setPropertyValues(
}
uno::Sequence< uno::Any > SAL_CALL
-SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames )
+SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames )
throw (css::uno::RuntimeException)
{
// a banal implementation for now
@@ -2380,7 +2378,7 @@ SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPrope
}
void SAL_CALL SwXTextCursor::addPropertiesChangeListener(
- const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
+ const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ )
throw (css::uno::RuntimeException)
{
@@ -2394,7 +2392,7 @@ void SAL_CALL SwXTextCursor::removePropertiesChangeListener(
}
void SAL_CALL SwXTextCursor::firePropertiesChangeEvent(
- const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
+ const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ )
throw (css::uno::RuntimeException)
{
@@ -2576,7 +2574,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextCursor::makeRedline(
- const ::rtl::OUString& rRedlineType,
+ const OUString& rRedlineType,
const uno::Sequence< beans::PropertyValue >& rRedlineProperties)
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index d40071ef5ef5..aa71134fc797 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -109,13 +109,12 @@
#include <comphelper/servicehelper.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
namespace sw {
sal_Bool SupportsServiceImpl(
size_t const nServices, char const*const pServices[],
- ::rtl::OUString const & rServiceName)
+ OUString const & rServiceName)
{
for (size_t i = 0; i < nServices; ++i)
{
@@ -127,14 +126,14 @@ sal_Bool SupportsServiceImpl(
return sal_False;
}
-uno::Sequence< ::rtl::OUString >
+uno::Sequence< OUString >
GetSupportedServiceNamesImpl(
size_t const nServices, char const*const pServices[])
{
- uno::Sequence< ::rtl::OUString > ret(nServices);
+ uno::Sequence< OUString > ret(nServices);
for (size_t i = 0; i < nServices; ++i)
{
- ret[i] = rtl::OUString::createFromAscii(pServices[i]);
+ ret[i] = OUString::createFromAscii(pServices[i]);
}
return ret;
}
@@ -847,13 +846,13 @@ void SwXTextRange::SetPositions(const SwPaM& rPam)
{
m_pImpl->Invalidate();
IDocumentMarkAccess* const pMA = m_pImpl->m_rDoc.getIDocumentMarkAccess();
- m_pImpl->m_pMark = pMA->makeMark(rPam, ::rtl::OUString(),
+ m_pImpl->m_pMark = pMA->makeMark(rPam, OUString(),
IDocumentMarkAccess::UNO_BOOKMARK);
m_pImpl->m_pMark->Add(m_pImpl.get());
}
void SwXTextRange::DeleteAndInsert(
- const ::rtl::OUString& rText, const bool bForceExpandHints)
+ const OUString& rText, const bool bForceExpandHints)
throw (uno::RuntimeException)
{
if (RANGE_IS_TABLE == m_pImpl->m_eRangePosition)
@@ -1418,7 +1417,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextRange::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1428,7 +1427,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextRange::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1438,7 +1437,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextRange::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1448,7 +1447,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextRange::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1522,7 +1521,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextRange::makeRedline(
- const ::rtl::OUString& rRedlineType,
+ const OUString& rRedlineType,
const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 5382e1b58a80..8a27742395f2 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -48,7 +48,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
class SwParaSelection
{
@@ -113,7 +112,7 @@ public:
bool m_bIsDescriptor;
sal_Int32 m_nSelectionStartPos;
sal_Int32 m_nSelectionEndPos;
- ::rtl::OUString m_sText;
+ OUString m_sText;
uno::Reference<text::XText> m_xParentText;
Impl( SwXParagraph & rThis,
@@ -151,7 +150,7 @@ public:
bool IsDescriptor() const { return m_bIsDescriptor; }
void SetPropertyValues_Impl(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames,
+ const uno::Sequence< OUString >& rPropertyNames,
const uno::Sequence< uno::Any >& rValues)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
@@ -159,13 +158,13 @@ public:
uno::Sequence< uno::Any >
GetPropertyValues_Impl(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames)
+ const uno::Sequence< OUString >& rPropertyNames)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException);
uno::Sequence< beans::GetDirectPropertyTolerantResult >
GetPropertyValuesTolerant_Impl(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames,
+ const uno::Sequence< OUString >& rPropertyNames,
bool bDirectValuesOnly)
throw (uno::RuntimeException);
protected:
@@ -811,7 +810,7 @@ bool ::sw::GetDefaultTextContentValue(
void SAL_CALL
SwXParagraph::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -821,7 +820,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXParagraph::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -831,7 +830,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXParagraph::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -841,7 +840,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXParagraph::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index caea251ac319..e221f80ecfa7 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -293,7 +293,7 @@ void SwXTextPortion::GetPropertyValue(
OUString sRet;
if( pRet )
- sRet = rtl::OUString::createFromAscii( pRet );
+ sRet = OUString::createFromAscii( pRet );
rVal <<= sRet;
}
break;
@@ -440,7 +440,7 @@ uno::Any SwXTextPortion::getPropertyValue(
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
- uno::Sequence< ::rtl::OUString > aPropertyNames(1);
+ uno::Sequence< OUString > aPropertyNames(1);
aPropertyNames.getArray()[0] = rPropertyName;
return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0];
}
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index ce0e056a024e..d891e66c28fc 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -45,8 +45,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
SwXRedlineText::SwXRedlineText(SwDoc* _pDoc, SwNodeIndex aIndex) :
SwXText(_pDoc, CURSOR_REDLINE),
@@ -232,15 +230,15 @@ static uno::Sequence<beans::PropertyValue> lcl_GetSuccessorProperties(const SwRe
if(pNext)
{
beans::PropertyValue* pValues = aValues.getArray();
- pValues[0].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR));
+ pValues[0].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR));
// GetAuthorString(n) walks the SwRedlineData* chain;
// here we always need element 1
pValues[0].Value <<= OUString(rRedline.GetAuthorString(1));
- pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME));
+ pValues[1].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME));
pValues[1].Value <<= lcl_DateTimeToUno(pNext->GetTimeStamp());
- pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT));
+ pValues[2].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT));
pValues[2].Value <<= OUString(pNext->GetComment());
- pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE));
+ pValues[3].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE));
pValues[3].Value <<= lcl_RedlineTypeToOUString(pNext->GetType());
}
return aValues;
@@ -354,25 +352,25 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties
sRedlineIdBuf.append( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(&rRedline) ) );
sal_Int32 nPropIdx = 0;
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR));
pRet[nPropIdx++].Value <<= OUString(rRedline.GetAuthorString());
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME));
pRet[nPropIdx++].Value <<= lcl_DateTimeToUno(rRedline.GetTimeStamp());
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT));
pRet[nPropIdx++].Value <<= OUString(rRedline.GetComment());
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE));
pRet[nPropIdx++].Value <<= lcl_RedlineTypeToOUString(rRedline.GetType());
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER));
pRet[nPropIdx++].Value <<= sRedlineIdBuf.makeStringAndClear();
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED));
sal_Bool bTmp = !rRedline.HasMark();
pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ;
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START));
pRet[nPropIdx++].Value.setValue(&bIsStart, ::getBooleanCppuType()) ;
bTmp = !rRedline.IsDelLastPara();
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA));
pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ;
SwNodeIndex* pNodeIdx = rRedline.GetContentIdx();
@@ -381,7 +379,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties
if ( 1 < ( pNodeIdx->GetNode().EndOfSectionIndex() - pNodeIdx->GetNode().GetIndex() ) )
{
uno::Reference<text::XText> xRet = new SwXRedlineText(rRedline.GetDoc(), *pNodeIdx);
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT));
pRet[nPropIdx++].Value <<= xRet;
}
else {
@@ -390,7 +388,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties
}
if(pNext)
{
- pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA));
+ pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA));
pRet[nPropIdx++].Value <<= lcl_GetSuccessorProperties(rRedline);
}
aRet.realloc(nPropIdx);
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 116f0aefdc49..f726abc0ae01 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -34,7 +34,6 @@
#include <switerator.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
SwXRedlines::SwXRedlines(SwDoc* _pDoc) :
SwUnoCollection(_pDoc)
@@ -100,7 +99,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException )
return OUString("SwXRedlines");
}
-sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/)
+sal_Bool SwXRedlines::supportsService(const OUString& /*ServiceName*/)
throw( uno::RuntimeException )
{
OSL_FAIL("not implemented");
@@ -162,12 +161,12 @@ uno::Any SwXRedlineEnumeration::nextElement(void)
return aRet;
}
-rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException )
+OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException )
{
return OUString("SwXRedlineEnumeration");
}
-sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException )
+sal_Bool SwXRedlineEnumeration::supportsService(const OUString& /*ServiceName*/) throw( uno::RuntimeException )
{
return sal_False;
}
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 5dccc5370596..3e034316af54 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/******************************************************************
* SwXReferenceMark
@@ -55,7 +54,7 @@ public:
bool m_bIsDescriptor;
SwDoc * m_pDoc;
const SwFmtRefMark * m_pMarkFmt;
- ::rtl::OUString m_sMarkName;
+ OUString m_sMarkName;
Impl( SwXReferenceMark & rThis,
SwDoc *const pDoc, SwFmtRefMark const*const pRefMark)
@@ -268,7 +267,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
if (!pTxtAttr)
{
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
"SwXReferenceMark::InsertRefMark(): cannot insert attribute")), 0);
}
@@ -899,7 +898,7 @@ throw (uno::RuntimeException)
}
// XServiceInfo
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SwXMeta::getImplementationName() throw (uno::RuntimeException)
{
return OUString("SwXMeta");
@@ -915,14 +914,14 @@ static const size_t g_nServicesMeta(
sizeof(g_ServicesMeta)/sizeof(g_ServicesMeta[0]));
sal_Bool SAL_CALL
-SwXMeta::supportsService(const ::rtl::OUString& rServiceName)
+SwXMeta::supportsService(const OUString& rServiceName)
throw (uno::RuntimeException)
{
return ::sw::SupportsServiceImpl(
g_nServicesMeta, g_ServicesMeta, rServiceName);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException)
{
return ::sw::GetSupportedServiceNamesImpl(g_nServicesMeta, g_ServicesMeta);
@@ -994,7 +993,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!m_pImpl->m_bIsDescriptor)
{
throw uno::RuntimeException(
- rtl::OUString("SwXMeta::attach(): already attached"),
+ OUString("SwXMeta::attach(): already attached"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -1002,7 +1001,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!xRangeTunnel.is())
{
throw lang::IllegalArgumentException(
- rtl::OUString("SwXMeta::attach(): argument is no XUnoTunnel"),
+ OUString("SwXMeta::attach(): argument is no XUnoTunnel"),
static_cast< ::cppu::OWeakObject* >(this), 0);
}
SwXTextRange *const pRange(
@@ -1012,7 +1011,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!pRange && !pCursor)
{
throw lang::IllegalArgumentException(
- rtl::OUString("SwXMeta::attach(): argument not supported type"),
+ OUString("SwXMeta::attach(): argument not supported type"),
static_cast< ::cppu::OWeakObject* >(this), 0);
}
@@ -1021,7 +1020,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!pDoc)
{
throw lang::IllegalArgumentException(
- rtl::OUString("SwXMeta::attach(): argument has no SwDoc"),
+ OUString("SwXMeta::attach(): argument has no SwDoc"),
static_cast< ::cppu::OWeakObject* >(this), 0);
}
@@ -1049,14 +1048,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!bSuccess)
{
throw lang::IllegalArgumentException(
- rtl::OUString("SwXMeta::attach(): cannot create meta: range invalid?"),
+ OUString("SwXMeta::attach(): cannot create meta: range invalid?"),
static_cast< ::cppu::OWeakObject* >(this), 1);
}
if (!pTxtAttr)
{
OSL_FAIL("meta inserted, but has no text attribute?");
throw uno::RuntimeException(
- rtl::OUString("SwXMeta::attach(): cannot create meta"),
+ OUString("SwXMeta::attach(): cannot create meta"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -1088,7 +1087,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException)
if (m_pImpl->m_bIsDescriptor)
{
throw uno::RuntimeException(
- rtl::OUString("SwXMeta::getAnchor(): not inserted"),
+ OUString("SwXMeta::getAnchor(): not inserted"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -1100,7 +1099,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException)
if (!bSuccess)
{
throw lang::DisposedException(
- rtl::OUString("SwXMeta::getAnchor(): not attached"),
+ OUString("SwXMeta::getAnchor(): not attached"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -1131,7 +1130,7 @@ SwXMeta::getEnd() throw (uno::RuntimeException)
return m_pImpl->m_Text.getEnd();
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwXMeta::getString() throw (uno::RuntimeException)
{
SolarMutexGuard g;
@@ -1139,7 +1138,7 @@ SwXMeta::getString() throw (uno::RuntimeException)
}
void SAL_CALL
-SwXMeta::setString(const rtl::OUString& rString) throw (uno::RuntimeException)
+SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException)
{
SolarMutexGuard g;
return m_pImpl->m_Text.setString(rString);
@@ -1164,7 +1163,7 @@ SwXMeta::createTextCursorByRange(
void SAL_CALL
SwXMeta::insertString(const uno::Reference<text::XTextRange> & xRange,
- const rtl::OUString& rString, sal_Bool bAbsorb)
+ const OUString& rString, sal_Bool bAbsorb)
throw (uno::RuntimeException)
{
SolarMutexGuard g;
@@ -1224,7 +1223,7 @@ void SAL_CALL
SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/)
throw (uno::RuntimeException, lang::NoSupportException)
{
- throw lang::NoSupportException(rtl::OUString("setting parent not supported"), *this);
+ throw lang::NoSupportException(OUString("setting parent not supported"), *this);
}
// XElementAccess
@@ -1255,7 +1254,7 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException)
if (m_pImpl->m_bIsDescriptor)
{
throw uno::RuntimeException(
- rtl::OUString("createEnumeration(): not inserted"),
+ OUString("createEnumeration(): not inserted"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -1328,7 +1327,7 @@ SwXMetaField::~SwXMetaField()
}
// XServiceInfo
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SwXMetaField::getImplementationName() throw (uno::RuntimeException)
{
return OUString("SwXMetaField");
@@ -1345,14 +1344,14 @@ static const size_t g_nServicesMetaField(
sizeof(g_ServicesMetaField)/sizeof(g_ServicesMetaField[0]));
sal_Bool SAL_CALL
-SwXMetaField::supportsService(const ::rtl::OUString& rServiceName)
+SwXMetaField::supportsService(const OUString& rServiceName)
throw (uno::RuntimeException)
{
return ::sw::SupportsServiceImpl(
g_nServicesMetaField, g_ServicesMetaField, rServiceName);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException)
{
return ::sw::GetSupportedServiceNamesImpl(
@@ -1410,7 +1409,7 @@ SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException)
void SAL_CALL
SwXMetaField::setPropertyValue(
- const ::rtl::OUString& rPropertyName, const uno::Any& rValue)
+ const OUString& rPropertyName, const uno::Any& rValue)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1445,7 +1444,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
}
uno::Any SAL_CALL
-SwXMetaField::getPropertyValue(const ::rtl::OUString& rPropertyName)
+SwXMetaField::getPropertyValue(const OUString& rPropertyName)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -1459,7 +1458,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if ( rPropertyName == "NumberFormat" )
{
- const ::rtl::OUString text( getPresentation(sal_False) );
+ const OUString text( getPresentation(sal_False) );
any <<= static_cast<sal_Int32>(pMeta->GetNumberFormat(text));
}
else if ( rPropertyName == "IsFixedLanguage" )
@@ -1476,7 +1475,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXMetaField::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1486,7 +1485,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXMetaField::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1496,7 +1495,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXMetaField::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1506,7 +1505,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXMetaField::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1536,7 +1535,7 @@ lcl_getURI(const bool bPrefix)
return (bPrefix) ? xOdfPrefix : xOdfSuffix;
}
-static ::rtl::OUString
+static OUString
lcl_getPrefixOrSuffix(
uno::Reference<rdf::XRepository> const & xRepository,
uno::Reference<rdf::XResource> const & xMetaField,
@@ -1558,14 +1557,14 @@ lcl_getPrefixOrSuffix(
}
return xObject->getValue();
}
- return ::rtl::OUString();
+ return OUString();
}
void
getPrefixAndSuffix(
const uno::Reference<frame::XModel>& xModel,
const uno::Reference<rdf::XMetadatable>& xMetaField,
- ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix)
+ OUString *const o_pPrefix, OUString *const o_pSuffix)
{
try {
const uno::Reference<rdf::XRepositorySupplier> xRS(
@@ -1586,13 +1585,13 @@ getPrefixAndSuffix(
throw;
} catch (const uno::Exception & e) {
throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString("getPrefixAndSuffix: exception"),
+ OUString("getPrefixAndSuffix: exception"),
0, uno::makeAny(e));
}
}
// XTextField
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SwXMetaField::getPresentation(sal_Bool bShowCommand)
throw (uno::RuntimeException)
{
@@ -1601,14 +1600,14 @@ throw (uno::RuntimeException)
if (bShowCommand)
{
//FIXME ?
- return ::rtl::OUString();
+ return OUString();
}
else
{
// getString should check if this is invalid
- const ::rtl::OUString content( this->getString() );
- ::rtl::OUString prefix;
- ::rtl::OUString suffix;
+ const OUString content( this->getString() );
+ OUString prefix;
+ OUString suffix;
getPrefixAndSuffix(GetModel(), this, &prefix, &suffix);
return prefix + content + suffix;
}
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 88e2b3f2e896..4ea1fcf9e464 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -61,15 +61,14 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
struct SwTextSectionProperties_Impl
{
uno::Sequence<sal_Int8> m_Password;
- ::rtl::OUString m_sCondition;
- ::rtl::OUString m_sLinkFileName;
- ::rtl::OUString m_sSectionFilter;
- ::rtl::OUString m_sSectionRegion;
+ OUString m_sCondition;
+ OUString m_sLinkFileName;
+ OUString m_sSectionFilter;
+ OUString m_sSectionRegion;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFmtCol> m_pColItem;
@@ -113,7 +112,7 @@ public:
::cppu::OInterfaceContainerHelper m_EventListeners;
const bool m_bIndexHeader;
bool m_bIsDescriptor;
- ::rtl::OUString m_sName;
+ OUString m_sName;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwTextSectionProperties_Impl> m_pProps;
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -147,14 +146,14 @@ public:
}
void SAL_CALL SetPropertyValues_Impl(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames,
+ const uno::Sequence< OUString >& rPropertyNames,
const uno::Sequence< uno::Any >& aValues)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException);
uno::Sequence< uno::Any > SAL_CALL
GetPropertyValues_Impl(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames)
+ const uno::Sequence< OUString >& rPropertyNames)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException);
protected:
@@ -337,7 +336,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
String tmp(m_pImpl->m_sName);
SwSectionData aSect(eType, pDoc->GetUniqueSectionName(&tmp));
aSect.SetCondition(m_pImpl->m_pProps->m_sCondition);
- ::rtl::OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName);
+ OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName);
sLinkNameBuf.append(sfx2::cTokenSeperator);
sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionFilter);
sLinkNameBuf.append(sfx2::cTokenSeperator);
@@ -623,7 +622,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
if (!m_pProps->m_bDDE)
{
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append(sfx2::cTokenSeperator);
buf.append(sfx2::cTokenSeperator);
m_pProps->m_sLinkFileName = buf.makeStringAndClear();
@@ -687,7 +686,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
pSectionData->SetType(FILE_LINK_SECTION);
}
- ::rtl::OUStringBuffer sFileNameBuf;
+ OUStringBuffer sFileNameBuf;
if (!aLink.FileURL.isEmpty())
{
sFileNameBuf.append( URIHelper::SmartRel2Abs(
@@ -701,7 +700,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
sFileNameBuf.append(
pSectionData->GetLinkFileName().GetToken(2,
sfx2::cTokenSeperator));
- const ::rtl::OUString sFileName(
+ const OUString sFileName(
sFileNameBuf.makeStringAndClear());
pSectionData->SetLinkFileName(sFileName);
if (sFileName.getLength() < 3)
@@ -926,7 +925,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
void SAL_CALL
SwXTextSection::setPropertyValues(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames,
+ const uno::Sequence< OUString >& rPropertyNames,
const uno::Sequence< uno::Any >& rValues)
throw (beans::PropertyVetoException, lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
@@ -956,7 +955,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
SolarMutexGuard aGuard;
- uno::Sequence< ::rtl::OUString > aPropertyNames(1);
+ uno::Sequence< OUString > aPropertyNames(1);
aPropertyNames.getArray()[0] = rPropertyName;
uno::Sequence< uno::Any > aValues(1);
aValues.getArray()[0] = rValue;
@@ -998,7 +997,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
{
OUString uTmp( (m_bIsDescriptor)
? m_pProps->m_sCondition
- : ::rtl::OUString(pSect->GetCondition()));
+ : OUString(pSect->GetCondition()));
pRet[nProperty] <<= uTmp;
}
break;
@@ -1006,7 +1005,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
case WID_SECT_DDE_FILE:
case WID_SECT_DDE_ELEMENT:
{
- ::rtl::OUString sRet;
+ OUString sRet;
if (m_bIsDescriptor)
{
if (m_pProps->m_bDDE)
@@ -1048,7 +1047,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
else if (FILE_LINK_SECTION == pSect->GetType())
{
- ::rtl::OUString sRet( pSect->GetLinkFileName() );
+ OUString sRet( pSect->GetLinkFileName() );
sal_Int32 nIndex(0);
aLink.FileURL =
sRet.getToken(0, sfx2::cTokenSeperator, nIndex);
@@ -1060,7 +1059,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
break;
case WID_SECT_REGION :
{
- ::rtl::OUString sRet;
+ OUString sRet;
if (m_bIsDescriptor)
{
sRet = m_pProps->m_sSectionRegion;
@@ -1278,7 +1277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::Sequence< uno::Any > SAL_CALL
SwXTextSection::getPropertyValues(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames)
+ const uno::Sequence< OUString >& rPropertyNames)
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1310,7 +1309,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
{
SolarMutexGuard aGuard;
- uno::Sequence< ::rtl::OUString > aPropertyNames(1);
+ uno::Sequence< OUString > aPropertyNames(1);
aPropertyNames.getArray()[0] = rPropertyName;
return m_pImpl->GetPropertyValues_Impl(aPropertyNames).getConstArray()[0];
}
@@ -1340,7 +1339,7 @@ void SAL_CALL SwXTextSection::firePropertiesChangeEvent(
void SAL_CALL
SwXTextSection::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1350,7 +1349,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextSection::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1360,7 +1359,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextSection::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1370,7 +1369,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXTextSection::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1530,9 +1529,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (m_pImpl->m_bIsDescriptor)
{
m_pImpl->m_pProps->m_bDDE = false;
- m_pImpl->m_pProps->m_sLinkFileName = ::rtl::OUString();
- m_pImpl->m_pProps->m_sSectionRegion = ::rtl::OUString();
- m_pImpl->m_pProps->m_sSectionFilter = ::rtl::OUString();
+ m_pImpl->m_pProps->m_sLinkFileName = OUString();
+ m_pImpl->m_pProps->m_sSectionRegion = OUString();
+ m_pImpl->m_pProps->m_sSectionFilter = OUString();
}
else
{
@@ -1685,7 +1684,7 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
- ::rtl::OUString sRet;
+ OUString sRet;
SwSectionFmt const*const pFmt = m_pImpl->GetSectionFmt();
if(pFmt)
{
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 48771155d6f5..68b135c2a605 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1112,7 +1112,7 @@ OSL_FAIL("not implemented");
******************************************************************/
const char aInvalidStyle[] = "__XXX___invalid";
-bool SwXNumberingRules::isInvalidStyle(const rtl::OUString &rName)
+bool SwXNumberingRules::isInvalidStyle(const OUString &rName)
{
return rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aInvalidStyle));
}
@@ -1182,8 +1182,8 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) :
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
for(i = 0; i < MAXLEVEL; i++)
{
- sNewCharStyleNames[i] = rtl::OUString(aInvalidStyle);
- sNewBulletFontNames[i] = rtl::OUString(aInvalidStyle);
+ sNewCharStyleNames[i] = OUString(aInvalidStyle);
+ sNewBulletFontNames[i] = OUString(aInvalidStyle);
}
}
@@ -1602,7 +1602,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues)
{
- OUString sCmp = rtl::OUString::createFromAscii(cName);
+ OUString sCmp = OUString::createFromAscii(cName);
for(sal_uInt16 i = 0; i < rPropertyValues.size(); i++)
{
PropValData* pTemp = rPropertyValues[i];
@@ -1748,7 +1748,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
if(sCharFmtName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_CHARACTER_FORMAT_NONE)))
{
- sNewCharStyleNames[(sal_uInt16)nIndex] = rtl::OUString(aInvalidStyle);
+ sNewCharStyleNames[(sal_uInt16)nIndex] = OUString(aInvalidStyle);
aFmt.SetCharFmt(0);
}
else if(pDocShell || pDoc)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 77303cb6251d..49502e0cdc9f 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -420,15 +420,15 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo
uno::Any aVal;
sal_Bool bTemp = sal_True;
aVal.setValue(&bTemp, ::getCppuBooleanType());
- pArray[0] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[0] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal.setValue(&bTemp, ::getCppuBooleanType());
- pArray[1] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[1] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal.setValue(&bTemp, ::getCppuBooleanType());
- pArray[2] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[2] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal.setValue(&bTemp, ::getCppuBooleanType());
- pArray[3] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[3] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal.setValue(&bTemp, ::getCppuBooleanType());
- pArray[4] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[4] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
return aSeq;
}
@@ -960,12 +960,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXStyleFamily::getPropertySe
return uno::Reference< beans::XPropertySetInfo >();
}
-void SAL_CALL SwXStyleFamily::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SwXStyleFamily::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL( "###unexpected!" );
}
-uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
@@ -1002,22 +1002,22 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp
return aRet;
}
-void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL( "###unexpected!" );
}
-void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL( "###unexpected!" );
}
-void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL( "###unexpected!" );
}
-void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL( "###unexpected!" );
}
@@ -1059,11 +1059,11 @@ public:
SwStyleProperties_Impl(const SfxItemPropertyMap& rMap);
~SwStyleProperties_Impl();
- sal_Bool SetProperty(const ::rtl::OUString& rName, uno::Any aVal);
- sal_Bool GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny);
- sal_Bool ClearProperty( const ::rtl::OUString& rPropertyName );
+ sal_Bool SetProperty(const OUString& rName, uno::Any aVal);
+ sal_Bool GetProperty(const OUString& rName, uno::Any*& rpAny);
+ sal_Bool ClearProperty( const OUString& rPropertyName );
void ClearAllProperties( );
- void GetProperty(const ::rtl::OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny );
+ void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny );
const PropertyEntryVector_t& GetPropertyVector() const {return aPropertyEntries; }
@@ -1087,7 +1087,7 @@ SwStyleProperties_Impl::~SwStyleProperties_Impl()
delete[] pAnyArr;
}
-sal_Bool SwStyleProperties_Impl::SetProperty(const ::rtl::OUString& rName, uno::Any aVal)
+sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVal)
{
sal_uInt16 nPos = 0;
sal_Bool bRet = sal_False;
@@ -1136,7 +1136,7 @@ void SwStyleProperties_Impl::ClearAllProperties( )
}
}
-sal_Bool SwStyleProperties_Impl::GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny )
+sal_Bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& rpAny )
{
sal_Bool bRet = sal_False;
sal_uInt16 nPos = 0;
@@ -2290,7 +2290,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
}
pSeq[n].Name = GetCommandContextByIndex(n);
- pSeq[n].Value <<= rtl::OUString( aStyleName );
+ pSeq[n].Value <<= OUString( aStyleName );
}
aRet <<= aSeq;
}
@@ -3601,7 +3601,7 @@ sal_Bool SwXAutoStyles::hasElements( ) throw(uno::RuntimeException)
return sal_True;
}
-uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name)
+uno::Any SwXAutoStyles::getByName(const OUString& Name)
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
uno::Any aRet;
@@ -3616,7 +3616,7 @@ uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name)
return aRet;
}
-uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void)
+uno::Sequence< OUString > SwXAutoStyles::getElementNames(void)
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT);
@@ -3627,7 +3627,7 @@ uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void)
return aNames;
}
-sal_Bool SwXAutoStyles::hasByName(const rtl::OUString& Name)
+sal_Bool SwXAutoStyles::hasByName(const OUString& Name)
throw( uno::RuntimeException )
{
if( Name.compareToAscii("CharacterStyles") == 0 ||
@@ -3927,7 +3927,7 @@ void SwXAutoStyle::removeVetoableChangeListener( const OUString& /*PropertyName*
}
void SwXAutoStyle::setPropertyValues(
- const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/,
+ const uno::Sequence< OUString >& /*aPropertyNames*/,
const uno::Sequence< uno::Any >& /*aValues*/ )
throw (beans::PropertyVetoException, lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
@@ -3980,7 +3980,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
}
uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues (
- const uno::Sequence< ::rtl::OUString >& rPropertyNames )
+ const uno::Sequence< OUString >& rPropertyNames )
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -4004,7 +4004,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues (
}
void SwXAutoStyle::addPropertiesChangeListener(
- const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/,
+ const uno::Sequence< OUString >& /*aPropertyNames*/,
const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
throw (uno::RuntimeException)
{
@@ -4017,7 +4017,7 @@ void SwXAutoStyle::removePropertiesChangeListener(
}
void SwXAutoStyle::firePropertiesChangeEvent(
- const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/,
+ const uno::Sequence< OUString >& /*aPropertyNames*/,
const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
throw (uno::RuntimeException)
{
@@ -4052,7 +4052,7 @@ uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName )
}
uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
- const uno::Sequence< ::rtl::OUString >& rPropertyNames )
+ const uno::Sequence< OUString >& rPropertyNames )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
if( !pSet.get() )
@@ -4092,13 +4092,13 @@ void SwXAutoStyle::setAllPropertiesToDefault( )
}
void SwXAutoStyle::setPropertiesToDefault(
- const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ )
+ const uno::Sequence< OUString >& /*aPropertyNames*/ )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
}
uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults(
- const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ )
+ const uno::Sequence< OUString >& /*aPropertyNames*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 02eaaaaefd50..e0c09aad697c 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -351,8 +351,8 @@ void sw_GetCellPosition( const String &rCellName,
// start of number found?
if (pBuf < pEnd && ('0' <= *pBuf && *pBuf <= '9'))
{
- rtl::OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer());
- rtl::OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf));
+ OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer());
+ OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf));
if (!aColTxt.isEmpty() && !aRowTxt.isEmpty())
{
sal_Int32 nColIdx = 0;
@@ -461,13 +461,13 @@ String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow )
#if OSL_DEBUG_LEVEL > 0
{
sal_Int32 nCol, nRow2;
- sw_GetCellPosition( rtl::OUString("z1"), nCol, nRow2);
+ sw_GetCellPosition( OUString("z1"), nCol, nRow2);
OSL_ENSURE( nCol == 51, "sw_GetCellPosition failed" );
- sw_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2);
+ sw_GetCellPosition( OUString("AA1"), nCol, nRow2);
OSL_ENSURE( nCol == 52, "sw_GetCellPosition failed" );
- sw_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2);
+ sw_GetCellPosition( OUString("AB1"), nCol, nRow2);
OSL_ENSURE( nCol == 53, "sw_GetCellPosition failed" );
- sw_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2);
+ sw_GetCellPosition( OUString("BB1"), nCol, nRow2);
OSL_ENSURE( nCol == 105, "sw_GetCellPosition failed" );
}
#endif
@@ -684,14 +684,14 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB
}
}
-static inline rtl::OUString lcl_getString( SwXCell &rCell )
+static inline OUString lcl_getString( SwXCell &rCell )
{
// getString is a member function of the base class...
return rCell.getString();
}
/* non UNO function call to set string in SwXCell */
-void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt,
+void sw_setString( SwXCell &rCell, const OUString &rTxt,
sal_Bool bKeepNumberFmt )
{
if(rCell.IsValid())
@@ -2657,7 +2657,7 @@ void SAL_CALL SwXTextTable::setDataArray(
{
const uno::Any &rAny = pColArray[nCol];
if (uno::TypeClass_STRING == rAny.getValueTypeClass())
- sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() );
+ sw_setString( *pXCell, *(OUString *) rAny.getValue() );
else
{
double d = 0;
@@ -3049,7 +3049,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
{
case UNO_NAME_TABLE_NAME :
{
- ::rtl::OUString sName;
+ OUString sName;
aValue >>= sName;
setName( sName );
}
@@ -4320,7 +4320,7 @@ void SAL_CALL SwXCellRange::setDataArray(
{
const uno::Any &rAny = pColArray[nCol];
if (uno::TypeClass_STRING == rAny.getValueTypeClass())
- sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() );
+ sw_setString( *pXCell, *(OUString *) rAny.getValue() );
else
{
double d = 0;
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 8d3b8c93b76a..a93a34fe73e5 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -67,7 +67,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
const sal_Char cInvalidObject[] = "this object is invalid";
@@ -464,7 +463,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
}
if (cIns)
{
- m_pImpl->m_pDoc->InsertString( aTmp, rtl::OUString(cIns), nInsertFlags );
+ m_pImpl->m_pDoc->InsertString( aTmp, OUString(cIns), nInsertFlags );
}
if (bAbsorb)
@@ -1119,7 +1118,7 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException)
}
void SAL_CALL
-SwXText::setPropertyValue(const ::rtl::OUString& /*aPropertyName*/,
+SwXText::setPropertyValue(const OUString& /*aPropertyName*/,
const uno::Any& /*aValue*/)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
@@ -1130,7 +1129,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
uno::Any SAL_CALL
SwXText::getPropertyValue(
- const ::rtl::OUString& rPropertyName)
+ const OUString& rPropertyName)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
@@ -1186,7 +1185,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXText::addPropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1196,7 +1195,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXText::removePropertyChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1206,7 +1205,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXText::addVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1216,7 +1215,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
void SAL_CALL
SwXText::removeVetoableChangeListener(
- const ::rtl::OUString& /*rPropertyName*/,
+ const OUString& /*rPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1283,7 +1282,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
uno::Reference< text::XTextRange > xRet;
bool bIllegalException = false;
bool bRuntimeException = false;
- ::rtl::OUString sMessage;
+ OUString sMessage;
m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_START , NULL);
// find end node, go backward - don't skip tables because the new
// paragraph has to be the last node
@@ -1396,7 +1395,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
uno::Reference< text::XTextRange > SAL_CALL
SwXText::insertTextPortion(
- const ::rtl::OUString& rText,
+ const OUString& rText,
const uno::Sequence< beans::PropertyValue > &
rCharacterAndParagraphProperties,
const uno::Reference<text::XTextRange>& xInsertPosition)
@@ -1419,7 +1418,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
bool bIllegalException = false;
bool bRuntimeException = false;
- ::rtl::OUString sMessage;
+ OUString sMessage;
m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
// SwPaM aPam(*pStartNode->EndOfSectionNode());
@@ -1481,7 +1480,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
-----------------------------------------------------------------------*/
uno::Reference< text::XTextRange > SAL_CALL
SwXText::appendTextPortion(
- const ::rtl::OUString& rText,
+ const OUString& rText,
const uno::Sequence< beans::PropertyValue > &
rCharacterAndParagraphProperties)
throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -1603,7 +1602,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
bool bIllegalException = false;
bool bRuntimeException = false;
- ::rtl::OUString sMessage;
+ OUString sMessage;
SwStartNode* pStartStartNode = aStartPam.GetNode()->StartOfSectionNode();
while (pStartStartNode && pStartStartNode->IsSectionNode())
{
@@ -1846,7 +1845,7 @@ void SwXText::Impl::ConvertCell(
if (rCell.getLength() != 2)
{
throw lang::IllegalArgumentException(
- rtl::OUString::createFromAscii( "rCell needs to contain 2 elements" ),
+ OUString::createFromAscii( "rCell needs to contain 2 elements" ),
uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) );
}
const uno::Reference<text::XTextRange> xStartRange = rCell[0];
@@ -1861,7 +1860,7 @@ void SwXText::Impl::ConvertCell(
!::sw::XTextRangeToSwPaM(aEndCellPam, xEndRange))
{
throw lang::IllegalArgumentException(
- rtl::OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ),
+ OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ),
uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) );
}
@@ -2034,7 +2033,7 @@ lcl_DebugCellProperties(
const uno::Sequence< uno::Sequence< uno::Sequence<
beans::PropertyValue > > >& rCellProperties)
{
- ::rtl::OUString sNames;
+ OUString sNames;
for (sal_Int32 nDebugRow = 0; nDebugRow < rCellProperties.getLength();
++nDebugRow)
{
@@ -2052,14 +2051,14 @@ lcl_DebugCellProperties(
for (sal_Int32 nDebugProperty = 0;
nDebugProperty < nDebugCellProperties; ++nDebugProperty)
{
- const ::rtl::OUString sName =
+ const OUString sName =
rDebugCellProperties[nDebugProperty].Name;
sNames += sName;
- sNames += ::rtl::OUString('-');
+ sNames += OUString('-');
}
- sNames += ::rtl::OUString('+');
+ sNames += OUString('+');
}
- sNames += ::rtl::OUString('|');
+ sNames += OUString('|');
}
(void)sNames;
}
@@ -2193,7 +2192,7 @@ lcl_MergeCells(::std::vector<VerticallyMergedCell> & rMergedCells)
while (aCellIter != aMergedIter->aCells.end())
{
(*aCellIter)->setPropertyValue(
- rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)),
+ OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)),
uno::makeAny(nCellCount));
if (bFirstCell)
{
@@ -2527,7 +2526,7 @@ throw (uno::RuntimeException)
if (::sw::XTextRangeToSwPaM(aPam, xTextPosition))
{
if ( !aPam.GetNode()->GetTxtNode() )
- throw uno::RuntimeException( rtl::OUString("Invalid text range"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Invalid text range"), uno::Reference< uno::XInterface >() );
SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent();
@@ -2548,7 +2547,7 @@ throw (uno::RuntimeException)
}
if(!aRef.is())
{
- throw uno::RuntimeException( rtl::OUString::createFromAscii( "End of content node doesn't have the proper start node" ),
+ throw uno::RuntimeException( OUString::createFromAscii( "End of content node doesn't have the proper start node" ),
uno::Reference< uno::XInterface >( *this ) );
}
return aRef;
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index e1fe221773da..72ffaa762759 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -57,7 +57,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo
void SAL_CALL SwXTextMarkup::commitTextMarkup(
::sal_Int32 nType,
- const ::rtl::OUString & rIdentifier,
+ const OUString & rIdentifier,
::sal_Int32 nStart,
::sal_Int32 nLength,
const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
@@ -226,7 +226,7 @@ static void lcl_commitGrammarMarkUp(
const ModelToViewHelper& rConversionMap,
SwGrammarMarkUp* pWList,
::sal_Int32 nType,
- const ::rtl::OUString & rIdentifier,
+ const OUString & rIdentifier,
::sal_Int32 nStart,
::sal_Int32 nLength,
const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
@@ -430,23 +430,23 @@ SwXStringKeyMap::SwXStringKeyMap()
{
}
-uno::Any SAL_CALL SwXStringKeyMap::getValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException)
+uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException)
{
- std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
+ std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
if ( aIter == maMap.end() )
throw container::NoSuchElementException();
return (*aIter).second;
}
-::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException)
+::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) throw (uno::RuntimeException)
{
return maMap.find( aKey ) != maMap.end();
}
-void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException)
+void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException)
{
- std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
+ std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
if ( aIter != maMap.end() )
throw container::ElementExistException();
@@ -458,12 +458,12 @@ void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const u
return maMap.size();
}
-::rtl::OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
{
if ( (sal_uInt32)nIndex >= maMap.size() )
throw lang::IndexOutOfBoundsException();
- return ::rtl::OUString();
+ return OUString();
}
uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 2e0be45974dd..b775fc094536 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -39,7 +39,6 @@ extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLs
using namespace ::com::sun::star;
-using ::rtl::OUString;
//////////////////////////////////////////////////////////////////////
@@ -209,8 +208,8 @@ SwPrintUIOptions::SwPrintUIOptions(
int nIdx = 0;
// load the writer PrinterOptions into the custom tab
- m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile");
- m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/swriter/ui/printeroptions.ui");
+ m_aUIProperties[nIdx].Name = OUString("OptionsUIFile");
+ m_aUIProperties[nIdx++].Value <<= OUString("modules/swriter/ui/printeroptions.ui");
// create "writer" section (new tab page in dialog)
SvtModuleOptions aModOpt;
@@ -220,7 +219,7 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage");
// create sub section for Contents
- m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), rtl::OUString());
+ m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), OUString());
// create a bool option for background
bool bDefaultVal = rDefaultPrintData.IsPrintPageBackground();
@@ -260,7 +259,7 @@ SwPrintUIOptions::SwPrintUIOptions(
bDefaultVal);
// create sub section for Color
- m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), rtl::OUString());
+ m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), OUString());
// create a bool option for printing text with black font color
bDefaultVal = rDefaultPrintData.IsPrintBlackFont();
@@ -272,7 +271,7 @@ SwPrintUIOptions::SwPrintUIOptions(
if (!bWeb)
{
// create subgroup for misc options
- m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", rtl::OUString(aLocalizedStrings.GetString(9)), rtl::OUString());
+ m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", OUString(aLocalizedStrings.GetString(9)), OUString());
// create a bool option for printing automatically inserted blank pages
bDefaultVal = rDefaultPrintData.IsPrintEmptyPages();
@@ -285,7 +284,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create a bool option for paper tray
bDefaultVal = rDefaultPrintData.IsPaperFromSetup();
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
- aPaperTrayOpt.maGroupHint = rtl::OUString( "OptionsPageOptGroup" );
+ aPaperTrayOpt.maGroupHint = OUString( "OptionsPageOptGroup" );
m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ),
".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox",
"PrintPaperFromSetup",
@@ -294,46 +293,46 @@ SwPrintUIOptions::SwPrintUIOptions(
// print range selection
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
- aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" );
+ aPrintRangeOpt.maGroupHint = OUString( "PrintRange" );
aPrintRangeOpt.mbInternalOnly = sal_True;
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aLocalizedStrings.GetString(26)),
- rtl::OUString(),
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)),
+ OUString(),
aPrintRangeOpt);
// create a choice for the content to create
- rtl::OUString aPrintRangeName( "PrintContent" );
- uno::Sequence< rtl::OUString > aChoices( 3 );
+ OUString aPrintRangeName( "PrintContent" );
+ uno::Sequence< OUString > aChoices( 3 );
uno::Sequence< sal_Bool > aChoicesDisabled( 3 );
- uno::Sequence< rtl::OUString > aHelpIds( 3 );
- uno::Sequence< rtl::OUString > aWidgetIds( 3 );
+ uno::Sequence< OUString > aHelpIds( 3 );
+ uno::Sequence< OUString > aWidgetIds( 3 );
aChoices[0] = aLocalizedStrings.GetString( 27 );
aChoicesDisabled[0] = sal_False;
- aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" );
+ aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" );
aWidgetIds[0] = "printallpages";
aChoices[1] = aLocalizedStrings.GetString( 28 );
aChoicesDisabled[1] = sal_False;
- aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" );
+ aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" );
aWidgetIds[1] = "printpages";
aChoices[2] = aLocalizedStrings.GetString( 29 );
aChoicesDisabled[2] = sal_Bool(! bHasSelection);
- aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" );
+ aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" );
aWidgetIds[2] = "printselection";
- m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(),
+ m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
aHelpIds, aPrintRangeName,
aChoices, 0 /* always default to 'All pages' */,
aChoicesDisabled);
// show an Edit dependent on "Pages" selected
vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True );
- m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(),
+ m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(),
".HelpID:vcl:PrintDialog:PageRange:Edit",
"PageRange",
- rtl::OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */,
+ OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */,
aPageRangeOpt);
// print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
- aContentsOpt.maGroupHint = rtl::OUString( "JobPage" );
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", rtl::OUString(aLocalizedStrings.GetString(12)),
- rtl::OUString(), aContentsOpt);
+ aContentsOpt.maGroupHint = OUString( "JobPage" );
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)),
+ OUString(), aContentsOpt);
// create a list box for notes content
const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts();
aChoices.realloc( 4 );
@@ -342,14 +341,14 @@ SwPrintUIOptions::SwPrintUIOptions(
aChoices[2] = aLocalizedStrings.GetString( 15 );
aChoices[3] = aLocalizedStrings.GetString( 16 );
aHelpIds.realloc( 2 );
- aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" );
- aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" );
- vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( "PrintProspect" ), 0, sal_False );
+ aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" );
+ aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" );
+ vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False );
aAnnotOpt.mbEnabled = bHasPostIts;
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments",
aLocalizedStrings.GetString( 17 ),
aHelpIds,
- rtl::OUString( "PrintAnnotationMode" ),
+ OUString( "PrintAnnotationMode" ),
aChoices,
nPrintPostIts,
uno::Sequence< sal_Bool >(),
@@ -357,18 +356,18 @@ SwPrintUIOptions::SwPrintUIOptions(
// create subsection for Page settings
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
- aPageSetOpt.maGroupHint = rtl::OUString( "LayoutPage" );
+ aPageSetOpt.maGroupHint = OUString( "LayoutPage" );
if (!bWeb)
{
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", rtl::OUString(aLocalizedStrings.GetString(18)),
- rtl::OUString(), aPageSetOpt);
- uno::Sequence< rtl::OUString > aRLChoices( 3 );
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", OUString(aLocalizedStrings.GetString(18)),
+ OUString(), aPageSetOpt);
+ uno::Sequence< OUString > aRLChoices( 3 );
aRLChoices[0] = aLocalizedStrings.GetString( 19 );
aRLChoices[1] = aLocalizedStrings.GetString( 20 );
aRLChoices[2] = aLocalizedStrings.GetString( 21 );
- uno::Sequence< rtl::OUString > aRLHelp( 1 );
- aRLHelp[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" );
+ uno::Sequence< OUString > aRLHelp( 1 );
+ aRLHelp[0] = OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" );
// create a choice option for all/left/right pages
// 0 : all pages (left & right)
// 1 : left pages
@@ -390,7 +389,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create a bool option for brochure
bDefaultVal = rDefaultPrintData.IsPrintProspect();
- rtl::OUString aBrochurePropertyName( "PrintProspect" );
+ OUString aBrochurePropertyName( "PrintProspect" );
m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ),
".HelpID:vcl:PrintDialog:PrintProspect:CheckBox",
aBrochurePropertyName,
@@ -400,21 +399,21 @@ SwPrintUIOptions::SwPrintUIOptions(
if (bCTL)
{
// create a bool option for brochure RTL dependent on brochure
- uno::Sequence< rtl::OUString > aBRTLChoices( 2 );
+ uno::Sequence< OUString > aBRTLChoices( 2 );
aBRTLChoices[0] = aLocalizedStrings.GetString( 24 );
aBRTLChoices[1] = aLocalizedStrings.GetString( 25 );
vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True );
- uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 );
- aBRTLHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" );
- aBrochureRTLOpt.maGroupHint = rtl::OUString( "LayoutPage" );
+ uno::Sequence< OUString > aBRTLHelpIds( 1 );
+ aBRTLHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" );
+ aBrochureRTLOpt.maGroupHint = OUString( "LayoutPage" );
// RTL brochure choices
// 0 : left-to-right
// 1 : right-to-left
const sal_Int16 nBRTLChoice = rDefaultPrintData.IsPrintProspectRTL() ? 1 : 0;
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection",
- rtl::OUString(),
+ OUString(),
aBRTLHelpIds,
- rtl::OUString( "PrintProspectRTL" ),
+ OUString( "PrintProspectRTL" ),
aBRTLChoices,
nBRTLChoice,
uno::Sequence< sal_Bool >(),
@@ -501,7 +500,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea
bool bChanged = processProperties( i_rNewProp );
uno::Reference< awt::XDevice > xRenderDevice;
- uno::Any aVal( getValue( rtl::OUString( "RenderDevice" ) ) );
+ uno::Any aVal( getValue( OUString( "RenderDevice" ) ) );
aVal >>= xRenderDevice;
OutputDevice* pOut = 0;
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index a9ba9214a146..e22ec0f07cb1 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -241,7 +241,7 @@ void SwViewImp::MakeDrawView()
pDrawView = new SwDrawView( *this, pIDDMA->GetDrawModel(), pOutDevForDrawView);
}
- GetDrawView()->SetActiveLayer(rtl::OUString("Heaven"));
+ GetDrawView()->SetActiveLayer(OUString("Heaven"));
const SwViewOption* pSwViewOption = GetShell()->GetViewOptions();
Init(pSwViewOption);
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 65d004486287..bb8b9a5627d2 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -301,7 +301,7 @@ sal_uLong SwASCIIParser::ReadChars()
if( pStt >= pEnd )
{
if( pLastStt != pStt )
- InsertText( rtl::OUString( pLastStt ));
+ InsertText( OUString( pLastStt ));
// Read a new block
sal_uLong lGCount;
@@ -424,7 +424,7 @@ sal_uLong SwASCIIParser::ReadChars()
*pStt++ = 0;
if( nLineLen )
{
- InsertText( rtl::OUString( pLastStt ));
+ InsertText( OUString( pLastStt ));
}
pDoc->SplitNode( *pPam->GetPoint(), false );
pDoc->InsertPoolItem( *pPam, SvxFmtBreakItem(
@@ -458,7 +458,7 @@ sal_uLong SwASCIIParser::ReadChars()
{
sal_Unicode c = *pStt;
*pStt = 0;
- InsertText( rtl::OUString( pLastStt ));
+ InsertText( OUString( pLastStt ));
pDoc->SplitNode( *pPam->GetPoint(), false );
pLastStt = pStt;
nLineLen = 0;
@@ -470,7 +470,7 @@ sal_uLong SwASCIIParser::ReadChars()
else if( bSplitNode )
{
// We found a CR/LF, thus save the text
- InsertText( rtl::OUString( pLastStt ));
+ InsertText( OUString( pLastStt ));
pDoc->SplitNode( *pPam->GetPoint(), false );
pLastStt = pStt;
nLineLen = 0;
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 8cc721ecfed1..089198ab0179 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -59,7 +59,6 @@
#include <rtl/uri.hxx>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star;
@@ -158,7 +157,7 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol )
SAL_WARN_IF(!ok, "sw", "failed to load msword library");
}
if (msword_.is())
- return msword_.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
+ return msword_.getFunctionSymbol( OUString::createFromAscii( pSymbol ) );
return NULL;
}
@@ -262,7 +261,7 @@ sal_Bool SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOpti
</FilterFlags>
*/
-#define FILTER_OPTION_ROOT rtl::OUString("Office.Writer/FilterFlags")
+#define FILTER_OPTION_ROOT OUString("Office.Writer/FilterFlags")
SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames,
sal_uInt32* pValues )
@@ -296,7 +295,7 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
}
void SwFilterOptions::Commit() {}
-void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
@@ -385,7 +384,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
// if the first node dont contained any content, then
// insert one char in it calc again and delete once again
SwIndex aNdIdx( pFirstTxtNd );
- pFirstTxtNd->InsertText(rtl::OUString("MM"), aNdIdx);
+ pFirstTxtNd->InsertText(OUString("MM"), aNdIdx);
sal_uLong nAbsMinCnts;
pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(),
nMinFrm, nMaxFrm, nAbsMinCnts );
@@ -587,7 +586,7 @@ String NameFromCharSet(rtl_TextEncoding nChrSet)
OSL_ENSURE(pRet != pStart->pName, "TXT: That was an unknown language!");
- return rtl::OUString::createFromAscii(pRet);
+ return OUString::createFromAscii(pRet);
}
// for the automatic conversion (mail/news/...)
@@ -661,7 +660,7 @@ void SwAsciiOptions::WriteUserData( String& rStr )
// 4. Language
if (nLanguage)
{
- rtl::OUString sTmp = LanguageTag( nLanguage ).getBcp47();
+ OUString sTmp = LanguageTag( nLanguage ).getBcp47();
rStr += (String)sTmp;
}
rStr += ',';
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 3058f06f45b9..57c548254d4c 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -63,7 +63,7 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_,
};
int bRet = sal_False;
- rtl::OString aName( pName );
+ OString aName( pName );
if ( sHTML == aName )
bRet = HTMLParser::IsHTMLFormat( pHeader, sal_True, RTL_TEXTENCODING_DONTKNOW );
else if ( FILTER_RTF == aName )
@@ -92,21 +92,21 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_,
const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
{
/* bei den StorageFiltern noch den SubStorageNamen setzen */
- const rtl::OUString& rUserData = rFltr.GetUserData();
+ const OUString& rUserData = rFltr.GetUserData();
if (rUserData == FILTER_XML ||
rUserData == FILTER_XMLV ||
rUserData == FILTER_XMLVW)
- return rtl::OUString("content.xml");
+ return OUString("content.xml");
if (rUserData == sWW6 || rUserData == FILTER_WW8)
- return rtl::OUString("WordDocument");
- return rtl::OUString();
+ return OUString("WordDocument");
+ return OUString();
}
const SfxFilter* SwIoSystem::GetFilterOfFormat(const String& rFmtNm,
const SfxFilterContainer* pCnt)
{
- SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) );
- SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) );
+ SfxFilterContainer aCntSw( OUString(sSWRITER) );
+ SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
const SfxFilterContainer* pFltCnt = pCnt ? pCnt : ( IsDocShellRegistered() ? &aCntSw : &aCntSwWeb );
do {
@@ -135,7 +135,7 @@ sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < co
try
{
sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg );
- bRet = rStg->isStreamElement( ::rtl::OUString("content.xml") );
+ bRet = rStg->isStreamElement( OUString("content.xml") );
if ( bRet )
bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) );
}
@@ -162,13 +162,13 @@ sal_Bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter
/* Bug 62703 - und auch WinWord Docs ohne ClipBoardId! */
if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
{
- bRet = !((rStg.IsContained( rtl::OUString("0Table")) ||
- rStg.IsContained( rtl::OUString("1Table"))) ^
+ bRet = !((rStg.IsContained( OUString("0Table")) ||
+ rStg.IsContained( OUString("1Table"))) ^
(rFilter.GetUserData() == FILTER_WW8));
if (bRet && !rFilter.IsAllowedAsTemplate())
{
SotStorageStreamRef xRef =
- rStg.OpenSotStream(rtl::OUString("WordDocument"),
+ rStg.OpenSotStream(OUString("WordDocument"),
STREAM_STD_READ | STREAM_NOCREATE );
xRef->Seek(10);
sal_uInt8 nByte;
@@ -200,8 +200,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
{
sal_Bool bRet = sal_False;
- SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) );
- SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) );
+ SfxFilterContainer aCntSw( OUString(sSWRITER) );
+ SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
const SfxFilterContainer& rFltContainer = IsDocShellRegistered() ? aCntSw : aCntSwWeb;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStor;
@@ -220,7 +220,7 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
const SfxFilter* pFltr = aIter.First();
while ( pFltr )
{
- const rtl::OUString& rUserData = pFltr->GetUserData();
+ const OUString& rUserData = pFltr->GetUserData();
if (rUserData.equals(rFmtName))
{
if( 'C' == rUserData[0] )
@@ -274,8 +274,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
const String& rPrefFltName, SfxMedium* pMedium)
{
- SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) );
- SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) );
+ SfxFilterContainer aCntSw( OUString(sSWRITER) );
+ SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
const SfxFilterContainer* pFCntnr = IsDocShellRegistered() ? &aCntSw : &aCntSwWeb;
if( !pFCntnr )
@@ -388,7 +388,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
{
String sEmptyUserData;
pNm = aFilterDetect[n].IsReader(aBuffer, nBytesRead, rFileName, sEmptyUserData);
- pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(rtl::OUString::createFromAscii(pNm), pFCntnr) : 0;
+ pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(OUString::createFromAscii(pNm), pFCntnr) : 0;
if (pNm && pFilterTmp)
{
return pFilterTmp;
@@ -550,7 +550,7 @@ const SfxFilter* SwIoSystem::GetTextFilter( const sal_Char* pBuf, sal_uLong nLen
{
bool bAuto = IsDetectableText(pBuf, nLen);
const sal_Char* pNm = bAuto ? FILTER_TEXT : FILTER_TEXT_DLG;
- return SwIoSystem::GetFilterOfFormat( rtl::OUString::createFromAscii(pNm), 0 );
+ return SwIoSystem::GetFilterOfFormat( OUString::createFromAscii(pNm), 0 );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index e72a084e741d..efefee8d8e8c 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -38,7 +38,7 @@ static char const sHTML_O_Object[] = "OBJECT";
}
-sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString& rName, sal_Bool bApplet )
+sal_uInt16 SwApplet_Impl::GetOptionType( const OUString& rName, sal_Bool bApplet )
{
sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG;
@@ -119,12 +119,12 @@ SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16
{
}
-void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUString& rName,
- sal_Bool bMayScript, const ::rtl::OUString& rCodeBase,
- const ::rtl::OUString& rDocumentBaseURL )
+void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
+ sal_Bool bMayScript, const OUString& rCodeBase,
+ const OUString& rDocumentBaseURL )
{
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aName;
+ OUString aName;
// create Applet; it will be in running state
xApplet = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_APPLET_CLASSID ).GetByteSequence(), aName );
@@ -133,31 +133,31 @@ void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUS
INetURLObject aUrlBase(rDocumentBaseURL);
aUrlBase.removeSegment();
- ::rtl::OUString sDocBase = aUrlBase.GetMainURL(INetURLObject::NO_DECODE);
+ OUString sDocBase = aUrlBase.GetMainURL(INetURLObject::NO_DECODE);
uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString("AppletCode"), uno::makeAny( rCode ) );
- xSet->setPropertyValue( ::rtl::OUString("AppletName"), uno::makeAny( rName ) );
- xSet->setPropertyValue( ::rtl::OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) );
- xSet->setPropertyValue( ::rtl::OUString("AppletDocBase"), uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue( OUString("AppletCode"), uno::makeAny( rCode ) );
+ xSet->setPropertyValue( OUString("AppletName"), uno::makeAny( rName ) );
+ xSet->setPropertyValue( OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) );
+ xSet->setPropertyValue( OUString("AppletDocBase"), uno::makeAny( sDocBase ) );
if ( !rCodeBase.isEmpty() )
- xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) );
+ xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) );
else
- xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( sDocBase ) );
}
}
#ifdef SOLAR_JAVA
-sal_Bool SwApplet_Impl::CreateApplet( const ::rtl::OUString& rBaseURL )
+sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
{
- ::rtl::OUString aCode, aName, aCodeBase;
+ OUString aCode, aName, aCodeBase;
sal_Bool bMayScript = sal_False;
size_t nArgCount = aCommandList.size();
for( size_t i = 0; i < nArgCount; i++ )
{
const SvCommand& rArg = aCommandList[i];
- const ::rtl::OUString& rName = rArg.GetCommand();
+ const OUString& rName = rArg.GetCommand();
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_code ) )
aCode = rArg.GetArgument();
else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_codebase ) )
@@ -185,12 +185,12 @@ void SwApplet_Impl::FinishApplet()
{
uno::Sequence < beans::PropertyValue > aProps;
aCommandList.FillSequence( aProps );
- xSet->setPropertyValue( ::rtl::OUString("AppletCommands"), uno::makeAny( aProps ) );
+ xSet->setPropertyValue( OUString("AppletCommands"), uno::makeAny( aProps ) );
}
}
#ifdef SOLAR_JAVA
-void SwApplet_Impl::AppendParam( const ::rtl::OUString& rName, const ::rtl::OUString& rValue )
+void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue )
{
aCommandList.Append( rName, rValue );
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c85cd2165cc4..05c1f84ac398 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -156,7 +156,7 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
sal_Bool bDeep );
static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
-static rtl::OString ConvToHex(sal_uInt16 nHex)
+static OString ConvToHex(sal_uInt16 nHex)
{
sal_Char aNToABuf[] = "00";
@@ -170,7 +170,7 @@ static rtl::OString ConvToHex(sal_uInt16 nHex)
nHex >>= 4;
}
- return rtl::OString(aNToABuf, 2);
+ return OString(aNToABuf, 2);
}
static OString GetCSS1Color(const Color& rColor)
@@ -267,7 +267,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
// In STYLE-Optionen den String codieren
Strm() << sOut.makeStringAndClear().getStr();
if( pVal )
- HTMLOutFuncs::Out_String( Strm(), rtl::OUString::createFromAscii(pVal),
+ HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(pVal),
eDestEnc, &aNonConvertableCharacters );
else if( pSVal )
HTMLOutFuncs::Out_String( Strm(), *pSVal, eDestEnc, &aNonConvertableCharacters );
@@ -285,7 +285,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
Strm() << sOut.makeStringAndClear().getStr();
}
-static void AddUnitPropertyValue(rtl::OStringBuffer &rOut, long nVal,
+static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
FieldUnit eUnit)
{
if( nVal < 0 )
@@ -446,7 +446,7 @@ static void AddUnitPropertyValue(rtl::OStringBuffer &rOut, long nVal,
void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
AddUnitPropertyValue(sOut, nVal, eCSS1Unit);
OutCSS1_PropertyAscii(pProp, sOut.makeStringAndClear());
}
@@ -509,7 +509,7 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
{
// wenn eine Property als Bestandteil einer Style-Option
// ausgegeben wurde, muss die Optiomn noch beendet werden
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
switch( nCSS1OutMode & CSS1_OUTMODE_ANY_OFF )
{
case CSS1_OUTMODE_SPAN_TAG_OFF:
@@ -660,12 +660,12 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
// wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben,
// sonst wird nur nach Token und Class fuer ein Format gesucht
-sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken,
+sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
String& rClass, sal_uInt16& rRefPoolId,
String *pPseudo )
{
sal_uInt16 nDeep = 0;
- rToken = rtl::OString();
+ rToken = OString();
rClass.Erase();
rRefPoolId = 0;
if( pPseudo )
@@ -697,7 +697,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) )
{
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
}
break;
case 'C': if( bChrFmt )
@@ -705,19 +705,19 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) )
{
rRefPoolId = RES_POOLCHR_HTML_CITIATION;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
}
else if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_code) )
{
rRefPoolId = RES_POOLCHR_HTML_CODE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
}
}
break;
case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) )
{
rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance);
}
else if( !bChrFmt )
{
@@ -735,12 +735,12 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
else if( nDefListLvl & HTML_DLCOLL_DD )
{
rRefPoolId = RES_POOLCOLL_HTML_DD;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_dd);
}
else
{
rRefPoolId = RES_POOLCOLL_HTML_DT;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_dt);
}
}
}
@@ -748,7 +748,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) )
{
rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
}
break;
case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) )
@@ -758,14 +758,14 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) )
{
rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard);
}
break;
case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) )
{
// Listing als PRE exportieren bzw. von
// PRE abgeleitete Vorlage exportieren
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF;
}
@@ -773,7 +773,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) )
{
rRefPoolId = RES_POOLCOLL_HTML_PRE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
}
break;
case 'S': if( bChrFmt )
@@ -781,32 +781,32 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) )
{
rRefPoolId = RES_POOLCHR_HTML_SAMPLE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_sample);
}
else if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_strong ) )
{
rRefPoolId = RES_POOLCHR_HTML_STRONG;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
}
}
break;
case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) )
{
rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype);
}
break;
case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) )
{
rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_variable);
}
break;
case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) )
{
// XMP als PRE exportieren (aber nicht die
// Vorlage als Style)
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF;
}
@@ -830,41 +830,41 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
bStop = (nDeep==0);
break;
case RES_POOLCOLL_TEXT:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_HEADLINE1:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head1);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head1);
break;
case RES_POOLCOLL_HEADLINE2:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head2);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head2);
break;
case RES_POOLCOLL_HEADLINE3:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head3);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head3);
break;
case RES_POOLCOLL_HEADLINE4:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head4);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head4);
break;
case RES_POOLCOLL_HEADLINE5:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head5);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head5);
break;
case RES_POOLCOLL_HEADLINE6:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head6);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_head6);
break;
case RES_POOLCOLL_SENDADRESS:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_address);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_address);
break;
case RES_POOLCOLL_HTML_BLOCKQUOTE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote);
break;
case RES_POOLCOLL_HTML_PRE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
break;
case RES_POOLCOLL_HTML_DD:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_dd);
break;
case RES_POOLCOLL_HTML_DT:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_dt);
break;
case RES_POOLCOLL_TABLE:
@@ -883,7 +883,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
OString(OOO_STRING_SVTOOLS_HTML_parabreak);
}
else
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_HTML_HR:
// HR nicht ausgeben!
@@ -892,7 +892,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case RES_POOLCOLL_FOOTNOTE:
if( !nDeep )
{
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak);
rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote );
rRefPoolId = RES_POOLCOLL_TEXT;
nDeep = CSS1_FMT_CMPREF;
@@ -901,7 +901,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
case RES_POOLCOLL_ENDNOTE:
if( !nDeep )
{
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak);
rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote );
rRefPoolId = RES_POOLCOLL_TEXT;
nDeep = CSS1_FMT_CMPREF;
@@ -910,44 +910,44 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
// Zeichen-Vorlagen
case RES_POOLCHR_HTML_EMPHASIS:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
break;
case RES_POOLCHR_HTML_CITIATION:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation);
break;
case RES_POOLCHR_HTML_STRONG:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_strong);
break;
case RES_POOLCHR_HTML_CODE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
break;
case RES_POOLCHR_HTML_SAMPLE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_sample);
break;
case RES_POOLCHR_HTML_KEYBOARD:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard);
break;
case RES_POOLCHR_HTML_VARIABLE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_variable);
break;
case RES_POOLCHR_HTML_DEFINSTANCE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance);
break;
case RES_POOLCHR_HTML_TELETYPE:
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype);
break;
case RES_POOLCHR_INET_NORMAL:
if( pPseudo )
{
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_anchor);
pPseudo->AssignAscii( sCSS1_link );
}
break;
case RES_POOLCHR_INET_VISIT:
if( pPseudo )
{
- rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor);
+ rToken = OString(OOO_STRING_SVTOOLS_HTML_anchor);
pPseudo->AssignAscii( sCSS1_visited );
}
break;
@@ -1011,7 +1011,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
sal_uInt16& rRefPoolId )
{
- rtl::OString aToken;
+ OString aToken;
String aClass;
String aPseudo;
@@ -1020,7 +1020,7 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
if( nDeep )
{
if( !aToken.isEmpty() )
- rSelector = rtl::OStringToOUString(aToken, RTL_TEXTENCODING_ASCII_US);
+ rSelector = OStringToOUString(aToken, RTL_TEXTENCODING_ASCII_US);
else
rSelector.Erase();
@@ -1759,7 +1759,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
else if( pTemplate )
pRefPageDesc = pTemplate->GetPageDescFromPool( nRefPoolId, false );
- String aSelector = rtl::OUString('@');
+ String aSelector = OUString('@');
aSelector.AppendAscii( sCSS1_page );
if( bPseudo )
@@ -1817,7 +1817,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
}
else
{
- rtl::OStringBuffer sVal;
+ OStringBuffer sVal;
AddUnitPropertyValue(sVal, rSz.Width(), rHTMLWrt.GetCSS1Unit());
sVal.append(' ');
AddUnitPropertyValue(sVal, rSz.Height(), rHTMLWrt.GetCSS1Unit());
@@ -1845,7 +1845,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
if( rHTMLWrt.bFirstCSS1Property && bPseudo )
{
rHTMLWrt.OutNewLine();
- rtl::OString sTmp(rtl::OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
+ OString sTmp(OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
rWrt.Strm() << sTmp.getStr() << " {";
rHTMLWrt.bFirstCSS1Property = sal_False;
}
@@ -2497,7 +2497,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
}
}
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
if( pUStr )
sOut.append(pUStr);
@@ -2708,7 +2708,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt )
sal_Int16 nValue = ((const SvxKerningItem&)rHt).GetValue();
if( nValue )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
if( nValue < 0 )
{
sOut.append('-');
@@ -2961,7 +2961,7 @@ static Writer& OutCSS1_SvxWidows( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
- rtl::OString aStr(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OString aStr(OString::valueOf(static_cast<sal_Int32>(
((const SvxWidowsItem&)rHt).GetValue())));
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_widows, aStr );
@@ -2972,7 +2972,7 @@ static Writer& OutCSS1_SvxOrphans( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
- rtl::OString aStr(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OString aStr(OString::valueOf(static_cast<sal_Int32>(
((const SvxOrphansItem&)rHt).GetValue())));
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_orphans, aStr );
@@ -3361,7 +3361,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
if( pTempFileName )
sGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm,
- rtl::OUString("JPG"),
+ OUString("JPG"),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
@@ -3463,8 +3463,8 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
{
if( bColor )
{
- rtl::OString sTmp(GetCSS1Color(aColor));
- sOut += String(rtl::OStringToOUString(sTmp,
+ OString sTmp(GetCSS1Color(aColor));
+ sOut += String(OStringToOUString(sTmp,
RTL_TEXTENCODING_ASCII_US));
}
@@ -3617,7 +3617,7 @@ Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt )
if( nTopDist == nBottomDist && nLeftDist == nRightDist )
{
- rtl::OStringBuffer sVal;
+ OStringBuffer sVal;
AddUnitPropertyValue(sVal, nTopDist, rHTMLWrt.GetCSS1Unit());
if( nTopDist != nLeftDist )
{
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index d3a74fbda30d..aa49869d68a8 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -98,7 +98,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const String& rNm, sal_uInt16 nPoolId )
return 1 | HTML_DLCOLL_DT;
}
- String sDTDD( rtl::OUString(OOO_STRING_SVTOOLS_HTML_dt) );
+ String sDTDD( OUString(OOO_STRING_SVTOOLS_HTML_dt) );
sDTDD += ' ';
if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) )
// DefinitionList - term
@@ -199,7 +199,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
struct SwHTMLTxtCollOutputInfo
{
- rtl::OString aToken; // auszugendens End-Token
+ OString aToken; // auszugendens End-Token
SfxItemSet *pItemSet; // harte Attributierung
sal_Bool bInNumBulList; // in einer Aufzaehlungs-Liste;
@@ -647,7 +647,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
// nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang
// ausgeben
- rInfo.aToken = rtl::OString(); // kein End-Tag ausgeben
+ rInfo.aToken = OString(); // kein End-Tag ausgeben
rWrt.Strm() << SwHTMLWriter::sNewLine;
return;
@@ -801,7 +801,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// ggf ein List-Item aufmachen
if( rInfo.bInNumBulList && bNumbered )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_li);
if( USHRT_MAX != nNumStart )
{
@@ -824,7 +824,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// The align=... attribute does behave strange in netscape
// if there are controls in a paragraph, because the control and
// all text behind the control does not recognize this attribute.
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -844,7 +844,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// ausgegeben, wenn,
// - keine Styles geschrieben werden, und
// - ein untere Abstand oder eine Absatz-Ausrichtung existiert
- rtl::OString aToken = rInfo.aToken;
+ OString aToken = rInfo.aToken;
if( !rHWrt.bCfgOutStyles && rInfo.bParaPossible && !bPara &&
(bHasParSpace || pAdjItem) )
{
@@ -903,7 +903,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.bTxtAttr = sal_False;
rHWrt.bOutOpts = sal_True;
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(aToken);
if( eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.eLang )
@@ -969,7 +969,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// wenn kein End-Tag geschrieben werden soll, es loeschen
if( bNoEndTag )
- rInfo.aToken = rtl::OString();
+ rInfo.aToken = OString();
}
if( nBulletGrfLvl != 255 )
@@ -2058,7 +2058,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.bLFPossible = sal_True;
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_horzrule);
const SfxItemSet* pItemSet = pNd->GetpSwAttrSet();
@@ -2592,7 +2592,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
else
pStr = OOO_STRING_SVTOOLS_HTML_AL_right;
- rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_linebreak));
+ OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_linebreak));
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).append('=').append(pStr);
HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), sOut.getStr() );
@@ -2667,7 +2667,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
if( COL_AUTO == aColor.GetColor() )
aColor.SetColor( COL_BLACK );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_color).append('=');
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -2711,7 +2711,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
String aNames;
SwHTMLWriter::PrepareFontList( ((const SvxFontItem&)rHt), aNames, 0,
rHTMLWrt.IsHTMLMode(HTMLMODE_FONT_GENERIC) );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_face).append("=\"");
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -2732,7 +2732,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
if( rHTMLWrt.bTagOn )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font);
sal_uInt32 nHeight = ((const SvxFontHeightItem&)rHt).GetHeight();
@@ -2770,7 +2770,7 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
if( rHTMLWrt.bTagOn )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_span);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
rHTMLWrt.OutLanguage( ((const SvxLanguageItem &)rHt).GetLanguage() );
@@ -2935,7 +2935,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
return rWrt;
}
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor);
bool bScriptDependent = false;
@@ -3020,7 +3020,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
}
if( sRel.Len() )
- sOut.append(rtl::OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US));
+ sOut.append(OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US));
if( sOut.getLength() )
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -3110,7 +3110,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
if( rHTMLWrt.bTagOn )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<');
if( !pFmtInfo->aToken.isEmpty() )
sOut.append(pFmtInfo->aToken);
@@ -3177,7 +3177,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
}
if( pStr )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=')
.append(pStr);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index e68f00782f81..44fbb39269dc 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -110,11 +110,11 @@ void SwHTMLParser::EndScript()
RemoveSGMLComment( aScriptSource, sal_True );
// get library name
- ::rtl::OUString aLibName;
+ OUString aLibName;
if( aBasicLib.Len() )
aLibName = aBasicLib;
else
- aLibName = ::rtl::OUString("Standard");
+ aLibName = OUString("Standard");
// get module library container
Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY );
@@ -144,16 +144,16 @@ void SwHTMLParser::EndScript()
{
aBasicModule.AssignAscii( "Modul" );
aBasicModule += OUString::number( (sal_Int32)(++nSBModuleCnt) );
- bFound = xModLib->hasByName( ::rtl::OUString( aBasicModule ) );
+ bFound = xModLib->hasByName( OUString( aBasicModule ) );
}
}
// create module
- ::rtl::OUString aModName( aBasicModule );
+ OUString aModName( aBasicModule );
if ( !xModLib->hasByName( aModName ) )
{
Any aElement;
- aElement <<= ::rtl::OUString( aScriptSource );
+ aElement <<= OUString( aScriptSource );
xModLib->insertByName( aModName , aElement );
}
}
@@ -232,7 +232,7 @@ void SwHTMLParser::AddScriptSource()
}
}
-void SwHTMLParser::InsertBasicDocEvent( rtl::OUString aEvent, const String& rName,
+void SwHTMLParser::InsertBasicDocEvent( OUString aEvent, const String& rName,
ScriptType eScrType,
const String& rScrType )
{
@@ -281,13 +281,13 @@ void SwHTMLWriter::OutBasic()
const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) );
OSL_ENSURE( pModule, "Wo ist das Modul?" );
- rtl::OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC);
+ OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC);
ScriptType eType = STARBASIC;
if( 0==i && 0==j )
{
OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_httpequiv)
.append("=\"")
@@ -296,7 +296,7 @@ void SwHTMLWriter::OutBasic()
.append("=\"text/x-");
Strm() << sOut.getStr();
// Entities aren't welcome here
- Strm() << rtl::OUStringToOString(sLang, eDestEnc).getStr()
+ Strm() << OUStringToOString(sLang, eDestEnc).getStr()
<< "\">";
}
@@ -328,7 +328,7 @@ void SwHTMLWriter::OutBasicBodyEvents()
uno::Reference < container::XNameReplace > xEvents = xSup->getEvents();
for ( sal_Int32 i=0; i<4; i++ )
{
- SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( ::rtl::OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True );
+ SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True );
if ( pMacro )
{
pDocTable->Insert( aBodyEventTable[i].nEvent, *pMacro );
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index a580a1e65433..6423ce55a1b9 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -225,7 +225,7 @@ void SwCSS1Parser::SetLinkCharFmts()
OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" );
SvxCSS1MapEntry *pStyleEntry =
- GetTag( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
+ GetTag( OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
SwCharFmt *pUnvisited = 0, *pVisited = 0;
if( pStyleEntry )
{
@@ -241,7 +241,7 @@ void SwCSS1Parser::SetLinkCharFmts()
bBodyVLinkSet |= bColorSet;
}
- String sTmp( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
+ String sTmp( OUString(OOO_STRING_SVTOOLS_HTML_anchor) );
sTmp.Append( ':' );
sTmp.AppendAscii( sCSS1_link );
pStyleEntry = GetTag( sTmp );
@@ -1195,7 +1195,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c
}
else
{
- String sCName( rtl::OUString::createFromAscii(sName) );
+ String sCName( OUString::createFromAscii(sName) );
pCFmt = pDoc->FindCharFmtByName( sCName );
if( !pCFmt )
{
@@ -1872,7 +1872,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn )
}
- pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_first), sal_True );
+ pPageEntry = GetPage( OUString::createFromAscii(sCSS1_first), sal_True );
if( pPageEntry )
{
SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(),
@@ -1880,7 +1880,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn )
bSetFirstPageDesc = sal_True;
}
- pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_right), sal_True );
+ pPageEntry = GetPage( OUString::createFromAscii(sCSS1_right), sal_True );
if( pPageEntry )
{
SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(),
@@ -1888,7 +1888,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn )
bSetRightPageDesc = sal_True;
}
- pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_left), sal_True );
+ pPageEntry = GetPage( OUString::createFromAscii(sCSS1_left), sal_True );
if( pPageEntry )
SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(),
pPageEntry->GetPropertyInfo() );
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index f68174316935..d098988d2ad8 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -682,7 +682,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
if( !pOutlinerParaObj )
return rWrt;
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_marquee);
// Die Attribute des Objektd holen
@@ -823,7 +823,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
- rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags );
+ OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 59f414d7139b..688ce4335fde 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -258,7 +258,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
// <SDFIELD>-Tag ausgeben
if( pTypeStr )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<');
sOut.append(OOO_STRING_SVTOOLS_HTML_sdfield).append(' ').
append(OOO_STRING_SVTOOLS_HTML_O_type).append('=').
@@ -448,7 +448,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
rWrt.Strm() << '/';
// TODO: HTML-Tags are written without entitities, that for, characters
// not contained in the destination encoding are lost!
- rtl::OString sTmp(rtl::OUStringToOString(rTxt,
+ OString sTmp(OUStringToOString(rTxt,
((SwHTMLWriter&)rWrt).eDestEnc));
rWrt.Strm() << sTmp.getStr() << '>';
}
@@ -470,7 +470,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
String sComment(convertLineEnd(rComment, GetSystemLineEnd()));
// TODO: HTML-Tags are written without entitities, that for,
// characters not contained in the destination encoding are lost!
- rtl::OString sTmp(rtl::OUStringToOString(sComment,
+ OString sTmp(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc));
rWrt.Strm() << sTmp.getStr();
bWritten = sal_True;
@@ -486,7 +486,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
// TODO: HTML-Tags are written without entitities, that for,
// characters not contained in the destination encoding are
// lost!
- rtl::OString sTmp(rtl::OUStringToOString(sComment,
+ OString sTmp(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc));
rWrt.Strm() << sTmp.getStr();
bWritten = sal_True;
@@ -497,10 +497,10 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
if( !bWritten )
{
String sComment(convertLineEnd(rComment, GetSystemLineEnd()));
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
// TODO: ???
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment)
- .append(' ').append(rtl::OUStringToOString(sComment,
+ .append(' ').append(OUStringToOString(sComment,
((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->");
rWrt.Strm() << sOut.getStr();
}
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 6ddbdde1d298..a5ae153a7e0a 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -443,7 +443,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
if( bLFPossible && HTML_CNTNR_DIV == nCntnrMode )
OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
pCntnrStr = (HTML_CNTNR_DIV == nCntnrMode)
? OOO_STRING_SVTOOLS_HTML_division
: OOO_STRING_SVTOOLS_HTML_span;
@@ -529,13 +529,13 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
}
-rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
+OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
const String& rAlternateTxt,
sal_uInt32 nFrmOpts,
- const rtl::OString &rEndTags )
+ const OString &rEndTags )
{
- rtl::OString sRetEndTags(rEndTags);
- rtl::OStringBuffer sOut;
+ OString sRetEndTags(rEndTags);
+ OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
@@ -934,7 +934,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
rHTMLWrt.aImgMapNames.push_back(aIMapName);
- rtl::OString aIndMap, aIndArea;
+ OString aIndMap, aIndArea;
const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0;
#if defined(UNX)
sal_Char aLF[2] = "\x00";
@@ -982,8 +982,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
rHTMLWrt.OutNewLine( sal_True );
// Attribute die ausserhelb der Grafik geschreiben werden muessen sammeln
- rtl::OStringBuffer sOut;
- rtl::OString aEndTags;
+ OStringBuffer sOut;
+ OString aEndTags;
// implizite Sprungmarke -> <A NAME=...></A>...<IMG ...>
if( pMarkType && rFrmFmt.GetName().Len() )
@@ -1056,7 +1056,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
}
rWrt.Strm() << ">";
- aEndTags = rtl::OStringBuffer().append("</").
+ aEndTags = OStringBuffer().append("</").
append(OOO_STRING_SVTOOLS_HTML_anchor).
append(RTL_CONSTASCII_STRINGPARAM(">")).append(aEndTags).
makeStringAndClear();
@@ -1130,7 +1130,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
HTMLOutFuncs::Out_Color( rWrt.Strm(),
pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ) << '>';
- aEndTags = rtl::OStringBuffer().
+ aEndTags = OStringBuffer().
append(RTL_CONSTASCII_STRINGPARAM("</")).
append(OOO_STRING_SVTOOLS_HTML_font).
append('>').append(aEndTags).makeStringAndClear();
@@ -1222,7 +1222,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
if( rHTMLWrt.GetOrigFileName() )
rGrfName = *rHTMLWrt.GetOrigFileName();
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName,
- rtl::OUString("JPG"),
+ OUString("JPG"),
(XOUTBMP_USE_GIF_IF_SENSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE));
if( !nErr )
@@ -1253,7 +1253,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
pLink = &rGrfName;
}
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
if( pTag )
sOut.append('<').append(pTag);
@@ -1390,7 +1390,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_multicol);
const SwFmtCol& rFmtCol = rFrmFmt.GetCol();
@@ -1465,14 +1465,14 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine( sal_True );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
.append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
// ALIGN, WIDTH, HEIGHT
- rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
+ OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
rWrt.Strm() << '>';
if( !aEndTags.isEmpty() )
@@ -1502,14 +1502,14 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(pStr);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
- rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
+ OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
rWrt.Strm() << '>';
@@ -1559,7 +1559,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
aGrfNm = *rHTMLWrt.GetOrigFileName();
if( aGrf.GetType() == GRAPHIC_NONE ||
XOutBitmap::WriteGraphic( aGrf, aGrfNm,
- rtl::OUString("JPG"),
+ OUString("JPG"),
(XOUTBMP_USE_GIF_IF_POSSIBLE|
XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 )
{
@@ -1618,7 +1618,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM ));
sal_uInt16 nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm,
- rtl::OUString("JPG"), nFlags, &aMM100Size );
+ OUString("JPG"), nFlags, &aMM100Size );
if( nErr ) // fehlerhaft, da ist nichts auszugeben
{
rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
@@ -1684,7 +1684,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// als Multicol ausgeben
rHTMLWrt.OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(OOO_STRING_SVTOOLS_HTML_division).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
.append(bHeader ? "HEADER" : "FOOTER");
@@ -1699,7 +1699,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sal_uInt16 nSize = bHeader ? rULSpace.GetLower() : rULSpace.GetUpper();
rHTMLWrt.nHeaderFooterSpace = nSize;
- rtl::OString aSpacer;
+ OString aSpacer;
if( rHTMLWrt.IsHTMLMode(HTMLMODE_VERT_SPACER) &&
nSize > HTML_PARSPACE && Application::GetDefaultDevice() )
{
@@ -1707,7 +1707,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
nSize = (sal_Int16)Application::GetDefaultDevice()
->LogicToPixel( Size(nSize,0), MapMode(MAP_TWIP) ).Width();
- aSpacer = rtl::OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer).
+ aSpacer = OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer).
append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type).
append('=').append(OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical).
append(' ').append(OOO_STRING_SVTOOLS_HTML_O_size).
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 41d488ed39ef..093d58b34dc8 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -79,7 +79,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::form;
-using ::rtl::OUString;
const sal_uInt16 TABINDEX_MIN = 0;
const sal_uInt16 TABINDEX_MAX = 32767;
@@ -2501,7 +2500,7 @@ void SwHTMLParser::EndSelect()
for(size_t i = 0; i < nEntryCnt; ++i)
{
- rtl::OUString sText(pFormImpl->GetStringList()[i]);
+ OUString sText(pFormImpl->GetStringList()[i]);
sText = comphelper::string::stripEnd(sText, ' ');
pStrings[i] = sText;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f224bf837bb1..c9b1695ba089 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -63,7 +63,6 @@
#include <rtl/strbuf.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
const sal_uInt32 HTML_FRMOPTS_CONTROL =
0;
@@ -165,7 +164,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
}
}
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ');
if( pOpt && (EXTENDED_STYPE != eScriptType ||
pDescs[i].AddListenerParam.isEmpty()) )
@@ -173,10 +172,10 @@ static void lcl_html_outEvents( SvStream& rStrm,
else
{
sOut.append(OOO_STRING_SVTOOLS_HTML_O_sdevent)
- .append(rtl::OUStringToOString(sListener,
+ .append(OUStringToOString(sListener,
RTL_TEXTENCODING_ASCII_US))
.append('-')
- .append(rtl::OUStringToOString(sMethod,
+ .append(OUStringToOString(sMethod,
RTL_TEXTENCODING_ASCII_US));
}
sOut.append("=\"");
@@ -187,10 +186,10 @@ static void lcl_html_outEvents( SvStream& rStrm,
!pDescs[i].AddListenerParam.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)
- .append(rtl::OUStringToOString(sListener,
+ .append(OUStringToOString(sListener,
RTL_TEXTENCODING_ASCII_US))
.append('-')
- .append(rtl::OUStringToOString(sMethod,
+ .append(OUStringToOString(sMethod,
RTL_TEXTENCODING_ASCII_US))
.append("=\"");
rStrm << sOut.makeStringAndClear().getStr();
@@ -470,7 +469,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
// die neue Form wird geoeffnet
if( bLFPossible )
OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_form);
uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY );
@@ -609,7 +608,7 @@ void SwHTMLWriter::OutHiddenControls(
{
if( bLFPossible )
OutNewLine( sal_True );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_input).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_type).append('=')
.append(OOO_STRING_SVTOOLS_HTML_IT_hidden);
@@ -750,7 +749,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
OOO_STRING_SVTOOLS_HTML_IT_button };
Type eType = TYPE_NONE;
OUString sValue;
- rtl::OStringBuffer sOptions;
+ OStringBuffer sOptions;
sal_Bool bEmptyValue = sal_False;
uno::Any aTmp = xPropSet->getPropertyValue(
OUString("ClassId") );
@@ -967,7 +966,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
if( eTag == TAG_NONE )
return rWrt;
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(TagNames[eTag]);
if( eType != TYPE_NONE )
{
@@ -1076,7 +1075,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
? HTML_FRMOPTS_IMG_CONTROL_CSS1
: HTML_FRMOPTS_CONTROL_CSS1);
}
- rtl::OString aEndTags;
+ OString aEndTags;
if( nFrmOpts != 0 )
aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmOpts );
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 2e4a451aca0f..00a8479a66f4 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -297,7 +297,7 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
rHTMLWrt.pFootEndNotes = new SwHTMLTxtFtns;
rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTxtFtn );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -357,7 +357,7 @@ void SwHTMLWriter::OutFootEndNotes()
if( bLFPossible )
OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -465,7 +465,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
}
}
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -495,7 +495,7 @@ static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt );
if( pStr )
{
- pParts[0] = rtl::OUString::createFromAscii( pStr );
+ pParts[0] = OUString::createFromAscii( pStr );
nParts = 1;
}
}
@@ -528,12 +528,12 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts,
{
xub_StrLen nPos = 0;
String aTmp( pParts[i] );
- rtl::OUString aRep("\\\\");
+ OUString aRep("\\\\");
while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( "\\",
aRep, nPos ) ) )
nPos += 2;
nPos = 0;
- aRep = rtl::OUString("\\;");
+ aRep = OUString("\\;");
while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( ";",
aRep, nPos ) ) )
nPos += 2;
@@ -543,7 +543,7 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts,
}
rHTMLWrt.OutNewLine();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName)
.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\"");
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 4c3e9afffa76..97caf18c790f 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -809,7 +809,7 @@ void SwHTMLParser::InsertBodyOptions()
{
const HTMLOption& rOption = rHTMLOptions[--i];
ScriptType eScriptType2 = eDfltScriptType;
- rtl::OUString aEvent;
+ OUString aEvent;
sal_Bool bSetEvent = sal_False;
switch( rOption.GetToken() )
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index c0273901bcab..3555f879ddc8 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -789,7 +789,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
rWrt.OutNewLine(); // <OL>/<UL> in eine neue Zeile
rWrt.aBulletGrfs[i].Erase();
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<');
const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get( i );
sal_Int16 eType = rNumFmt.GetNumberingType();
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 319a12c1b41f..104813f179b5 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -409,7 +409,7 @@ void SwHTMLParser::InsertEmbed()
// das Plugin anlegen
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aObjName;
+ OUString aObjName;
uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aObjName );
if ( svt::EmbeddedObjectRef::TryRunningState( xObj ) )
{
@@ -417,15 +417,15 @@ void SwHTMLParser::InsertEmbed()
if ( xSet.is() )
{
if( bHasURL )
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
- uno::makeAny( ::rtl::OUString( aURL ) ) );
+ xSet->setPropertyValue( OUString("PluginURL"),
+ uno::makeAny( OUString( aURL ) ) );
if( bHasType )
- xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"),
- uno::makeAny( ::rtl::OUString( aType ) ) );
+ xSet->setPropertyValue( OUString("PluginMimeType"),
+ uno::makeAny( OUString( aType ) ) );
uno::Sequence < beans::PropertyValue > aProps;
aCmdLst.FillSequence( aProps );
- xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aProps ) );
+ xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aProps ) );
}
}
@@ -871,7 +871,7 @@ void SwHTMLParser::InsertFloatingFrame()
// den Floating-Frame anlegen
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aObjName;
+ OUString aObjName;
uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aObjName );
try
@@ -882,28 +882,28 @@ void SwHTMLParser::InsertFloatingFrame()
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- ::rtl::OUString aName = aFrameDesc.GetName();
+ OUString aName = aFrameDesc.GetName();
ScrollingMode eScroll = aFrameDesc.GetScrollingMode();
sal_Bool bHasBorder = aFrameDesc.HasFrameBorder();
Size aMargin = aFrameDesc.GetMargin();
- xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( aName ) );
+ xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( aName ) );
if ( eScroll == ScrollingAuto )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"),
+ xSet->setPropertyValue( OUString("FrameIsAutoScroll"),
uno::makeAny( sal_True ) );
else
- xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"),
+ xSet->setPropertyValue( OUString("FrameIsScrollingMode"),
uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"),
+ xSet->setPropertyValue( OUString("FrameIsBorder"),
uno::makeAny( bHasBorder ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"),
+ xSet->setPropertyValue( OUString("FrameMarginWidth"),
uno::makeAny( sal_Int32( aMargin.Width() ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"),
+ xSet->setPropertyValue( OUString("FrameMarginHeight"),
uno::makeAny( sal_Int32( aMargin.Height() ) ) );
}
}
@@ -1014,16 +1014,16 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
pMarkToOLE );
uno::Any aAny;
SvGlobalName aGlobName( xObj->getClassID() );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<');
if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) )
{
// erstmal das Plug-spezifische
sOut.append(OOO_STRING_SVTOOLS_HTML_embed);
- ::rtl::OUString aStr;
+ OUString aStr;
String aURL;
- aAny = xSet->getPropertyValue( ::rtl::OUString("PluginURL") );
+ aAny = xSet->getPropertyValue( OUString("PluginURL") );
if( (aAny >>= aStr) && !aStr.isEmpty() )
{
aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(),
@@ -1039,8 +1039,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sOut.append('\"');
}
- ::rtl::OUString aType;
- aAny = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") );
+ OUString aType;
+ aAny = xSet->getPropertyValue( OUString("PluginMimeType") );
if( (aAny >>= aType) && !aType.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type)
@@ -1071,8 +1071,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sOut.append(OOO_STRING_SVTOOLS_HTML_applet);
// CODEBASE
- ::rtl::OUString aCd;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") );
+ OUString aCd;
+ aAny = xSet->getPropertyValue( OUString("AppletCodeBase") );
if( (aAny >>= aCd) && !aCd.isEmpty() )
{
String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) );
@@ -1087,8 +1087,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
}
// CODE
- ::rtl::OUString aClass;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCode") );
+ OUString aClass;
+ aAny = xSet->getPropertyValue( OUString("AppletCode") );
aAny >>= aClass;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code)
.append("=\"");
@@ -1097,8 +1097,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sOut.append('\"');
// NAME
- ::rtl::OUString aAppletName;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletName") );
+ OUString aAppletName;
+ aAny = xSet->getPropertyValue( OUString("AppletName") );
aAny >>= aAppletName;
if( !aAppletName.isEmpty() )
{
@@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
}
sal_Bool bScript = sal_False;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") );
+ aAny = xSet->getPropertyValue( OUString("AppletIsScript") );
aAny >>= bScript;
if( bScript )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript);
@@ -1139,7 +1139,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
nFrmOpts |= HTML_FRMOPTS_OLE_CSS1;
- rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts );
+ OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
@@ -1149,7 +1149,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// und ein </APPLET> schreiben
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") );
+ aAny = xSet->getPropertyValue( OUString("AppletCommands") );
aAny >>= aProps;
SvCommandList aCommands;
@@ -1186,7 +1186,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
const String& rName = rCommand.GetCommand();
const String& rValue = rCommand.GetArgument();
rHTMLWrt.OutNewLine();
- rtl::OStringBuffer sBuf;
+ OStringBuffer sBuf;
sBuf.append('<').append(OOO_STRING_SVTOOLS_HTML_param)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
.append("=\"");
@@ -1208,7 +1208,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// fuer Plugins die Parameter als Optionen schreiben
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") );
+ aAny = xSet->getPropertyValue( OUString("PluginCommands") );
aAny >>= aProps;
SvCommandList aCommands;
@@ -1265,7 +1265,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
aGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm,
- rtl::OUString("JPG"),
+ OUString("JPG"),
(XOUTBMP_USE_GIF_IF_POSSIBLE |
XOUTBMP_USE_NATIVE_IF_POSSIBLE) );
if( nErr ) // fehlerhaft, da ist nichts auszugeben
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 0949e733aa19..263c90b34aff 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -314,7 +314,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
}
rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<');
sOut.append(bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata);
@@ -550,7 +550,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
if( text::VertOrientation::TOP==eRowVertOri || text::VertOrientation::BOTTOM==eRowVertOri )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_valign)
.append('=').append(text::VertOrientation::TOP==eRowVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
@@ -634,7 +634,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( rWrt.bLFPossible )
rWrt.OutNewLine(); // <TABLE> in neue Zeile
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
sal_uInt16 nOldDirection = rWrt.nDirection;
@@ -746,7 +746,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( pCaption && pCaption->Len() )
{
rWrt.OutNewLine(); // <CAPTION> in neue Zeile
- rtl::OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption));
+ OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption));
sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=')
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom);
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), sal_True );
@@ -775,7 +775,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
const SwWriteTableCol *pColumn = aCols[nCol];
- rtl::OStringBuffer sOutStr;
+ OStringBuffer sOutStr;
sOutStr.append('<').append(OOO_STRING_SVTOOLS_HTML_col);
sal_uInt32 nWidth;
@@ -1112,7 +1112,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
else
{
- rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division));
+ OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division));
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=')
.append(OOO_STRING_SVTOOLS_HTML_AL_right);
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(),
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index fe8427515591..8455ab1e6999 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -149,7 +149,7 @@ CSS1Token CSS1Parser::GetNextToken()
if (comphelper::string::isalphaAscii(cNextCh))
{
// den naechsten Identifer scannen
- ::rtl::OUStringBuffer sTmpBuffer( 32L );
+ OUStringBuffer sTmpBuffer( 32L );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
@@ -245,7 +245,7 @@ CSS1Token CSS1Parser::GetNextToken()
if( 'i'==cNextCh || 'I'==cNextCh)
{
// den naechsten Identifer scannen
- ::rtl::OUStringBuffer sTmpBuffer( 32L );
+ OUStringBuffer sTmpBuffer( 32L );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
@@ -284,7 +284,7 @@ CSS1Token CSS1Parser::GetNextToken()
sal_Unicode cQuoteChar = cNextCh;
cNextCh = GetNextChar();
- ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN );
+ OUStringBuffer sTmpBuffer( MAX_LEN );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
@@ -315,7 +315,7 @@ CSS1Token CSS1Parser::GetNextToken()
sal_Bool bEOFSave = bEOF;
// erstmal versuchen eine Hex-Zahl zu scannen
- ::rtl::OUStringBuffer sTmpBuffer( 16 );
+ OUStringBuffer sTmpBuffer( 16 );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
@@ -351,7 +351,7 @@ CSS1Token CSS1Parser::GetNextToken()
!IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
- nValue = rtl::OUString(aToken).toDouble();
+ nValue = OUString(aToken).toDouble();
// White Space ueberlesen
while( ( ' ' == cNextCh ||
@@ -389,7 +389,7 @@ CSS1Token CSS1Parser::GetNextToken()
// den naechsten Identifer scannen
String aIdent;
- ::rtl::OUStringBuffer sTmpBuffer2( 64L );
+ OUStringBuffer sTmpBuffer2( 64L );
do {
sTmpBuffer2.append( cNextCh );
cNextCh = GetNextChar();
@@ -539,7 +539,7 @@ CSS1Token CSS1Parser::GetNextToken()
sal_Bool bEOFSave = bEOF;
// erstmal versuchen eine Hex-Zahl zu scannen
- ::rtl::OUStringBuffer sTmpBuffer( 6L );
+ OUStringBuffer sTmpBuffer( 6L );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
@@ -595,7 +595,7 @@ CSS1Token CSS1Parser::GetNextToken()
sal_Bool bHexColor = sal_True;
// den naechsten Identifer scannen
- ::rtl::OUStringBuffer sTmpBuffer( 64L );
+ OUStringBuffer sTmpBuffer( 64L );
do {
sTmpBuffer.append( cNextCh );
if( bHexColor )
@@ -625,7 +625,7 @@ CSS1Token CSS1Parser::GetNextToken()
aToken.EqualsIgnoreCaseAscii(sCSS1_rgb)) ) )
{
sal_uInt16 nNestCnt = 0;
- ::rtl::OUStringBuffer sTmpBuffer2( 64L );
+ OUStringBuffer sTmpBuffer2( 64L );
do {
sTmpBuffer2.append( cNextCh );
switch( cNextCh )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 01dd8bd51ef1..9c929b2e791e 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1426,11 +1426,11 @@ void SwHTMLParser::NextToken( int nToken )
break;
case HTML_NONBREAKSPACE:
- pDoc->InsertString( *pPam, rtl::OUString(CHAR_HARDBLANK) );
+ pDoc->InsertString( *pPam, OUString(CHAR_HARDBLANK) );
break;
case HTML_SOFTHYPH:
- pDoc->InsertString( *pPam, rtl::OUString(CHAR_SOFTHYPHEN) );
+ pDoc->InsertString( *pPam, OUString(CHAR_SOFTHYPHEN) );
break;
case HTML_LINEFEEDCHAR:
@@ -1952,7 +1952,7 @@ void SwHTMLParser::NextToken( int nToken )
}
else
{
- rtl::OUStringBuffer aComment;
+ OUStringBuffer aComment;
aComment.append('<').append(aToken).append('>');
InsertComment( aComment.makeStringAndClear() );
}
@@ -2021,7 +2021,7 @@ void SwHTMLParser::NextToken( int nToken )
if( bInsertUnknown )
{
- String aComment(rtl::OUString("HTML: <"));
+ String aComment(OUString("HTML: <"));
if( (HTML_TOKEN_ONOFF & nToken) != 0 && (1 & nToken) != 0 )
aComment += '/';
aComment += sSaveToken;
@@ -2834,7 +2834,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
IDocumentMarkAccess::BOOKMARK );
// jump to bookmark
- if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == ::rtl::OUString(sJmpMark) )
+ if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == OUString(sJmpMark) )
{
bChkJumpMark = sal_True;
eJumpTo = JUMPTO_NONE;
@@ -5001,7 +5001,7 @@ void SwHTMLParser::InsertSpacer()
else
{
NewAttr( &aAttrTab.pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING ) );
- rtl::OUString aTmp( ' ' );
+ OUString aTmp( ' ' );
pDoc->InsertString( *pPam, aTmp );
EndAttr( aAttrTab.pKerning );
}
@@ -5205,7 +5205,7 @@ void SwHTMLParser::InsertLineBreak()
{
// wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird
// ein Zeilenumbruch eingef?gt
- rtl::OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
+ OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-)
pDoc->InsertString( *pPam, sTmp );
}
else if( pPam->GetPoint()->nContent.GetIndex() )
@@ -5437,7 +5437,7 @@ void SwHTMLParser::ParseMoreMetaOptions()
return;
}
- rtl::OUStringBuffer sText;
+ OUStringBuffer sText;
sText.append("HTML: <");
sText.append(OOO_STRING_SVTOOLS_HTML_meta);
sText.append(' ');
@@ -5557,10 +5557,10 @@ bool SwHTMLParser::ParseMetaOptions(
}
// override so we can parse DOCINFO field subtypes INFO[1-4]
-void SwHTMLParser::AddMetaUserDefined( ::rtl::OUString const & i_rMetaName )
+void SwHTMLParser::AddMetaUserDefined( OUString const & i_rMetaName )
{
// unless we already have 4 names, append the argument to m_InfoNames
- ::rtl::OUString* pName // the first empty string in m_InfoNames
+ OUString* pName // the first empty string in m_InfoNames
(m_InfoNames[0].isEmpty() ? &m_InfoNames[0] :
(m_InfoNames[1].isEmpty() ? &m_InfoNames[1] :
(m_InfoNames[2].isEmpty() ? &m_InfoNames[2] :
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 723795e7c924..d628185827ae 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -471,7 +471,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
sal_Bool bRemoveHidden : 1; // the filter implementation might set the hidden flag
/// the names corresponding to the DOCINFO field subtypes INFO[1-4]
- ::rtl::OUString m_InfoNames[4];
+ OUString m_InfoNames[4];
SfxViewFrame* pTempViewFrame;
@@ -749,7 +749,7 @@ private:
void AddScriptSource();
// ein Event in die SFX-Konfiguation eintragen (htmlbas.cxx)
- void InsertBasicDocEvent( rtl::OUString aEventName, const String& rName,
+ void InsertBasicDocEvent( OUString aEventName, const String& rName,
ScriptType eScrType, const String& rScrType );
// ein Event an ein VC-Control anhaengen (htmlform.cxx)
@@ -891,7 +891,7 @@ protected:
// If the document is removed, remove the parser as well
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew );
- virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName );
+ virtual void AddMetaUserDefined( OUString const & i_rMetaName );
public:
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index c0eb4076026b..5eff6f95db1d 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -189,7 +189,7 @@ sal_uLong SwHTMLWriter::WriteStream()
const sal_Char *pHelpHack = getenv( "HelpEx" );
if( pHelpHack )
{
- rtl::OString aTmp(pHelpHack);
+ OString aTmp(pHelpHack);
if (aTmp.equalsIgnoreAsciiCase("Hilfe"))
nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND;
}
@@ -279,7 +279,7 @@ sal_uLong SwHTMLWriter::WriteStream()
GetNumInfo().Clear();
pNextNumRuleInfo = 0;
- rtl::OString aStartTags;
+ OString aStartTags;
// Tabellen und Bereiche am Doc.-Anfang beachten
{
@@ -310,11 +310,11 @@ sal_uLong SwHTMLWriter::WriteStream()
"Export gelinkter Bereiche am Dok-Anfang ist nicht implemntiert" );
// nur das Tag fuer die Section merken
- rtl::OString aName = HTMLOutFuncs::ConvertStringToHTML(
+ OString aName = HTMLOutFuncs::ConvertStringToHTML(
pSNd->GetSection().GetSectionName(), eDestEnc,
&aNonConvertableCharacters );
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id)
.append("=\"").append(aName).append('\"').append('>')
@@ -526,7 +526,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
const sal_Char *pTag = pCol ? OOO_STRING_SVTOOLS_HTML_multicol : OOO_STRING_SVTOOLS_HTML_division;
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(pTag);
const String& rName = rSection.GetSectionName();
@@ -851,7 +851,7 @@ static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt,
if( pColorItem )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(pTag).append('=');
rHWrt.Strm() << sOut.makeStringAndClear().getStr();
Color aColor( pColorItem->GetValue() );
@@ -907,7 +907,7 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(OOO_STRING_SVTOOLS_HTML_doctype).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_doctype40);
HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() );
@@ -922,7 +922,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
IncIndentLevel(); // Inhalt von <HEAD> einruecken
// DokumentInfo
- rtl::OString sIndent = GetIndentString();
+ OString sIndent = GetIndentString();
using namespace ::com::sun::star;
uno::Reference<document::XDocumentProperties> xDocProps;
SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -1029,7 +1029,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
void SwHTMLWriter::OutAnchor( const String& rName )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -1130,7 +1130,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
/// only checking, if transparency is not set.
if( rBackColor.GetColor() != COL_TRANSPARENT )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('=');
Strm() << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc);
@@ -1152,7 +1152,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
if(pTempFileName)
rEmbGrfNm = *pTempFileName;
sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm,
- rtl::OUString("JPG"),
+ OUString("JPG"),
XOUTBMP_USE_NATIVE_IF_POSSIBLE );
if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
@@ -1218,7 +1218,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang )
{
if( LANGUAGE_DONTKNOW != nLang )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_lang)
.append("=\"");
Strm() << sOut.makeStringAndClear().getStr();
@@ -1267,16 +1267,16 @@ void SwHTMLWriter::OutDirection( sal_uInt16 nDir )
}
if( pValue != 0 )
{
- rtl::OStringBuffer sOut;
+ OStringBuffer sOut;
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_dir)
.append("=\"").append(pValue).append('\"');
Strm() << sOut.makeStringAndClear().getStr();
}
}
-rtl::OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
+OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
{
- rtl::OString sRet;
+ OString sRet;
// etwas umstaendlich, aber wir haben nur einen Indent-String!
sal_uInt16 nLevel = nIndentLvl + nIncLvl;
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 5b68aaeca0aa..9d8bbf9a66fd 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -218,7 +218,7 @@ struct SwHTMLFmtInfo
const SwFmt *pFmt; // das Format selbst
const SwFmt *pRefFmt; // das Vergleichs-Format
- rtl::OString aToken; // das auszugebende Token
+ OString aToken; // das auszugebende Token
String aClass; // die auszugebende Klasse
SfxItemSet *pItemSet; // der auszugebende Attribut-Set
@@ -444,7 +444,7 @@ public:
inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
const sal_Char *pVal );
inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
- const rtl::OString& rVal );
+ const OString& rVal );
inline void OutCSS1_Property( const sal_Char *pProp, const String& rVal );
void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal,
const String *pSVal );
@@ -469,8 +469,8 @@ public:
// ALT/ALIGN/WIDTH/HEIGHT/HSPACE/VSPACE-Optionen des aktuellen
// Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
// rEndTags anhaengen
- rtl::OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt,
- sal_uInt32 nFrmOpts, const rtl::OString& rEndTags = rtl::OString() );
+ OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt,
+ sal_uInt32 nFrmOpts, const OString& rEndTags = OString() );
void OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt );
void OutCSS1_TableCellBorderHack(const SwFrmFmt& rFrmFmt);
void OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwFmtCol *pCol );
@@ -483,7 +483,7 @@ public:
void IncIndentLevel() { nIndentLvl++; }
void DecIndentLevel() { if ( nIndentLvl ) nIndentLvl--; }
- rtl::OString GetIndentString(sal_uInt16 nIncLvl = 0);
+ OString GetIndentString(sal_uInt16 nIncLvl = 0);
xub_StrLen GetLineLen() { return (xub_StrLen)(Strm().Tell()-nLastLFPos); }
void OutNewLine( sal_Bool bCheck=sal_False );
@@ -520,7 +520,7 @@ public:
static const SdrObject *GetHTMLControl( const SwDrawFrmFmt& rFmt );
static const SdrObject *GetMarqueeTextObj( const SwDrawFrmFmt& rFmt );
- static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken,
+ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
String& rClass, sal_uInt16& rRefPoolId,
String *pPseudo=0 );
@@ -574,7 +574,7 @@ inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
}
inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
- const rtl::OString& rVal )
+ const OString& rVal )
{
OutCSS1_Property( pProp, rVal.getStr(), 0 );
}
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 00a01725e345..60fd30b26626 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -398,14 +398,14 @@ namespace sw
class WrtRedlineAuthor : public boost::noncopyable
{
protected:
- std::vector<rtl::OUString> maAuthors; // Array of Sw - Bookmarknames
+ std::vector<OUString> maAuthors; // Array of Sw - Bookmarknames
sal_uInt16 GetPos( const String& rNm );
public:
WrtRedlineAuthor() {}
virtual ~WrtRedlineAuthor() {}
- sal_uInt16 AddName( const rtl::OUString& rNm );
+ sal_uInt16 AddName( const OUString& rNm );
virtual void Write(Writer &rWrt) = 0;
// std::vector<String> GetNames();
};
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 8cb8a50c4c3a..634d4bc9ff21 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1069,7 +1069,7 @@ SwFltShell::~SwFltShell()
SwDoc& rDoc = GetDoc();
// 1. SectionFmt und Section anlegen
SwSectionFmt* pSFmt = rDoc.MakeSectionFmt( 0 );
- SwSectionData aSectionData(CONTENT_SECTION, rtl::OUString("PMW-Protect"));
+ SwSectionData aSectionData(CONTENT_SECTION, OUString("PMW-Protect"));
aSectionData.SetProtectFlag( true );
// 2. Start- und EndIdx suchen
const SwNode* pEndNd = &rDoc.GetNodes().GetEndOfContent();
@@ -1143,13 +1143,13 @@ OUString SwFltShell::QuoteStr( const OUString& rIn )
SwFltShell& SwFltShell::operator << ( const sal_Unicode c )
{
OSL_ENSURE( eSubMode != Style, "char insert while in style-mode");
- GetDoc().InsertString( *pPaM, rtl::OUString(c) );
+ GetDoc().InsertString( *pPaM, OUString(c) );
return *this;
}
SwFltShell& SwFltShell::AddError( const sal_Char* pErr )
{
- String aName(rtl::OUString("ErrorTag"));
+ String aName(OUString("ErrorTag"));
SwFieldType* pFT = GetDoc().GetFldType( RES_SETEXPFLD, aName, false );
if( pFT == 0)
{
@@ -1157,7 +1157,7 @@ SwFltShell& SwFltShell::AddError( const sal_Char* pErr )
pFT = GetDoc().InsertFldType(aS);
}
SwSetExpField aFld( (SwSetExpFieldType*)pFT,
- rtl::OUString::createFromAscii( pErr ));
+ OUString::createFromAscii( pErr ));
//, VVF_INVISIBLE
GetDoc().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
return *this;
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 38b744b4b465..3ccddb0a63fd 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -61,7 +61,7 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset )
if( rFib.GetStream().Seek( ulFilePos + ulOffset ) == ulFilePos+ulOffset &&
rFib.GetStream().Read( &cRead, sizeof( cRead ) ) == sizeof( cRead ) )
{
- cRet = rtl::OUString(&cRead, 1, RTL_TEXTENCODING_MS_1252).toChar();
+ cRet = OUString(&cRead, 1, RTL_TEXTENCODING_MS_1252).toChar();
}
else
cRet = ' ';
@@ -77,7 +77,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const
bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos;
return bSeekOk ?
read_uInt8s_ToOUString(rFib.GetStream(), nLen, RTL_TEXTENCODING_MS_1252) :
- rtl::OUString();
+ OUString();
}
///////////////////////////////////////////////////////////////// Style
@@ -928,7 +928,7 @@ long Ww1Bookmarks::Len() const
const String Ww1Bookmarks::GetName() const
{
if( nIsEnd )
- return rtl::OUString("???");
+ return OUString("???");
return aNames.GetStr( nPlcIdx[0] );
}
@@ -1033,12 +1033,12 @@ Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib)
String Ww1Assoc::GetStr(sal_uInt16 code)
{
- rtl::OStringBuffer sRet;
+ OStringBuffer sRet;
OSL_ENSURE(code<MaxFields, "out of range");
if (pStrTbl[code] != NULL)
for( sal_uInt16 i=0;i<pStrTbl[code][0];i++ )
sRet.append(pStrTbl[code][i+1]);
- return rtl::OStringToOUString(sRet.makeStringAndClear(),
+ return OStringToOUString(sRet.makeStringAndClear(),
RTL_TEXTENCODING_MS_1252);
}
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index c4fe8f2faa9c..507393924a86 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -814,7 +814,7 @@ oncemore:
}
else // rekursion:
{
- rtl::OUString aName("Ww");
+ OUString aName("Ww");
aName += OUString::number( nPlcIndex );
SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false);
if (pFT == 0)
@@ -836,7 +836,7 @@ oncemore:
aStr.Erase(0, 1);
if( !aFName.Len() )
break;
- aFName.SearchAndReplaceAscii( "\\\\", rtl::OUString('\\') );
+ aFName.SearchAndReplaceAscii( "\\\\", OUString('\\') );
aFName = URIHelper::SmartRel2Abs(
INetURLObject(rOut.GetBaseURL()), aFName );
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index 677087a803f8..73732b830664 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -50,25 +50,25 @@ WW8FFData::~WW8FFData()
{
}
-void WW8FFData::setHelp(const ::rtl::OUString & rHelp)
+void WW8FFData::setHelp(const OUString & rHelp)
{
msHelp = rHelp;
mbOwnHelp = true;
}
-void WW8FFData::setStatus(const ::rtl::OUString & rStatus)
+void WW8FFData::setStatus(const OUString & rStatus)
{
msStatus = rStatus;
mbOwnStat = true;
}
-void WW8FFData::addListboxEntry(const ::rtl::OUString & rEntry)
+void WW8FFData::addListboxEntry(const OUString & rEntry)
{
mbListBox = true;
msListEntries.push_back(rEntry);
}
-void WW8FFData::WriteOUString(SvStream * pDataStrm, const ::rtl::OUString & rStr,
+void WW8FFData::WriteOUString(SvStream * pDataStrm, const OUString & rStr,
bool bAddZero)
{
sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength());
@@ -147,11 +147,11 @@ void WW8FFData::Write(SvStream * pDataStrm)
sal_uInt32 nListboxEntries = msListEntries.size();
*pDataStrm << nListboxEntries;
- ::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin();
+ ::std::vector< OUString >::const_iterator aIt = msListEntries.begin();
while (aIt != msListEntries.end())
{
- const ::rtl::OUString & rEntry = *aIt;
+ const OUString & rEntry = *aIt;
WriteOUString(pDataStrm, rEntry, false);
++aIt;
diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx
index 9d90866e7a8e..0b639af3a1c8 100644
--- a/sw/source/filter/ww8/WW8FFData.hxx
+++ b/sw/source/filter/ww8/WW8FFData.hxx
@@ -48,19 +48,19 @@ private:
sal_uInt16 mnCheckboxHeight;
// offset 10 and beyond
- ::rtl::OUString msName;
- ::rtl::OUString msDefault; // only for type == 0
+ OUString msName;
+ OUString msDefault; // only for type == 0
sal_uInt16 mnDefault; // only for type != 0
- ::rtl::OUString msFormat;
- ::rtl::OUString msHelp;
- ::rtl::OUString msStatus;
- ::rtl::OUString msMacroEnter;
- ::rtl::OUString msMacroExit;
+ OUString msFormat;
+ OUString msHelp;
+ OUString msStatus;
+ OUString msMacroEnter;
+ OUString msMacroExit;
- ::std::vector< ::rtl::OUString > msListEntries;
+ ::std::vector< OUString > msListEntries;
protected:
- void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero);
+ void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero);
public:
WW8FFData();
@@ -84,24 +84,24 @@ public:
sal_uInt16 getMaxLen() const { return mnMaxLen; }
void setCheckboxHeight(sal_uInt16 nCheckboxHeight) { mnCheckboxHeight = nCheckboxHeight; }
sal_uInt16 getCheckboxHeight() const { return mnCheckboxHeight; }
- void setName(const ::rtl::OUString & rName) { msName = rName; }
- const ::rtl::OUString & getName() const { return msName; }
- void setDefaultString(const ::rtl::OUString & rDefault) { msDefault = rDefault; }
- const ::rtl::OUString & getDefaultString() const { return msDefault; }
+ void setName(const OUString & rName) { msName = rName; }
+ const OUString & getName() const { return msName; }
+ void setDefaultString(const OUString & rDefault) { msDefault = rDefault; }
+ const OUString & getDefaultString() const { return msDefault; }
void setDefaultResult(sal_uInt16 nDefault) { mnDefault = nDefault; }
sal_uInt16 getDefaultResult() const { return mnDefault; }
- void setFormat(const ::rtl::OUString & rFormat) { msFormat = rFormat; }
- const ::rtl::OUString & getFormat() const { return msFormat; }
- void setHelp(const ::rtl::OUString & rHelp);
- const ::rtl::OUString getHelp() const { return msHelp; }
- void setStatus(const ::rtl::OUString & rStatus);
- const ::rtl::OUString & getStatus() const { return msStatus; }
- void setMacroEnter(const ::rtl::OUString & rMacroEnter) { msMacroEnter = rMacroEnter; }
- const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; }
- void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; }
- const ::rtl::OUString & getMacroExit() const { return msMacroExit; }
+ void setFormat(const OUString & rFormat) { msFormat = rFormat; }
+ const OUString & getFormat() const { return msFormat; }
+ void setHelp(const OUString & rHelp);
+ const OUString getHelp() const { return msHelp; }
+ void setStatus(const OUString & rStatus);
+ const OUString & getStatus() const { return msStatus; }
+ void setMacroEnter(const OUString & rMacroEnter) { msMacroEnter = rMacroEnter; }
+ const OUString & getMacroEnter() const { return msMacroEnter; }
+ void setMacroExit(const OUString & rMacroExit) { msMacroExit = rMacroExit; }
+ const OUString & getMacroExit() const { return msMacroExit; }
- void addListboxEntry(const ::rtl::OUString & rEntry);
+ void addListboxEntry(const OUString & rEntry);
void Write(SvStream * pDataStrm);
};
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx
index 0f6705911faa..b791df619734 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -64,10 +64,10 @@ namespace ww8
return nResult;
}
- ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset,
+ OUString WW8Struct::getUString(sal_uInt32 nOffset,
sal_uInt32 nCount)
{
- ::rtl::OUString aResult;
+ OUString aResult;
if (nCount > 0)
{
@@ -79,10 +79,10 @@ namespace ww8
if (nCount > nAvailable)
nCount = nAvailable;
#if defined OSL_LITENDIAN
- aResult = rtl::OUString(reinterpret_cast<const sal_Unicode *>(
+ aResult = OUString(reinterpret_cast<const sal_Unicode *>(
mp_data.get() + nStartOff), nCount);
#else
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
for (sal_uInt32 i = 0; i < nCount; ++i)
aBuf.append(static_cast<sal_Unicode>(getU16(nStartOff+i*2)));
aResult = aBuf.makeStringAndClear();
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 5cc79a5d7bca..b7187546d0fa 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -48,12 +48,12 @@ class WW8Struct : public ::sw::ExternalData
sal_uInt32 getU32(sal_uInt32 nOffset)
{ return getU16(nOffset) + (getU16(nOffset + 1) << 16); }
- ::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
+ OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
- ::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount);
+ OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount);
};
-typedef ::std::vector<rtl::OUString> StringVector_t;
+typedef ::std::vector<OUString> StringVector_t;
template <class T>
class WW8Sttb : public WW8Struct
{
@@ -68,7 +68,7 @@ typedef ::std::vector<rtl::OUString> StringVector_t;
virtual ~WW8Sttb();
sal_uInt32 getCount() const;
- ::rtl::OUString getEntry(sal_uInt32 nEntry) const
+ OUString getEntry(sal_uInt32 nEntry) const
{
return m_Strings[nEntry];
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1216829af07e..5f5934f156ca 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -120,7 +120,7 @@ using namespace ::com::sun::star;
class FFDataWriterHelper
{
::sax_fastparser::FSHelperPtr m_pSerializer;
- void writeCommonStart( const rtl::OUString& rName )
+ void writeCommonStart( const OUString& rName )
{
m_pSerializer->startElementNS( XML_w, XML_ffData, FSEND );
m_pSerializer->singleElementNS( XML_w, XML_name,
@@ -137,7 +137,7 @@ class FFDataWriterHelper
}
public:
FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr pSerializer ) : m_pSerializer( pSerializer ){}
- void WriteFormCheckbox( const rtl::OUString& rName, const rtl::OUString& rDefault, bool bChecked )
+ void WriteFormCheckbox( const OUString& rName, const OUString& rDefault, bool bChecked )
{
writeCommonStart( rName );
// Checkbox specific bits
@@ -150,14 +150,14 @@ public:
{
m_pSerializer->singleElementNS( XML_w, XML_default,
FSNS( XML_w, XML_val ),
- rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
+ OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
}
if ( bChecked )
m_pSerializer->singleElementNS( XML_w, XML_checked, FSEND );
m_pSerializer->endElementNS( XML_w, XML_checkBox );
writeFinish();
}
- void WriteFormText( const rtl::OUString& rName, const rtl::OUString& rDefault )
+ void WriteFormText( const OUString& rName, const OUString& rDefault )
{
writeCommonStart( rName );
if ( !rDefault.isEmpty() )
@@ -165,7 +165,7 @@ public:
m_pSerializer->startElementNS( XML_w, XML_textInput, FSEND );
m_pSerializer->singleElementNS( XML_w, XML_default,
FSNS( XML_w, XML_val ),
- rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
+ OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
m_pSerializer->endElementNS( XML_w, XML_textInput );
}
writeFinish();
@@ -177,9 +177,9 @@ class FieldMarkParamsHelper
const sw::mark::IFieldmark& mrFieldmark;
public:
FieldMarkParamsHelper( const sw::mark::IFieldmark& rFieldmark ) : mrFieldmark( rFieldmark ) {}
- rtl::OUString getName() { return mrFieldmark.GetName(); }
+ OUString getName() { return mrFieldmark.GetName(); }
template < typename T >
- bool extractParam( const rtl::OUString& rKey, T& rResult )
+ bool extractParam( const OUString& rKey, T& rResult )
{
bool bResult = false;
if ( mrFieldmark.GetParameters() )
@@ -706,8 +706,8 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos )
const ::sw::mark::IFieldmark& rFieldmark = *rInfos.pFieldmark;
if ( rInfos.eType == ww::eFORMDROPDOWN )
{
- uno::Sequence< ::rtl::OUString> vListEntries;
- rtl::OUString sName, sHelp, sToolTip, sSelected;
+ uno::Sequence< OUString> vListEntries;
+ OUString sName, sHelp, sToolTip, sSelected;
FieldMarkParamsHelper params( rFieldmark );
params.extractParam( ODF_FORMDROPDOWN_LISTENTRY, vListEntries );
@@ -724,7 +724,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos )
}
else if ( rInfos.eType == ww::eFORMCHECKBOX )
{
- rtl::OUString sName;
+ OUString sName;
bool bChecked = false;
FieldMarkParamsHelper params( rFieldmark );
@@ -735,13 +735,13 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos )
bChecked = true;
FFDataWriterHelper ffdataOut( m_pSerializer );
- ffdataOut.WriteFormCheckbox( sName, rtl::OUString(), bChecked );
+ ffdataOut.WriteFormCheckbox( sName, OUString(), bChecked );
}
else if ( rInfos.eType == ww::eFORMTEXT )
{
FieldMarkParamsHelper params( rFieldmark );
FFDataWriterHelper ffdataOut( m_pSerializer );
- ffdataOut.WriteFormText( params.getName(), rtl::OUString() );
+ ffdataOut.WriteFormText( params.getName(), OUString() );
}
}
@@ -767,7 +767,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun )
if ( rInfos.pField )
{
const SwDropDownField& rFld2 = *(SwDropDownField*)rInfos.pField;
- uno::Sequence<rtl::OUString> aItems =
+ uno::Sequence<OUString> aItems =
rFld2.GetItemSequence();
GetExport().DoComboBox(rFld2.GetName(),
rFld2.GetHelp(),
@@ -836,7 +836,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos )
// Replace tabs by </instrText><tab/><instrText>
if ( i < ( nNbToken - 1 ) )
- RunText( rtl::OUString( "\t" ) );
+ RunText( OUString( "\t" ) );
}
m_pSerializer->endElementNS( XML_w, XML_r );
@@ -1285,7 +1285,7 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
{
OUString osUrl( sUrl );
- OString sId = rtl::OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(),
+ OString sId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
osUrl, true ), RTL_TEXTENCODING_UTF8 );
@@ -3671,7 +3671,7 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
{
m_pSerializer->singleElementNS( XML_w, XML_w,
- FSNS( XML_w, XML_val ), rtl::OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND );
+ FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND );
}
void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
@@ -3774,9 +3774,9 @@ void DocxAttributeOutput::WritePostitFields()
OString idstr = OString::valueOf( sal_Int32( i ));
const SwPostItField* f = m_postitFields[ i ];
m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( XML_w, XML_id ), idstr.getStr(),
- FSNS( XML_w, XML_author ), rtl::OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(),
+ FSNS( XML_w, XML_author ), OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(),
FSNS( XML_w, XML_date ), msfilter::util::DateTimeToOString(f->GetDateTime()).getStr(),
- FSNS( XML_w, XML_initials ), rtl::OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
+ FSNS( XML_w, XML_initials ), OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
// Check for the text object existing, it seems that it can be NULL when saving a newly created
// comment without giving focus back to the main document. As GetTxt() is empty in that case as well,
// that is probably a bug in the Writer core.
@@ -3934,7 +3934,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
{
// autonumbered
m_pSerializer->singleElementNS( XML_w, nToken,
- FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(),
+ FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(),
FSEND );
}
else
@@ -3942,7 +3942,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference()
// not autonumbered
m_pSerializer->singleElementNS( XML_w, nToken,
FSNS( XML_w, XML_customMarkFollows ), "1",
- FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(),
+ FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(),
FSEND );
RunText( pFootnote->GetNumStr() );
@@ -4050,7 +4050,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
fs->singleElementNS( XML_w, XML_numFmt, FSNS( XML_w, XML_val ), fmt, FSEND );
if( info.nFtnOffset != 0 )
fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ),
- rtl::OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND );
+ OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND );
if( listtag != 0 ) // we are writing to settings.xml, write also special footnote/endnote list
{ // there are currently only two hardcoded ones ( see FootnotesEndnotes())
fs->singleElementNS( XML_w, listtag, FSNS( XML_w, XML_id ), "0", FSEND );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 7c33d0764aae..050980eefc8b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -273,7 +273,7 @@ public:
void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode );
void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark );
- void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds );
+ void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds );
private:
/// Initialize the structures where we are going to collect some of the paragraph properties.
@@ -589,8 +589,8 @@ private:
sal_Int32 m_nNextMarkId;
/// Bookmarks to output
- std::vector<rtl::OString> m_rMarksStart;
- std::vector<rtl::OString> m_rMarksEnd;
+ std::vector<OString> m_rMarksStart;
+ std::vector<OString> m_rMarksEnd;
/// Is there a postit start to output?
bool m_bPostitStart;
@@ -598,7 +598,7 @@ private:
bool m_bPostitEnd;
/// Maps of the bookmarks ids
- std::map<rtl::OString, sal_uInt16> m_rOpenedMarksIds;
+ std::map<OString, sal_uInt16> m_rOpenedMarksIds;
/// The current table helper
SwWriteTable *m_pTableWrt;
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index e7bec6f95d61..b25b1eb86340 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -160,12 +160,12 @@ void DocxExport::ExportGrfBullet(const SwTxtNode&)
CollectGrfsOfBullets();
}
-::rtl::OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget )
+OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget )
{
OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
rType, rTarget, true );
- return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
+ return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
@@ -240,11 +240,11 @@ void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*
#endif
}
-void DocxExport::DoComboBox(const rtl::OUString& rName,
- const rtl::OUString& rHelp,
- const rtl::OUString& rToolTip,
- const rtl::OUString& rSelected,
- uno::Sequence<rtl::OUString>& rListItems)
+void DocxExport::DoComboBox(const OUString& rName,
+ const OUString& rHelp,
+ const OUString& rToolTip,
+ const OUString& rSelected,
+ uno::Sequence<OUString>& rListItems)
{
m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND );
@@ -278,7 +278,7 @@ void DocxExport::DoComboBox(const rtl::OUString& rName,
}
m_pDocumentFS->singleElementNS( XML_w, XML_result,
- FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ),
+ FSNS( XML_w, XML_val ), OString::valueOf( nId ).getStr( ),
FSEND );
// Loop over the entries
@@ -300,7 +300,7 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/)
OSL_TRACE( "TODO DocxExport::ForFormText()" );
}
-rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount )
+OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount )
{
OUString aFileName = "charts/chart" + OUString::valueOf(nCount) + ".xml";
OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(),
@@ -314,7 +314,7 @@ rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, s
oox::drawingml::ChartExport aChartExport( XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX );
aChartExport.ExportContent();
- return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
+ return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
void DocxExport::ExportDocument_Impl()
@@ -634,7 +634,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
// and write the reference
m_pDocumentFS->singleElementNS( XML_w, nReference,
FSNS( XML_w, XML_type ), pType,
- FSNS( XML_r, XML_id ), rtl::OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
+ FSNS( XML_r, XML_id ), OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
}
@@ -700,7 +700,7 @@ void DocxExport::WriteSettings()
FSEND );
// Zoom
- rtl::OString aZoom(rtl::OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom())));
+ OString aZoom(OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom())));
pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), aZoom.getStr(), FSEND);
if( pDoc->get( IDocumentSettingAccess::EMBED_FONTS ))
pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND );
@@ -708,7 +708,7 @@ void DocxExport::WriteSettings()
pFS->singleElementNS( XML_w, XML_embedSystemFonts, FSEND );
if( settings.defaultTabStop != 0 )
pFS->singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val ),
- rtl::OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND );
+ OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND );
if( settings.evenAndOddHeaders )
pFS->singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND );
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index ac5637d09469..d8790f8ba420 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -106,12 +106,12 @@ public:
virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen );
- virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false );
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
virtual void ExportGrfBullet(const SwTxtNode&);
/// Returns the relationd id
- rtl::OString AddRelation( const rtl::OUString& rType, const rtl::OUString& rTarget );
+ OString AddRelation( const OUString& rType, const OUString& rTarget );
virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ }
virtual void WriteChar( sal_Unicode ) { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
@@ -131,18 +131,18 @@ public:
virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
- virtual void DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
- const rtl::OUString &ToolTip,
- const rtl::OUString &rSelected,
- com::sun::star::uno::Sequence<rtl::OUString> &rListItems);
+ virtual void DoComboBox(const OUString &rName,
+ const OUString &rHelp,
+ const OUString &ToolTip,
+ const OUString &rSelected,
+ com::sun::star::uno::Sequence<OUString> &rListItems);
virtual void DoFormText(const SwInputField * pFld);
virtual sal_uLong ReplaceCr( sal_uInt8 nChar );
/// Returns the relationd id
- rtl::OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount );
+ OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount );
void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp);
@@ -165,7 +165,7 @@ protected:
/// Output SwOLENode
virtual void OutputOLENode( const SwOLENode& );
- virtual void OutputLinkedOLE( const rtl::OUString& );
+ virtual void OutputLinkedOLE( const OUString& );
virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 7f92fc6ff894..c18ea97a33eb 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -47,7 +47,7 @@ public:
private:
/// Implementatio of the filter abstract method.
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const
{
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index dad80d0ab2c5..189e4b17ed72 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -65,7 +65,7 @@ namespace ww
}
#if OSL_DEBUG_LEVEL > 1
bool bBroken=false;
- rtl::OUString sError;
+ OUString sError;
pIter = pWwSprmTab;
const C *pBeforeEnd = pWwSprmTab + nNoElems - 1;
while (pIter < pBeforeEnd)
@@ -88,11 +88,11 @@ namespace ww
reinterpret_cast<const sal_uInt8 *>(&(*pIter));
for (size_t i=0; i < nSize; ++i)
{
- sError += rtl::OUString::valueOf(
+ sError += OUString::valueOf(
static_cast<sal_Int32>(pHack[i]), 16);
- sError += rtl::OUString::valueOf(sal_Unicode(' '));
+ sError += OUString::valueOf(sal_Unicode(' '));
}
- sError += rtl::OUString::valueOf(sal_Unicode('\n'));
+ sError += OUString::valueOf(sal_Unicode('\n'));
while (*pIter == *(pIter+1) && pIter < pBeforeEnd)
++pIter;
}
@@ -101,7 +101,7 @@ namespace ww
}
if (bBroken)
{
- OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
#endif
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9636254b19a3..ce0c1e0f65cd 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1435,7 +1435,7 @@ void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eTyp
m_aRunText->append("}}");
}
-void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds )
+void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds )
{
for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it != end; ++it )
{
@@ -3273,7 +3273,7 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S
static void lcl_AppendSP( OStringBuffer& rBuffer,
const char cName[],
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
const RtfExport& rExport )
{
rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{"
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index fb40139341f4..5038f32787d2 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -73,8 +73,8 @@ public:
virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
// Access to (anyway) private buffers, used by the sdr exporter
- rtl::OStringBuffer& RunText();
- rtl::OStringBuffer& Styles();
+ OStringBuffer& RunText();
+ OStringBuffer& Styles();
/// Output text (without markup).
virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
@@ -206,7 +206,7 @@ public:
const SvxBrushItem* pBrush = 0);//For i120928,to export graphic of bullet
void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode );
- void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds );
+ void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds );
void WriteHeaderFooter_Impl( const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg );
protected:
@@ -456,20 +456,20 @@ private:
/*
* This is written after runs.
*/
- rtl::OStringBuffer m_aAfterRuns;
+ OStringBuffer m_aAfterRuns;
/*
* Same for colors and stylesheets: first we just want to output colors,
* need to buffer the stylesheet table to output it after the color one.
*/
- rtl::OStringBuffer m_aStylesheet;
+ OStringBuffer m_aStylesheet;
/*
* This one just holds the style commands in the current style.
*/
- rtl::OStringBuffer m_aStyles;
+ OStringBuffer m_aStyles;
/*
* This is the same as m_aStyles but the conents of it is written last.
*/
- rtl::OStringBuffer m_aStylesEnd;
+ OStringBuffer m_aStylesEnd;
/*
* We just get a "end of strike" mark at the end of strike, store here what to finish: single or double strike.
@@ -499,7 +499,7 @@ private:
/*
* For late output of row definitions.
*/
- rtl::OStringBuffer m_aRowDefs;
+ OStringBuffer m_aRowDefs;
/*
* Is a column break needed after the next \par?
@@ -510,14 +510,14 @@ private:
* If section breaks should be buffered to m_aSectionBreaks
*/
bool m_bBufferSectionBreaks;
- rtl::OStringBuffer m_aSectionBreaks;
+ OStringBuffer m_aSectionBreaks;
/*
* If section headers (and footers) should be buffered to
* m_aSectionHeaders.
*/
bool m_bBufferSectionHeaders;
- rtl::OStringBuffer m_aSectionHeaders;
+ OStringBuffer m_aSectionHeaders;
/*
* Support for starting multiple tables at the same cell.
@@ -528,7 +528,7 @@ private:
* List of already started but not yet defined tables (need to be defined
* after the nested tables).
*/
- std::vector< rtl::OString > m_aTables;
+ std::vector< OString > m_aTables;
/*
* If cell info is already output.
*/
@@ -560,7 +560,7 @@ public:
/// Return the right export class.
virtual MSWordExportBase& GetExport();
- rtl::OStringBuffer m_aTabStop;
+ OStringBuffer m_aTabStop;
/// Access to the page style of the previous paragraph.
const SwPageDesc* m_pPrevPageDesc;
@@ -585,7 +585,7 @@ public:
void FontPitchType( FontPitch ePitch ) const;
/// Writes binary data as a hex dump.
- static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64);
+ static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64);
};
#endif // _RTFATTRIBUTEOUTPUT_HXX_
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 3f413a5293a2..cb769c77ec04 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -317,11 +317,11 @@ void RtfExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/
SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
-void RtfExport::DoComboBox(const rtl::OUString& /*rName*/,
- const rtl::OUString& /*rHelp*/,
- const rtl::OUString& /*rToolTip*/,
- const rtl::OUString& /*rSelected*/,
- uno::Sequence<rtl::OUString>& /*rListItems*/)
+void RtfExport::DoComboBox(const OUString& /*rName*/,
+ const OUString& /*rHelp*/,
+ const OUString& /*rToolTip*/,
+ const OUString& /*rSelected*/,
+ uno::Sequence<OUString>& /*rListItems*/)
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
@@ -332,10 +332,10 @@ void RtfExport::DoFormText(const SwInputField* pFld )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
- ::rtl::OUString sResult = pFld->ExpandField(true);
- ::rtl::OUString sHelp( pFld->GetHelp() );
- ::rtl::OUString sName = pFld->GetPar2();
- ::rtl::OUString sStatus = pFld->GetToolTip();
+ OUString sResult = pFld->ExpandField(true);
+ OUString sHelp( pFld->GetHelp() );
+ OUString sName = pFld->GetPar2();
+ OUString sStatus = pFld->GetToolTip();
m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }");
m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0" );
if( !sHelp.isEmpty() )
@@ -739,7 +739,7 @@ void RtfExport::OutputOLENode( const SwOLENode& )
/* noop, see RtfAttributeOutput::FlyFrameOLE */
}
-void RtfExport::OutputLinkedOLE( const rtl::OUString& )
+void RtfExport::OutputLinkedOLE( const OUString& )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index e071e5c621f2..4f4f24e78e41 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -26,7 +26,7 @@ class RtfAttributeOutput;
class RtfExportFilter;
class RtfSdrExport;
typedef std::map<sal_uInt16,Color> RtfColorTbl;
-typedef std::map<sal_uInt16,rtl::OString> RtfStyleTbl;
+typedef std::map<sal_uInt16,OString> RtfStyleTbl;
typedef std::map<String,sal_uInt16> RtfRedlineTbl;
class SwNode;
class SwTxtNode;
@@ -71,7 +71,7 @@ public:
virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen );
- virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false );
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
//For i120928,add an interface to export graphic of bullet
virtual void ExportGrfBullet(const SwTxtNode& rNd);
@@ -97,11 +97,11 @@ public:
virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
- virtual void DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
- const rtl::OUString &ToolTip,
- const rtl::OUString &rSelected,
- com::sun::star::uno::Sequence<rtl::OUString> &rListItems);
+ virtual void DoComboBox(const OUString &rName,
+ const OUString &rHelp,
+ const OUString &ToolTip,
+ const OUString &rSelected,
+ com::sun::star::uno::Sequence<OUString> &rListItems);
virtual void DoFormText(const SwInputField * pFld);
@@ -131,7 +131,7 @@ protected:
/// Output SwOLENode
virtual void OutputOLENode( const SwOLENode& );
- virtual void OutputLinkedOLE(const rtl::OUString&);
+ virtual void OutputLinkedOLE(const OUString&);
virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
@@ -169,8 +169,8 @@ public:
sal_uInt16 GetRedline( const String& rAuthor );
const String* GetRedline( sal_uInt16 nId );
- void InsStyle( sal_uInt16 nId, const rtl::OString& rStyle );
- rtl::OString* GetStyle( sal_uInt16 nId );
+ void InsStyle( sal_uInt16 nId, const OString& rStyle );
+ OString* GetStyle( sal_uInt16 nId );
private:
/// No copying.
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index db8b2df2e7a1..212adb2a6a43 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -61,8 +61,8 @@ public:
RtfWriter m_aWriter;
};
-::rtl::OUString RtfExport_getImplementationName();
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL RtfExport_getSupportedServiceNames()
+OUString RtfExport_getImplementationName();
+::com::sun::star::uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames()
throw();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL RtfExport_createInstance(
const ::com::sun::star::uno::Reference<
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index b21f671c7f2a..bb1d1a02c7e1 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -411,7 +411,7 @@ void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom());
}
-void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle )
+void RtfSdrExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle )
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
@@ -426,7 +426,7 @@ void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Re
extern const char* pShapeTypes[];
-static void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue)
+static void lcl_AppendSP( OStringBuffer& rRunText, const char cName[], const OString& rValue)
{
rRunText.append('{').append(OOO_STRING_SVTOOLS_RTF_SP)
.append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append(cName).append('}')
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index edf5a7d92e38..2e8d2dd52fe7 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -45,9 +45,9 @@ class RtfSdrExport : public EscherEx
sal_uInt32 m_nShapeFlags;
/// Remember style, the most important shape attribute ;-)
- rtl::OStringBuffer *m_pShapeStyle;
+ OStringBuffer *m_pShapeStyle;
- std::map<rtl::OString,rtl::OString> m_aShapeProps;
+ std::map<OString,OString> m_aShapeProps;
/// Remember which shape types we had already written.
bool *m_pShapeTypeWritten;
@@ -91,7 +91,7 @@ private:
void AddLineDimensions( const Rectangle& rRectangle );
/// Add position and size to the OStringBuffer.
- void AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle );
+ void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle );
void WriteOutliner(const OutlinerParaObject& rParaObj);
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx
index 13546db0d40a..91d3c6170466 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -50,7 +50,7 @@ void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutp
pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode);
}
-rtl::OString RtfStringBufferValue::makeStringAndClear()
+OString RtfStringBufferValue::makeStringAndClear()
{
return m_aBuffer.makeStringAndClear();
}
@@ -80,23 +80,23 @@ void RtfStringBuffer::makeStringAndClear(RtfAttributeOutput* pAttributeOutput)
i->makeStringAndClear(pAttributeOutput);
}
-rtl::OString RtfStringBuffer::makeStringAndClear()
+OString RtfStringBuffer::makeStringAndClear()
{
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
for (RtfStringBuffer::Values_t::iterator i = m_aValues.begin(); i != m_aValues.end(); ++i)
if (!i->isGraphic())
aBuf.append(i->makeStringAndClear());
return aBuf.makeStringAndClear();
}
-rtl::OStringBuffer& RtfStringBuffer::getLastBuffer()
+OStringBuffer& RtfStringBuffer::getLastBuffer()
{
if (m_aValues.empty() || m_aValues.back().isGraphic())
m_aValues.push_back(RtfStringBufferValue());
return m_aValues.back().m_aBuffer;
}
-rtl::OStringBuffer* RtfStringBuffer::operator->()
+OStringBuffer* RtfStringBuffer::operator->()
{
return &getLastBuffer();
}
diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx
index a6a8a8a35737..b0fc2a152f09 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.hxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.hxx
@@ -46,10 +46,10 @@ public:
/// This version handles graphics.
void makeStringAndClear(RtfAttributeOutput* pAttributeOutput);
/// This one doesn't.
- rtl::OString makeStringAndClear();
+ OString makeStringAndClear();
bool isGraphic() const;
- rtl::OStringBuffer m_aBuffer;
+ OStringBuffer m_aBuffer;
const SwFlyFrmFmt* m_pFlyFrmFmt;
const SwGrfNode* m_pGrfNode;
};
@@ -64,10 +64,10 @@ public:
/// Writes the contents of the buffer directly to the supplied stream.
void makeStringAndClear(RtfAttributeOutput* pAttributeOutput);
/// Returns the bufferent strings as a string (ignores graphic elements!)
- rtl::OString makeStringAndClear();
+ OString makeStringAndClear();
/// Access to the last buffer.
- rtl::OStringBuffer& getLastBuffer();
- rtl::OStringBuffer* operator->();
+ OStringBuffer& getLastBuffer();
+ OStringBuffer* operator->();
/// Similar to ->setLength(0), but for all buffers.
void clear();
/// Same as ->append(), but for graphics and without expanding contents to save memory.
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index f57cb6c17397..9a596edac533 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -62,7 +62,7 @@ namespace ww
std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems);
#if OSL_DEBUG_LEVEL > 1
bool bBroken=false;
- rtl::OUString sError;
+ OUString sError;
const C *pIter = mpWwSprmTab;
const C *pBeforeEnd = mpWwSprmTab + mnNoElems - 1;
while (pIter < pBeforeEnd)
@@ -85,11 +85,11 @@ namespace ww
reinterpret_cast<const sal_uInt8 *>(&(*pIter));
for (size_t i=0; i < nSize; ++i)
{
- sError += rtl::OUString::valueOf(
+ sError += OUString::valueOf(
static_cast<sal_Int32>(pHack[i]), 16);
- sError += rtl::OUString::valueOf(sal_Unicode(' '));
+ sError += OUString::valueOf(sal_Unicode(' '));
}
- sError += rtl::OUString::valueOf(sal_Unicode('\n'));
+ sError += OUString::valueOf(sal_Unicode('\n'));
while (*pIter == *(pIter+1) && pIter < pBeforeEnd)
++pIter;
}
@@ -98,7 +98,7 @@ namespace ww
}
if (bBroken)
{
- OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
#endif
}
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 5c9e6ec42b1a..d903255a557c 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -295,7 +295,7 @@ namespace sw
rObj.AbandonObject();
}
- bool DrawingOLEAdaptor::TransferToDoc( rtl::OUString &rName )
+ bool DrawingOLEAdaptor::TransferToDoc( OUString &rName )
{
OSL_ENSURE(mxIPRef.is(), "Transferring invalid object to doc");
if (!mxIPRef.is())
@@ -312,7 +312,7 @@ namespace sw
::svt::EmbeddedObjectRef::SetGraphicToContainer( *mpGraphic,
mrPers.GetEmbeddedObjectContainer(),
rName,
- rtl::OUString() );
+ OUString() );
mxIPRef = 0;
}
@@ -473,7 +473,7 @@ namespace sw
return aStyles;
}
- SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName)
+ SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName)
{
// Search first in the Doc-Styles
SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName(rName);
@@ -488,7 +488,7 @@ namespace sw
return pColl;
}
- SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName)
+ SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName)
{
SwCharFmt *pFmt = rDoc.FindCharFmtByName(rName);
if (!pFmt)
@@ -661,10 +661,10 @@ namespace sw
}
}
- bool IsStarSymbol(const rtl::OUString &rFontName)
+ bool IsStarSymbol(const OUString &rFontName)
{
sal_Int32 nIndex = 0;
- rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
+ OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") ||
sFamilyNm.equalsIgnoreAsciiCase("opensymbol"));
}
@@ -785,10 +785,10 @@ namespace sw
std::for_each(maStack.begin(), maStack.end(), SetInDocAndDelete(mrDoc));
}
- sal_uInt16 WrtRedlineAuthor::AddName( const rtl::OUString& rNm )
+ sal_uInt16 WrtRedlineAuthor::AddName( const OUString& rNm )
{
sal_uInt16 nRet;
- typedef std::vector<rtl::OUString>::iterator myiter;
+ typedef std::vector<OUString>::iterator myiter;
myiter aIter = std::find(maAuthors.begin(), maAuthors.end(), rNm);
if (aIter != maAuthors.end())
nRet = static_cast< sal_uInt16 >(aIter - maAuthors.begin());
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 4768a3efde7e..059299b66f3f 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -530,7 +530,7 @@ namespace sw
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
*/
- SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName);
+ SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName);
/** Get a Character Style which fits a given name
@@ -548,7 +548,7 @@ namespace sw
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
*/
- SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName);
+ SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName);
/** Sort sequence of Paragraph Styles by assigned outline style list level
@@ -757,7 +757,7 @@ namespace sw
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
*/
- bool IsStarSymbol(const rtl::OUString &rFontName);
+ bool IsStarSymbol(const OUString &rFontName);
/** Make setting a drawing object's layer in a Writer document easy
@@ -889,7 +889,7 @@ namespace sw
class DrawingOLEAdaptor
{
private:
- rtl::OUString msOrigPersistName;
+ OUString msOrigPersistName;
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef;
SfxObjectShell& mrPers;
const Graphic* mpGraphic;
@@ -923,7 +923,7 @@ namespace sw
@return On success true is returned, otherwise false. On
success rName is then suitable for user with SwDoc::InsertOLE
*/
- bool TransferToDoc(rtl::OUString &rName);
+ bool TransferToDoc(OUString &rName);
private:
/// No assigning allowed
DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&);
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 93d892ccf34e..bcb1253490bf 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -758,10 +758,10 @@ namespace sw
// Force to NatNum when finding one of 'oOA'
String sOldParams( rParams );
- rParams.SearchAndReplaceAll( rtl::OUString( "o" ),
- rtl::OUString( "m" ) );
- rParams.SearchAndReplaceAll( rtl::OUString( "O" ),
- rtl::OUString( "M" ) );
+ rParams.SearchAndReplaceAll( OUString( "o" ),
+ OUString( "m" ) );
+ rParams.SearchAndReplaceAll( OUString( "O" ),
+ OUString( "M" ) );
bool bForceNatNum = !sOldParams.Equals( rParams );
if (LANGUAGE_FRENCH != nDocLang)
{
@@ -811,7 +811,7 @@ namespace sw
// But not if it's a '/' inside AM/PM
if (!(IsPreviousAM(rParams, nI) && IsNextPM(rParams, nI)))
{
- rParams.Replace(nI, 1, rtl::OUString("\\/"));
+ rParams.Replace(nI, 1, OUString("\\/"));
}
nI++;
nLen++;
@@ -942,10 +942,10 @@ namespace sw
rLang = LANGUAGE_JAPANESE;
if (bForceNatNum)
- rParams.Insert(rtl::OUString("[NatNum1][$-411]"),0);
+ rParams.Insert(OUString("[NatNum1][$-411]"),0);
if (bHijri)
- rParams.Insert(rtl::OUString("[~hijri]"), 0);
+ rParams.Insert(OUString("[~hijri]"), 0);
OUString sTemp(rParams);
pFormatter->PutEntry(sTemp, nCheckPos, nType, nKey, rLang);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index a39f12ff86a1..f0c655d05f0e 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -181,34 +181,34 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
{
- rtl::OUString sSelected;
- uno::Sequence<rtl::OUString> aListItems;
+ OUString sSelected;
+ uno::Sequence<OUString> aListItems;
xPropSet->getPropertyValue("StringItemList") >>= aListItems;
sal_Int32 nNoStrings = aListItems.getLength();
if (nNoStrings)
{
uno::Any aTmp = xPropSet->getPropertyValue("DefaultText");
- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
+ const OUString *pStr = (const OUString *)aTmp.getValue();
if (pStr)
sSelected = *pStr;
}
- rtl::OUString sName;
+ OUString sName;
{
uno::Any aTmp = xPropSet->getPropertyValue("Name");
- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
+ const OUString *pStr = (const OUString *)aTmp.getValue();
if (pStr)
sName = *pStr;
}
- rtl::OUString sHelp;
+ OUString sHelp;
{
// property "Help" does not exist and due to the no-existence an exception is thrown.
try
{
uno::Any aTmp = xPropSet->getPropertyValue("HelpText");
- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
+ const OUString *pStr = (const OUString *)aTmp.getValue();
if (pStr)
sHelp = *pStr;
}
@@ -216,10 +216,10 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
{}
}
- rtl::OUString sToolTip;
+ OUString sToolTip;
{
uno::Any aTmp = xPropSet->getPropertyValue("Name");
- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue();
+ const OUString *pStr = (const OUString *)aTmp.getValue();
if (pStr)
sToolTip = *pStr;
}
@@ -227,11 +227,11 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
DoComboBox(sName, sHelp, sToolTip, sSelected, aListItems);
}
-void WW8Export::DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
- const rtl::OUString &rToolTip,
- const rtl::OUString &rSelected,
- uno::Sequence<rtl::OUString> &rListItems)
+void WW8Export::DoComboBox(const OUString &rName,
+ const OUString &rHelp,
+ const OUString &rToolTip,
+ const OUString &rSelected,
+ uno::Sequence<OUString> &rListItems)
{
OSL_ENSURE(bWrtWW8, "Not allowed");
if (!bWrtWW8)
@@ -315,21 +315,21 @@ void WW8Export::DoCheckBox(uno::Reference<beans::XPropertySet> xPropSet)
xPropSet->getPropertyValue("State") >>= nTemp;
aFFData.setResult(nTemp);
- ::rtl::OUString aStr;
- static ::rtl::OUString sName("Name");
+ OUString aStr;
+ static OUString sName("Name");
if (xPropSetInfo->hasPropertyByName(sName))
{
xPropSet->getPropertyValue(sName) >>= aStr;
aFFData.setName(aStr);
}
- static ::rtl::OUString sHelpText("HelpText");
+ static OUString sHelpText("HelpText");
if (xPropSetInfo->hasPropertyByName(sHelpText))
{
xPropSet->getPropertyValue(sHelpText) >>= aStr;
aFFData.setHelp(aStr);
}
- static ::rtl::OUString sHelpF1Text("HelpF1Text");
+ static OUString sHelpF1Text("HelpF1Text");
if (xPropSetInfo->hasPropertyByName(sHelpF1Text))
{
xPropSet->getPropertyValue(sHelpF1Text) >>= aStr;
@@ -1422,7 +1422,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
Graphic aGraphic(pGrfNd->GetGrf());
GraphicObject aGraphicObject( aGraphic );
- rtl::OString aUniqueId = aGraphicObject.GetUniqueID();
+ OString aUniqueId = aGraphicObject.GetUniqueID();
if (!aUniqueId.isEmpty())
{
@@ -1631,7 +1631,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush,
sal_uInt32 nOpaque = 0;
if (const GraphicObject *pGraphicObject = rBrush.GetGraphicObject())
{
- rtl::OString aUniqueId = pGraphicObject->GetUniqueID();
+ OString aUniqueId = pGraphicObject->GetUniqueID();
if (!aUniqueId.isEmpty())
{
const Graphic &rGraphic = pGraphicObject->GetGraphic();
@@ -2731,7 +2731,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt,
AddShape(ESCHER_ShpInst_PictureFrame, nShapeFlags, nShapeId);
GraphicObject aGraphicObject(rGraphic);
- rtl::OString aId = aGraphicObject.GetUniqueID();
+ OString aId = aGraphicObject.GetUniqueID();
if (!aId.isEmpty())
{
Rectangle aRect = rObj.GetLogicRect();
@@ -2882,11 +2882,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
//Open the ObjectPool
SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
- rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
+ OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL);
//Create a destination storage for the microsoft control
- rtl::OUStringBuffer sStorageName;
+ OUStringBuffer sStorageName;
sal_uInt32 nObjId = GenerateObjectID();
sStorageName.append('_').append( static_cast<sal_Int64>( nObjId ));
SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(),
@@ -2896,7 +2896,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
return false;
- rtl::OUString sUName;
+ OUString sUName;
if (!WriteOCXStream( mxModel, xOleStg,xControlModel,aSize,sUName))
return false;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d04de434c5bf..eeaab4845dca 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -110,17 +110,17 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
if ( !pFieldmark) {
return String();
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) {
- return rtl::OUString(" FORMTEXT ");
+ return OUString(" FORMTEXT ");
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) {
- return rtl::OUString(" FORMDROPDOWN ");
+ return OUString(" FORMDROPDOWN ");
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) {
- return rtl::OUString(" FORMCHECKBOX ");
+ return OUString(" FORMCHECKBOX ");
} else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) {
- return rtl::OUString(" TOC ");
+ return OUString(" TOC ");
} else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) {
- return rtl::OUString(" HYPERLINK ");
+ return OUString(" HYPERLINK ");
} else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) {
- return rtl::OUString(" PAGEREF ");
+ return OUString(" PAGEREF ");
} else {
return pFieldmark->GetFieldname();
}
@@ -1845,7 +1845,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM );
if ( it != pFieldmark->GetParameters()->end() )
{
- rtl::OUString sFieldId;
+ OUString sFieldId;
it->second >>= sFieldId;
eFieldId = (ww::eField)sFieldId.toInt32();
}
@@ -1853,7 +1853,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
it = pFieldmark->GetParameters()->find( ODF_CODE_PARAM );
if ( it != pFieldmark->GetParameters()->end() )
{
- rtl::OUString sOUCode;
+ OUString sOUCode;
it->second >>= sOUCode;
sCode = sOUCode;
}
@@ -1878,7 +1878,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_OLE_PARAM );
if ( it != pFieldmark->GetParameters()->end() )
{
- rtl::OUString sOleId;
+ OUString sOleId;
uno::Any aValue = it->second;
aValue >>= sOleId;
if ( !sOleId.isEmpty() )
@@ -1899,7 +1899,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM );
if ( it != pFieldmark->GetParameters()->end() )
{
- rtl::OUString sFieldId;
+ OUString sFieldId;
it->second >>= sFieldId;
eFieldId = (ww::eField)sFieldId.toInt32();
}
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 628cb41c525b..eb1cf9d08249 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -45,7 +45,7 @@ using namespace sw::util;
sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 nLevel, sal_uInt16 nVal )
{
sal_uInt16 nNumId = USHRT_MAX;
- String sPrefix(rtl::OUString("WW8TempExport"));
+ String sPrefix(OUString("WW8TempExport"));
sPrefix += OUString::number( nUniqueList++ );
SwNumRule* pMyNumRule =
new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ),
@@ -637,7 +637,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
const Font& rFont = rFmt.GetBulletFont()
? *rFmt.GetBulletFont()
: numfunc::GetDefBulletFont();
- String sNumStr = rtl::OUString(rFmt.GetBulletChar());
+ String sNumStr = OUString(rFmt.GetBulletChar());
rtl_TextEncoding eChrSet = rFont.GetCharSet();
String sFontName = rFont.GetName();
@@ -673,7 +673,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
*rpCh = static_cast< sal_uInt8 >(cChar - 0xF000);
}
else
- *rpCh = rtl::OUStringToOString(rtl::OUString(cChar), eChrSet).toChar();
+ *rpCh = OUStringToOString(OUString(cChar), eChrSet).toChar();
}
rpCh++;
rCharLen--;
@@ -698,7 +698,7 @@ void MSWordExportBase::SubstituteBullet( String& rNumStr,
{
if (!bSubstituteBullets)
return;
- rtl::OUString sFontName = rFontName;
+ OUString sFontName = rFontName;
rNumStr.SetChar(0, msfilter::util::bestFitOpenSymbolToMSFont(rNumStr.GetChar(0),
rChrSet, sFontName, !SupportsUnicode()));
rFontName = sFontName;
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 3be4c6718100..f8493cfc9415 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -527,7 +527,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
String aName = pFmt->GetName();
if ( aName.EqualsAscii( "Default" ) )
- aName = rtl::OUString("Normal");
+ aName = OUString("Normal");
m_rExport.AttrOutput().StartStyle( aName, bFmtColl,
nBase, nWwNext, GetWWId( *pFmt ), nPos,
@@ -766,13 +766,13 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc)
{
mbWrtWW8 = bWrtWW8;
- GetId(wwFont(rtl::OUString("Times New Roman"), PITCH_VARIABLE,
+ GetId(wwFont(OUString("Times New Roman"), PITCH_VARIABLE,
FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8));
- GetId(wwFont(rtl::OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
+ GetId(wwFont(OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
RTL_TEXTENCODING_SYMBOL,bWrtWW8));
- GetId(wwFont(rtl::OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
+ GetId(wwFont(OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
RTL_TEXTENCODING_MS_1252,bWrtWW8));
const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT);
@@ -2049,7 +2049,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
// Additional paragraph containing a space to
// assure that by WW created RTF from written WW8
// does not crash WW.
- rWrt.WriteStringAsPara( rtl::OUString(" ") );
+ rWrt.WriteStringAsPara( OUString(" ") );
}
}
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 86e3f5757374..2cdc3cbd975c 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -212,8 +212,8 @@ public:
#define ANZ_DEFAULT_STYLES 16
// Names of the storage streams
-#define sMainStream rtl::OUString("WordDocument")
-#define sCompObj rtl::OUString("\1CompObj")
+#define sMainStream OUString("WordDocument")
+#define sCompObj OUString("\1CompObj")
static void WriteDop( WW8Export& rWrt )
{
@@ -339,7 +339,7 @@ const sal_Unicode *WW8DopTypography::GetJapanNotEndLevel1()
return &aJapanNotEndLevel1[0];
}
-static int lcl_CmpBeginEndChars( const rtl::OUString& rSWStr,
+static int lcl_CmpBeginEndChars( const OUString& rSWStr,
const sal_Unicode* pMSStr, int nMSStrByteLen )
{
nMSStrByteLen /= sizeof( sal_Unicode );
@@ -1275,7 +1275,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt )
std::sort(aBookmarks.begin(), aBookmarks.end());
// First write the Bookmark Name Stringtable
- std::vector<rtl::OUString> aNames;
+ std::vector<OUString> aNames;
aNames.reserve(aBookmarks.size());
for (BkmIter bIt = aBookmarks.begin(); bIt < aBookmarks.end(); ++bIt)
aNames.push_back(bIt->name);
@@ -1399,7 +1399,7 @@ void WW8Export::MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo)
pBkmks->MoveFieldMarks(nFrom, nTo);
}
-void WW8Export::AppendBookmark( const rtl::OUString& rName, bool bSkip )
+void WW8Export::AppendBookmark( const OUString& rName, bool bSkip )
{
sal_uLong nSttCP = Fc2Cp( Strm().Tell() ) + ( bSkip? 1: 0 );
pBkmks->Append( nSttCP, rName );
@@ -1544,14 +1544,14 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
if( !pRedlAuthors )
{
pRedlAuthors = new WW8_WrtRedlineAuthor;
- pRedlAuthors->AddName(rtl::OUString("Unknown"));
+ pRedlAuthors->AddName(OUString("Unknown"));
}
return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
}
//--------------------------------------------------------------------------
-void WW8Export::WriteAsStringTable(const std::vector<rtl::OUString>& rStrings,
+void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen)
{
sal_uInt16 n, nCount = static_cast< sal_uInt16 >(rStrings.size());
@@ -1579,7 +1579,7 @@ void WW8Export::WriteAsStringTable(const std::vector<rtl::OUString>& rStrings,
SwWW8Writer::WriteShort( rStrm, 0 );
for( n = 0; n < nCount; ++n )
{
- const rtl::OUString &rString = rStrings[n];
+ const OUString &rString = rStrings[n];
const String aNm(rString.copy(0, std::min<sal_Int32>(rString.getLength(), 255)));
rStrm << (sal_uInt8)aNm.Len();
SwWW8Writer::WriteString8(rStrm, aNm, false,
@@ -1640,7 +1640,7 @@ void SwWW8Writer::InsAsString16(ww::bytes &rO, const String& rStr)
void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr,
rtl_TextEncoding eCodeSet)
{
- rtl::OString sTmp(rtl::OUStringToOString(rStr, eCodeSet));
+ OString sTmp(OUStringToOString(rStr, eCodeSet));
const sal_Char *pStart = sTmp.getStr();
const sal_Char *pEnd = pStart + sTmp.getLength();
rO.reserve(rO.size() + sTmp.getLength());
@@ -2681,7 +2681,7 @@ void WW8Export::WriteFkpPlcUsw()
some magic. cmc
*/
/* Similiarly having msvbasic storage seems to also trigger creating this stream */
- GetWriter().GetStorage().OpenSotStorage(rtl::OUString(SL::aObjectPool),
+ GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool),
STREAM_READWRITE | STREAM_SHARE_DENYALL);
}
@@ -2716,7 +2716,7 @@ void WW8Export::WriteFkpPlcUsw()
if ( pSttbfAssoc ) // #i106057#
{
- ::std::vector<rtl::OUString> aStrings;
+ ::std::vector<OUString> aStrings;
::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings();
::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end();
@@ -3017,9 +3017,9 @@ void WW8Export::ExportDocument_Impl()
if( bWrtWW8 )
{
pFib->fWhichTblStm = 1;
- xTableStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::a1Table),
+ xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table),
STREAM_STD_WRITE );
- xDataStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::aData),
+ xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData),
STREAM_STD_WRITE );
xDataStrm->SetBufferSize( 32768 ); // for graphics
@@ -3196,7 +3196,7 @@ void WW8Export::ExportDocument_Impl()
{
xDataStrm.Clear();
pDataStrm = 0;
- GetWriter().GetStorage().Remove(rtl::OUString(SL::aData));
+ GetWriter().GetStorage().Remove(OUString(SL::aData));
}
}
}
@@ -3263,7 +3263,7 @@ void WW8Export::PrepareStorage()
SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x46 );
- GetWriter().GetStorage().SetClass( aGName, 0, rtl::OUString::createFromAscii( pName ));
+ GetWriter().GetStorage().SetClass( aGName, 0, OUString::createFromAscii( pName ));
SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) );
xStor->Write( pData, nLen );
@@ -3493,7 +3493,7 @@ void WW8Export::RestoreMacroCmds()
try
{
uno::Reference < io::XStream > xSrcStream =
- xSrcRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READ );
+ xSrcRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READ );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream );
if ( pStream && SVSTREAM_OK == pStream->GetError())
@@ -3552,7 +3552,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
type=2;
::sw::mark::IFieldmark::parameter_map_t::const_iterator pNameParameter = rFieldmark.GetParameters()->find("name");
- ::rtl::OUString ffname;
+ OUString ffname;
if(pNameParameter != rFieldmark.GetParameters()->end())
pNameParameter->second >>= ffname;
@@ -3599,7 +3599,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
}
aFldHeader.bits |= ( (ffres<<2) & 0x7C );
- std::vector< ::rtl::OUString > aListItems;
+ std::vector< OUString > aListItems;
if (type==2)
{
aFldHeader.bits |= 0x8000; // ffhaslistbox
@@ -3607,18 +3607,18 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY);
if(pListEntries != pParameters->end())
{
- uno::Sequence< ::rtl::OUString > vListEntries;
+ uno::Sequence< OUString > vListEntries;
pListEntries->second >>= vListEntries;
copy(::comphelper::stl_begin(vListEntries), ::comphelper::stl_end(vListEntries), back_inserter(aListItems));
}
}
- const ::rtl::OUString ffdeftext;
- const ::rtl::OUString ffformat;
- const ::rtl::OUString ffhelptext;
- const ::rtl::OUString ffstattext;
- const ::rtl::OUString ffentrymcr;
- const ::rtl::OUString ffexitmcr;
+ const OUString ffdeftext;
+ const OUString ffformat;
+ const OUString ffhelptext;
+ const OUString ffstattext;
+ const OUString ffentrymcr;
+ const OUString ffexitmcr;
const sal_uInt8 aFldData[] =
@@ -3648,7 +3648,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
slen += 4; // for num of list items
const int items = aListItems.size();
for( int i = 0; i < items; i++ ) {
- rtl::OUString item = aListItems[i];
+ OUString item = aListItems[i];
slen += 2 * item.getLength() + 2;
}
}
@@ -3679,7 +3679,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
const int items=aListItems.size();
*pDataStrm<<(sal_uInt32)items;
for(int i=0;i<items;i++) {
- rtl::OUString item=aListItems[i];
+ OUString item=aListItems[i];
SwWW8Writer::WriteString_xstz( *pDataStrm, item, false );
}
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 862854575a98..6e061bca486f 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -294,7 +294,7 @@ public:
bool Write( SvStream *pTableStram ) const;
void WriteDocx( DocxAttributeOutput* rAttrOutput ) const;
void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const;
- rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); }
+ OUString GetFamilyName() const { return OUString( msFamilyNm ); }
friend bool operator < (const wwFont &r1, const wwFont &r2);
};
@@ -593,10 +593,10 @@ public:
const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const;
/// Find the reference.
- bool HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo );
+ bool HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo );
/// Find the bookmark name.
- String GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo );
+ String GetBookmarkName( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo );
/// Add a bookmark converted to a Word name.
void AppendWordBookmark( const String& rName );
@@ -645,7 +645,7 @@ public:
virtual void AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ) = 0;
- virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ) = 0;
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) = 0;
//For i120928,add this interface to export graphic of bullet
virtual void ExportGrfBullet(const SwTxtNode& rNd) = 0;
@@ -730,11 +730,11 @@ public:
virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) = 0;
- virtual void DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
- const rtl::OUString &ToolTip,
- const rtl::OUString &rSelected,
- com::sun::star::uno::Sequence<rtl::OUString> &rListItems) = 0;
+ virtual void DoComboBox(const OUString &rName,
+ const OUString &rHelp,
+ const OUString &ToolTip,
+ const OUString &rSelected,
+ com::sun::star::uno::Sequence<OUString> &rListItems) = 0;
virtual void DoFormText(const SwInputField * pFld) = 0;
@@ -798,7 +798,7 @@ protected:
/// Output SwOLENode
virtual void OutputOLENode( const SwOLENode& ) = 0;
- virtual void OutputLinkedOLE( const rtl::OUString& ) = 0;
+ virtual void OutputLinkedOLE( const OUString& ) = 0;
/// Output SwSectionNode
@@ -1009,14 +1009,14 @@ public:
SvStorageRef xObjStg, String &rStorageName, SwOLENode *pOLENd);
virtual void AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen );
- virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false );
+ virtual void AppendBookmark( const OUString& rName, bool bSkip = false );
virtual void ExportGrfBullet(const SwTxtNode& rNd);
void OutGrfBullets(const sw::Frame &rFrame);
void MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo);
- void WriteAsStringTable(const ::std::vector<rtl::OUString>&, sal_Int32& rfcSttbf,
+ void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf,
sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0);
virtual sal_uLong ReplaceCr( sal_uInt8 nChar );
@@ -1089,11 +1089,11 @@ public:
bool bIsWW8 );
virtual ~WW8Export();
- virtual void DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
- const rtl::OUString &ToolTip,
- const rtl::OUString &rSelected,
- com::sun::star::uno::Sequence<rtl::OUString> &rListItems);
+ virtual void DoComboBox(const OUString &rName,
+ const OUString &rHelp,
+ const OUString &ToolTip,
+ const OUString &rSelected,
+ com::sun::star::uno::Sequence<OUString> &rListItems);
virtual void DoFormText(const SwInputField * pFld);
@@ -1127,7 +1127,7 @@ protected:
/// Output SwOLENode
virtual void OutputOLENode( const SwOLENode& );
- virtual void OutputLinkedOLE( const rtl::OUString& );
+ virtual void OutputLinkedOLE( const OUString& );
virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum );
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 67d5c9ac0825..61632d5f20ef 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -225,7 +225,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well.
SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
- rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
+ OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL );
if( xObjStg.Is() )
@@ -245,7 +245,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
bool bIsNotDuplicate = aRes.second; //.second is false when element already existed
nPictureId = aRes.first->second;
Set_UInt32(pDataAdr, nPictureId);
- String sStorageName = rtl::OUString('_');
+ String sStorageName = OUString('_');
sStorageName += OUString::number( nPictureId );
SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
@@ -262,7 +262,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
GetOLEExp().ExportOLEObject( aObjRef, *xOleStg );
if ( nAspect == embed::Aspects::MSOLE_ICON )
{
- ::rtl::OUString aObjInfo( "\3ObjInfo" );
+ OUString aObjInfo( "\3ObjInfo" );
if ( !xOleStg->IsStream( aObjInfo ) )
{
const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 };
@@ -338,14 +338,14 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
}
}
-void WW8Export::OutputLinkedOLE( const rtl::OUString& rOleId )
+void WW8Export::OutputLinkedOLE( const OUString& rOleId )
{
uno::Reference< embed::XStorage > xDocStg = pDoc->GetDocStorage();
uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( "OLELinks", embed::ElementModes::READ );
SotStorageRef xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, STREAM_READ );
SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
- rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
+ OUString(SL::aObjectPool), STREAM_READWRITE |
STREAM_SHARE_DENYALL );
if( xObjStg.Is() && xObjSrc.Is() )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 0b18e29c7884..7c8560c9e1d4 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -833,7 +833,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
pOutFmtNode = pOldMod;
}
-bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo )
+bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo )
{
const SwTxtNode* pNd;
@@ -869,7 +869,7 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pNa
return false;
}
-String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo )
+String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo )
{
String sRet;
switch ( nTyp )
@@ -1908,7 +1908,7 @@ void WW8Export::StartCommentOutput(const String& rName)
void WW8Export::EndCommentOutput(const String& rName)
{
- String sStr(rtl::OUString(" ["));
+ String sStr(OUString(" ["));
sStr += rName;
sStr.AppendAscii("] ");
OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END |
@@ -2469,7 +2469,7 @@ bool WW8AttributeOutput::DropdownField( const SwField* pFld )
if ( m_rWW8Export.bWrtWW8 )
{
const SwDropDownField& rFld2 = *(SwDropDownField*)pFld;
- uno::Sequence<rtl::OUString> aItems =
+ uno::Sequence<OUString> aItems =
rFld2.GetItemSequence();
GetExport().DoComboBox(rFld2.GetName(),
rFld2.GetHelp(),
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 365087437109..b40813e274cc 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -43,7 +43,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion,
if (aWwFib.nFibBack >= 0x6A) //Word97
{
- xTableStream = pStg->OpenSotStream(rtl::OUString::createFromAscii(
+ xTableStream = pStg->OpenSotStream(OUString::createFromAscii(
aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
@@ -158,7 +158,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
while( (sal_uInt16)-1 != nCurPos )
{
sShortcut.Erase( nLen ) +=
- rtl::OUString::valueOf(++nStart); // add an Number to it
+ OUString::valueOf(++nStart); // add an Number to it
nCurPos = rBlocks.GetIndex( sShortcut );
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 21b705875c8d..11a2b3dd1df1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -150,7 +150,7 @@ Color WW8TransCol(SVBT32 nWC)
return Color(nWC[0], nWC[1], nWC[2]);
}
-void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixed)
+void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixed)
{
if (mbIsDisabled || rFixed.isEmpty())
return;
@@ -666,7 +666,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
if (bSymbol == false && bDoingSymbol)
{
bDoingSymbol = false;
- rtl::OUStringBuffer sTemp;
+ OUStringBuffer sTemp;
comphelper::string::padToLength(sTemp,
nTxtStart - nStartReplace, cReplaceSymbol);
mpDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(),
@@ -955,7 +955,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS
rString = comphelper::string::remove(rString, 0x1);
rString = comphelper::string::remove(rString, 0x5);
rString = comphelper::string::remove(rString, 0x8);
- rString.SearchAndReplaceAllAscii("\007\007", rtl::OUString("\007\012"));
+ rString.SearchAndReplaceAllAscii("\007\007", OUString("\007\012"));
rString.SearchAndReplaceAll(0x7, ' ');
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index abdd6529ce56..8b4f9f285c6a 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -144,7 +144,7 @@ public:
mxCtx = comphelper::getProcessComponentContext();
}
bool import( const uno::Reference< io::XInputStream >& rxIn );
- rtl::OUString getProjectName();
+ OUString getProjectName();
};
bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rxIn )
@@ -156,7 +156,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx
oox::StorageRef vbaStg = root.openSubStorage( "Macros" , false );
if ( vbaStg.get() )
{
- oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), rtl::OUString("Writer") );
+ oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), OUString("Writer") );
bRet = aVbaPrj.importVbaProject( *vbaStg );
}
}
@@ -167,9 +167,9 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx
return bRet;
}
-rtl::OUString BasicProjImportHelper::getProjectName()
+OUString BasicProjImportHelper::getProjectName()
{
- rtl::OUString sProjName( "Standard" );
+ OUString sProjName( "Standard" );
uno::Reference< beans::XPropertySet > xProps( mrDocShell.GetModel(), uno::UNO_QUERY );
if ( xProps.is() )
{
@@ -192,7 +192,7 @@ class Sttb : TBBase
struct SBBItem
{
sal_uInt16 cchData;
- rtl::OUString data;
+ OUString data;
SBBItem() : cchData(0){}
};
sal_uInt16 fExtend;
@@ -208,7 +208,7 @@ public:
~Sttb();
bool Read(SvStream &rS);
void Print( FILE* fp );
- rtl::OUString getStringAtIndex( sal_uInt32 );
+ OUString getStringAtIndex( sal_uInt32 );
};
Sttb::Sttb() : fExtend( 0 )
@@ -248,15 +248,15 @@ void Sttb::Print( FILE* fp )
if ( cData )
{
for ( sal_Int32 index = 0; index < cData; ++index )
- fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
+ fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
-rtl::OUString
+OUString
Sttb::getStringAtIndex( sal_uInt32 index )
{
- rtl::OUString aRet;
+ OUString aRet;
if ( index < dataItems.size() )
aRet = dataItems[ index ].data;
return aRet;
@@ -737,7 +737,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
{
fExtraTextRotation /= 100.0;
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
- const rtl::OUString sTextRotateAngle( "TextRotateAngle" );
+ const OUString sTextRotateAngle( "TextRotateAngle" );
com::sun::star::beans::PropertyValue aPropVal;
aPropVal.Name = sTextRotateAngle;
aPropVal.Value <<= fExtraTextRotation;
@@ -2737,7 +2737,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
pStr->buffer[nEndUsed] = 0;
pStr->length = nEndUsed;
- emulateMSWordAddTextToParagraph(rtl::OUString(pStr, SAL_NO_ACQUIRE));
+ emulateMSWordAddTextToParagraph(OUString(pStr, SAL_NO_ACQUIRE));
pStr = NULL;
rPos += nL2;
if (!maApos.back()) //a para end in apo doesn't count
@@ -2759,7 +2759,7 @@ namespace
//We want to force weak chars inside 0x0020 to 0x007F to LATIN
sal_Int16 lcl_getScriptType(
const uno::Reference<i18n::XBreakIterator>& rBI,
- const rtl::OUString &rString, sal_Int32 nPos)
+ const OUString &rString, sal_Int32 nPos)
{
sal_Int16 nScript = rBI->getScriptType(rString, nPos);
if (nScript == i18n::ScriptType::WEAK && rString[nPos] >= 0x0020 && rString[nPos] <= 0x007F)
@@ -2771,7 +2771,7 @@ namespace
//useful, and see lcl_getScriptType anyway
sal_Int32 lcl_endOfScript(
const uno::Reference<i18n::XBreakIterator>& rBI,
- const rtl::OUString &rString, sal_Int32 nPos, sal_Int16 nScript)
+ const OUString &rString, sal_Int32 nPos, sal_Int16 nScript)
{
while (nPos < rString.getLength())
{
@@ -2785,7 +2785,7 @@ namespace
sal_Int32 lcl_getWriterScriptType(
const uno::Reference<i18n::XBreakIterator>& rBI,
- const rtl::OUString &rString, sal_Int32 nPos)
+ const OUString &rString, sal_Int32 nPos)
{
sal_Int16 nScript = i18n::ScriptType::WEAK;
@@ -2841,7 +2841,7 @@ namespace
//to auto-bias to LATIN.
//
//See https://bugs.freedesktop.org/show_bug.cgi?id=34319 for an example
-void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString)
+void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString)
{
if (rAddString.isEmpty())
return;
@@ -2856,7 +2856,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0);
sal_Int32 nLen = rAddString.getLength();
- rtl::OUString sParagraphText;
+ OUString sParagraphText;
const SwCntntNode *pCntNd = pPaM->GetCntntNode();
const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
if (pNd)
@@ -2871,7 +2871,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
if (nEnd < 0)
break;
- rtl::OUString sChunk(rAddString.copy(nPos, nEnd-nPos));
+ OUString sChunk(rAddString.copy(nPos, nEnd-nPos));
const sal_uInt16 aIds[] = {RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT};
const SvxFontItem *pOverriddenItems[] = {NULL, NULL, NULL};
bool aForced[] = {false, false, false};
@@ -2977,7 +2977,7 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const String& rAddString)
#if OSL_DEBUG_LEVEL > 1
{
- rtl::OString sText(rtl::OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8));
+ OString sText(OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8));
SAL_INFO("sw.ww8", "<addTextToParagraph>" << sText.getStr() << "</addTextToParagraph>");
}
#endif
@@ -3029,7 +3029,7 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd,
{
for(sal_uInt16 nCh = 0; nCh < nEnd - rPos; ++nCh)
{
- rDoc.InsertString( *pPaM, rtl::OUString(cSymbol) );
+ rDoc.InsertString( *pPaM, OUString(cSymbol) );
}
pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT );
}
@@ -3171,13 +3171,13 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
bRet = HandlePageBreakChar();
break;
case 0x1e: // Non-breaking hyphen
- rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDHYPHEN) );
+ rDoc.InsertString( *pPaM, OUString(CHAR_HARDHYPHEN) );
break;
case 0x1f: // Non-required hyphens
- rDoc.InsertString( *pPaM, rtl::OUString(CHAR_SOFTHYPHEN) );
+ rDoc.InsertString( *pPaM, OUString(CHAR_SOFTHYPHEN) );
break;
case 0xa0: // Non-breaking spaces
- rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDBLANK) );
+ rDoc.InsertString( *pPaM, OUString(CHAR_HARDBLANK) );
break;
case 0x1:
/*
@@ -3264,7 +3264,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
if( '\x0' != cInsert )
{
- rtl::OUString sInsert(cInsert);
+ OUString sInsert(cInsert);
emulateMSWordAddTextToParagraph(sInsert);
}
if (!maApos.back()) //a para end in apo doesn't count
@@ -3615,7 +3615,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
if(pAktItemSet && !pFmt)
{
- rtl::OUString sPrefix(rtl::OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear());
+ OUString sPrefix(OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear());
pNewSwCharFmt = rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)rDoc.GetDfltCharFmt());
pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT);
pNewSwCharFmt->SetFmtAttr( *pAktItemSet );
@@ -3694,8 +3694,8 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
maSectionManager(*this),
m_aExtraneousParas(rD),
maInsertedTables(rD),
- maSectionNameGenerator(rD, rtl::OUString("WW")),
- maGrfNameGenerator(bNewDoc, rtl::OUString('G')),
+ maSectionNameGenerator(rD, OUString("WW")),
+ maGrfNameGenerator(bNewDoc, OUString('G')),
maParaStyleMapper(rD),
maCharStyleMapper(rD),
maTxtNodesHavingFirstLineOfstSet(), // #i103711#
@@ -4168,7 +4168,7 @@ void SwWW8ImplReader::StoreMacroCmds()
try
{
uno::Reference < io::XStream > xStream =
- xRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
+ xRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream );
sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds];
@@ -4206,9 +4206,9 @@ void SwWW8ImplReader::ReadDocVars()
for(size_t i=0; i<aDocVarStrings.size(); i++)
{
uno::Any aDefaultValue;
- ::rtl::OUString name(aDocVarStrings[i]);
+ OUString name(aDocVarStrings[i]);
uno::Any aValue;
- aValue <<= ::rtl::OUString(aDocValueStrings[i]);
+ aValue <<= OUString(aDocValueStrings[i]);
try {
xUserDefinedProps->addProperty( name,
beans::PropertyAttribute::REMOVABLE,
@@ -4237,11 +4237,11 @@ void SwWW8ImplReader::ReadDocInfo()
if (xDocProps.is()) {
if ( pWwFib->fDot )
{
- rtl::OUString sTemplateURL;
+ OUString sTemplateURL;
SfxMedium* pMedium = mpDocShell->GetMedium();
if ( pMedium )
{
- rtl::OUString aName = pMedium->GetName();
+ OUString aName = pMedium->GetName();
INetURLObject aURL( aName );
sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
if ( !sTemplateURL.isEmpty() )
@@ -4260,7 +4260,7 @@ void SwWW8ImplReader::ReadDocInfo()
aSttb.Print( stderr );
#endif
String sPath = aSttb.getStringAtIndex( 0x1 );
- rtl::OUString aURL;
+ OUString aURL;
// attempt to convert to url ( won't work for obvious reasons on linux
if ( sPath.Len() )
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL );
@@ -4275,14 +4275,14 @@ void SwWW8ImplReader::ReadDocInfo()
}
}
-static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName )
+static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const OUString& sTemplatePathOrURL, const OUString& sVBAProjName )
{
if ( xPrjNameCache.is() )
{
INetURLObject aObj;
aObj.SetURL( sTemplatePathOrURL );
bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
- rtl::OUString aURL;
+ OUString aURL;
if ( bIsURL )
aURL = sTemplatePathOrURL;
else
@@ -4292,8 +4292,8 @@ static void lcl_createTemplateToProjectEntry( const uno::Reference< container::X
}
try
{
- rtl::OUString templateNameWithExt = aObj.GetLastName();
- rtl::OUString templateName;
+ OUString templateNameWithExt = aObj.GetLastName();
+ OUString templateName;
sal_Int32 nIndex = templateNameWithExt.lastIndexOf( '.' );
if ( nIndex != -1 )
{
@@ -4348,11 +4348,11 @@ bool WW8Customizations::Import( SwDocShell* pShell )
}
}
-bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache )
+bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache )
{
SvtPathOptions aPathOpt;
String aAddinPath = aPathOpt.GetAddinPath();
- uno::Sequence< rtl::OUString > sGlobalTemplates;
+ uno::Sequence< OUString > sGlobalTemplates;
// first get the autoload addins in the directory STARTUP
uno::Reference<ucb::XSimpleFileAccess3> xSFA(ucb::SimpleFileAccess::create(::comphelper::getProcessComponentContext()));
@@ -4367,7 +4367,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF
INetURLObject aObj;
aObj.SetURL( sGlobalTemplates[ i ] );
bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
- rtl::OUString aURL;
+ OUString aURL;
if ( bIsURL )
aURL = sGlobalTemplates[ i ];
else
@@ -4382,10 +4382,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF
aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() );
lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() );
// Read toolbars & menus
- SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( "WordDocument" ));
+ SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" ));
refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
WW8Fib aWwFib( *refMainStream, 8 );
- SvStorageStreamRef xTableStream = rRoot->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
+ SvStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
@@ -4642,7 +4642,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
xDocPropSupp(mpDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
- rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
+ OUString sCreatedFrom = xDocProps->getTemplateURL();
uno::Reference< container::XNameContainer > xPrjNameCache;
uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY);
if ( xSF.is() )
@@ -4897,14 +4897,14 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
break;
}
- rTableStream = pStg->OpenSotStream( rtl::OUString::createFromAscii(
+ rTableStream = pStg->OpenSotStream( OUString::createFromAscii(
pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
STREAM_STD_READ);
pTableStream = &rTableStream;
pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
- rDataStream = pStg->OpenSotStream(rtl::OUString(SL::aData),
+ rDataStream = pStg->OpenSotStream(OUString(SL::aData),
STREAM_STD_READ | STREAM_NOCREATE );
if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
@@ -5022,7 +5022,7 @@ namespace
{
String sUniPassword = QueryPasswordForMedium( rMedium );
- rtl::OString sPassword(rtl::OUStringToOString(sUniPassword,
+ OString sPassword(OUStringToOString(sUniPassword,
WW8Fib::GetFIBCharset(pWwFib->chseTables)));
sal_Int32 nLen = sPassword.getLength();
@@ -5641,7 +5641,7 @@ sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuff
{
sal_uLong nRet = ERR_SWG_READ_ERROR;
OSL_ENSURE( pStg, "wo ist mein Storage?" );
- rRef = pStg->OpenSotStream( rtl::OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL);
+ rRef = pStg->OpenSotStream( OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL);
if( rRef.Is() )
{
@@ -5830,8 +5830,8 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
if( bRet )
{
rStorageName = OUString('_');
- rStorageName += rtl::OUString::valueOf(nPictureId);
- rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString(
+ rStorageName += OUString::valueOf(nPictureId);
+ rSrcStorage = rReader.pStg->OpenSotStorage(OUString(
SL::aObjectPool));
if (!rReader.mpDocShell)
bRet=false;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 1fabdbbb3d44..e6d706a70775 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -458,9 +458,9 @@ namespace sw
class WW8FieldEntry
{
private:
- ::rtl::OUString msBookmarkName;
- ::rtl::OUString msMarkType;
- ::rtl::OUString msMarkCode;
+ OUString msBookmarkName;
+ OUString msMarkType;
+ OUString msMarkCode;
::sw::mark::IFieldmark::parameter_map_t maParams;
public:
@@ -475,11 +475,11 @@ class WW8FieldEntry
SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); };
xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); };
- ::rtl::OUString GetBookmarkName();
- ::rtl::OUString GetBookmarkCode();
- void SetBookmarkName(::rtl::OUString bookmarkName);
- void SetBookmarkType(::rtl::OUString bookmarkType);
- void SetBookmarkCode(::rtl::OUString bookmarkCode);
+ OUString GetBookmarkName();
+ OUString GetBookmarkCode();
+ void SetBookmarkName(OUString bookmarkName);
+ void SetBookmarkType(OUString bookmarkType);
+ void SetBookmarkCode(OUString bookmarkCode);
::sw::mark::IFieldmark::parameter_map_t& getParameters();
};
@@ -553,7 +553,7 @@ class WW8FormulaControl : private ::boost::noncopyable
protected:
SwWW8ImplReader &rRdr;
public:
- WW8FormulaControl(const rtl::OUString& rN, SwWW8ImplReader &rR)
+ WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rR)
: rRdr(rR), fUnknown(0), fDropdownIndex(0),
fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0),
fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN )
@@ -573,12 +573,12 @@ public:
sal_uInt16 nChecked;
sal_uInt16 nDefaultChecked;
- rtl::OUString sTitle;
- rtl::OUString sDefault;
- rtl::OUString sFormatting;
- rtl::OUString sHelp;
- rtl::OUString sToolTip;
- std::vector<rtl::OUString> maListEntries;
+ OUString sTitle;
+ OUString sDefault;
+ OUString sFormatting;
+ OUString sHelp;
+ OUString sToolTip;
+ std::vector<OUString> maListEntries;
virtual ~WW8FormulaControl() {}
void FormulaRead(SwWw8ControlType nWhich,SvStream *pD);
virtual sal_Bool Import(const com::sun::star::uno::Reference <
@@ -586,7 +586,7 @@ public:
com::sun::star::uno::Reference <
com::sun::star::form::XFormComponent> &rFComp,
com::sun::star::awt::Size &rSz) = 0;
- rtl::OUString sName;
+ OUString sName;
};
class WW8FormulaCheckBox : public WW8FormulaControl
@@ -665,7 +665,7 @@ class SwMSDffManager : public SvxMSDffManager
private:
SwWW8ImplReader& rReader;
SvStream *pFallbackStream;
- std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache;
+ std::map<sal_uInt32,OString> aOldEscherBlipCache;
virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const;
@@ -840,12 +840,12 @@ public:
class wwFrameNamer : private ::boost::noncopyable
{
private:
- rtl::OUString msSeed;
+ OUString msSeed;
sal_Int32 mnImportedGraphicsCount;
bool mbIsDisabled;
public:
- void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixedPart);
- wwFrameNamer(bool bIsDisabled, const rtl::OUString &rSeed)
+ void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixedPart);
+ wwFrameNamer(bool bIsDisabled, const OUString &rSeed)
: msSeed(rSeed), mnImportedGraphicsCount(0), mbIsDisabled(bIsDisabled)
{
}
@@ -1255,7 +1255,7 @@ private:
pReffingStck = 0;
}
void DeleteAnchorStk() { DeleteStk( pAnchorStck ); pAnchorStck = 0; }
- void emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString);
+ void emulateMSWordAddTextToParagraph(const OUString& rAddString);
void simpleAddTextToParagraph(const String& rAddString);
bool HandlePageBreakChar();
bool ReadChar(long nPosCp, long nCpOfs);
@@ -1542,7 +1542,7 @@ private:
// #i84783#
// determine object attribute "Layout in Table Cell"
bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const;
- bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
+ bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
//No copying
SwWW8ImplReader(const SwWW8ImplReader &);
SwWW8ImplReader& operator=(const SwWW8ImplReader&);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 40056b8f86eb..fbc2e083c576 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -772,7 +772,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
if( pStyles->pStyRule ) // Bullet-Style already present
return pStyles->pStyRule;
- const String aBaseName(rtl::OUString("WW8StyleNum"));
+ const String aBaseName(OUString("WW8StyleNum"));
const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// #i86652#
@@ -848,7 +848,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
// If NumRuleItems were set, either directly or through inheritance, disable them now
pAktColl->SetFmtAttr( SwNumRuleItem() );
- String aName(rtl::OUString("Outline"));
+ String aName(OUString("Outline"));
SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
OUTLINE_RULE );
@@ -4299,13 +4299,13 @@ void WW8RStyle::ImportOldFormatStyles()
if (const sal_Char *pStr = GetEnglishNameFromSti(eSti))
sName = String(pStr, RTL_TEXTENCODING_ASCII_US);
else
- sName = rtl::OUString("Unknown");
+ sName = OUString("Unknown");
}
else // user style
{
- rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount);
+ OString aTmp = read_uInt8s_ToOString(rSt, nCount);
nByteCount += aTmp.getLength();
- sName = rtl::OStringToOUString(aTmp, eStructChrSet);
+ sName = OStringToOUString(aTmp, eStructChrSet);
}
rSI.SetOrgWWIdent(sName, stc);
rSI.bImported = true;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index b3312ba96d80..13d0646386f3 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -160,8 +160,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
if (aBookmarkName.Len()>0) {
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
- maFieldStack.back().getParameters()["Description"] = uno::makeAny(::rtl::OUString(aFormula.sToolTip));
- maFieldStack.back().getParameters()["Name"] = uno::makeAny(::rtl::OUString(aFormula.sTitle));
+ maFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.sToolTip));
+ maFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.sTitle));
}
return FLD_TEXT;
}
@@ -213,8 +213,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
if (pFieldmark!=NULL) {
IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark);
- (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(::rtl::OUString(aFormula.sTitle));
- (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(::rtl::OUString(aFormula.sToolTip));
+ (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(OUString(aFormula.sTitle));
+ (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(OUString(aFormula.sToolTip));
if(pCheckboxFm)
pCheckboxFm->SetChecked(aFormula.nChecked);
@@ -285,7 +285,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if ( pFieldmark != NULL )
{
- uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size());
+ uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size());
::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries));
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
sal_Int32 nIndex = aFormula.fDropdownIndex < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
@@ -1075,7 +1075,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
{
// wird erstmal zur Bildung des Style Namens genommen
- String sPrefix(rtl::OUString("WW8Num"));
+ String sPrefix(OUString("WW8Num"));
sPrefix += OUString::number(nUniqueList++);
// #i86652#
sal_uInt16 nRul =
@@ -1318,7 +1318,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
break;
// Nauemsprefix aufbauen: fuer NumRule-Name (eventuell)
// und (falls vorhanden) fuer Style-Name (dann auf jeden Fall)
- String sPrefix(rtl::OUString("WW8NumSt"));
+ String sPrefix(OUString("WW8NumSt"));
sPrefix += OUString::number( nLfo + 1 );
// jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!!
// (bis dahin war hier die Parent NumRule vermerkt )
@@ -2220,7 +2220,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
{
if ( iRes != 25 )
nChecked = iRes;
- sDefault = ( wDef == 0 ) ? rtl::OUString( "0" ) : rtl::OUString( "1" );
+ sDefault = ( wDef == 0 ) ? OUString( "0" ) : OUString( "1" );
}
}
// xstzTextFormat
@@ -2274,7 +2274,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
}
WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR)
- : WW8FormulaControl(rtl::OUString(SL::aListBox), rR)
+ : WW8FormulaControl(OUString(SL::aListBox), rR)
{
}
@@ -2333,7 +2333,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString,
String pNm;
if (xPropSetInfo->hasPropertyByName(pNm = "FontStyleName"))
{
- aTmp <<= rtl::OUString( pFontItem->GetStyleName());
+ aTmp <<= OUString( pFontItem->GetStyleName());
rPropSet->setPropertyValue( pNm, aTmp );
}
if (xPropSetInfo->hasPropertyByName(pNm = "FontFamily"))
@@ -2352,7 +2352,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString,
rPropSet->setPropertyValue( pNm, aTmp );
}
- aTmp <<= rtl::OUString( pFontItem->GetFamilyName());
+ aTmp <<= OUString( pFontItem->GetFamilyName());
aFont.SetName( pFontItem->GetFamilyName() );
aFont.SetStyleName( pFontItem->GetStyleName() );
aFont.SetFamily( pFontItem->GetFamily() );
@@ -2398,8 +2398,8 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString,
break;
}
- if (bSet && xPropSetInfo->hasPropertyByName(rtl::OUString::createFromAscii(pMap->pPropNm)))
- rPropSet->setPropertyValue(rtl::OUString::createFromAscii(pMap->pPropNm), aTmp);
+ if (bSet && xPropSetInfo->hasPropertyByName(OUString::createFromAscii(pMap->pPropNm)))
+ rPropSet->setPropertyValue(OUString::createFromAscii(pMap->pPropNm), aTmp);
}
// now calculate the size of the control
OutputDevice* pOut = Application::GetDefaultDevice();
@@ -2450,9 +2450,9 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
if (!maListEntries.empty())
{
sal_uInt32 nLen = maListEntries.size();
- uno::Sequence< ::rtl::OUString > aListSource(nLen);
+ uno::Sequence< OUString > aListSource(nLen);
for (sal_uInt32 nI = 0; nI < nLen; ++nI)
- aListSource[nI] = rtl::OUString(maListEntries[nI]);
+ aListSource[nI] = OUString(maListEntries[nI]);
aTmp <<= aListSource;
xPropSet->setPropertyValue("StringItemList", aTmp );
@@ -2475,20 +2475,20 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
{
0x2002,0x2002,0x2002,0x2002,0x2002
};
- rSz = rRdr.MiserableDropDownFormHack(rtl::OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet);
+ rSz = rRdr.MiserableDropDownFormHack(OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet);
}
return sal_True;
}
WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR)
- : WW8FormulaControl(rtl::OUString(SL::aCheckBox), rR)
+ : WW8FormulaControl(OUString(SL::aCheckBox), rR)
{
}
static void lcl_AddToPropertyContainer
(uno::Reference<beans::XPropertySet> xPropSet,
- const rtl::OUString & rPropertyName, const rtl::OUString & rValue)
+ const OUString & rPropertyName, const OUString & rValue)
{
uno::Reference<beans::XPropertySetInfo> xPropSetInfo =
xPropSet->getPropertySetInfo();
@@ -2547,7 +2547,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
}
WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR)
- : WW8FormulaControl(rtl::OUString(SL::aTextField) ,rR)
+ : WW8FormulaControl(OUString(SL::aTextField) ,rR)
{
}
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 8e92ce6c05b8..7aa31b67d17d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -80,7 +80,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
// 0x2c, 0x30 Skalierung x,y in Promille
// 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw
- SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( rtl::OUString("\3PIC"),
+ SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pS = xSrc3;
pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -125,7 +125,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
SvStorageRef& rSrc1)
{
- SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( rtl::OUString("\3META"),
+ SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"),
STREAM_STD_READ | STREAM_NOCREATE);
SvStorageStream* pSt = xSrc2;
pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -181,7 +181,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
{
// 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
- SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(rtl::OUString("\3PICT"));
+ SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT"));
SvStorageStream* pStp = xSrc4;
pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden
@@ -230,7 +230,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
// TODO/MBA: is the object inserted multiple times here? Testing!
// And is it a problem that we now use the same naming scheme as in the other apps?
sw::hack::DrawingOLEAdaptor aOLEObj(rObject, *pPersist);
- ::rtl::OUString sNewName;
+ OUString sNewName;
bool bSuccess = aOLEObj.TransferToDoc(sNewName);
OSL_ENSURE(bSuccess, "Insert OLE failed");
@@ -344,11 +344,11 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
long nX=0, nY=0; // nX, nY is graphic size
bool bOleOk = true;
- String aSrcStgName = rtl::OUString('_');
+ String aSrcStgName = OUString('_');
// ergibt Name "_4711"
aSrcStgName += OUString::number( nObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
+ SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
@@ -425,7 +425,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
{
- SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(rtl::OUString("\3ObjInfo"),
+ SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(OUString("\3ObjInfo"),
STREAM_STD_READ | STREAM_NOCREATE );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 2b9316156751..37229ccaae89 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -349,7 +349,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
// needed if the filterflags say we will convert bookmarks
// to SetExpFields! And this the exception!
- rtl::OUString sHex("\\x");
+ OUString sHex("\\x");
bool bSetAsHex;
bool bAllowCr = SwFltGetFlag(nFieldFlags,
SwFltControlStack::ALLOW_FLD_CR) ? true : false;
@@ -421,8 +421,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
void SwWW8ImplReader::ConvertFFileName( String& rName, const String& rOrg )
{
rName = rOrg;
- rName.SearchAndReplaceAllAscii( "\\\\", rtl::OUString( '\\' ));
- rName.SearchAndReplaceAllAscii( "%20", rtl::OUString( ' ' ));
+ rName.SearchAndReplaceAllAscii( "\\\\", OUString( '\\' ));
+ rName.SearchAndReplaceAllAscii( "%20", OUString( ' ' ));
// ggfs. anhaengende Anfuehrungszeichen entfernen
if( rName.Len() && '"' == rName.GetChar( rName.Len()-1 ))
@@ -575,10 +575,10 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL
// #i36594#
// Fix provided by mloiseleur@openoffice.org.
// A default date can have already 4 year digits, in some case
- const xub_StrLen pos = sParams.Search(rtl::OUString("YYYY"));
+ const xub_StrLen pos = sParams.Search(OUString("YYYY"));
if ( pos == STRING_NOTFOUND )
{
- sParams.SearchAndReplace(rtl::OUString("YY"), rtl::OUString("YYYY"));
+ sParams.SearchAndReplace(OUString("YY"), OUString("YYYY"));
}
return sParams;
}
@@ -622,7 +622,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
}
if (bHijri)
- sParams.Insert(rtl::OUString("[~hijri]"), 0);
+ sParams.Insert(OUString("[~hijri]"), 0);
sal_Int32 nCheckPos = 0;
short nType = NUMBERFORMAT_DEFINED;
@@ -721,7 +721,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
*pPaM->GetPoint() = maFieldStack.back().maStartPos;
break;
default:
- rtl::OUString aCode = maFieldStack.back().GetBookmarkCode();
+ OUString aCode = maFieldStack.back().GetBookmarkCode();
if ( !aCode.isEmpty() )
{
// Unhandled field with stored code
@@ -740,23 +740,23 @@ sal_uInt16 SwWW8ImplReader::End_Field()
{
const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
- rtl::OUString sFieldId = rtl::OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) );
+ OUString sFieldId = OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) );
pFieldmark->GetParameters()->insert(
- std::pair< rtl::OUString, uno::Any > (
+ std::pair< OUString, uno::Any > (
ODF_ID_PARAM,
uno::makeAny( sFieldId ) ) );
pFieldmark->GetParameters()->insert(
- std::pair< rtl::OUString, uno::Any > (
+ std::pair< OUString, uno::Any > (
ODF_CODE_PARAM,
uno::makeAny( aCode ) ) );
if ( maFieldStack.back().mnObjLocFc > 0 )
{
// Store the OLE object as an internal link
- String sOleId = rtl::OUString('_');
+ String sOleId = OUString('_');
sOleId += OUString::number( maFieldStack.back().mnObjLocFc );
- SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
+ SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool));
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ );
// Store it now!
@@ -782,8 +782,8 @@ sal_uInt16 SwWW8ImplReader::End_Field()
// Store the OLE Id as a parameter
pFieldmark->GetParameters()->insert(
- std::pair< rtl::OUString, uno::Any >(
- ODF_OLE_PARAM, uno::makeAny( rtl::OUString( sOleId ) ) ) );
+ std::pair< OUString, uno::Any >(
+ ODF_OLE_PARAM, uno::makeAny( OUString( sOleId ) ) ) );
}
}
@@ -840,27 +840,27 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw()
return *this;
}
-::rtl::OUString WW8FieldEntry::GetBookmarkName()
+OUString WW8FieldEntry::GetBookmarkName()
{
return msBookmarkName;
}
-::rtl::OUString WW8FieldEntry::GetBookmarkCode()
+OUString WW8FieldEntry::GetBookmarkCode()
{
return msMarkCode;
}
-void WW8FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName)
+void WW8FieldEntry::SetBookmarkName(OUString bookmarkName)
{
msBookmarkName=bookmarkName;
}
-void WW8FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType)
+void WW8FieldEntry::SetBookmarkType(OUString bookmarkType)
{
msMarkType=bookmarkType;
}
-void WW8FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode)
+void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode)
{
msMarkCode = bookmarkCode;
}
@@ -1144,7 +1144,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
// Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert.
void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
{
- rtl::OUString sHex("\\x");
+ OUString sHex("\\x");
bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT )
|| SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
sal_Unicode cChar;
@@ -1212,7 +1212,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagText )
{
- String aName(rtl::OUString("WwFieldTag"));
+ String aName(OUString("WwFieldTag"));
if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer?
aName += OUString::number( nId ); // ausgeben ?
@@ -1385,7 +1385,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF,
}
else
{
- sName = rtl::OUString("WWSetBkmk");
+ sName = OUString("WWSetBkmk");
nNo = pReffingStck->aFieldVarNames.size()+1;
sName += OUString::number(nNo);
nNo += pPlcxMan->GetBook()->GetIMax();
@@ -1506,7 +1506,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr )
eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, String& rStr )
{
if( !pNumFldType ){ // 1. Mal
- SwSetExpFieldType aT( &rDoc, rtl::OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
+ SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
pNumFldType = rDoc.InsertFldType( aT );
}
SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr,
@@ -1999,7 +1999,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
NewAttr(aSz);
}
- rDoc.InsertString(*pPaM, rtl::OUString(cChar));
+ rDoc.InsertString(*pPaM, OUString(cChar));
if (nSize > 0)
pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONTSIZE);
@@ -2008,7 +2008,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
}
else
{
- rDoc.InsertString(*pPaM, rtl::OUString("###"));
+ rDoc.InsertString(*pPaM, OUString("###"));
}
return FLD_OK;
@@ -2217,10 +2217,10 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr )
#if defined(WW_NATIVE_TOC)
if (1) {
- ::rtl::OUString aBookmarkName("_REF");
+ OUString aBookmarkName("_REF");
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(ODF_PAGEREF);
- maFieldStack.back().AddParam(rtl::OUString(), sName);
+ maFieldStack.back().AddParam(OUString(), sName);
return FLD_TEXT;
}
#endif
@@ -2262,7 +2262,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String& rStr)
aVText += aReadParam.GetResult();
if (bNewVText)
{
- bBracket = aVText.EqualsIgnoreCaseAscii(rtl::OUString('['), 1, 0)
+ bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 1, 0)
? true : false;
bNewVText = false;
}
@@ -2313,7 +2313,7 @@ bool CanUseRemoteLink(const String &rGrfName)
::ucbhelper::Content aCnt(rGrfName,
uno::Reference< ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- rtl::OUString aTitle;
+ OUString aTitle;
aCnt.getPropertyValue("Title") >>= aTitle;
bUseRemote = !aTitle.isEmpty();
@@ -2539,7 +2539,7 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam)
{
String sCombinedCharacters;
if ((-2 == rReadParam.SkipToNextToken()) &&
- rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('('), 1, 0))
+ rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('('), 1, 0))
{
for (int i=0;i<2;i++)
{
@@ -2549,8 +2549,8 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam)
if (-2 != rReadParam.SkipToNextToken())
break;
String sF = rReadParam.GetResult();
- if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0))
- || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('o'), 1, 0)))
+ if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('p'), 1, 0))
+ || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('o'), 1, 0)))
{
if (-2 == rReadParam.SkipToNextToken())
{
@@ -2620,7 +2620,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
if ('u' == nRet)
{
if (-2 == rReadParam.SkipToNextToken() &&
- (rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0)))
+ (rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('p'), 1, 0)))
{
if (-2 == rReadParam.SkipToNextToken())
{
@@ -2924,7 +2924,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
{
#if defined(WW_NATIVE_TOC)
if (1) {
- ::rtl::OUString aBookmarkName("_TOC");
+ OUString aBookmarkName("_TOC");
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(ODF_TOC);
return FLD_TEXT;
@@ -3297,7 +3297,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
if ( aIt != aPattern.end() )
{
SwFormToken aNumberEntrySeparator( TOKEN_TEXT );
- aNumberEntrySeparator.sText = rtl::OUString(" ");
+ aNumberEntrySeparator.sText = OUString(" ");
aPattern.insert( ++aIt, aNumberEntrySeparator );
pForm->SetPattern( nStyleLevel, aPattern );
}
@@ -3447,7 +3447,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
{
#if defined(WW_NATIVE_TOC)
if (1) {
- ::rtl::OUString aBookmarkName("_HYPERLINK");
+ OUString aBookmarkName("_HYPERLINK");
maFieldStack.back().SetBookmarkName(aBookmarkName);
maFieldStack.back().SetBookmarkType(ODF_HYPERLINK);
return FLD_TEXT;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 8eb7940f9af1..43277d585541 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2705,7 +2705,7 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen
if( bVer67 )
{
//convert single byte from MS1252 to Unicode
- cSymbol = rtl::OUString(
+ cSymbol = OUString(
reinterpret_cast<const sal_Char*>(pData+2), 1,
RTL_TEXTENCODING_MS_1252).toChar();
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a8ecc85e4f11..789412032541 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1903,7 +1903,7 @@ Err:
String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc)
{
- rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc);
+ OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc);
rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end
return aRet;
}
@@ -3847,8 +3847,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
rArray.push_back(read_uInt16_PascalString(rStrm));
else
{
- rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm);
- rArray.push_back(rtl::OStringToOUString(aTmp, eCS));
+ OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm);
+ rArray.push_back(OStringToOUString(aTmp, eCS));
}
// Skip the extra data
@@ -3878,8 +3878,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
pValueArray->push_back(read_uInt16_PascalString(rStrm));
else
{
- rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm);
- pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS));
+ OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm);
+ pValueArray->push_back(OStringToOUString(aTmp, eCS));
}
}
}
@@ -3904,9 +3904,9 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
++nRead;
if (nBChar)
{
- rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar);
+ OString aTmp = read_uInt8s_ToOString(rStrm, nBChar);
nRead += aTmp.getLength();
- rArray.push_back(rtl::OStringToOUString(aTmp, eCS));
+ rArray.push_back(OStringToOUString(aTmp, eCS));
}
else
rArray.push_back(aEmptyStr);
@@ -4146,9 +4146,9 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex)
return bFound ? aBookNames[i] : aEmptyStr;
}
-rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggestedName)
+OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName)
{
- rtl::OUString aRet(rSuggestedName.isEmpty() ? rtl::OUString("Unnamed") : rSuggestedName);
+ OUString aRet(rSuggestedName.isEmpty() ? OUString("Unnamed") : rSuggestedName);
size_t i = 0;
while (i < aBookNames.size())
{
@@ -4158,7 +4158,7 @@ rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggest
sal_Int32 p = len - 1;
while (p > 0 && aRet[p] >= '0' && aRet[p] <= '9')
--p;
- aRet = aRet.copy(0, p+1) + rtl::OUString::valueOf(nBookmarkId++);
+ aRet = aRet.copy(0, p+1) + OUString::valueOf(nBookmarkId++);
i = 0; // start search from beginning
}
else
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 6913545d67bd..e52cbc5b7361 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -724,7 +724,7 @@ public:
bool MapName(String& rName);
String GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex);
eBookStatus GetStatus() const;
- rtl::OUString GetUniqueBookmarkName(const rtl::OUString &rSuggestedName);
+ OUString GetUniqueBookmarkName(const OUString &rSuggestedName);
};
/*
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 27e23ef29ada..26a80a68cfeb 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star;
// no. of visual data elements in a SwCTB ( fixed )
const short nVisualData = 5;
-typedef std::map< sal_Int16, rtl::OUString > IdToString;
+typedef std::map< sal_Int16, OUString > IdToString;
class MSOWordCommandConvertor : public MSOCommandConvertor
{
@@ -59,8 +59,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor
IdToString tcidToOOcmd;
public:
MSOWordCommandConvertor();
- virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
- virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key );
+ virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
+ virtual OUString MSOTCIDToOOCommand( sal_Int16 key );
};
MSOWordCommandConvertor::MSOWordCommandConvertor()
@@ -75,18 +75,18 @@ MSOWordCommandConvertor::MSOWordCommandConvertor()
tcidToOOcmd[ 0x9d9 ] = ".uno:Print";
}
-rtl::OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
+OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key )
{
- rtl::OUString sResult;
+ OUString sResult;
IdToString::iterator it = msoToOOcmd.find( key );
if ( it != msoToOOcmd.end() )
sResult = it->second;
return sResult;
}
-rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
+OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key )
{
- rtl::OUString sResult;
+ OUString sResult;
IdToString::iterator it = tcidToOOcmd.find( key );
if ( it != tcidToOOcmd.end() )
sResult = it->second;
@@ -117,7 +117,7 @@ Customization* SwCTBWrapper::GetCustomizaton( sal_Int16 index )
return &rCustomizations[ index ];
}
-SwCTB* SwCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName )
+SwCTB* SwCTBWrapper::GetCustomizationData( const OUString& sTBName )
{
SwCTB* pCTB = NULL;
for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
@@ -345,14 +345,14 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
if ( pCust )
{
// currently only support built-in menu
- rtl::OUString sMenuBar( "private:resource/menubar/" );
+ OUString sMenuBar( "private:resource/menubar/" );
sMenuBar = sMenuBar.concat( "menubar" );
// Get menu name
SwTBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() );
if ( !pTBC )
return false;
- rtl::OUString sMenuName = pTBC->GetCustomText();
+ OUString sMenuName = pTBC->GetCustomText();
sMenuName = sMenuName.replace('&','~');
// see if the document has already setting for the menubar
@@ -378,7 +378,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
// create the popup menu
uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
aPopupMenu[0].Name = "CommandURL";
- aPopupMenu[0].Value = uno::makeAny( rtl::OUString( "vnd.openoffice.org:" ) + sMenuName );
+ aPopupMenu[0].Value = uno::makeAny( OUString( "vnd.openoffice.org:" ) + sMenuName );
aPopupMenu[1].Name = "Label";
aPopupMenu[1].Value <<= sMenuName;
aPopupMenu[2].Name = "Type";
@@ -544,7 +544,7 @@ SwCTB::Print( FILE* fp )
{
Indent a;
indent_printf(fp, "[ 0x%x ] SwCTB - dump\n", nOffSet );
- indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
+ indent_printf(fp, " name %s\n", OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
indent_printf(fp, " cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields. %x\n", static_cast< unsigned int >( cbTBData ) );
tb.Print(fp);
@@ -568,7 +568,7 @@ SwCTB::Print( FILE* fp )
bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
{
- static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" );
+ static OUString sToolbarPrefix( "private:resource/toolbar/custom_" );
bool bRes = false;
try
{
@@ -582,7 +582,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp
// set UI name for toolbar
xProps->setPropertyValue( "UIName", uno::makeAny( name.getString() ) );
- rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
+ OUString sToolBarName = sToolbarPrefix.concat( name.getString() );
for ( std::vector< SwTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it )
{
// createToolBar item for control
@@ -709,7 +709,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
std::vector< css::beans::PropertyValue > props;
if ( bBuiltin )
{
- rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
+ OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
if ( !sCommand.isEmpty() )
{
beans::PropertyValue aProp;
@@ -772,10 +772,10 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
return true;
}
-rtl::OUString
+OUString
SwTBC::GetCustomText()
{
- rtl::OUString sCustomText;
+ OUString sCustomText;
if ( tbcd.get() )
sCustomText = tbcd->getGeneralInfo().CustomText();
return sCustomText;
@@ -797,7 +797,7 @@ Xst::Print( FILE* fp )
{
Indent a;
indent_printf( fp, "[ 0x%x ] Xst -- dump\n", nOffSet );
- indent_printf( fp, " %s", rtl::OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() );
+ indent_printf( fp, " %s", OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() );
}
Tcg::Tcg() : nTcgVer( -1 )
@@ -1143,7 +1143,7 @@ void TcgSttbfCore::Print( FILE* fp )
if ( cData )
{
for ( sal_Int32 index = 0; index < cData; ++index )
- indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData );
+ indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData );
}
}
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 85b8a902ab6f..bb38220bffd7 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -35,11 +35,11 @@
class Xst : public TBBase
{
- rtl::OUString sString;
+ OUString sString;
public:
Xst(){}
bool Read(SvStream &rS);
- rtl::OUString getString() { return sString; }
+ OUString getString() { return sString; }
void Print( FILE* fp );
};
@@ -55,7 +55,7 @@ public:
bool Read(SvStream &rS);
void Print( FILE* );
bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
- rtl::OUString GetCustomText();
+ OUString GetCustomText();
};
class SwCTB : public TBBase
@@ -80,7 +80,7 @@ public:
bool IsMenuToolbar();
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
- rtl::OUString GetName() { return tb.getName().getString(); }
+ OUString GetName() { return tb.getName().getString(); }
};
class TBDelta : public TBBase
@@ -174,7 +174,7 @@ public:
bool ImportCustomToolBar( SfxObjectShell& rDocSh );
Customization* GetCustomizaton( sal_Int16 index );
- SwCTB* GetCustomizationData( const rtl::OUString& name );
+ SwCTB* GetCustomizationData( const OUString& name );
void Print( FILE* );
};
@@ -272,7 +272,7 @@ class TcgSttbfCore : public TBBase
struct SBBItem
{
sal_uInt16 cchData;
- rtl::OUString data;
+ OUString data;
sal_uInt16 extraData;
SBBItem() : cchData(0), extraData(0){}
};
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index d1cece0b1abf..b2abe8fa8642 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-using ::rtl::OUString;
using ::com::sun::star::frame::XModel;
using ::com::sun::star::text::XTextCursor;
using ::com::sun::star::text::XTextRange;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 2858d70013a4..24f2517232d4 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -37,17 +37,17 @@ namespace com { namespace sun { namespace star {
} } }
-typedef ::std::map< ::rtl::OUString, RedlineInfo* > RedlineMapType;
+typedef ::std::map< OUString, RedlineInfo* > RedlineMapType;
class XMLRedlineImportHelper
{
- const ::rtl::OUString sEmpty;
- const ::rtl::OUString sInsertion;
- const ::rtl::OUString sDeletion;
- const ::rtl::OUString sFormatChange;
- const ::rtl::OUString sShowChanges;
- const ::rtl::OUString sRecordChanges;
- const ::rtl::OUString sRedlineProtectionKey;
+ const OUString sEmpty;
+ const OUString sInsertion;
+ const OUString sDeletion;
+ const OUString sFormatChange;
+ const OUString sShowChanges;
+ const OUString sRecordChanges;
+ const OUString sRedlineProtectionKey;
RedlineMapType aRedlineMap;
@@ -81,10 +81,10 @@ public:
/// (The redline will be inserted into the document after both start
/// and end cursor has been set.)
void Add(
- const ::rtl::OUString& rType, /// redline type (insert, del,... )
- const ::rtl::OUString& rId, /// use to identify this redline
- const ::rtl::OUString& rAuthor, /// name of the author
- const ::rtl::OUString& rComment, /// redline comment
+ const OUString& rType, /// redline type (insert, del,... )
+ const OUString& rId, /// use to identify this redline
+ const OUString& rAuthor, /// name of the author
+ const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
sal_Bool bMergeLastParagraph); /// merge last paragraph?
@@ -94,12 +94,12 @@ public:
::com::sun::star::text::XTextCursor> CreateRedlineTextSection(
::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> xOldCursor,
- const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
+ const OUString& rId); /// ID used to RedlineAdd() call
/// Set start or end position for a redline in the text body.
/// Accepts XTextRange objects.
void SetCursor(
- const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
+ const OUString& rId, /// ID used in RedlineAdd() call
sal_Bool bStart, /// start or end Range
::com::sun::star::uno::Reference< /// the actual XTextRange
::com::sun::star::text::XTextRange> & rRange,
@@ -116,7 +116,7 @@ public:
* only be considered valid if it points to the next text node
* after the position given in a previous SetCursor */
void AdjustStartNodeCursor(
- const ::rtl::OUString& rId, /// ID used in RedlineAdd() call
+ const OUString& rId, /// ID used in RedlineAdd() call
sal_Bool bStart,
/// XTextRange _inside_ a table/section
::com::sun::star::uno::Reference<
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 3e48044e8b27..ac78331779ec 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -83,7 +83,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
static void lcl_EnsureValidPam( SwPaM& rPam )
@@ -172,7 +171,7 @@ sal_Int32 ReadThroughComponent(
#ifdef TIMELOG
// if we do profiling, we want to know the stream
- rtl::OString aString(rtl::OUStringToOString(rStreamName,
+ OString aString(OUStringToOString(rStreamName,
RTL_TEXTENCODING_ASCII_US));
RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740",
"ReadThroughComponent : parsing \"%s\"", aString.getStr() );
@@ -207,9 +206,9 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
"SAX parse exception caught while importing:\n"));
- aError.append(rtl::OUStringToOString(r.Message,
+ aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -243,9 +242,9 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
"SAX exception caught while importing:\n"));
- aError.append(rtl::OUStringToOString(r.Message,
+ aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -256,9 +255,9 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
"Zip exception caught while importing:\n"));
- aError.append(rtl::OUStringToOString(r.Message,
+ aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -268,9 +267,9 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
"IO exception caught while importing:\n"));
- aError.append(rtl::OUStringToOString(r.Message,
+ aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -280,9 +279,9 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
"uno exception caught while importing:\n"));
- aError.append(rtl::OUStringToOString(r.Message,
+ aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -698,7 +697,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW );
beans::NamedValue aLateInitSettings(
- ::rtl::OUString( "LateInitSettings" ),
+ OUString( "LateInitSettings" ),
makeAny( xLateInitSettings )
);
@@ -792,12 +791,12 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
SfxMedium* pMedDescrMedium = pMedium ? pMedium : pDocSh->GetMedium();
OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!\n" );
- ::rtl::OUString aBaseURL( rBaseURL );
+ OUString aBaseURL( rBaseURL );
OUString sPropName("BaseURI");
xInfoSet->setPropertyValue( sPropName, makeAny( aBaseURL ) );
// TODO/LATER: separate links from usual embedded objects
- ::rtl::OUString StreamPath;
+ OUString StreamPath;
if( SFX_CREATE_MODE_EMBEDDED == rDoc.GetDocShell()->GetCreateMode() )
{
if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() )
@@ -809,7 +808,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
}
else
{
- StreamPath = ::rtl::OUString("dummyObjectName");
+ StreamPath = OUString("dummyObjectName");
}
if( !StreamPath.isEmpty() )
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 11ccee0b9bb8..096d0ced53f1 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -53,7 +53,6 @@
#include <comphelper/makesequence.hxx>
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -73,7 +72,7 @@ SwXMLWriter::~SwXMLWriter()
sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& xStatusIndicator,
- const rtl::OUString& aDocHierarchicalName )
+ const OUString& aDocHierarchicalName )
{
// Get service factory
uno::Reference< uno::XComponentContext > xContext =
@@ -207,7 +206,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
// Set base URI
OUString sPropName("BaseURI");
- xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( GetBaseURL() ) ) );
+ xInfoSet->setPropertyValue( sPropName, makeAny( OUString( GetBaseURL() ) ) );
if( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocShell()->GetCreateMode() )
{
@@ -215,7 +214,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if ( !aDocHierarchicalName.isEmpty() )
aName = aDocHierarchicalName;
else
- aName = ::rtl::OUString( "dummyObjectName" );
+ aName = OUString( "dummyObjectName" );
sPropName = OUString("StreamRelPath");
xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
@@ -298,10 +297,10 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
{
const uno::Reference<beans::XPropertySet> xPropSet(xStg,
uno::UNO_QUERY_THROW);
- const ::rtl::OUString VersionProp("Version");
+ const OUString VersionProp("Version");
try
{
- ::rtl::OUString Version;
+ OUString Version;
// ODF >= 1.2
if ((xPropSet->getPropertyValue(VersionProp) >>= Version)
&& !Version.equals(ODFVER_010_TEXT)
@@ -328,7 +327,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
Reference< frame::XModule > xModule( xModelComp, UNO_QUERY );
if ( xModule.is() )
{
- ::rtl::OUString aModuleID = xModule->getIdentifier();
+ OUString aModuleID = xModule->getIdentifier();
bStoreMeta = ( !aModuleID.isEmpty() && ( aModuleID == "com.sun.star.sdb.FormDesign" || aModuleID == "com.sun.star.sdb.TextReportDesign" ) );
}
}
@@ -410,7 +409,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
OUString aMime("application/binary");
uno::Any aAny2;
aAny2 <<= aMime;
- xSet->setPropertyValue( rtl::OUString("MediaType"), aAny2 );
+ xSet->setPropertyValue( OUString("MediaType"), aAny2 );
pDoc->WriteLayoutCache( *pStream );
}
@@ -465,13 +464,13 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
sal_uLong SwXMLWriter::WriteStorage()
{
- return _Write( uno::Reference < task::XStatusIndicator >(), ::rtl::OUString() );
+ return _Write( uno::Reference < task::XStatusIndicator >(), OUString() );
}
sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
{
uno::Reference < task::XStatusIndicator > xStatusIndicator;
- rtl::OUString aName;
+ OUString aName;
const SfxUnoAnyItem* pStatusBarItem = static_cast<const SfxUnoAnyItem*>(
aTargetMedium.GetItemSet()->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) );
if ( pStatusBarItem )
@@ -524,7 +523,7 @@ bool SwXMLWriter::WriteThroughComponent(
OUString aMime("text/xml");
uno::Any aAny;
aAny <<= aMime;
- xSet->setPropertyValue( rtl::OUString("MediaType"), aAny );
+ xSet->setPropertyValue( OUString("MediaType"), aAny );
OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption");
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index debc8d98d27e..8097510abf65 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star {
class SwXMLWriter : public StgWriter
{
- sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const rtl::OUString& );
+ sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& );
using StgWriter::Write;
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 05a24adec83d..4364c341bd72 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -37,7 +37,6 @@
#include "xmlimpit.hxx"
#include "xmlexpit.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 923f92868cfb..e524f9b42c1f 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -50,7 +50,7 @@ public:
SwXMLBrushItemImportContext(
SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
@@ -59,7 +59,7 @@ public:
SwXMLBrushItemImportContext(
SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
@@ -68,7 +68,7 @@ public:
virtual ~SwXMLBrushItemImportContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index ea2bbec578ce..8012a86e36bc 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -64,7 +64,6 @@
#include <pausethreadstarting.hxx> // #i73788#
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
@@ -446,7 +445,7 @@ void SwXMLExport::SetBodyAttributes()
pDoc->GetCurrentViewShell()->GetPageCount() > 1 )
{
sal_Bool bValue = sal_True;
- rtl::OUStringBuffer sBuffer;
+ OUStringBuffer sBuffer;
::sax::Converter::convertBool(sBuffer, bValue);
AddAttribute(XML_NAMESPACE_TEXT, XML_USE_SOFT_PAGE_BREAKS,
sBuffer.makeStringAndClear());
@@ -494,7 +493,7 @@ void SwXMLExport::_ExportContent()
aAny >>= nYear;
if (nYear != 1930 )
{
- rtl::OUStringBuffer sBuffer;
+ OUStringBuffer sBuffer;
::sax::Converter::convertNumber(sBuffer, nYear);
AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear());
SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True);
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 9af8a5cee5c8..a30bb1d74f74 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -68,7 +68,7 @@ class SwXMLExport : public SvXMLExport
void ExportTableLinesAutoStyles( const SwTableLines& rLines,
sal_uInt32 nAbsWidth,
sal_uInt32 nBaseWidth,
- const ::rtl::OUString& rNamePrefix,
+ const OUString& rNamePrefix,
SwXMLTableColumnsSortByWidth_Impl& rExpCols,
SwXMLTableFrmFmtsSort_Impl& rExpRows,
SwXMLTableFrmFmtsSort_Impl& rExpCells,
@@ -101,9 +101,9 @@ class SwXMLExport : public SvXMLExport
virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings );
// string constants for table cell export
- const ::rtl::OUString sNumberFormat;
- const ::rtl::OUString sIsProtected;
- const ::rtl::OUString sCell;
+ const OUString sNumberFormat;
+ const OUString sIsProtected;
+ const OUString sCell;
void setBlockMode();
private:
@@ -145,7 +145,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo (override parent method)
- ::rtl::OUString SAL_CALL getImplementationName()
+ OUString SAL_CALL getImplementationName()
throw( ::com::sun::star::uno::RuntimeException );
const SwDoc* getDoc() const;
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 71d2f7c8f067..9cf92e038205 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -52,8 +52,6 @@
using ::editeng::SvxBorderLine;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
using uno::Any;
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index 39e195d15ed1..e40e25e3a8c1 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -114,7 +114,7 @@ public:
inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
static bool QueryXMLValue( const SfxPoolItem& rItem,
- ::rtl::OUString& rValue, sal_uInt16 nMemberId,
+ OUString& rValue, sal_uInt16 nMemberId,
const SvXMLUnitConverter& rUnitConverter );
};
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 8eae79fb2586..452271c6e75f 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -52,8 +52,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::xmloff::token;
class SwXMLConditionParser_Impl
@@ -745,7 +743,7 @@ protected:
virtual uno::Reference < container::XNameContainer >
GetStylesContainer( sal_uInt16 nFamily ) const;
- virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const;
// HACK
public:
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 1546f3aacc92..fec9a9f4984e 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -39,7 +39,6 @@
#include <SwStyleNameMapper.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -47,7 +46,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::xmloff::token;
-using rtl::OUString;
void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
{
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 8b79d6bd2327..34e16489c1b6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -67,7 +67,6 @@
#include <comphelper/servicehelper.hxx>
#include <comphelper/processfactory.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -908,7 +907,7 @@ void SwXMLImport::endDocument( void )
{
Sequence< beans::PropertyValue > aXFormsSettings;
- ::rtl::OUString sXFormsSettingsName( GetXMLToken( XML_XFORM_MODEL_SETTINGS ) );
+ OUString sXFormsSettingsName( GetXMLToken( XML_XFORM_MODEL_SETTINGS ) );
if ( xLateInitSettings.is() && xLateInitSettings->hasByName( sXFormsSettingsName ) )
{
OSL_VERIFY( xLateInitSettings->getByName( sXFormsSettingsName ) >>= aXFormsSettings );
@@ -1469,7 +1468,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
void SwXMLImport::SetDocumentSpecificSettings(
- const ::rtl::OUString& _rSettingsGroupName,
+ const OUString& _rSettingsGroupName,
const Sequence< PropertyValue>& _rSettings )
{
// the only doc-specific settings group we know so far are the XForms settings
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 5e2e4959c918..76738e0d65d3 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -99,7 +99,7 @@ protected:
// This method is called after the namespace map has been updated, but
// before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
@@ -128,7 +128,7 @@ public:
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo (override parent method)
- ::rtl::OUString SAL_CALL getImplementationName()
+ OUString SAL_CALL getImplementationName()
throw( ::com::sun::star::uno::RuntimeException );
void InsertStyles( sal_Bool bAuto );
@@ -138,22 +138,22 @@ public:
// NB: in contrast to other CreateFooContexts, this particular one handles
// the root element (i.e. office:document-meta)
- SvXMLImportContext *CreateMetaContext( const ::rtl::OUString& rLocalName );
- SvXMLImportContext *CreateScriptContext( const ::rtl::OUString& rLocalName );
+ SvXMLImportContext *CreateMetaContext( const OUString& rLocalName );
+ SvXMLImportContext *CreateScriptContext( const OUString& rLocalName );
SvXMLImportContext *CreateStylesContext(
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
sal_Bool bAuto );
SvXMLImportContext *CreateMasterStylesContext(
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateFontDeclsContext(
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
- SvXMLImportContext *CreateBodyContentContext( const ::rtl::OUString& rLocalName );
+ SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName );
sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
bool IsInsertMode() const { return bInsert; }
bool IsStylesOnlyMode() const { return !bLoadDoc; }
@@ -164,7 +164,7 @@ public:
inline const SvXMLImportItemMapper& GetTableItemMapper() const;
inline SvXMLImportItemMapper& GetTableItemMapper();
SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nSubFamily, SfxItemSet& rItemSet );
@@ -174,15 +174,15 @@ public:
const SvXMLTokenMap& GetTableCellAttrTokenMap();
bool FindAutomaticStyle( sal_uInt16 nFamily,
- const ::rtl::OUString& rName,
+ const OUString& rName,
const SfxItemSet **ppItemSet=0,
- ::rtl::OUString *pParent=0 ) const;
+ OUString *pParent=0 ) const;
virtual void SetStatistics(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats);
virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);
virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps);
- virtual void SetDocumentSpecificSettings(const ::rtl::OUString& _rSettingsGroupName,
+ virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings);
SvStorage *GetPackage() { return &xPackage; }
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 22878e325e37..6d57f456249d 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -53,7 +53,6 @@
#include <com/sun/star/uno/Any.hxx>
using ::editeng::SvxBorderLine;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
using uno::Any;
@@ -228,7 +227,7 @@ SvXMLImportItemMapper::finished(SfxItemSet &, SvXMLUnitConverter const&) const
// put an XML-string value into an item
bool SvXMLImportItemMapper::PutXMLValue(
SfxPoolItem& rItem,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
sal_uInt16 nMemberId,
const SvXMLUnitConverter& rUnitConverter )
{
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 5b2fce09fa2a..5c044a342301 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -56,7 +56,7 @@ public:
virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry,
SfxPoolItem& rItem,
SfxItemSet& rSet,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap );
@@ -64,7 +64,7 @@ public:
MID_SW_FLAG_NO_ITEM_IMPORT flag set */
virtual bool handleNoItem( const SvXMLItemMapEntry& rEntry,
SfxItemSet& rSet,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap );
@@ -81,7 +81,7 @@ public:
upon an XML attribute value. */
static bool PutXMLValue(
SfxPoolItem& rItem,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
sal_uInt16 nMemberId,
const SvXMLUnitConverter& rUnitConverter );
};
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index 7b6b455a86fb..75445bbfe76f 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -21,7 +21,6 @@
#include "xmlimpit.hxx"
#include "xmlitem.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
SvXMLItemSetContext::SvXMLItemSetContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
@@ -63,7 +62,7 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT
*/
SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/,
SfxItemSet& /*rItemSet*/,
const SvXMLItemMapEntry& /*rEntry*/,
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index bc04c0a1b6c9..4c428364b963 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -42,7 +42,7 @@ protected:
public:
SvXMLItemSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
SvXMLImportItemMapper& rIMap,
@@ -51,14 +51,14 @@ public:
virtual ~SvXMLItemSetContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
// SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT_ITEM_IMPORT
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index f23db6f8b43b..be0e27cb8a4d 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -43,8 +43,6 @@
#include <editeng/memberids.hrc>
#include <comphelper/processfactory.hxx>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 379579dd6de3..1df63c9976a6 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -50,7 +50,6 @@
#include "xmlimpit.hxx"
#include "xmlitem.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -77,7 +76,7 @@ public:
virtual bool
handleNoItem(SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
- ::rtl::OUString const& rValue,
+ OUString const& rValue,
SvXMLUnitConverter const& rUnitConverter,
SvXMLNamespaceMap const& rNamespaceMap);
@@ -89,7 +88,7 @@ public:
private:
void Reset();
- ::rtl::OUString m_FoMarginValue;
+ OUString m_FoMarginValue;
enum { LEFT = 0, RIGHT = 1, TOP = 2, BOTTOM = 3 };
bool m_bHaveMargin[4];
};
@@ -107,7 +106,7 @@ SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl()
void SwXMLImportTableItemMapper_Impl::Reset()
{
- m_FoMarginValue = ::rtl::OUString();
+ m_FoMarginValue = OUString();
for (int i = 0; i < 3; ++i)
{
m_bHaveMargin[i] = false;
@@ -180,7 +179,7 @@ bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
bool SwXMLImportTableItemMapper_Impl::handleNoItem(
SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
- ::rtl::OUString const& rValue,
+ OUString const& rValue,
SvXMLUnitConverter const& rUnitConverter,
SvXMLNamespaceMap const& rNamespaceMap)
{
@@ -262,7 +261,7 @@ public:
virtual ~SwXMLItemSetContext_Impl();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::uno::Reference< xml::sax::XAttributeList > & xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index db555aebe122..10627afe22e8 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -37,7 +37,6 @@
#include <xmloff/xmluconv.hxx>
using ::editeng::SvxBorderLine;
-using ::rtl::OUString;
using namespace ::xmloff::token;
using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx
index 1401660430cc..23a2a85e3291 100644
--- a/sw/source/filter/xml/xmlithlp.hxx
+++ b/sw/source/filter/xml/xmlithlp.hxx
@@ -37,7 +37,7 @@ namespace rtl { class OUString; }
/** Define various helper variables and functions for xmlimpit.cxx and
* xmlexpit.cxx. */
-bool sw_frmitems_parseXMLBorder( const ::rtl::OUString& rValue,
+bool sw_frmitems_parseXMLBorder( const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
bool& rHasStyle, sal_uInt16& rStyle,
bool& rHasWidth, sal_uInt16& rWidth,
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 275f2172f94c..4faacd4c82a8 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -74,7 +74,7 @@ public:
virtual ~SvXMLItemMapEntries();
SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace,
- const ::rtl::OUString& rString,
+ const OUString& rString,
SvXMLItemMapEntry* pStartAt = NULL ) const;
SvXMLItemMapEntry* getByIndex( sal_uInt16 nIndex ) const;
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx
index 375c36409575..f2796f8bee66 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -20,7 +20,6 @@
#include <rtl/ustring.hxx>
#include "xmlitmap.hxx"
-using rtl::OUString;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_TOKEN_INVALID;
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 2d3334b0522b..6352f2be4134 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -34,8 +34,6 @@
#include "xmlexp.hxx"
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx
index a50d57a28b1e..e5f55ad44c15 100644
--- a/sw/source/filter/xml/xmlscript.cxx
+++ b/sw/source/filter/xml/xmlscript.cxx
@@ -24,7 +24,6 @@
#include "xmlimp.hxx"
#include "xmlexp.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
// ---------------------------------------------------------------------
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index d33edb61ccee..a7bce2873a7f 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -52,8 +52,6 @@
#include <boost/foreach.hpp>
#include <o3tl/sorted_vector.hxx>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index cc273a7eea7a..ec43a0ce33c6 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -57,7 +57,6 @@
#include <osl/mutex.hxx>
#include "ndtxt.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -67,7 +66,6 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
using ::boost::unordered_map;
-using rtl::OUString;
enum SwXMLTableElemTokens
{
@@ -1175,7 +1173,7 @@ static String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
if (sPrefixStr.Len() == 0)
{
- sPrefixStr = rtl::OUString('_');
+ sPrefixStr = OUString('_');
}
// increase count until we find a name that is not yet taken
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index f6d9da92cabb..7062dc487a0c 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -50,10 +50,10 @@ namespace com { namespace sun { namespace star {
class SwXMLTableContext : public XMLTextTableContext
{
- ::rtl::OUString aStyleName;
- ::rtl::OUString aDfltCellStyleName;
+ OUString aStyleName;
+ OUString aDfltCellStyleName;
/// NB: this contains the xml:id only if this table is a subtable!
- ::rtl::OUString mXmlId;
+ OUString mXmlId;
//! Holds basic information about a column's width.
struct ColumnWidthInfo {
@@ -125,7 +125,7 @@ class SwXMLTableContext : public XMLTextTableContext
/** sets the appropriate SwTblBoxFmt at pBox. */
SwTableBoxFmt* GetSharedBoxFormat(
SwTableBox* pBox, /// the table box
- const ::rtl::OUString& rStyleName, /// XML style name
+ const OUString& rStyleName, /// XML style name
sal_Int32 nColumnWidth, /// width of column
sal_Bool bProtected, /// is cell protected?
sal_Bool bMayShare, /// may the format be shared (no value, formula...)
@@ -137,29 +137,29 @@ public:
TYPEINFO();
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable,
- const ::rtl::OUString& i_rXmlId );
+ const OUString& i_rXmlId );
virtual ~SwXMLTableContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
void InsertColumn( sal_Int32 nWidth, bool bRelWidth,
- const ::rtl::OUString *pDfltCellStyleName = 0 );
+ const OUString *pDfltCellStyleName = 0 );
sal_Int32 GetColumnWidth( sal_uInt32 nCol, sal_uInt32 nColSpan=1UL ) const;
- ::rtl::OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const;
+ OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const;
inline sal_uInt32 GetColumnCount() const;
inline bool HasColumnDefaultCellStyleNames() const;
@@ -168,20 +168,20 @@ public:
bool IsInsertRowPossible() const { return nCurRow < USHRT_MAX; }
bool IsValid() const { return pTableNode != 0; }
- void InsertCell( const ::rtl::OUString& rStyleName,
+ void InsertCell( const OUString& rStyleName,
sal_uInt32 nRowSpan=1U, sal_uInt32 nColSpan=1U,
const SwStartNode *pStNd=0,
- const ::rtl::OUString & i_rXmlId = ::rtl::OUString(),
+ const OUString & i_rXmlId = OUString(),
SwXMLTableContext *pTable=0,
sal_Bool bIsProtected = sal_False,
- const ::rtl::OUString *pFormula=0,
+ const OUString *pFormula=0,
sal_Bool bHasValue = sal_False,
double fValue = 0.0,
- ::rtl::OUString const*const pStringValue = 0);
- void InsertRow( const ::rtl::OUString& rStyleName,
- const ::rtl::OUString& rDfltCellStyleName,
+ OUString const*const pStringValue = 0);
+ void InsertRow( const OUString& rStyleName,
+ const OUString& rDfltCellStyleName,
bool bInHead,
- const ::rtl::OUString & i_rXmlId = ::rtl::OUString() );
+ const OUString & i_rXmlId = OUString() );
void FinishRow();
void InsertRepRows( sal_uInt32 nCount );
const SwXMLTableCell_Impl *GetCell( sal_uInt32 nRow, sal_uInt32 nCol ) const;
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index efa81035479d..8e1e208334d9 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -20,7 +20,6 @@
#include <xmloff/xmlnmspe.hxx>
#include "xmlimp.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 36b6efebffe7..987a465d59d2 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -46,8 +46,6 @@
#include <sfx2/frmdescr.hxx>
#include <SwStyleNameMapper.hxx>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
@@ -56,8 +54,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::io;
using namespace ::xmloff::token;
-using rtl::OUString;
-using rtl::OUStringBuffer;
enum SvEmbeddedObjectTypes
{
@@ -300,36 +296,36 @@ static void lcl_addFrameProperties(
if ( !xSet.is() )
return;
- ::rtl::OUString aURL;
- Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
+ OUString aURL;
+ Any aAny = xSet->getPropertyValue( OUString("FrameURL") );
aAny >>= aURL;
- ::rtl::OUString aName;
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName"));
+ OUString aName;
+ aAny = xSet->getPropertyValue( OUString("FrameName"));
aAny >>= aName;
sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode;
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll"));
+ aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll"));
aAny >>= bIsAutoScroll;
if ( !bIsAutoScroll )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") );
+ aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") );
aAny >>= bIsScrollingMode;
}
sal_Bool bIsBorderSet, bIsAutoBorder = sal_False;
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") );
+ aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") );
aAny >>= bIsAutoBorder;
if ( !bIsAutoBorder )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") );
+ aAny = xSet->getPropertyValue( OUString("FrameIsBorder") );
aAny >>= bIsBorderSet;
}
sal_Int32 nWidth, nHeight;
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") );
+ aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") );
aAny >>= nWidth;
- aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") );
+ aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") );
aAny >>= nHeight;
if( !bIsAutoScroll )
@@ -550,28 +546,28 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
if( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) )
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
- ::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") );
+ OUString aStr;
+ Any aAny2 = xSet->getPropertyValue( OUString("AppletCodeBase") );
aAny2 >>= aStr;
if (!aStr.isEmpty() )
lcl_addURL(rXMLExport, aStr);
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletName") );
+ aAny2 = xSet->getPropertyValue( OUString("AppletName") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCode") );
+ aAny2 = xSet->getPropertyValue( OUString("AppletCode") );
aAny2 >>= aStr;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr );
sal_Bool bScript = sal_False;
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") );
+ aAny2 = xSet->getPropertyValue( OUString("AppletIsScript") );
aAny2 >>= bScript;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE );
uno::Sequence < beans::PropertyValue > aProps;
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") );
+ aAny2 = xSet->getPropertyValue( OUString("AppletCommands") );
aAny2 >>= aProps;
sal_Int32 i = aProps.getLength();
@@ -581,7 +577,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
if ( nType2 == SWHTML_OPTTYPE_TAG)
{
- ::rtl::OUString aStr2;
+ OUString aStr2;
aProp.Value >>= aStr2;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, aProp.Name, aStr2);
}
@@ -597,12 +593,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
if ( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) )
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
- ::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginURL") );
+ OUString aStr;
+ Any aAny2 = xSet->getPropertyValue( OUString("PluginURL") );
aAny2 >>= aStr;
lcl_addURL( rXMLExport, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") );
+ aAny2 = xSet->getPropertyValue( OUString("PluginMimeType") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr );
@@ -616,13 +612,13 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
if ( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) )
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
- ::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
+ OUString aStr;
+ Any aAny2 = xSet->getPropertyValue( OUString("FrameURL") );
aAny2 >>= aStr;
lcl_addURL( rXMLExport, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameName") );
+ aAny2 = xSet->getPropertyValue( OUString("FrameName") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
@@ -656,7 +652,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sURL += rOLEObj.GetCurrentPersistName();
if ( ( rXMLExport.getExportFlags() & EXPORT_OASIS ) == 0 )
- sURL += ::rtl::OUString( "?oasis=false" );
+ sURL += OUString( "?oasis=false" );
rXMLExport.AddEmbeddedObjectAsBase64( sURL );
}
@@ -667,7 +663,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") );
+ aAny = xSet->getPropertyValue( OUString("AppletCommands") );
aAny >>= aProps;
sal_Int32 i = aProps.getLength();
@@ -677,7 +673,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
if (SWHTML_OPTTYPE_PARAM == nType2 || SWHTML_OPTTYPE_SIZE == nType2 )
{
- ::rtl::OUString aStr;
+ OUString aStr;
aProp.Value >>= aStr;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name );
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
@@ -693,7 +689,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") );
+ aAny = xSet->getPropertyValue( OUString("PluginCommands") );
aAny >>= aProps;
sal_Int32 i = aProps.getLength();
@@ -703,7 +699,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_False );
if ( nType2 == SWHTML_OPTTYPE_TAG)
{
- ::rtl::OUString aStr;
+ OUString aStr;
aProp.Value >>= aStr;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name );
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 34d1bb6ef5d5..7cceb4a8e880 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -32,9 +32,9 @@ namespace com { namespace sun { namespace star { namespace style {
class SwXMLTextParagraphExport : public XMLTextParagraphExport
{
- const ::rtl::OUString sTextTable;
- const ::rtl::OUString sEmbeddedObjectProtocol;
- const ::rtl::OUString sGraphicObjectProtocol;
+ const OUString sTextTable;
+ const OUString sEmbeddedObjectProtocol;
+ const OUString sGraphicObjectProtocol;
const SvGlobalName aAppletClassId;
const SvGlobalName aPluginClassId;
@@ -73,7 +73,7 @@ public:
virtual void setTextEmbeddedGraphicURL(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
- ::rtl::OUString& rStreamName ) const;
+ OUString& rStreamName ) const;
};
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 62665b2c43a0..c230dd641f70 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -63,8 +63,6 @@
#include <svl/urihelper.hxx>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -278,12 +276,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
{
// create object with desired ClassId
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
- ::rtl::OUString aName("DummyName");
+ OUString aName("DummyName");
uno::Sequence < sal_Int8 > aClass( aClassName.GetByteSequence() );
uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() );
uno::Reference < embed::XEmbeddedObject > xObj =
uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
- aClass, ::rtl::OUString(), xStorage, aName,
+ aClass, OUString(), xStorage, aName,
uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY );
if ( xObj.is() )
{
@@ -315,12 +313,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
SwOLENode* pExistingOLENd = pNd->GetOLENode();
if( pExistingOLENd )
{
- ::rtl::OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName();
+ OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName();
if ( aExistingName.equals( aObjName ) )
{
OSL_FAIL( "The document contains duplicate object references, means it is partially broken, please let developers know how this document was generated!\n" );
- ::rtl::OUString aTmpName = pDoc->GetPersist()->GetEmbeddedObjectContainer().CreateUniqueObjectName();
+ OUString aTmpName = pDoc->GetPersist()->GetEmbeddedObjectContainer().CreateUniqueObjectName();
try
{
pDoc->GetPersist()->GetStorage()->copyElementTo( aObjName,
@@ -567,13 +565,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
try
{
// create object with desired ClassId
- ::rtl::OUString aName("DummyName");
+ OUString aName("DummyName");
uno::Reference < embed::XEmbeddedObjectCreator > xFactory =
embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext());
uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
- aMediaDescriptor[0].Name = ::rtl::OUString("URL");
- aMediaDescriptor[0].Value <<= ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
+ aMediaDescriptor[0].Name = OUString("URL");
+ aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
{
uno::Reference< task::XInteractionHandler > xInteraction =
@@ -581,7 +579,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
if ( xInteraction.is() )
{
aMediaDescriptor.realloc( 2 );
- aMediaDescriptor[1].Name = ::rtl::OUString( "InteractionHandler" );
+ aMediaDescriptor[1].Name = OUString( "InteractionHandler" );
aMediaDescriptor[1].Value <<= xInteraction;
}
}
@@ -698,12 +696,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
try
{
// create object with desired ClassId
- ::rtl::OUString aName("DummyName");
+ OUString aName("DummyName");
uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence() );
uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() );
uno::Reference < embed::XEmbeddedObject > xObj =
uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
- aClass, ::rtl::OUString(), xStorage, aName,
+ aClass, OUString(), xStorage, aName,
uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY );
// set size to the object
@@ -718,11 +716,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
if ( xSet.is() )
{
if( bValidURL )
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
- makeAny( ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ xSet->setPropertyValue( OUString("PluginURL"),
+ makeAny( OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
if( bValidMimeType )
- xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"),
- makeAny( ::rtl::OUString( rMimeType ) ) );
+ xSet->setPropertyValue( OUString("PluginMimeType"),
+ makeAny( OUString( rMimeType ) ) );
}
SwFrmFmt *pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
@@ -829,12 +827,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
try
{
// create object with desired ClassId
- ::rtl::OUString aName("DummyName");
+ OUString aName("DummyName");
uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence() );
uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() );
uno::Reference < embed::XEmbeddedObject > xObj =
uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
- aClass, ::rtl::OUString(), xStorage, aName,
+ aClass, OUString(), xStorage, aName,
uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY );
// set size to the object
@@ -848,31 +846,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString("FrameURL"),
- makeAny( ::rtl::OUString( URIHelper::SmartRel2Abs(
+ xSet->setPropertyValue( OUString("FrameURL"),
+ makeAny( OUString( URIHelper::SmartRel2Abs(
INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameName"),
- makeAny( ::rtl::OUString( rName ) ) );
+ xSet->setPropertyValue( OUString("FrameName"),
+ makeAny( OUString( rName ) ) );
if ( eScrollMode == ScrollingAuto )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"),
+ xSet->setPropertyValue( OUString("FrameIsAutoScroll"),
makeAny( sal_True ) );
else
- xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"),
+ xSet->setPropertyValue( OUString("FrameIsScrollingMode"),
makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) );
if ( bIsBorderSet )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"),
+ xSet->setPropertyValue( OUString("FrameIsBorder"),
makeAny( bHasBorder ) );
else
- xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoBorder"),
+ xSet->setPropertyValue( OUString("FrameIsAutoBorder"),
makeAny( sal_True ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"),
+ xSet->setPropertyValue( OUString("FrameMarginWidth"),
makeAny( sal_Int32( aMargin.Width() ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"),
+ xSet->setPropertyValue( OUString("FrameMarginHeight"),
makeAny( sal_Int32( aMargin.Height() ) ) );
}
@@ -897,7 +895,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
void SwXMLTextImportHelper::endAppletOrPlugin(
const uno::Reference < XPropertySet > &rPropSet,
- ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > &rParamMap)
+ ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap)
{
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
@@ -922,8 +920,8 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
const sal_Int32 nCount = rParamMap.size();
uno::Sequence< beans::PropertyValue > aCommandSequence( nCount );
- ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > ::iterator aIter = rParamMap.begin();
- ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > ::iterator aEnd = rParamMap.end();
+ ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aIter = rParamMap.begin();
+ ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aEnd = rParamMap.end();
sal_Int32 nIndex=0;
while (aIter != aEnd )
{
@@ -935,14 +933,14 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
}
// unfortunately the names of the properties are depending on the object
- ::rtl::OUString aParaName("AppletCommands");
+ OUString aParaName("AppletCommands");
try
{
xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
}
catch ( uno::Exception& )
{
- aParaName = ::rtl::OUString("PluginCommands");
+ aParaName = OUString("PluginCommands");
try
{
xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 2a5929517b46..4e30e16d2168 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -31,7 +31,7 @@ class SwXMLTextImportHelper : public XMLTextImportHelper
protected:
virtual SvXMLImportContext *CreateTableChildContext(
SvXMLImport& rImport,
- sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nPrefix, const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
@@ -50,63 +50,63 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertOLEObject( SvXMLImport& rImport,
- const ::rtl::OUString& rHRef,
- const ::rtl::OUString& rStyleName,
- const ::rtl::OUString& rTblName,
+ const OUString& rHRef,
+ const OUString& rStyleName,
+ const OUString& rTblName,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
- const ::rtl::OUString& rHRef,
- const ::rtl::OUString& rStyleName,
- const ::rtl::OUString& rTblName,
+ const OUString& rHRef,
+ const OUString& rStyleName,
+ const OUString& rTblName,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertApplet(
- const ::rtl::OUString &rName,
- const ::rtl::OUString &rCode,
+ const OUString &rName,
+ const OUString &rCode,
sal_Bool bMayScript,
- const ::rtl::OUString& rHRef,
+ const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertPlugin(
- const ::rtl::OUString &rMimeType,
- const ::rtl::OUString& rHRef,
+ const OUString &rMimeType,
+ const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertFloatingFrame(
- const ::rtl::OUString &rName,
- const ::rtl::OUString &rHRef,
- const ::rtl::OUString &rStyleName,
+ const OUString &rName,
+ const OUString &rHRef,
+ const OUString &rStyleName,
sal_Int32 nWidth, sal_Int32 nHeight );
virtual void endAppletOrPlugin(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
- ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess> &rParamMap);
+ ::std::map < const OUString, OUString, ::comphelper::UStringLess> &rParamMap);
virtual sal_Bool IsInHeaderFooter() const;
// redlining helper methods
// (here is the real implementation)
virtual void RedlineAdd(
- const ::rtl::OUString& rType, /// redline type (insert, del,... )
- const ::rtl::OUString& rId, /// use to identify this redline
- const ::rtl::OUString& rAuthor, /// name of the author
- const ::rtl::OUString& rComment, /// redline comment
+ const OUString& rType, /// redline type (insert, del,... )
+ const OUString& rId, /// use to identify this redline
+ const OUString& rAuthor, /// name of the author
+ const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
sal_Bool bMergeLastPara); /// merge last paragraph
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> & rOldCursor,
- const ::rtl::OUString& rId); /// ID used to RedlineAdd() call
+ const OUString& rId); /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
- const ::rtl::OUString& rId, /// ID used to RedlineAdd() call
+ const OUString& rId, /// ID used to RedlineAdd() call
sal_Bool bStart, /// start or end Cursor
sal_Bool bIsOutsideOfParagraph);
virtual void RedlineAdjustStartNodeCursor(
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index cefbc1435064..a303fd749dc5 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -187,7 +187,7 @@ static SwView* lcl_LoadDoc(SwView* pView, const String& rURL)
if(rURL.Len())
{
SfxStringItem aURL(SID_FILE_NAME, rURL);
- SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") );
+ SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") );
SfxBoolItem aHidden( SID_HIDDEN, sal_True );
SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle());
SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()->
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index d840bf84824e..689c760280d9 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -73,7 +73,6 @@
#include <IDocumentDeviceAccess.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
// is in appenv.cxx
extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& );
@@ -143,7 +142,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte
String sDBName;
if( (!rItem.bSynchron || !(nCol|nRow)) && (sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).Len() && !bLast )
{
- sDBName.SetToken( 3, DB_DELIM, rtl::OUString("True"));
+ sDBName.SetToken( 3, DB_DELIM, OUString("True"));
SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh );
rFldMgr.InsertFld( aData );
}
@@ -329,7 +328,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
pSh->SetMark(); // set only the mark
SwSectionData aSect(CONTENT_SECTION,
- rtl::OUString(MASTER_LABEL));
+ OUString(MASTER_LABEL));
pSh->InsertSection(aSect);
}
}
@@ -337,7 +336,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
{
SwSectionData aSect(FILE_LINK_SECTION,
pSh->GetUniqueSectionName());
- rtl::OUStringBuffer sLinkName;
+ OUStringBuffer sLinkName;
sLinkName.append(sfx2::cTokenSeperator);
sLinkName.append(sfx2::cTokenSeperator);
sLinkName.append(MASTER_LABEL);
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 1b792f8dab3e..fe93d9f87704 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -152,17 +152,17 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
using namespace ::com::sun::star::i18n::ScriptType;
- Any aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale"));
+ Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale"));
aLang >>= aLocale;
nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), LATIN);
pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE));
- aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CJK"));
+ aLang = aLinguCfg.GetProperty(OUString("DefaultLocale_CJK"));
aLang >>= aLocale;
nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), ASIAN);
pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE));
- aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CTL"));
+ aLang = aLinguCfg.GetProperty(OUString("DefaultLocale_CTL"));
aLang >>= aLocale;
nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), COMPLEX);
pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE));
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 92f10005545c..e961da17cb99 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -110,7 +110,6 @@
#include <sfx2/Metadatable.hxx>
#include <switerator.hxx>
-using rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@@ -258,7 +257,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
SW_MOD()->SetEmbeddedLoadSave( sal_False );
- SetError( nErr, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ SetError( nErr, OUString( OSL_LOG_PREFIX ) );
sal_Bool bOk = !IsError( nErr );
if ( bOk && !pDoc->IsInLoadAsynchron() )
@@ -350,7 +349,7 @@ sal_Bool SwDocShell::Save()
}
SW_MOD()->SetEmbeddedLoadSave( sal_False );
}
- SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) );
SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0;
if( pFrm )
@@ -397,8 +396,8 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps
= xDPS->getDocumentProperties();
- xDocProps->setTemplateName(::rtl::OUString());
- xDocProps->setTemplateURL(::rtl::OUString());
+ xDocProps->setTemplateName(OUString());
+ xDocProps->setTemplateURL(OUString());
xDocProps->setTemplateDate(::util::DateTime());
}
}
@@ -483,7 +482,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
// Increase RSID
pDoc->setRsid( pDoc->getRsid() );
}
- SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) );
return !IsError( nErr );
}
@@ -538,7 +537,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
OSL_ENSURE( !xStg->GetError(), "No storage available for storing VBA macros!" );
if ( !xStg->GetError() )
{
- nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, rtl::OUString("Macros") );
+ nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, OUString("Macros") );
xStg->Commit();
pDoc->SetContainsMSVBasic( sal_True );
}
@@ -557,18 +556,18 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
{
uno::Reference< XLibraryContainer > xLibCont(GetBasicContainer(), UNO_QUERY);
uno::Reference< XNameAccess > xLib;
- Sequence<rtl::OUString> aNames = xLibCont->getElementNames();
- const rtl::OUString* pNames = aNames.getConstArray();
+ Sequence<OUString> aNames = xLibCont->getElementNames();
+ const OUString* pNames = aNames.getConstArray();
for(sal_Int32 nLib = 0; nLib < aNames.getLength(); nLib++)
{
Any aLib = xLibCont->getByName(pNames[nLib]);
aLib >>= xLib;
if(xLib.is())
{
- Sequence<rtl::OUString> aModNames = xLib->getElementNames();
+ Sequence<OUString> aModNames = xLib->getElementNames();
if(aModNames.getLength())
{
- SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ SetError(WARN_SWG_HTML_NO_MACROS, OUString( OSL_LOG_PREFIX ) );
break;
}
}
@@ -639,7 +638,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
// TODO/MBA: testing
uno::Reference < beans::XPropertySet > xSet( rMedium.GetStorage(), uno::UNO_QUERY );
if ( xSet.is() )
- xSet->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) );
+ xSet->setPropertyValue( OUString("MediaType"), uno::makeAny( OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) );
}
catch (const uno::Exception&)
{
@@ -723,7 +722,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
SW_MOD()->SetEmbeddedLoadSave( sal_False );
- SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ SetError( nErrno ? nErrno : nVBWarning, OUString( OSL_LOG_PREFIX ) );
if( !rMedium.IsStorage() )
rMedium.CloseOutStream();
@@ -752,7 +751,7 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
if( bResetModified )
EnableSetModified( sal_False );
- uno::Sequence < rtl::OUString > aNames = pOLEChildList->GetObjectNames();
+ uno::Sequence < OUString > aNames = pOLEChildList->GetObjectNames();
for( sal_Int32 n = aNames.getLength(); n; n-- )
{
if ( !pOLEChildList->MoveEmbeddedObject( aNames[n-1], GetEmbeddedObjectContainer() ) )
@@ -1129,7 +1128,7 @@ void SwDocShell::RemoveOLEObjects()
if( !pOLEChildList )
pOLEChildList = new comphelper::EmbeddedObjectContainer;
- ::rtl::OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName();
+ OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName();
GetEmbeddedObjectContainer().MoveEmbeddedObject( aObjName, *pOLEChildList );
}
}
@@ -1209,13 +1208,13 @@ Sequence< OUString > SwDocShell::GetEventNames()
return aRet;
}
-rtl::OUString SwDocShell::GetEventName( sal_Int32 nIndex )
+OUString SwDocShell::GetEventName( sal_Int32 nIndex )
{
if (nIndex < s_nEvents)
{
- return ::rtl::OUString::createFromAscii(s_EventNames[nIndex]);
+ return OUString::createFromAscii(s_EventNames[nIndex]);
}
- return rtl::OUString();
+ return OUString();
}
const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 483e647e5217..4f92956e4912 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -119,7 +119,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-using ::rtl::OUString;
using namespace ::sfx2;
extern bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
@@ -777,7 +776,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
SfxObjectFactory &rFact = GetFactory();
- SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) );
+ SfxFilterMatcher aMatcher( OUString::createFromAscii(rFact.GetShortName()) );
SfxFilterMatcherIter aIter( aMatcher );
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
const SfxFilter* pFlt = aIter.First();
@@ -796,7 +795,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this );
const SfxFilter *pOwnFlt =
SwDocShell::Factory().GetFilterContainer()->
- GetFilter4FilterName(rtl::OUString("writer8"));
+ GetFilter4FilterName(OUString("writer8"));
// make sure the default file format is also available
if(bWeb)
@@ -843,7 +842,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
bMerge = 0 != (nFlags&SFX_MERGE_STYLES);
aOpt.SetMerge( !bMerge );
- SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
if ( !GetError() )
rReq.Done();
}
@@ -864,7 +863,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
// 3 - file saved in non-HTML -> QueryBox to save as HTML
const SfxFilter* pHtmlFlt =
SwIoSystem::GetFilterOfFormat(
- rtl::OUString("HTML"),
+ OUString("HTML"),
SwWebDocShell::Factory().GetFilterContainer() );
sal_Bool bLocalHasName = HasName();
if(bLocalHasName)
@@ -986,7 +985,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext );
- ::rtl::OUString aCmd("SendOutlineToImpress");
+ OUString aCmd("SendOutlineToImpress");
uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) );
pStrm->Seek( STREAM_SEEK_TO_END );
*pStrm << '\0';
@@ -1003,9 +1002,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead );
uno::Sequence< beans::PropertyValue > aArgs(1);
- aArgs[0].Name = ::rtl::OUString("RtfOutline");
+ aArgs[0].Name = OUString("RtfOutline");
aArgs[0].Value <<= aSeq;
- xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs );
+ xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs );
}
}
else
@@ -1037,7 +1036,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
EnableSetModified( sal_False );
WriterRef xWrt;
// mba: looks as if relative URLs don't make sense here
- ::GetRTFWriter( rtl::OUString('O'), rtl::OUString(), xWrt );
+ ::GetRTFWriter( OUString('O'), OUString(), xWrt );
SvMemoryStream *pStrm = new SvMemoryStream();
pStrm->SetBufferSize( 16348 );
SwWriter aWrt( *pStrm, *GetDoc() );
@@ -1053,7 +1052,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext );
- ::rtl::OUString aCmd("SendOutlineToImpress");
+ OUString aCmd("SendOutlineToImpress");
uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) );
pStrm->Seek( STREAM_SEEK_TO_END );
*pStrm << '\0';
@@ -1070,9 +1069,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead );
uno::Sequence< beans::PropertyValue > aArgs(1);
- aArgs[0].Name = ::rtl::OUString("RtfOutline");
+ aArgs[0].Name = OUString("RtfOutline");
aArgs[0].Value <<= aSeq;
- xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs );
+ xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs );
}
}
else
@@ -1189,7 +1188,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
// for HTML there is only one filter!!
pFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString("HTML"),
+ OUString("HTML"),
SwWebDocShell::Factory().GetFilterContainer() );
nStrId = STR_LOAD_HTML_DOC;
}
@@ -1197,7 +1196,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
// for Global-documents we now only offer the current one.
pFlt = SwGlobalDocShell::Factory().GetFilterContainer()->
- GetFilter4Extension( rtl::OUString("odm") );
+ GetFilter4Extension( OUString("odm") );
nStrId = STR_LOAD_GLOBAL_DOC;
}
@@ -1401,8 +1400,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
// Ok. I did my best.
break;
- SfxStringItem aApp(SID_DOC_SERVICE, rtl::OUString("com.sun.star.text.TextDocument"));
- SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank"));
+ SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.text.TextDocument"));
+ SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
pViewShell->GetDispatcher()->Execute(
SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L);
}
@@ -1672,7 +1671,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
INetURLObject aURLObj( rURL );
// Set filter:
- String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
+ String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
SfxFilterMatcher aMatcher( sFactory );
// search for filter in WebDocShell, too
@@ -1681,7 +1680,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
if(!pFlt)
{
- String sWebFactory(rtl::OUString::createFromAscii(SwWebDocShell::Factory().GetShortName()));
+ String sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName()));
SfxFilterMatcher aWebMatcher( sWebFactory );
aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
}
@@ -1702,7 +1701,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
try
{
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY_THROW );
- const ::rtl::OUString aMediaTypePropName( "MediaType" );
+ const OUString aMediaTypePropName( "MediaType" );
xProps->getPropertyValue( aMediaTypePropName );
bImport = true;
}
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 716e70fab400..fba0504f1a09 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -92,7 +92,6 @@ using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-using ::rtl::OUString;
// Load Document
sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
@@ -570,7 +569,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
UpdateFontList();
InitDraw();
- SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
bRet = !IsError( nErr );
if ( bRet && !pDoc->IsInLoadAsynchron() &&
@@ -598,7 +597,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
do { // middle check loop
sal_uInt32 nErr = ERR_SWG_READ_ERROR;
String aStreamName;
- aStreamName = rtl::OUString("styles.xml");
+ aStreamName = OUString("styles.xml");
uno::Reference < container::XNameAccess > xAccess( rMedium.GetStorage(), uno::UNO_QUERY );
if ( xAccess->hasByName( aStreamName ) && rMedium.GetStorage()->isStreamElement( aStreamName ) )
{
@@ -621,7 +620,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
OSL_FAIL("Code removed!");
}
- SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
bRet = !IsError( nErr );
} while( false );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index d7ceaf4798e7..8b546240dcc8 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -308,8 +308,8 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
xCont->getByName(pFamilyItem->GetValue()) >>= xStyles;
uno::Reference< beans::XPropertySet > xInfo;
xStyles->getByName( pNameItem->GetValue() ) >>= xInfo;
- ::rtl::OUString aUIName;
- xInfo->getPropertyValue( ::rtl::OUString("DisplayName") ) >>= aUIName;
+ OUString aUIName;
+ xInfo->getPropertyValue( OUString("DisplayName") ) >>= aUIName;
if ( !aUIName.isEmpty() )
rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) );
}
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index dc36e110d3d2..2af3322ea944 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -287,11 +287,11 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc,
static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam,
- const rtl::OUString& rName)
+ const OUString& rName)
{
if(!rLst.empty())
{
- String sSrch = rtl::OUString(' ');
+ String sSrch = OUString(' ');
switch( eFam )
{
case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break;
@@ -331,7 +331,7 @@ bool FindPhyStyle( SwDoc& rDoc, const String& rName, SfxStyleFamily eFam )
// Add Strings to the list of templates
void SwPoolFmtList::Append( char cChar, const String& rStr )
{
- String aStr = rtl::OUString(cChar);
+ String aStr = OUString(cChar);
aStr += rStr;
for(std::vector<String>::const_iterator i = begin(); i != end(); ++i)
if(*i == aStr)
@@ -633,7 +633,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() );
- rtl::OUString sPlus(" + ");
+ OUString sPlus(" + ");
if ( SFX_STYLE_FAMILY_PAGE == nFamily )
{
if( !pSet )
@@ -683,7 +683,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
String aDesc;
const SfxPoolItem* pItem = aIter.FirstItem();
- rtl::OUString sPageNum;
+ OUString sPageNum;
String sModel, sBreak;
bool bHasWesternFontPrefix = false;
bool bHasCJKFontPrefix = false;
@@ -2789,7 +2789,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Next()
return 0;
}
-SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName)
+SfxStyleSheetBase* SwStyleSheetIterator::Find(const OUString& rName)
{
// searching
if( !bFirstCalled )
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx
index 4ffa8ce72418..7946fd5a127d 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/ui/app/swdll.cxx
@@ -98,12 +98,12 @@ SwDLL::SwDLL()
SwModule* pModule = new SwModule( pWDocFact, pDocFact, pGlobDocFact );
*ppShlPtr = pModule;
- pWDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.WebDocument"));
+ pWDocFact->SetDocumentServiceName(OUString("com.sun.star.text.WebDocument"));
if ( aOpt.IsWriter() )
{
- pGlobDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.GlobalDocument"));
- pDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.TextDocument"));
+ pGlobDocFact->SetDocumentServiceName(OUString("com.sun.star.text.GlobalDocument"));
+ pDocFact->SetDocumentServiceName(OUString("com.sun.star.text.TextDocument"));
}
// register SvDraw-Fields
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index eb485a65ed41..f22fcd7a3cf1 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -61,7 +61,6 @@
#include <tools/color.hxx>
#include "PostItMgr.hxx"
-using ::rtl::OUString;
using namespace ::svx;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 3002df016bc3..dc820bb493f7 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -174,7 +174,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
pDragDrop( 0 ),
pXSelection( 0 )
{
- SetName( rtl::OUString("StarWriter") );
+ SetName( OUString("StarWriter") );
pSwResMgr = GetResMgr();
SvxErrorHandler::ensure();
pErrorHdl = new SfxErrorHandler( RID_SW_ERRHDL,
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index 43bae1046cb1..05b32005d61f 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -52,13 +52,13 @@ long NumEditAction::Notify( NotifyEvent& rNEvt )
NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId)
: Edit(pParent, rResId)
- , sForbiddenChars(rtl::OUString(" "))
+ , sForbiddenChars(OUString(" "))
{
}
NoSpaceEdit::NoSpaceEdit(Window* pParent)
: Edit(pParent, WB_BORDER|WB_TABSTOP)
- , sForbiddenChars(rtl::OUString(" "))
+ , sForbiddenChars(OUString(" "))
{
}
@@ -71,7 +71,7 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt)
bool bCallParent = true;
if(rEvt.GetCharCode())
{
- rtl::OUString sKey(rEvt.GetCharCode());
+ OUString sKey(rEvt.GetCharCode());
if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
bCallParent = false;
}
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 8573b7365d03..b5c7359e318f 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -78,7 +78,7 @@ const char *aCommandContext[COND_COMMAND_COUNT] =
"NumberingLevel10"
};
-sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName )
+sal_Int16 GetCommandContextIndex( const OUString &rContextName )
{
sal_Int16 nRes = -1;
for (sal_Int16 i = 0; nRes == -1 && i < COND_COMMAND_COUNT; ++i)
@@ -89,12 +89,12 @@ sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName )
return nRes;
}
-rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex )
+OUString GetCommandContextByIndex( sal_Int16 nIndex )
{
- rtl::OUString aRes;
+ OUString aRes;
if (0 <= nIndex && nIndex < COND_COMMAND_COUNT)
{
- aRes = rtl::OUString::createFromAscii( aCommandContext[ nIndex ] );
+ aRes = OUString::createFromAscii( aCommandContext[ nIndex ] );
}
return aRes;
}
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index e7efa9177250..cfa6741b1820 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -235,7 +235,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
{
- ::rtl::OUString sURL = m_pURLED->GetText();
+ OUString sURL = m_pURLED->GetText();
if(!sURL.isEmpty())
{
sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
@@ -243,7 +243,7 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
static const sal_Char* pFile = "file:";
sal_Int32 nLength = ((sal_Int32)sizeof(pFile)-1);
if( sURL.copy(0, nLength ).equalsAsciiL( pFile, nLength ))
- sURL = URIHelper::simpleNormalizedMakeRelative(::rtl::OUString(), sURL);
+ sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL);
}
SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText());
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index efae40258d38..0c7c0402252e 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -164,7 +164,7 @@ String GetDefaultString(sal_uInt16 nChars)
{
String aStr;
for (sal_uInt16 i = 0; i < nChars; i++)
- aStr += rtl::OUString((char) (i + 65));
+ aStr += OUString((char) (i + 65));
return aStr;
}
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx
index 95da3e4c6204..f9c4db5a81fd 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/ui/config/barcfg.cxx
@@ -26,7 +26,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
#define SEL_TYPE_TABLE_TEXT 0
@@ -123,6 +122,6 @@ void SwToolbarConfigItem::Commit()
PutProperties(aNames, aValues);
}
-void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 44f4b693cf01..951e791228d5 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -30,7 +30,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI
sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))),
nPos(1),
nLevel(0),
- sSeparator( rtl::OUString(": ") ),
+ sSeparator( OUString(": ") ),
bIgnoreSeqOpts(false),
bCopyAttributes(sal_False)
{
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx
index b6469980e86a..ac732a81811d 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/ui/config/dbconfig.cxx
@@ -26,7 +26,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
@@ -116,7 +115,7 @@ const SwDBData& SwDBConfig::GetBibliographySource()
}
void SwDBConfig::Commit() {}
-void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 22be0e3a00fc..fd36d345633d 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -30,7 +30,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL)
@@ -317,6 +316,6 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType
return nRet;
}
-void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 1528670b0ca0..cdd999c71b25 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::mail;
using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
class SwTestAccountSettingsDialog : public SfxModalDialog
{
@@ -320,7 +319,7 @@ void SwTestAccountSettingsDialog::Test()
{
uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
- rtl::OUString sException;
+ OUString sException;
bool bIsLoggedIn = false;
bool bIsServer = false;
@@ -357,7 +356,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_pConfigItem->GetInServerName(),
m_pParent->m_pConfigItem->GetInServerPort(),
- ::rtl::OUString("Insecure"));
+ OUString("Insecure"));
xInMailService->connect(xConnectionContext, xAuthenticator);
}
if(m_bStop)
@@ -419,7 +418,7 @@ void SwTestAccountSettingsDialog::Test()
if(!bIsServer || !bIsLoggedIn )
{
- rtl::OUStringBuffer aErrorMessage(m_sErrorServer);
+ OUStringBuffer aErrorMessage(m_sErrorServer);
if (!sException.isEmpty())
aErrorMessage.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n--\n")).append(sException);
m_eErrorsED.SetText(aErrorMessage.makeStringAndClear());
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index f9d35bdf9903..aebce5f424b6 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -38,7 +38,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
#define GLOB_NAME_CALC 0
@@ -293,7 +292,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
return nRet;
}
-void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwRevisionConfig::Commit()
{
@@ -584,9 +583,9 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
OUString* pWebNames = aWebNames.getArray();
int i;
for(i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
for(i = 0; i < nWebCount; i++)
- pWebNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pWebNames[i] = OUString::createFromAscii(aPropNames[i]);
}
return bIsWeb ? aWebNames : aNames;
}
@@ -635,12 +634,12 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro
case 5: pValues[nProp] <<= OUString(rOpt.GetSeparator());break;//Delimiter",
case 6: pValues[nProp] <<= (sal_Int32)rOpt.GetLevel(); break;//Level",
case 7: pValues[nProp] <<= (sal_Int32)rOpt.GetPos(); break;//Position",
- case 8: pValues[nProp] <<= (::rtl::OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle
+ case 8: pValues[nProp] <<= (OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle
case 9: pValues[nProp] <<= rOpt.CopyAttributes(); break; //ApplyAttributes
}
}
-void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwInsertConfig::Commit()
{
@@ -873,7 +872,7 @@ static void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp
break;//Position",
case 8 : //CharacterStyle
{
- ::rtl::OUString sTemp; pValues[nProp] >>= sTemp;
+ OUString sTemp; pValues[nProp] >>= sTemp;
rOpt.SetCharacterStyle( sTemp );
}
break;
@@ -1148,7 +1147,7 @@ SwTableConfig::~SwTableConfig()
{
}
-void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwTableConfig::Commit()
{
@@ -1246,12 +1245,12 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
};
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
}
return aNames;
}
-void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwMiscConfig::Commit()
{
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 6d562702ecb5..fa3ebd859886 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -171,18 +171,18 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage()
void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry )
{
- rtl::OUString sFormatName(utl::ConfigManager::getProductName());
- rtl::OUString sFormatVersion;
+ OUString sFormatName(utl::ConfigManager::getProductName());
+ OUString sFormatVersion;
bool bOpenOffice = ( sFormatName == "OpenOffice.org" );
if ( bOpenOffice )
- sFormatVersion = rtl::OUString("1.1");
+ sFormatVersion = OUString("1.1");
else
- sFormatVersion = rtl::OUString("6.0/7");
+ sFormatVersion = OUString("6.0/7");
if ( !bOpenOffice && ( sFormatName != "StarSuite" ) )
- sFormatName = rtl::OUString("StarOffice");
+ sFormatName = OUString("StarOffice");
- rEntry.SearchAndReplace( rtl::OUString("%FORMATNAME"), sFormatName );
- rEntry.SearchAndReplace( rtl::OUString("%FORMATVERSION"), sFormatVersion );
+ rEntry.SearchAndReplace( OUString("%FORMATNAME"), sFormatName );
+ rEntry.SearchAndReplace( OUString("%FORMATVERSION"), sFormatVersion );
}
sal_uLong convertBools2Ulong_Impl
@@ -264,7 +264,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
m_aDefaultPB.Disable();
}
String sText = m_aMainFL.GetText();
- sText.SearchAndReplace( rtl::OUString("%DOCNAME"), sDocTitle );
+ sText.SearchAndReplace( OUString("%DOCNAME"), sDocTitle );
m_aMainFL.SetText( sText );
// loading file formats
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d5a1f59dbb81..0b68d0ca5255 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -480,7 +480,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
aLbLevel.InsertEntry(OUString::number(i + 1));
sal_Unicode nLvl = MAXLEVEL;
- rtl::OUString sDelim(": ");
+ OUString sDelim(": ");
if (pSh)
{
@@ -574,9 +574,9 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet)
SetOptions(nPos++, GRAPHIC_CAP);
// get Productname and -version
- rtl::OUString sWithoutVersion( utl::ConfigManager::getProductName() );
- rtl::OUString sComplete(
- sWithoutVersion + rtl::OUString(" ") +
+ OUString sWithoutVersion( utl::ConfigManager::getProductName() );
+ OUString sComplete(
+ sWithoutVersion + OUString(" ") +
utl::ConfigManager::getProductVersion() );
SvObjectServerList aObjS;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e67d58dd2eac..bfe09fee95ca 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -497,7 +497,7 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet)
if (pListItem && pListItem->GetValue())
{
std::vector<String> aFaxList;
- const std::vector<rtl::OUString>& rPrinters = Printer::GetPrinterQueues();
+ const std::vector<OUString>& rPrinters = Printer::GetPrinterQueues();
for (unsigned int i = 0; i < rPrinters.size(); ++i)
aFaxList.insert(aFaxList.begin(), rPrinters[i]);
SetFax( aFaxList );
@@ -1770,10 +1770,10 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aMarkColorLB.SetSelectHdl( aLk );
//solution: set different accessible name of four color box
- aInsertColorLB.SetAccessibleName(::rtl::OUString( aInsertFT.GetDisplayText()) + ::rtl::OUString(aInsertColorFT.GetDisplayText()));
- aDeletedColorLB.SetAccessibleName(::rtl::OUString( aDeletedFT.GetDisplayText()) + ::rtl::OUString( aDeletedColorFT.GetDisplayText()));
- aChangedColorLB.SetAccessibleName(::rtl::OUString( aChangedFT.GetDisplayText()) + ::rtl::OUString( aChangedColorFT.GetDisplayText()));
- aMarkColorLB.SetAccessibleName(::rtl::OUString( aMarkPosFT.GetDisplayText()) + ::rtl::OUString( aMarkColorFT.GetDisplayText()));
+ aInsertColorLB.SetAccessibleName(OUString( aInsertFT.GetDisplayText()) + OUString(aInsertColorFT.GetDisplayText()));
+ aDeletedColorLB.SetAccessibleName(OUString( aDeletedFT.GetDisplayText()) + OUString( aDeletedColorFT.GetDisplayText()));
+ aChangedColorLB.SetAccessibleName(OUString( aChangedFT.GetDisplayText()) + OUString( aChangedColorFT.GetDisplayText()));
+ aMarkColorLB.SetAccessibleName(OUString( aMarkPosFT.GetDisplayText()) + OUString( aMarkColorFT.GetDisplayText()));
}
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index 01bd2dfe7b8d..ca075300dfbe 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -28,7 +28,6 @@
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
@@ -132,7 +131,7 @@ SwPrintOptions::~SwPrintOptions()
}
-void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwPrintOptions::Commit()
{
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index b9207bb3cf7f..dc153b8ea5f8 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -160,7 +160,7 @@ int SwBaseNumRules::Load(SvStream &rStream)
}
SwChapterNumRules::SwChapterNumRules() :
- SwBaseNumRules(rtl::OUString(CHAPTER_FILENAME))
+ SwBaseNumRules(OUString(CHAPTER_FILENAME))
{
}
@@ -390,7 +390,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
if( VERSION_53A > nVersion )
{
sal_Char cEncoded(aFmt.GetBulletChar());
- aFmt.SetBulletChar(rtl::OUString(&cEncoded, 1, nCharSet).toChar());
+ aFmt.SetBulletChar(OUString(&cEncoded, 1, nCharSet).toChar());
}
}
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index ee01698dd906..286ca229d6c5 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -37,7 +37,6 @@ using namespace utl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
@@ -358,7 +357,7 @@ void SwLayoutViewConfig::Load()
}
}
-void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwGridConfig::GetPropertyNames()
{
@@ -452,7 +451,7 @@ void SwGridConfig::Load()
}
}
-void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwCursorConfig::GetPropertyNames()
{
@@ -466,7 +465,7 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames()
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
}
@@ -534,7 +533,7 @@ void SwCursorConfig::Load()
}
}
-void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) :
ConfigItem("Office.WriterWeb/Background",
@@ -563,7 +562,7 @@ void SwWebColorConfig::Commit()
PutProperties(aPropNames, aValues);
}
-void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwWebColorConfig::Load()
{
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index b0003d3feee2..a365e47091e5 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -128,7 +128,7 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut,
sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const
{
OSL_ENSURE( pOut, "no Outdev" );
- return sal_uInt16(pOut->GetTextWidth( rtl::OUString(aPostItStr )));
+ return sal_uInt16(pOut->GetTextWidth( OUString(aPostItStr )));
}
void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 2dfe6f5e2bab..35c0b6f07071 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -83,8 +83,8 @@ struct AddressUserData_Impl
SharedConnection xConnection;
uno::Reference< XColumnsSupplier> xColumnsSupplier;
uno::Reference< sdbc::XResultSet> xResultSet;
- ::rtl::OUString sFilter;
- ::rtl::OUString sURL; // data is editable
+ OUString sFilter;
+ OUString sURL; // data is editable
sal_Int32 nCommandType;
sal_Int32 nTableAndQueryCount;
AddressUserData_Impl() :
@@ -93,12 +93,12 @@ struct AddressUserData_Impl
{}
};
-static ::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties )
+static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties )
{
- ::rtl::OUString sURL;
+ OUString sURL;
if(xSourceProperties.is())
{
- rtl::OUString sDBURL;
+ OUString sDBURL;
xSourceProperties->getPropertyValue("URL") >>= sDBURL;
if(String(sDBURL).SearchAscii("sdbc:flat:") == 0)
{
@@ -108,10 +108,10 @@ static ::rtl::OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSou
xSourceProperties->getPropertyValue("Info") >>= aInfo;
if(aFilters.getLength() == 1 && aInfo.getLength() )
{
- ::rtl::OUString sFieldDelim;
- ::rtl::OUString sStringDelim;
- ::rtl::OUString sExtension;
- ::rtl::OUString sCharSet;
+ OUString sFieldDelim;
+ OUString sStringDelim;
+ OUString sExtension;
+ OUString sCharSet;
for(sal_Int32 nInfo = 0; nInfo < aInfo.getLength(); ++nInfo)
{
if(aInfo[nInfo].Name == "FieldDelimiter")
@@ -217,9 +217,9 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
m_aListLB.SelectAll( sal_False );
SwDBConfig aDb;
- ::rtl::OUString sBibliography = aDb.GetBibliographySource().sDataSource;
- uno::Sequence< ::rtl::OUString> aNames = m_xDBContext->getElementNames();
- const ::rtl::OUString* pNames = aNames.getConstArray();
+ OUString sBibliography = aDb.GetBibliographySource().sDataSource;
+ uno::Sequence< OUString> aNames = m_xDBContext->getElementNames();
+ const OUString* pNames = aNames.getConstArray();
for(sal_Int32 nName = 0; nName < aNames.getLength(); ++nName)
{
if ( pNames[nName] == sBibliography )
@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
xRowProperties->setPropertyValue("ActiveConnection", makeAny(pUserData->xConnection.getTyped()));
xRowSet->execute();
- ::rtl::OUString sQuery;
+ OUString sQuery;
xRowProperties->getPropertyValue("ActiveCommand")>>= sQuery;
xComposer->setQuery(sQuery);
if(!pUserData->sFilter.isEmpty())
@@ -388,15 +388,15 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
pInfo[1].Name = "StringDelimiter";
pInfo[1].Value <<= OUString('"');
pInfo[2].Name = "Extension";
- pInfo[2].Value <<= ::rtl::OUString(aURL.getExtension());//"csv";
+ pInfo[2].Value <<= OUString(aURL.getExtension());//"csv";
pInfo[3].Name = "CharSet";
- pInfo[3].Value <<= rtl::OUString::createFromAscii(cUTF8);
+ pInfo[3].Value <<= OUString::createFromAscii(cUTF8);
aAny <<= aInfo;
xDataProperties->setPropertyValue("Info", aAny);
uno::Reference<sdb::XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW);
uno::Reference<frame::XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW);
- String sExt = rtl::OUString(".odb");
+ String sExt = OUString(".odb");
String sTmpName;
{
String sHomePath(SvtPathOptions().GetWorkPath());
@@ -549,8 +549,8 @@ void SwAddressListDialog::DetectTablesAndQueries(
if(pUserData->xConnection.is())
{
sal_Int32 nTables = 0;
- uno::Sequence<rtl::OUString> aTables;
- uno::Sequence<rtl::OUString> aQueries;
+ uno::Sequence<OUString> aTables;
+ uno::Sequence<OUString> aQueries;
uno::Reference<XTablesSupplier> xTSupplier(pUserData->xConnection, UNO_QUERY);
if(xTSupplier.is())
{
@@ -687,9 +687,9 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier()
return xRet;
}
-::rtl::OUString SwAddressListDialog::GetFilter()
+OUString SwAddressListDialog::GetFilter()
{
- ::rtl::OUString sRet;
+ OUString sRet;
SvTreeListEntry* pSelect = m_aListLB.FirstSelected();
if(pSelect)
{
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index b1956faa741b..0b5c819efaa6 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -104,7 +104,7 @@ public:
GetColumnsSupplier();
const SwDBData& GetDBData() const {return m_aDBData;}
- ::rtl::OUString GetFilter();
+ OUString GetFilter();
};
#endif
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 077a74de83ad..3db7ac0b1625 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -44,7 +44,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs;
-using ::rtl::OUString;
class SwAddressControl_Impl : public Control
{
@@ -567,10 +566,10 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl)
uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
String sPath( SvtPathOptions().SubstituteVariable(
- rtl::OUString("$(userurl)/database") ));
+ OUString("$(userurl)/database") ));
aDlgHelper.SetDisplayDirectory( sPath );
uno::Reference< XFilterManager > xFltMgr(xFP, uno::UNO_QUERY);
- ::rtl::OUString sCSV("*.csv");
+ OUString sCSV("*.csv");
xFltMgr->appendFilter( m_sAddressListFilterName, sCSV );
xFltMgr->setCurrentFilter( m_sAddressListFilterName ) ;
@@ -578,7 +577,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl)
{
m_sURL = xFP->getFiles().getConstArray()[0];
INetURLObject aResult( m_sURL );
- aResult.setExtension(rtl::OUString("csv"));
+ aResult.setExtension(OUString("csv"));
m_sURL = aResult.GetMainURL(INetURLObject::NO_DECODE);
}
}
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 1759e50da1be..98ad7c954f16 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -33,8 +33,8 @@ class SwMailMergeConfigItem;
// container of the created database
struct SwCSVData
{
- ::std::vector< ::rtl::OUString > aDBColumnHeaders;
- ::std::vector< ::std::vector< ::rtl::OUString> > aDBData;
+ ::std::vector< OUString > aDBColumnHeaders;
+ ::std::vector< ::std::vector< OUString> > aDBData;
};
class SwFindEntryDialog;
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 8ab066fb66ae..b4784e42a0ce 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -58,7 +58,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
m_aUpPB.SetClickHdl(aUpDownLk);
m_aDownPB.SetClickHdl(aUpDownLk);
- ::std::vector< ::rtl::OUString >::iterator aHeaderIter;
+ ::std::vector< OUString >::iterator aHeaderIter;
for(aHeaderIter = m_pNewData->aDBColumnHeaders.begin();
aHeaderIter != m_pNewData->aDBColumnHeaders.end(); ++aHeaderIter)
@@ -108,7 +108,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton)
m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sNew);
//add a new entry into all data arrays
String sTemp;
- ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter;
+ ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
aDataIter->insert(aDataIter->begin() + nPos, sTemp);
@@ -131,7 +131,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl)
//remove the column
m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nPos);
//remove the data
- ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter;
+ ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
aDataIter->erase(aDataIter->begin() + nPos);
@@ -152,13 +152,13 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton)
m_aFieldsLB.InsertEntry(aTemp, nPos);
m_aFieldsLB.SelectEntryPos(nPos);
//align m_pNewData
- ::rtl::OUString sHeader = m_pNewData->aDBColumnHeaders[nOldPos];
+ OUString sHeader = m_pNewData->aDBColumnHeaders[nOldPos];
m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nOldPos);
m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sHeader);
- ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter;
+ ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
{
- ::rtl::OUString sData = (*aDataIter)[nOldPos];
+ OUString sData = (*aDataIter)[nOldPos];
aDataIter->erase(aDataIter->begin() + nOldPos);
aDataIter->insert(aDataIter->begin() + nPos, sData);
}
@@ -183,7 +183,7 @@ SwCSVData* SwCustomizeAddressListDialog::GetNewData()
}
SwAddRenameEntryDialog::SwAddRenameEntryDialog(
- Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& rCSVHeader) :
+ Window* pParent, bool bRename, const ::std::vector< OUString >& rCSVHeader) :
SfxModalDialog(pParent, SW_RES(DLG_MM_ADD_RENAME_ENTRY)),
#ifdef _MSC_VER
#pragma warning (disable : 4355)
@@ -213,12 +213,12 @@ SwAddRenameEntryDialog::~SwAddRenameEntryDialog()
IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
{
- ::rtl::OUString sEntry = pEdit->GetText();
+ OUString sEntry = pEdit->GetText();
sal_Bool bFound = sEntry.isEmpty();
if(!bFound)
{
- ::std::vector< ::rtl::OUString >::const_iterator aHeaderIter;
+ ::std::vector< OUString >::const_iterator aHeaderIter;
for(aHeaderIter = m_rCSVHeader.begin();
aHeaderIter != m_rCSVHeader.end();
++aHeaderIter)
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index f4bdab646f44..3eec3fbb4e8e 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -69,11 +69,11 @@ class SwAddRenameEntryDialog : public SfxModalDialog
CancelButton m_aCancel;
HelpButton m_aHelp;
- const ::std::vector< ::rtl::OUString >& m_rCSVHeader;
+ const ::std::vector< OUString >& m_rCSVHeader;
DECL_LINK(ModifyHdl_Impl, Edit*);
public:
- SwAddRenameEntryDialog(Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& aCSVHeader);
+ SwAddRenameEntryDialog(Window* pParent, bool bRename, const ::std::vector< OUString >& aCSVHeader);
~SwAddRenameEntryDialog();
void SetFieldName(const String& rName) {m_aFieldNameED.SetText(rName);}
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index e475cdf2a163..f8679f4dd170 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -163,7 +163,7 @@ struct _DB_Column
struct _DB_ColumnConfigData
{
SwInsDBColumns aDBColumns;
- rtl::OUString sSource, sTable, sEdit, sTblList, sTmplNm, sTAutoFmtNm;
+ OUString sSource, sTable, sEdit, sTblList, sTmplNm, sTAutoFmtNm;
sal_Bool bIsTable : 1,
bIsField : 1,
bIsHeadlineOn : 1,
@@ -269,8 +269,8 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
}
}
Reference <XNameAccess> xCols = xColSupp->getColumns();
- Sequence<rtl::OUString> aColNames = xCols->getElementNames();
- const rtl::OUString* pColNames = aColNames.getConstArray();
+ Sequence<OUString> aColNames = xCols->getElementNames();
+ const OUString* pColNames = aColNames.getConstArray();
long nCount = aColNames.getLength();
for (long n = 0; n < nCount; n++)
{
@@ -278,7 +278,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
Any aCol = xCols->getByName(pColNames[n]);
Reference <XPropertySet> xCol;
aCol >>= xCol;
- Any aType = xCol->getPropertyValue(rtl::OUString("Type"));
+ Any aType = xCol->getPropertyValue(OUString("Type"));
sal_Int32 eDataType = 0;
aType >>= eDataType;
switch(eDataType)
@@ -311,7 +311,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFmt );
Any aFormatVal = xNumProps->getPropertyValue("FormatString");
Any aLocale = xNumProps->getPropertyValue("Locale");
- rtl::OUString sFormat;
+ OUString sFormat;
aFormatVal >>= sFormat;
lang::Locale aLoc;
aLocale >>= aLoc;
@@ -814,7 +814,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
if( bEnableFmt )
{
- (( sTxt += rtl::OUString(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')';
+ (( sTxt += OUString(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')';
}
sal_Bool bIsDBFmt = (*it)->bIsDBFmt;
@@ -1139,7 +1139,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
else
{
- rtl::OUString sVal = xColumn->getString();
+ OUString sVal = xColumn->getString();
if(!xColumn->wasNull())
{
rSh.SwEditShell::Insert2( sVal );
@@ -1148,7 +1148,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
catch (const Exception& rExcept)
{
- OSL_FAIL(rtl::OUStringToOString(rExcept.Message, osl_getThreadTextEncoding()).getStr());
+ OSL_FAIL(OUStringToOString(rExcept.Message, osl_getThreadTextEncoding()).getStr());
(void)rExcept;
}
}
@@ -1239,7 +1239,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh.
GetFldType( 0, RES_DBNEXTSETFLD ),
- rtl::OUString("1"), aEmptyStr, aDBData );
+ OUString("1"), aEmptyStr, aDBData );
bool bSetCrsr = true;
@@ -1364,8 +1364,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
GetfnParaCurr(), GetfnParaStart() );
pMark = rSh.SetBookmark(
KeyCode(),
- ::rtl::OUString(),
- ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
+ OUString(),
+ OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
rSh.SwCrsrShell::MovePara(
GetfnParaCurr(), GetfnParaEnd() );
bSetCrsr = false;
@@ -1466,10 +1466,10 @@ void SwInsertDBColAutoPilot::SetTabSet()
_DB_ColumnConfigData::~_DB_ColumnConfigData() {}
-static Sequence<rtl::OUString> lcl_createSourceNames(const String& rNodeName)
+static Sequence<OUString> lcl_createSourceNames(const String& rNodeName)
{
- Sequence<rtl::OUString> aSourceNames(11);
- rtl::OUString* pNames = aSourceNames.getArray();
+ Sequence<OUString> aSourceNames(11);
+ OUString* pNames = aSourceNames.getArray();
String sTmp( rNodeName );
const xub_StrLen nPos = sTmp.Len();
@@ -1498,10 +1498,10 @@ static Sequence<rtl::OUString> lcl_createSourceNames(const String& rNodeName)
return aSourceNames;
}
-static Sequence<rtl::OUString> lcl_CreateSubNames( const String& rSubNodeName )
+static Sequence<OUString> lcl_CreateSubNames( const String& rSubNodeName )
{
- Sequence<rtl::OUString> aSubSourceNames(6);
- rtl::OUString* pNames = aSubSourceNames.getArray();
+ Sequence<OUString> aSubSourceNames(6);
+ OUString* pNames = aSubSourceNames.getArray();
String sTmp( rSubNodeName );
const xub_StrLen nPos = sTmp.Len();
pNames[0] = sTmp.ReplaceAscii( nPos, STRING_MAXLEN,
@@ -1519,15 +1519,15 @@ static Sequence<rtl::OUString> lcl_CreateSubNames( const String& rSubNodeName )
return aSubSourceNames;
}
-static rtl::OUString lcl_CreateUniqueName(const Sequence<rtl::OUString>& aNames)
+static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames)
{
sal_Int32 nIdx = aNames.getLength();
- const rtl::OUString* pNames = aNames.getConstArray();
- rtl::OUString sTest("_");
- rtl::OUString sRet;
+ const OUString* pNames = aNames.getConstArray();
+ OUString sTest("_");
+ OUString sRet;
while(true)
{
- sRet = sTest; sRet += rtl::OUString::valueOf(nIdx++);
+ sRet = sTest; sRet += OUString::valueOf(nIdx++);
bool bFound = false;
for(sal_Int32 i = 0; i < aNames.getLength(); i++)
{
@@ -1543,64 +1543,64 @@ static rtl::OUString lcl_CreateUniqueName(const Sequence<rtl::OUString>& aNames)
return sRet;
}
-void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwInsertDBColAutoPilot::Commit()
{
- Sequence <rtl::OUString> aNames = GetNodeNames(rtl::OUString());
- const rtl::OUString* pNames = aNames.getArray();
+ Sequence <OUString> aNames = GetNodeNames(OUString());
+ const OUString* pNames = aNames.getArray();
//remove entries that contain this data source + table at first
for(sal_Int32 nNode = 0; nNode < aNames.getLength(); nNode++)
{
- Sequence<rtl::OUString> aSourceNames(2);
- rtl::OUString* pSourceNames = aSourceNames.getArray();
+ Sequence<OUString> aSourceNames(2);
+ OUString* pSourceNames = aSourceNames.getArray();
pSourceNames[0] = pNames[nNode];
pSourceNames[0] += "/DataSource";
pSourceNames[1] = pNames[nNode];
pSourceNames[1] += "/Command";
Sequence<Any> aSourceProperties = GetProperties(aSourceNames);
const Any* pSourceProps = aSourceProperties.getArray();
- rtl::OUString sSource, sCommand;
+ OUString sSource, sCommand;
pSourceProps[0] >>= sSource;
pSourceProps[1] >>= sCommand;
if(sSource.equals(aDBData.sDataSource) && sCommand.equals(aDBData.sCommand))
{
- Sequence<rtl::OUString> aElements(1);
+ Sequence<OUString> aElements(1);
aElements.getArray()[0] = pNames[nNode];
- ClearNodeElements(rtl::OUString(), aElements);
+ ClearNodeElements(OUString(), aElements);
}
}
- aNames = GetNodeNames(rtl::OUString());
- rtl::OUString sNewNode = lcl_CreateUniqueName(aNames);
- Sequence<rtl::OUString> aNodeNames = lcl_createSourceNames(sNewNode);
+ aNames = GetNodeNames(OUString());
+ OUString sNewNode = lcl_CreateUniqueName(aNames);
+ Sequence<OUString> aNodeNames = lcl_createSourceNames(sNewNode);
Sequence<PropertyValue> aValues(aNodeNames.getLength());
PropertyValue* pValues = aValues.getArray();
- const rtl::OUString* pNodeNames = aNodeNames.getConstArray();
- rtl::OUString sSlash("/");
+ const OUString* pNodeNames = aNodeNames.getConstArray();
+ OUString sSlash("/");
for(sal_Int32 i = 0; i < aNodeNames.getLength(); i++)
{
pValues[i].Name = sSlash;
pValues[i].Name += pNodeNames[i];
}
- pValues[0].Value <<= rtl::OUString(aDBData.sDataSource);
- pValues[1].Value <<= rtl::OUString(aDBData.sCommand);
+ pValues[0].Value <<= OUString(aDBData.sDataSource);
+ pValues[1].Value <<= OUString(aDBData.sCommand);
pValues[2].Value <<= aDBData.nCommandType;
- pValues[3].Value <<= rtl::OUString(aEdDbText.GetText());
+ pValues[3].Value <<= OUString(aEdDbText.GetText());
String sTmp;
for( sal_uInt16 n = 0, nCnt = aLbTableCol.GetEntryCount(); n < nCnt; ++n )
( sTmp += aLbTableCol.GetEntry( n ) ) += '\x0a';
if( sTmp.Len() )
- pValues[4].Value <<= rtl::OUString(sTmp);
+ pValues[4].Value <<= OUString(sTmp);
if( sNoTmpl != (sTmp = aLbDbParaColl.GetSelectEntry()) )
- pValues[5].Value <<= rtl::OUString(sTmp);
+ pValues[5].Value <<= OUString(sTmp);
if( pTAutoFmt )
- pValues[6].Value <<= rtl::OUString(pTAutoFmt->GetName());
+ pValues[6].Value <<= OUString(pTAutoFmt->GetName());
const Type& rBoolType = ::getBooleanCppuType();
sal_Bool bTmp = aRbAsTable.IsChecked();
@@ -1615,18 +1615,18 @@ void SwInsertDBColAutoPilot::Commit()
bTmp = aRbHeadlEmpty.IsChecked();
pValues[10].Value.setValue(&bTmp, rBoolType);
- SetSetProperties(rtl::OUString(), aValues);
+ SetSetProperties(OUString(), aValues);
sNewNode += "/ColumnSet";
- rtl::OUString sDelim("/__");
+ OUString sDelim("/__");
LanguageType ePrevLang = (LanguageType)-1;
- rtl::OUString sPrevLang;
+ OUString sPrevLang;
SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter();
for(sal_uInt16 nCol = 0; nCol < aDBColumns.size(); nCol++)
{
- rtl::OUString sColumnNode = sNewNode;
+ OUString sColumnNode = sNewNode;
SwInsDBColumn* pColumn = aDBColumns[nCol];
String sColumnInsertNode(sColumnNode);
sColumnInsertNode += sDelim;
@@ -1636,10 +1636,10 @@ void SwInsertDBColAutoPilot::Commit()
sColumnInsertNode += '0';
sColumnInsertNode += OUString::number( nCol );
- Sequence <rtl::OUString> aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode);
+ Sequence <OUString> aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode);
Sequence<PropertyValue> aSubValues(aSubNodeNames.getLength());
PropertyValue* pSubValues = aSubValues.getArray();
- const rtl::OUString* pSubNodeNames = aSubNodeNames.getConstArray();
+ const OUString* pSubNodeNames = aSubNodeNames.getConstArray();
sal_Int32 i;
for( i = 0; i < aSubNodeNames.getLength(); i++)
@@ -1657,12 +1657,12 @@ void SwInsertDBColAutoPilot::Commit()
LanguageType eLang;
if( pNF )
{
- pSubValues[4].Value <<= rtl::OUString(pNF->GetFormatstring());
+ pSubValues[4].Value <<= OUString(pNF->GetFormatstring());
eLang = pNF->GetLanguage();
}
else
{
- pSubValues[4].Value <<= rtl::OUString(sTmp);
+ pSubValues[4].Value <<= OUString(sTmp);
eLang = GetAppLanguage();
}
@@ -1672,7 +1672,7 @@ void SwInsertDBColAutoPilot::Commit()
lang::Locale aLocale( LanguageTag( eLang ).getLocale());
/* umm.. what's this string anyway, "Country-Language" instead of
* "Language-Country" ??? */
- (( sPrevLang = aLocale.Country ) += rtl::OUString( '-' )) += aLocale.Language;
+ (( sPrevLang = aLocale.Country ) += OUString( '-' )) += aLocale.Language;
ePrevLang = eLang;
}
@@ -1683,17 +1683,17 @@ void SwInsertDBColAutoPilot::Commit()
void SwInsertDBColAutoPilot::Load()
{
- Sequence <rtl::OUString> aNames = GetNodeNames(rtl::OUString());
- const rtl::OUString* pNames = aNames.getArray();
+ Sequence <OUString> aNames = GetNodeNames(OUString());
+ const OUString* pNames = aNames.getArray();
SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter();
for(sal_Int32 nNode = 0; nNode < aNames.getLength(); nNode++)
{
//search for entries with the appropriate data source and table
- Sequence<rtl::OUString> aSourceNames = lcl_createSourceNames(pNames[nNode]);
+ Sequence<OUString> aSourceNames = lcl_createSourceNames(pNames[nNode]);
Sequence< Any> aDataSourceProps = GetProperties(aSourceNames);
const Any* pDataSourceProps = aDataSourceProps.getConstArray();
- rtl::OUString sSource, sCommand;
+ OUString sSource, sCommand;
sal_Int16 nCommandType;
pDataSourceProps[0] >>= sSource;
pDataSourceProps[1] >>= sCommand;
@@ -1717,19 +1717,19 @@ void SwInsertDBColAutoPilot::Load()
if(pDataSourceProps[10].hasValue())
pNewData->bIsEmptyHeadln = *(sal_Bool*)pDataSourceProps[10].getValue();
- rtl::OUString sSubNodeName(pNames[nNode]);
+ OUString sSubNodeName(pNames[nNode]);
sSubNodeName += "/ColumnSet/";
- Sequence <rtl::OUString> aSubNames = GetNodeNames(sSubNodeName);
- const rtl::OUString* pSubNames = aSubNames.getConstArray();
+ Sequence <OUString> aSubNames = GetNodeNames(sSubNodeName);
+ const OUString* pSubNames = aSubNames.getConstArray();
for(sal_Int32 nSub = 0; nSub < aSubNames.getLength(); nSub++)
{
- rtl::OUString sSubSubNodeName(sSubNodeName);
+ OUString sSubSubNodeName(sSubNodeName);
sSubSubNodeName += pSubNames[nSub];
- Sequence <rtl::OUString> aSubNodeNames = lcl_CreateSubNames(sSubSubNodeName);
+ Sequence <OUString> aSubNodeNames = lcl_CreateSubNames(sSubSubNodeName);
Sequence< Any> aSubProps = GetProperties(aSubNodeNames);
const Any* pSubProps = aSubProps.getConstArray();
- rtl::OUString sColumn;
+ OUString sColumn;
pSubProps[0] >>= sColumn;
//check for existance of the loaded column name
bool bFound = false;
@@ -1752,7 +1752,7 @@ void SwInsertDBColAutoPilot::Load()
pInsDBColumn->bIsDBFmt = *(sal_Bool*)pSubProps[3].getValue();
pSubProps[4] >>= pInsDBColumn->sUsrNumFmt;
- rtl::OUString sNumberFormatLocale;
+ OUString sNumberFormatLocale;
pSubProps[5] >>= sNumberFormatLocale;
/* FIXME-BCP47: handle language tags, and cope with the wrong
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index cc63401d0a20..c7ce0395d406 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -276,7 +276,7 @@ static sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
}
static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
- const String& rColumnName, long nLanguage, rtl::OUString& rResult, double* pNumber)
+ const String& rColumnName, long nLanguage, OUString& rResult, double* pNumber)
{
uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY );
uno::Reference<XNameAccess> xCols;
@@ -565,7 +565,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
else
{
// column not found -> show error
- rtl::OUStringBuffer sInsert;
+ OUStringBuffer sInsert;
sInsert.append('?').append(sColumn).append('?');
pSh->Insert(sInsert.makeStringAndClear());
}
@@ -576,8 +576,8 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
else
{
String sStr;
- Sequence<rtl::OUString> aColNames = xCols->getElementNames();
- const rtl::OUString* pColNames = aColNames.getConstArray();
+ Sequence<OUString> aColNames = xCols->getElementNames();
+ const OUString* pColNames = aColNames.getConstArray();
long nLength = aColNames.getLength();
for(long i = 0; i < nLength; i++)
{
@@ -609,7 +609,7 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName)
xConnection = pParam->xConnection;
else
{
- rtl::OUString sDBName(rDBName);
+ OUString sDBName(rDBName);
if ( !sDBName.isEmpty() )
xConnection = RegisterConnection( sDBName );
}
@@ -619,8 +619,8 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName)
if(xTSupplier.is())
{
uno::Reference<XNameAccess> xTbls = xTSupplier->getTables();
- Sequence<rtl::OUString> aTbls = xTbls->getElementNames();
- const rtl::OUString* pTbls = aTbls.getConstArray();
+ Sequence<OUString> aTbls = xTbls->getElementNames();
+ const OUString* pTbls = aTbls.getConstArray();
for(long i = 0; i < aTbls.getLength(); i++)
{
sal_uInt16 nEntry = pListBox->InsertEntry(pTbls[i]);
@@ -631,8 +631,8 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName)
if(xQSupplier.is())
{
uno::Reference<XNameAccess> xQueries = xQSupplier->getQueries();
- Sequence<rtl::OUString> aQueries = xQueries->getElementNames();
- const rtl::OUString* pQueries = aQueries.getConstArray();
+ Sequence<OUString> aQueries = xQueries->getElementNames();
+ const OUString* pQueries = aQueries.getConstArray();
for(long i = 0; i < aQueries.getLength(); i++)
{
sal_uInt16 nEntry = pListBox->InsertEntry(pQueries[i]);
@@ -664,15 +664,15 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
xConnection = pParam->xConnection;
else
{
- rtl::OUString sDBName(rDBName);
+ OUString sDBName(rDBName);
xConnection = RegisterConnection( sDBName );
}
uno::Reference< XColumnsSupplier> xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName);
if(xColsSupp.is())
{
uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
- const Sequence<rtl::OUString> aColNames = xCols->getElementNames();
- const rtl::OUString* pColNames = aColNames.getConstArray();
+ const Sequence<OUString> aColNames = xCols->getElementNames();
+ const OUString* pColNames = aColNames.getConstArray();
for(int nCol = 0; nCol < aColNames.getLength(); nCol++)
{
pListBox->InsertEntry(pColNames[nCol]);
@@ -692,8 +692,8 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
if(xColsSupp.is())
{
uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
- const Sequence<rtl::OUString> aColNames = xCols->getElementNames();
- const rtl::OUString* pColNames = aColNames.getConstArray();
+ const Sequence<OUString> aColNames = xCols->getElementNames();
+ const OUString* pColNames = aColNames.getConstArray();
for(int nCol = 0; nCol < aColNames.getLength(); nCol++)
{
pListBox->InsertEntry(pColNames[nCol]);
@@ -833,7 +833,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
const bool bAsSingleFile = rMergeDescriptor.nMergeType == DBMGR_MERGE_SINGLE_FILE;
::rtl::Reference< MailDispatcher > xMailDispatcher;
- ::rtl::OUString sBodyMimeType;
+ OUString sBodyMimeType;
rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding();
if(bEMail)
@@ -841,15 +841,15 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
xMailDispatcher.set( new MailDispatcher(rMergeDescriptor.xSmtpServer));
if(!rMergeDescriptor.bSendAsAttachment && rMergeDescriptor.bSendAsHTML)
{
- sBodyMimeType = ::rtl::OUString("text/html; charset=");
- sBodyMimeType += ::rtl::OUString::createFromAscii(
+ sBodyMimeType = OUString("text/html; charset=");
+ sBodyMimeType += OUString::createFromAscii(
rtl_getBestMimeCharsetFromTextEncoding( eEncoding ));
SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
eEncoding = rHtmlOptions.GetTextEncoding();
}
else
sBodyMimeType =
- ::rtl::OUString("text/plain; charset=UTF-8; format=flowed");
+ OUString("text/plain; charset=UTF-8; format=flowed");
}
uno::Reference< XPropertySet > xColumnProp;
@@ -882,7 +882,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
// if a save_to filter is set then use it - otherwise use the default
if( bEMail && !rMergeDescriptor.bSendAsAttachment )
{
- rtl::OUString sExtension = rMergeDescriptor.bSendAsHTML ? rtl::OUString("html") : rtl::OUString("txt");
+ OUString sExtension = rMergeDescriptor.bSendAsHTML ? OUString("html") : OUString("txt");
pStoreToFilter = pFilterContainer->GetFilter4Extension(sExtension, SFX_FILTER_EXPORT);
}
else if( rMergeDescriptor.sSaveToFilter.Len())
@@ -1169,7 +1169,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
pMessage->setReplyToAddress(rMergeDescriptor.pMailMergeConfigItem->GetMailReplyTo());
pMessage->addRecipient( sMailAddress );
pMessage->SetSenderAddress( rMergeDescriptor.pMailMergeConfigItem->GetMailAddress() );
- ::rtl::OUString sBody;
+ OUString sBody;
if(rMergeDescriptor.bSendAsAttachment)
{
sBody = rMergeDescriptor.sMailBody;
@@ -1191,12 +1191,12 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
if(pInStream)
{
pInStream->SetStreamCharSet( eEncoding );
- rtl::OString sLine;
+ OString sLine;
sal_Bool bDone = pInStream->ReadLine( sLine );
while ( bDone )
{
- sBody += rtl::OStringToOUString(sLine, eEncoding);
- sBody += ::rtl::OUString('\n');
+ sBody += OStringToOUString(sLine, eEncoding);
+ sBody += OUString('\n');
bDone = pInStream->ReadLine( sLine );
}
}
@@ -1211,13 +1211,13 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
if(rMergeDescriptor.aCopiesTo.getLength())
{
- const ::rtl::OUString* pCopies = rMergeDescriptor.aCopiesTo.getConstArray();
+ const OUString* pCopies = rMergeDescriptor.aCopiesTo.getConstArray();
for( sal_Int32 nToken = 0; nToken < rMergeDescriptor.aCopiesTo.getLength(); ++nToken)
pMessage->addCcRecipient( pCopies[nToken] );
}
if(rMergeDescriptor.aBlindCopiesTo.getLength())
{
- const ::rtl::OUString* pCopies = rMergeDescriptor.aBlindCopiesTo.getConstArray();
+ const OUString* pCopies = rMergeDescriptor.aBlindCopiesTo.getConstArray();
for( sal_Int32 nToken = 0; nToken < rMergeDescriptor.aBlindCopiesTo.getLength(); ++nToken)
pMessage->addBccRecipient( pCopies[nToken] );
}
@@ -1275,11 +1275,11 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
#if OSL_DEBUG_LEVEL > 1
sal_Bool _bVal;
sal_Int16 _nVal;
- rtl::OUString _sVal;
+ OUString _sVal;
const beans::PropertyValue* pDbgPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray();
for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption)
{
- rtl::OUString aName( pDbgPrintOptions[nOption].Name );
+ OUString aName( pDbgPrintOptions[nOption].Name );
uno::Any aVal( pDbgPrintOptions[nOption].Value );
aVal >>= _bVal;
aVal >>= _nVal;
@@ -1291,7 +1291,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions );
const sal_Int32 nOpts = aOptions.getLength();
aOptions.realloc( nOpts + 1 );
- aOptions[ nOpts ].Name = rtl::OUString("Wait");
+ aOptions[ nOpts ].Name = OUString("Wait");
aOptions[ nOpts ].Value <<= sal_True ;
// move print options
const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray();
@@ -1390,7 +1390,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( const String& rDBName,
}
else
{
- rtl::OUString sDBName(rDBName);
+ OUString sDBName(rDBName);
xConnection = RegisterConnection( sDBName );
bDisposeConnection = true;
}
@@ -1489,7 +1489,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
uno::Reference<XPropertySet> xNumProps = xNumberFormats->getByKey( nFmt );
Any aFormatString = xNumProps->getPropertyValue("FormatString");
Any aLocaleVal = xNumProps->getPropertyValue("Locale");
- rtl::OUString sFormat;
+ OUString sFormat;
aFormatString >>= sFormat;
lang::Locale aLoc;
aLocaleVal >>= aLoc;
@@ -1536,7 +1536,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName,
}
else
{
- rtl::OUString sDBName(rDBName);
+ OUString sDBName(rDBName);
xConnection = RegisterConnection( sDBName );
}
if( !xColsSupp.is() )
@@ -1552,7 +1552,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName,
Any aCol = xCols->getByName(rColNm);
uno::Reference<XPropertySet> xCol;
aCol >>= xCol;
- Any aType = xCol->getPropertyValue(rtl::OUString("Type"));
+ Any aType = xCol->getPropertyValue(OUString("Type"));
aType >>= nRet;
}
if(bDispose)
@@ -1606,7 +1606,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
Reference<XRowSet> xRowSet(xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
- ::rtl::OUString sDataSource;
+ OUString sDataSource;
Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection, sDataSource);
Reference<XPropertySet> xSourceProperties(xSource, UNO_QUERY);
if(xSourceProperties.is())
@@ -1616,7 +1616,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe
Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
xRowProperties->setPropertyValue("DataSourceName", makeAny(sDataSource));
- xRowProperties->setPropertyValue("Command", makeAny(::rtl::OUString(rTableOrQuery)));
+ xRowProperties->setPropertyValue("Command", makeAny(OUString(rTableOrQuery)));
xRowProperties->setPropertyValue("CommandType", makeAny(nCommandType));
xRowProperties->setPropertyValue("FetchSize", makeAny((sal_Int32)10));
xRowProperties->setPropertyValue("ActiveConnection", makeAny(xConnection));
@@ -1740,7 +1740,7 @@ sal_Bool SwNewDBMgr::IsDataSourceOpen(const String& rDataSource,
sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTableName,
const String& rColumnName, sal_uInt32 nAbsRecordId,
long nLanguage,
- rtl::OUString& rResult, double* pNumber)
+ OUString& rResult, double* pNumber)
{
sal_Bool bRet = sal_False;
SwDSParam* pFound = 0;
@@ -1805,11 +1805,11 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTabl
// reads the column data at the current position
sal_Bool SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage,
- rtl::OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
+ OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
{
if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection )
{
- rResult = rtl::OUString();
+ rResult = OUString();
return sal_False;
}
@@ -1946,7 +1946,7 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa
pFound->xConnection = pParam->xConnection;
else if(bCreate)
{
- rtl::OUString sDataSource(rDataSource);
+ OUString sDataSource(rDataSource);
pFound->xConnection = RegisterConnection( sDataSource );
}
if(pFound->xConnection.is())
@@ -1965,8 +1965,8 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa
pFound->bScrollable = sal_True;
}
pFound->xStatement = pFound->xConnection->createStatement();
- rtl::OUString aQuoteChar = xMetaData->getIdentifierQuoteString();
- rtl::OUString sStatement("SELECT * FROM ");
+ OUString aQuoteChar = xMetaData->getIdentifierQuoteString();
+ OUString sStatement("SELECT * FROM ");
sStatement = "SELECT * FROM ";
sStatement += aQuoteChar;
sStatement += rTableOrQuery;
@@ -1989,7 +1989,7 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa
return pFound->xResultSet.is();
}
-uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(rtl::OUString& rDataSource)
+uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(OUString& rDataSource)
{
SwDSParam* pFound = SwNewDBMgr::FindDSConnection(rDataSource, sal_True);
uno::Reference< XDataSource> xSource;
@@ -2123,7 +2123,7 @@ SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
return pFound;
}
-SwDSParam* SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, sal_Bool bCreate)
+SwDSParam* SwNewDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool bCreate)
{
//prefer merge data if available
if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
@@ -2164,7 +2164,7 @@ const SwDBData& SwNewDBMgr::GetAddressDBName()
return SW_MOD()->GetDBConfig()->GetAddressSource();
}
-Sequence<rtl::OUString> SwNewDBMgr::GetExistingDatabaseNames()
+Sequence<OUString> SwNewDBMgr::GetExistingDatabaseNames()
{
Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
@@ -2230,7 +2230,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
|| sExt.EqualsIgnoreCaseAscii("ods")
|| sExt.EqualsIgnoreCaseAscii("xls"))
{
- rtl::OUString sDBURL("sdbc:calc:");
+ OUString sDBURL("sdbc:calc:");
sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE);
aURLAny <<= sDBURL;
}
@@ -2238,11 +2238,11 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
{
aTempURL.removeSegment();
aTempURL.removeFinalSlash();
- rtl::OUString sDBURL("sdbc:dbase:");
+ OUString sDBURL("sdbc:dbase:");
sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE);
aURLAny <<= sDBURL;
//set the filter to the file name without extension
- Sequence<rtl::OUString> aFilters(1);
+ Sequence<OUString> aFilters(1);
aFilters[0] = aURL.getBase();
aTableFilterAny <<= aFilters;
}
@@ -2250,28 +2250,28 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
{
aTempURL.removeSegment();
aTempURL.removeFinalSlash();
- rtl::OUString sDBURL("sdbc:flat:");
+ OUString sDBURL("sdbc:flat:");
//only the 'path' has to be added
sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE);
aURLAny <<= sDBURL;
bTextConnection = true;
//set the filter to the file name without extension
- Sequence<rtl::OUString> aFilters(1);
+ Sequence<OUString> aFilters(1);
aFilters[0] = aURL.getBase();
aTableFilterAny <<= aFilters;
}
#ifdef WNT
else if(sExt.EqualsIgnoreCaseAscii("mdb"))
{
- rtl::OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=");
+ OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=");
sDBURL += aTempURL.PathToFileName();
aURLAny <<= sDBURL;
aSuppressVersionsAny <<= makeAny(true);
}
else if(sExt.EqualsIgnoreCaseAscii("accdb"))
{
- rtl::OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=");
+ OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=");
sDBURL += aTempURL.PathToFileName();
aURLAny <<= sDBURL;
aSuppressVersionsAny <<= makeAny(true);
@@ -2331,13 +2331,13 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
::comphelper::copyProperties(
uno::Reference < beans::XPropertySet >( xSettingsDlg, uno::UNO_QUERY_THROW ),
xDSSettings );
- xDSSettings->setPropertyValue( "Extension", uno::makeAny( ::rtl::OUString( sExt )));
+ xDSSettings->setPropertyValue( "Extension", uno::makeAny( OUString( sExt )));
}
}
Reference<XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW);
Reference<XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW);
- String sOutputExt = rtl::OUString(".odb");
+ String sOutputExt = OUString(".odb");
String sTmpName;
{
utl::TempFile aTempFile(sNewName , &sOutputExt, &sHomePath);
@@ -2365,7 +2365,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
//prevent second call
if(pImpl->pMergeDialog)
return ;
- rtl::OUString sDataSource, sDataTableOrQuery;
+ OUString sDataSource, sDataTableOrQuery;
Sequence<Any> aSelection;
sal_Int32 nCmdType = CommandType::TABLE;
@@ -2417,9 +2417,9 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xDocShell));
{
//copy rSh to aTempFile
- ::rtl::OUString sTempURL;
+ OUString sTempURL;
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString(FILTER_XML),
+ OUString(FILTER_XML),
SwDocShell::Factory().GetFilterContainer() );
try
{
@@ -2427,7 +2427,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
- pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+ pValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
uno::Reference< XStorable > xStore( xDocShell->GetModel(), uno::UNO_QUERY);
sTempURL = URIHelper::SmartRel2Abs( INetURLObject(), utl::TempFile::CreateTempName() );
xStore->storeToURL( sTempURL, aValues );
@@ -2523,7 +2523,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
void SwNewDBMgr::InsertText(SwWrtShell& rSh,
const Sequence< PropertyValue>& rProperties)
{
- rtl::OUString sDataSource, sDataTableOrQuery;
+ OUString sDataSource, sDataTableOrQuery;
uno::Reference<XResultSet> xResSet;
Sequence<Any> aSelection;
sal_Int16 nCmdType = CommandType::TABLE;
@@ -2573,7 +2573,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if( RET_OK == pDlg->Execute() )
{
- rtl::OUString sDummy;
+ OUString sDummy;
if(!xConnection.is())
xConnection = xSource->getConnection(sDummy, sDummy);
try
@@ -2604,7 +2604,7 @@ void SwNewDBMgr::RemoveDbtoolsClient()
pDbtoolsClient = 0;
}
-uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName)
+uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName)
{
uno::Reference<XDataSource> xSource;
try
@@ -2622,8 +2622,8 @@ uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Referen
return xSource;
}
-uno::Reference<XResultSet> SwNewDBMgr::createCursor(const ::rtl::OUString& _sDataSourceName,
- const ::rtl::OUString& _sCommand,
+uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSourceName,
+ const OUString& _sCommand,
sal_Int32 _nCommandType,
const uno::Reference<XConnection>& _xConnection
)
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index add08275e3ef..8a5193733c80 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::beans;
struct SwConnectionData
{
- ::rtl::OUString sSourceName;
+ OUString sSourceName;
Reference<XConnection> xConnection;
};
@@ -91,7 +91,7 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
SwWrtShell* GetWrtShell() { return pWrtSh;}
void SetWrtShell(SwWrtShell& rSh) { pWrtSh = &rSh;}
Reference<XDatabaseContext> GetContext() const {return xDBContext;}
- Reference<XConnection> GetConnection(const rtl::OUString& rSourceName);
+ Reference<XConnection> GetConnection(const OUString& rSourceName);
};
SwDBTreeList_Impl::~SwDBTreeList_Impl()
@@ -117,7 +117,7 @@ void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) throw (Runtime
void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
- ::rtl::OUString sSource;
+ OUString sSource;
rEvent.Accessor >>= sSource;
for(SwConnectionArr::iterator i = aConnections.begin(); i != aConnections.end(); ++i)
{
@@ -152,7 +152,7 @@ sal_Bool SwDBTreeList_Impl::HasContext()
return xDBContext.is();
}
-Reference<XConnection> SwDBTreeList_Impl::GetConnection(const rtl::OUString& rSourceName)
+Reference<XConnection> SwDBTreeList_Impl::GetConnection(const OUString& rSourceName)
{
Reference<XConnection> xRet;
for(SwConnectionArr::const_iterator i = aConnections.begin(); i != aConnections.end(); ++i)
@@ -233,8 +233,8 @@ void SwDBTreeList::InitTreeList()
GetModel()->SetCompareHdl(LINK(this, SwDBTreeList, DBCompare));
- Sequence< ::rtl::OUString > aDBNames = pImpl->GetContext()->getElementNames();
- const ::rtl::OUString* pDBNames = aDBNames.getConstArray();
+ Sequence< OUString > aDBNames = pImpl->GetContext()->getElementNames();
+ const OUString* pDBNames = aDBNames.getConstArray();
long nCount = aDBNames.getLength();
Image aImg = aImageList.GetImage(IMG_DB);
@@ -349,8 +349,8 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent)
if(xColsSupplier.is())
{
Reference <XNameAccess> xCols = xColsSupplier->getColumns();
- Sequence< ::rtl::OUString> aColNames = xCols->getElementNames();
- const ::rtl::OUString* pColNames = aColNames.getConstArray();
+ Sequence< OUString> aColNames = xCols->getElementNames();
+ const OUString* pColNames = aColNames.getConstArray();
long nCount = aColNames.getLength();
for (long i = 0; i < nCount; i++)
{
@@ -377,10 +377,10 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent)
if(xTSupplier.is())
{
Reference<XNameAccess> xTbls = xTSupplier->getTables();
- Sequence< ::rtl::OUString> aTblNames = xTbls->getElementNames();
+ Sequence< OUString> aTblNames = xTbls->getElementNames();
String sTableName;
long nCount = aTblNames.getLength();
- const ::rtl::OUString* pTblNames = aTblNames.getConstArray();
+ const OUString* pTblNames = aTblNames.getConstArray();
Image aImg = aImageList.GetImage(IMG_DBTABLE);
for (long i = 0; i < nCount; i++)
{
@@ -395,10 +395,10 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent)
if(xQSupplier.is())
{
Reference<XNameAccess> xQueries = xQSupplier->getQueries();
- Sequence< ::rtl::OUString> aQueryNames = xQueries->getElementNames();
+ Sequence< OUString> aQueryNames = xQueries->getElementNames();
String sQueryName;
long nCount = aQueryNames.getLength();
- const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray();
+ const OUString* pQueryNames = aQueryNames.getConstArray();
Image aImg = aImageList.GetImage(IMG_DBQUERY);
for (long i = 0; i < nCount; i++)
{
@@ -506,7 +506,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
// drag database field
svx::OColumnTransferable aColTransfer(
sDBName
- ,::rtl::OUString()
+ ,OUString()
, sdb::CommandType::TABLE
,sTableName
, sColumnName
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx
index b8e27e6f7c68..17c18dabc925 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/ui/dbui/dbui.cxx
@@ -91,15 +91,15 @@ CreateMonitor::CreateMonitor( Window *pParent )
m_aCounting (this, SW_RES( FT_COUNTING )),
m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )),
m_sCountingPattern(),
- m_sVariable_Total( rtl::OUString("%Y") ),
- m_sVariable_Position( rtl::OUString("%X") ),
+ m_sVariable_Total( OUString("%Y") ),
+ m_sVariable_Position( OUString("%X") ),
m_nTotalCount(0),
m_nCurrentPosition(0)
{
FreeResource();
m_sCountingPattern = m_aCounting.GetText();
- m_aCounting.SetText(rtl::OUString("..."));
+ m_aCounting.SetText(OUString("..."));
}
void CreateMonitor::UpdateCountingText()
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx
index 819b82a5407b..2208f1a122be 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -23,7 +23,6 @@
#include <algorithm>
using namespace ::com::sun::star;
-using ::rtl::OUString;
typedef std::list< ::rtl::Reference<IMailDispatcherListener> > MailDispatcherListenerContainer_t;
@@ -75,7 +74,7 @@ namespace /* private */
MailDeliveryErrorNotifier(
::rtl::Reference<MailDispatcher> xMailDispatcher,
uno::Reference<mail::XMailMessage> message,
- const ::rtl::OUString& error_message) :
+ const OUString& error_message) :
mail_dispatcher_(xMailDispatcher),
message_(message),
error_message_(error_message)
@@ -87,7 +86,7 @@ namespace /* private */
private:
::rtl::Reference<MailDispatcher> mail_dispatcher_;
uno::Reference<mail::XMailMessage> message_;
- ::rtl::OUString error_message_;
+ OUString error_message_;
};
} // namespace private
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 71f243269228..49bcc64d0eba 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const
{
SfxFloatingWindow::FillInfo(rInfo);
- rInfo.aWinState = rtl::OString();
+ rInfo.aWinState = OString();
rInfo.bVisible = sal_False;
}
@@ -170,7 +170,7 @@ public:
virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher,
uno::Reference< mail::XMailMessage> xMailMessage);
virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher,
- uno::Reference< mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage);
+ uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage);
static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
};
@@ -211,7 +211,7 @@ void SwMailDispatcherListener_Impl::mailDelivered(
void SwMailDispatcherListener_Impl::mailDeliveryError(
::rtl::Reference<MailDispatcher> /*xMailDispatcher*/,
uno::Reference< mail::XMailMessage> xMailMessage,
- const rtl::OUString& sErrorMessage)
+ const OUString& sErrorMessage)
{
SolarMutexGuard aGuard;
m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage );
@@ -229,8 +229,8 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa
uno::Reference< beans::XPropertySet > xTransferableProperties( aAttachments[nFile].Data, uno::UNO_QUERY_THROW);
if( xTransferableProperties.is() )
{
- ::rtl::OUString sURL;
- xTransferableProperties->getPropertyValue( ::rtl::OUString("URL") ) >>= sURL;
+ OUString sURL;
+ xTransferableProperties->getPropertyValue( OUString("URL") ) >>= sURL;
if(!sURL.isEmpty())
SWUnoHelper::UCB_DeleteFile( sURL );
}
@@ -635,7 +635,7 @@ void SwSendMailDialog::StateChanged( StateChangedType nStateChange )
void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessage,
bool bResult,
- const ::rtl::OUString* pError )
+ const OUString* pError )
{
//sending should stop on send errors
if(pError &&
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 37070ee914ec..b5d75e07d961 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
-using rtl::OUString;
namespace SwMailMergeHelper
{
@@ -55,7 +54,7 @@ namespace SwMailMergeHelper
String CallSaveAsDialog(String& rFilter)
{
ErrCode nRet;
- String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
+ String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
0,
sFactory );
@@ -76,7 +75,7 @@ String CallSaveAsDialog(String& rFilter)
for at least one '.' after the '@'
and for at least to characters before and after the dot
*/
-bool CheckMailAddress( const ::rtl::OUString& rMailAddress )
+bool CheckMailAddress( const OUString& rMailAddress )
{
String sAddress(rMailAddress);
if (!(comphelper::string::getTokenCount(sAddress, '@') == 2))
@@ -131,7 +130,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
new SwConnectionContext(
rConfigItem.GetInServerName(),
rConfigItem.GetInServerPort(),
- ::rtl::OUString("Insecure"));
+ OUString("Insecure"));
xInMailService->connect(xConnectionContext, xAuthenticator);
rxInMailService = xInMailService;
}
@@ -186,7 +185,7 @@ SwBoldFixedInfo::~SwBoldFixedInfo()
struct SwAddressPreview_Impl
{
- ::std::vector< ::rtl::OUString > aAdresses;
+ ::std::vector< OUString > aAdresses;
sal_uInt16 nRows;
sal_uInt16 nColumns;
sal_uInt16 nSelectedAddress;
@@ -226,13 +225,13 @@ IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl)
return 0;
}
-void SwAddressPreview::AddAddress(const ::rtl::OUString& rAddress)
+void SwAddressPreview::AddAddress(const OUString& rAddress)
{
pImpl->aAdresses.push_back(rAddress);
UpdateScrollBar();
}
-void SwAddressPreview::SetAddress(const ::rtl::OUString& rAddress)
+void SwAddressPreview::SetAddress(const OUString& rAddress)
{
pImpl->aAdresses.clear();
pImpl->aAdresses.push_back(rAddress);
@@ -264,7 +263,7 @@ void SwAddressPreview::Clear()
UpdateScrollBar();
}
-void SwAddressPreview::ReplaceSelectedAddress(const ::rtl::OUString& rNew)
+void SwAddressPreview::ReplaceSelectedAddress(const OUString& rNew)
{
pImpl->aAdresses[pImpl->nSelectedAddress] = rNew;
Invalidate();
@@ -341,7 +340,7 @@ void SwAddressPreview::Paint(const Rectangle&)
bool bIsSelected = nAddress == pImpl->nSelectedAddress;
if((pImpl->nColumns * pImpl->nRows) == 1)
bIsSelected = false;
- ::rtl::OUString adr(pImpl->aAdresses[nAddress]);
+ OUString adr(pImpl->aAdresses[nAddress]);
DrawText_Impl(adr,aPos,aPartSize,bIsSelected);
++nAddress;
}
@@ -424,7 +423,7 @@ void SwAddressPreview::StateChanged( StateChangedType nStateChange )
}
void SwAddressPreview::DrawText_Impl(
- const ::rtl::OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected)
+ const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected)
{
SetClipRegion( Region( Rectangle(rTopLeft, rSize)) );
if(bIsSelected)
@@ -447,20 +446,20 @@ void SwAddressPreview::DrawText_Impl(
}
String SwAddressPreview::FillData(
- const ::rtl::OUString& rAddress,
+ const OUString& rAddress,
SwMailMergeConfigItem& rConfigItem,
- const Sequence< ::rtl::OUString>* pAssignments)
+ const Sequence< OUString>* pAssignments)
{
//find the column names in the address string (with name assignment!) and
//exchange the placeholder (like <Firstname>) with the database content
//unassigned columns are expanded to <not assigned>
Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), UNO_QUERY);
Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0;
- Sequence< ::rtl::OUString> aAssignment = pAssignments ?
+ Sequence< OUString> aAssignment = pAssignments ?
*pAssignments :
rConfigItem.GetColumnAssignment(
rConfigItem.GetCurrentDBData() );
- const ::rtl::OUString* pAssignment = aAssignment.getConstArray();
+ const OUString* pAssignment = aAssignment.getConstArray();
const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
String sAddress(rAddress);
String sNotAssigned(SW_RES(STR_NOTASSIGNED));
@@ -468,13 +467,13 @@ String SwAddressPreview::FillData(
sNotAssigned += '>';
sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry();
- const ::rtl::OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
+ const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
String sCountryColumn;
if( bSpecialReplacementForCountry )
{
sCountryColumn = rDefHeaders.GetString(MM_PART_COUNTRY);
- Sequence< ::rtl::OUString> aSpecialAssignment =
+ Sequence< OUString> aSpecialAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength())
sCountryColumn = aSpecialAssignment[MM_PART_COUNTRY];
@@ -514,7 +513,7 @@ String SwAddressPreview::FillData(
{
try
{
- ::rtl::OUString sReplace = xColumn->getString();
+ OUString sReplace = xColumn->getString();
if( bSpecialReplacementForCountry && sCountryColumn == sConvertedColumn )
{
@@ -619,8 +618,8 @@ OUString SwAuthenticator::getPassword( ) throw (RuntimeException)
}
SwConnectionContext::SwConnectionContext(
- const ::rtl::OUString& rMailServer, sal_Int16 nPort,
- const ::rtl::OUString& rConnectionType) :
+ const OUString& rMailServer, sal_Int16 nPort,
+ const OUString& rConnectionType) :
m_sMailServer(rMailServer),
m_nPort(nPort),
m_sConnectionType(rConnectionType)
@@ -631,7 +630,7 @@ SwConnectionContext::~SwConnectionContext()
{
}
-uno::Any SwConnectionContext::getValueByName( const ::rtl::OUString& rName )
+uno::Any SwConnectionContext::getValueByName( const OUString& rName )
throw (uno::RuntimeException)
{
uno::Any aRet;
@@ -663,7 +662,7 @@ void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/)
{
}
-SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType) :
+SwMailTransferable::SwMailTransferable(const OUString& rBody, const OUString& rMimeType) :
cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex),
m_aMimeType( rMimeType ),
m_sBody( rBody ),
@@ -671,8 +670,8 @@ SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OU
{
}
-SwMailTransferable::SwMailTransferable(const rtl::OUString& rURL,
- const rtl::OUString& rName, const rtl::OUString& rMimeType) :
+SwMailTransferable::SwMailTransferable(const OUString& rURL,
+ const OUString& rName, const OUString& rMimeType) :
cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex),
m_aMimeType( rMimeType ),
m_aURL(rURL),
@@ -691,7 +690,7 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*
{
uno::Any aRet;
if( m_bIsBody )
- aRet <<= ::rtl::OUString(m_sBody);
+ aRet <<= OUString(m_sBody);
else
{
Sequence<sal_Int8> aData;
@@ -717,7 +716,7 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla
aRet[0].MimeType = m_aMimeType;
if( m_bIsBody )
{
- aRet[0].DataType = getCppuType((::rtl::OUString*)0);
+ aRet[0].DataType = getCppuType((OUString*)0);
}
else
{
@@ -731,7 +730,7 @@ sal_Bool SwMailTransferable::isDataFlavorSupported(
const datatransfer::DataFlavor& aFlavor )
throw (uno::RuntimeException)
{
- return (aFlavor.MimeType == ::rtl::OUString(m_aMimeType));
+ return (aFlavor.MimeType == OUString(m_aMimeType));
}
uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo( ) throw(uno::RuntimeException)
@@ -739,13 +738,13 @@ uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo
return uno::Reference< beans::XPropertySetInfo >();
}
-void SwMailTransferable::setPropertyValue( const ::rtl::OUString& , const uno::Any& )
+void SwMailTransferable::setPropertyValue( const OUString& , const uno::Any& )
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
{
}
-uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyName )
+uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
@@ -755,27 +754,27 @@ uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyN
}
void SwMailTransferable::addPropertyChangeListener(
- const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
+ const OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
void SwMailTransferable::removePropertyChangeListener(
- const ::rtl::OUString&,
+ const OUString&,
const uno::Reference< beans::XPropertyChangeListener >& )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
void SwMailTransferable::addVetoableChangeListener(
- const ::rtl::OUString&,
+ const OUString&,
const uno::Reference< beans::XVetoableChangeListener >& )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
void SwMailTransferable::removeVetoableChangeListener(
- const ::rtl::OUString& ,
+ const OUString& ,
const uno::Reference< beans::XVetoableChangeListener >& )
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
@@ -790,32 +789,32 @@ SwMailMessage::~SwMailMessage()
{
}
-::rtl::OUString SwMailMessage::getSenderName() throw (uno::RuntimeException)
+OUString SwMailMessage::getSenderName() throw (uno::RuntimeException)
{
return m_sSenderName;
}
-::rtl::OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException)
+OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException)
{
return m_sSenderAddress;
}
-::rtl::OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException)
+OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException)
{
return m_sReplyToAddress;
}
-void SwMailMessage::setReplyToAddress( const ::rtl::OUString& _replytoaddress ) throw (uno::RuntimeException)
+void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress ) throw (uno::RuntimeException)
{
m_sReplyToAddress = _replytoaddress;
}
-::rtl::OUString SwMailMessage::getSubject() throw (uno::RuntimeException)
+OUString SwMailMessage::getSubject() throw (uno::RuntimeException)
{
return m_sSubject;
}
-void SwMailMessage::setSubject( const ::rtl::OUString& _subject ) throw (uno::RuntimeException)
+void SwMailMessage::setSubject( const OUString& _subject ) throw (uno::RuntimeException)
{
m_sSubject = _subject;
}
@@ -832,14 +831,14 @@ void SwMailMessage::setBody(
m_xBody = rBody;
}
-void SwMailMessage::addRecipient( const ::rtl::OUString& rRecipientAddress )
+void SwMailMessage::addRecipient( const OUString& rRecipientAddress )
throw (uno::RuntimeException)
{
m_aRecipients.realloc(m_aRecipients.getLength() + 1);
m_aRecipients[m_aRecipients.getLength() - 1] = rRecipientAddress;
}
-void SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress )
+void SwMailMessage::addCcRecipient( const OUString& rRecipientAddress )
throw (uno::RuntimeException)
{
m_aCcRecipients.realloc(m_aCcRecipients.getLength() + 1);
@@ -847,23 +846,23 @@ void SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress )
}
-void SwMailMessage::addBccRecipient( const ::rtl::OUString& rRecipientAddress ) throw (uno::RuntimeException)
+void SwMailMessage::addBccRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException)
{
m_aBccRecipients.realloc(m_aBccRecipients.getLength() + 1);
m_aBccRecipients[m_aBccRecipients.getLength() - 1] = rRecipientAddress;
}
-uno::Sequence< ::rtl::OUString > SwMailMessage::getRecipients( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SwMailMessage::getRecipients( ) throw (uno::RuntimeException)
{
return m_aRecipients;
}
-uno::Sequence< ::rtl::OUString > SwMailMessage::getCcRecipients( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SwMailMessage::getCcRecipients( ) throw (uno::RuntimeException)
{
return m_aCcRecipients;
}
-uno::Sequence< ::rtl::OUString > SwMailMessage::getBccRecipients( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SwMailMessage::getBccRecipients( ) throw (uno::RuntimeException)
{
return m_aBccRecipients;
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index b81a767ce38c..473407084027 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -143,7 +143,7 @@ void SwMailMergeAddressBlockPage::ActivatePage()
m_aDocumentIndexFI.SetText(sTemp);
m_aSettingsWIN.Clear();
- const uno::Sequence< ::rtl::OUString> aBlocks =
+ const uno::Sequence< OUString> aBlocks =
m_pWizard->GetConfigItem().GetAddressBlocks();
for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress)
m_aSettingsWIN.AddAddress(aBlocks[nAddress]);
@@ -175,7 +175,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl)
xAddrDialog->GetConnection(),
xAddrDialog->GetColumnsSupplier(),
xAddrDialog->GetDBData());
- ::rtl::OUString sFilter = xAddrDialog->GetFilter();
+ OUString sFilter = xAddrDialog->GetFilter();
rConfigItem.SetFilter( sFilter );
InsertDataHdl_Impl(0);
GetWizard()->UpdateRoadmap();
@@ -184,7 +184,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl)
}
catch (const uno::Exception& e)
{
- OSL_FAIL(rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
+ OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
ErrorBox(this, WB_OK, e.Message).Execute();
}
return 0;
@@ -200,7 +200,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton)
if(RET_OK == pDlg->Execute())
{
//the dialog provides the selected address at the first position!
- const uno::Sequence< ::rtl::OUString> aBlocks =
+ const uno::Sequence< OUString> aBlocks =
pDlg->GetAddressBlocks();
rConfig.SetAddressBlocks(aBlocks);
m_aSettingsWIN.Clear();
@@ -221,7 +221,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress();
- const uno::Sequence< ::rtl::OUString> aBlocks = rConfigItem.GetAddressBlocks();
+ const uno::Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks();
SwAssignFieldsDialog* pDlg =
new SwAssignFieldsDialog(pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true);
if(RET_OK == pDlg->Execute())
@@ -265,7 +265,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox)
IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)
{
sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress();
- const uno::Sequence< ::rtl::OUString> aBlocks =
+ const uno::Sequence< OUString> aBlocks =
m_pWizard->GetConfigItem().GetAddressBlocks();
String sPreview = SwAddressPreview::FillData(aBlocks[nSel], m_pWizard->GetConfigItem());
m_aPreviewWIN.SetAddress(sPreview);
@@ -312,7 +312,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
{
//Fill data into preview
sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress();
- const uno::Sequence< ::rtl::OUString> aBlocks =
+ const uno::Sequence< OUString> aBlocks =
m_pWizard->GetConfigItem().GetAddressBlocks();
String sPreview = SwAddressPreview::FillData(aBlocks[nSel], rConfig);
m_aPreviewWIN.SetAddress(sPreview);
@@ -382,7 +382,7 @@ SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog()
{
}
-void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OUString>& rBlocks,
+void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< OUString>& rBlocks,
sal_uInt16 nSelectedAddress)
{
m_aAddressBlocks = rBlocks;
@@ -392,14 +392,14 @@ void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OU
}
// return the address blocks and put the selected one to the first position
-const uno::Sequence< ::rtl::OUString >& SwSelectAddressBlockDialog::GetAddressBlocks()
+const uno::Sequence< OUString >& SwSelectAddressBlockDialog::GetAddressBlocks()
{
//put the selected block to the first position
sal_uInt16 nSelect = m_aPreview.GetSelectedAddress();
if(nSelect)
{
- uno::Sequence< ::rtl::OUString >aTemp = m_aAddressBlocks;
- ::rtl::OUString* pTemp = aTemp.getArray();
+ uno::Sequence< OUString >aTemp = m_aAddressBlocks;
+ OUString* pTemp = aTemp.getArray();
pTemp[0] = m_aAddressBlocks[nSelect];
sal_uInt32 nIndex = 0;
const sal_uInt32 nNumBlocks = m_aAddressBlocks.getLength();
@@ -416,7 +416,7 @@ const uno::Sequence< ::rtl::OUString >& SwSelectAddressBlockDialog::GetAddres
}
void SwSelectAddressBlockDialog::SetSettings(
- sal_Bool bIsCountry, ::rtl::OUString rCountry)
+ sal_Bool bIsCountry, OUString rCountry)
{
if(bIsCountry)
{
@@ -428,9 +428,9 @@ void SwSelectAddressBlockDialog::SetSettings(
m_aDeletePB.Enable(m_aAddressBlocks.getLength() > 1);
}
-::rtl::OUString SwSelectAddressBlockDialog::GetCountry() const
+OUString SwSelectAddressBlockDialog::GetCountry() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
if(m_aDependentRB.IsChecked())
sRet = m_aCountryED.GetText();
return sRet;
@@ -441,7 +441,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton)
if(m_aAddressBlocks.getLength())
{
sal_uInt16 nSelected = m_aPreview.GetSelectedAddress();
- ::rtl::OUString* pAddressBlocks = m_aAddressBlocks.getArray();
+ OUString* pAddressBlocks = m_aAddressBlocks.getArray();
sal_Int32 nSource = 0;
for(sal_Int32 nTarget = 0; nTarget < m_aAddressBlocks.getLength() - 1; nTarget++)
{
@@ -473,13 +473,13 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton
{
if(bCustomize)
{
- ::rtl::OUString sNew = pDlg->GetAddress();
+ OUString sNew = pDlg->GetAddress();
m_aPreview.ReplaceSelectedAddress(sNew);
m_aAddressBlocks[m_aPreview.GetSelectedAddress()] = sNew;
}
else
{
- ::rtl::OUString sNew = pDlg->GetAddress();
+ OUString sNew = pDlg->GetAddress();
m_aPreview.AddAddress(sNew);
m_aAddressBlocks.realloc(m_aAddressBlocks.getLength() + 1);
sal_uInt16 nSelect = (sal_uInt16)m_aAddressBlocks.getLength() - 1;
@@ -507,7 +507,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt)
bool bCallParent = true;
if(rEvt.GetCharCode())
{
- rtl::OUString sKey(rEvt.GetCharCode());
+ OUString sKey(rEvt.GetCharCode());
if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
bCallParent = false;
}
@@ -570,7 +570,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_rConfigItem(rConfig),
m_eType(eType)
{
- m_aFieldCB.SetForbiddenChars( rtl::OUString("<>"));
+ m_aFieldCB.SetForbiddenChars( OUString("<>"));
m_aDragED.SetStyle(m_aDragED.GetStyle() |WB_NOHIDESELECTION);
if( eType >= GREETING_FEMALE )
{
@@ -590,7 +590,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
ResStringArray aPunctArr(SW_RES(RA_PUNCTUATION));
for(i = 0; i < aPunctArr.Count(); ++i)
m_aPunctuations.push_back(aPunctArr.GetString(i));
- m_aDragED.SetText(rtl::OUString(" "));
+ m_aDragED.SetText(OUString(" "));
SetText( String( SW_RES( eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE)));
m_aAddressElementsFT.SetText(String(SW_RES(ST_SALUTATIONELEMENTS)));
m_aInsertFieldIB.SetQuickHelpText(String(SW_RES(ST_INSERTSALUTATIONFIELD)));
@@ -610,7 +610,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
aPreviewSize.Height() += nDiff;
m_aPreviewWIN.SetSizePixel(aPreviewSize);
m_aPreviewWIN.SetPosPixel(m_aFieldCB.GetPosPixel());
- m_aDragED.SetText(rtl::OUString("\n\n\n\n\n"));
+ m_aDragED.SetText(OUString("\n\n\n\n\n"));
}
FreeResource();
const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
@@ -825,14 +825,14 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl()
(0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || !m_aFieldCB.GetText().isEmpty()));
}
-void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress)
+void SwCustomizeAddressBlockDialog::SetAddress(const OUString& rAddress)
{
m_aDragED.SetText( rAddress );
UpdateImageButtons_Impl();
m_aDragED.Modify();
}
-::rtl::OUString SwCustomizeAddressBlockDialog::GetAddress()
+OUString SwCustomizeAddressBlockDialog::GetAddress()
{
String sAddress(m_aDragED.GetAddress());
//remove placeholders by the actual content
@@ -993,15 +993,15 @@ SwAssignFieldsControl::SwAssignFieldsControl(
uno::Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY);
//get the name of the actual columns
uno::Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0;
- uno::Sequence< ::rtl::OUString > aFields;
+ uno::Sequence< OUString > aFields;
if(xColAccess.is())
aFields = xColAccess->getElementNames();
- const ::rtl::OUString* pFields = aFields.getConstArray();
+ const OUString* pFields = aFields.getConstArray();
//get the current assignment list
//each position in this sequence matches the position in the header array rHeaders
//if no assignment is available an empty sequence will be returned
- uno::Sequence< ::rtl::OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
+ uno::Sequence< OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
@@ -1028,7 +1028,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
{
const XubString& rHeader = rHeaders.GetString( i );
FixedInfo* pNewText = new FixedInfo(&m_aWindow, ResId( FT_FIELDS, *rResId.GetResMgr()));
- String sLabel(rtl::OUString("<>"));
+ String sLabel(OUString("<>"));
sLabel.Insert(rHeader, 1);
pNewText->SetText(sLabel);
ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr()));
@@ -1182,7 +1182,7 @@ IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox)
String sColumn = pBox->GetSelectEntry();
uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem.GetResultSet(), uno::UNO_QUERY);
uno::Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0;
- ::rtl::OUString sPreview;
+ OUString sPreview;
if(xColAccess.is() && xColAccess->hasByName(sColumn))
{
uno::Any aCol = xColAccess->getByName(sColumn);
@@ -1233,7 +1233,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox)
SwAssignFieldsDialog::SwAssignFieldsDialog(
Window* pParent, SwMailMergeConfigItem& rConfigItem,
- const ::rtl::OUString& rPreview,
+ const OUString& rPreview,
bool bIsAddressBlock) :
SfxModalDialog(pParent, SW_RES(DLG_MM_ASSIGNFIELDS)),
#ifdef _MSC_VER
@@ -1288,11 +1288,11 @@ SwAssignFieldsDialog::~SwAssignFieldsDialog()
delete m_pFieldsControl;
}
-uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
+uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments()
{
- uno::Sequence< ::rtl::OUString > aAssignments(
+ uno::Sequence< OUString > aAssignments(
m_rConfigItem.GetDefaultAddressHeaders().Count());
- ::rtl::OUString* pAssignments = aAssignments.getArray();
+ OUString* pAssignments = aAssignments.getArray();
::std::vector<ListBox*>::iterator aLBIter;
sal_Int32 nIndex = 0;
for(aLBIter = m_pFieldsControl->m_aMatches.begin();
@@ -1303,7 +1303,7 @@ uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments()
if(m_sNone != sSelect)
pAssignments[nIndex] = sSelect;
else
- pAssignments[nIndex] = ::rtl::OUString();
+ pAssignments[nIndex] = OUString();
}
return aAssignments;
}
@@ -1319,7 +1319,7 @@ IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl)
IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl)
{
- uno::Sequence< ::rtl::OUString > aAssignments = CreateAssignments();
+ uno::Sequence< OUString > aAssignments = CreateAssignments();
String sPreview = SwAddressPreview::FillData(
m_rPreviewString, m_rConfigItem, &aAssignments);
m_aPreviewWIN.SetAddress(sPreview);
@@ -1439,7 +1439,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
if(sPara.Len() && sPara.GetChar(sPara.Len() - 1) != ' ')
{
TextPaM aPaM(nPara, sPara.Len());
- pTextEngine->ReplaceText(TextSelection( aPaM ), rtl::OUString(' '));
+ pTextEngine->ReplaceText(TextSelection( aPaM ), OUString(' '));
}
while(true)
{
@@ -1461,7 +1461,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
if(nLastLen)
{
TextPaM aPaM(nParaCount ? nParaCount - 1 : 0, nLastLen);
- pTextEngine->ReplaceText( TextSelection( aPaM ), rtl::OUString("\n \n "));
+ pTextEngine->ReplaceText( TextSelection( aPaM ), OUString("\n \n "));
}
}
}
@@ -1583,7 +1583,7 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove)
{
TextPaM aTemp(nPara - 1, pTextEngine->GetTextLen( nPara - 1 ));
- pTextEngine->ReplaceText( aTemp, rtl::OUString('\n'));
+ pTextEngine->ReplaceText( aTemp, OUString('\n'));
}
InsertNewEntryAtPosition( sCurrentItem, nPara, nIndex );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 9c2d76be843b..57e409711159 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -116,7 +116,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog
CancelButton m_aCancel;
HelpButton m_aHelp;
- com::sun::star::uno::Sequence< ::rtl::OUString> m_aAddressBlocks;
+ com::sun::star::uno::Sequence< OUString> m_aAddressBlocks;
SwMailMergeConfigItem& m_rConfig;
DECL_LINK(NewCustomizeHdl_Impl, PushButton*);
@@ -129,13 +129,13 @@ public:
SwSelectAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig);
~SwSelectAddressBlockDialog();
- void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks,
+ void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks,
sal_uInt16 nSelected);
- const com::sun::star::uno::Sequence< ::rtl::OUString>& GetAddressBlocks();
+ const com::sun::star::uno::Sequence< OUString>& GetAddressBlocks();
- void SetSettings(sal_Bool bIsCountry, ::rtl::OUString sCountry);
+ void SetSettings(sal_Bool bIsCountry, OUString sCountry);
sal_Bool IsIncludeCountry() const {return !m_aNeverRB.IsChecked();}
- ::rtl::OUString GetCountry() const;
+ OUString GetCountry() const;
};
class SwCustomizeAddressBlockDialog;
@@ -268,8 +268,8 @@ public:
SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType);
~SwCustomizeAddressBlockDialog();
- void SetAddress(const ::rtl::OUString& rAddress);
- ::rtl::OUString GetAddress();
+ void SetAddress(const OUString& rAddress);
+ OUString GetAddress();
};
class SwAssignFieldsControl;
@@ -288,18 +288,18 @@ class SwAssignFieldsDialog : public SfxModalDialog
HelpButton m_aHelp;
String m_sNone;
- ::rtl::OUString m_rPreviewString;
+ OUString m_rPreviewString;
SwMailMergeConfigItem& m_rConfigItem;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments();
+ ::com::sun::star::uno::Sequence< OUString > CreateAssignments();
DECL_LINK(OkHdl_Impl, void *);
DECL_LINK(AssignmentModifyHdl_Impl, void*);
public:
SwAssignFieldsDialog(Window* pParent,
SwMailMergeConfigItem& rConfigItem,
- const ::rtl::OUString& rPreview,
+ const OUString& rPreview,
bool bIsAddressBlock);
~SwAssignFieldsDialog();
};
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index f47a0597113c..1cc6e6fbddfa 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -46,7 +46,6 @@
#include <unomid.h>
using namespace utl;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -68,9 +67,9 @@ const char* cDataCommandType = "DataSource/DataCommandType";
struct DBAddressDataAssignment
{
SwDBData aDBData;
- Sequence< ::rtl::OUString> aDBColumnAssignments;
+ Sequence< OUString> aDBColumnAssignments;
//if loaded the name of the node has to be saved
- ::rtl::OUString sConfigNodeName;
+ OUString sConfigNodeName;
//all created or changed assignments need to be stored
bool bColumnAssignmentsChanged;
@@ -88,47 +87,47 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
Reference< XStatement> xStatement;
Reference< XResultSet> xResultSet;
SwDBData aDBData;
- ::rtl::OUString sFilter;
+ OUString sFilter;
sal_Int32 nResultSetCursorPos;
::std::vector<DBAddressDataAssignment> aAddressDataAssignments;
- ::std::vector< ::rtl::OUString> aAddressBlocks;
+ ::std::vector< OUString> aAddressBlocks;
sal_Int32 nCurrentAddressBlock;
sal_Bool bIsAddressBlock;
sal_Bool bIsHideEmptyParagraphs;
sal_Bool bIsOutputToLetter;
sal_Bool bIncludeCountry;
- ::rtl::OUString sExcludeCountry;
+ OUString sExcludeCountry;
sal_Bool bIsGreetingLine;
sal_Bool bIsIndividualGreetingLine;
- ::std::vector< ::rtl::OUString> aFemaleGreetingLines;
+ ::std::vector< OUString> aFemaleGreetingLines;
sal_Int32 nCurrentFemaleGreeting;
- ::std::vector< ::rtl::OUString> aMaleGreetingLines;
+ ::std::vector< OUString> aMaleGreetingLines;
sal_Int32 nCurrentMaleGreeting;
- ::std::vector< ::rtl::OUString> aNeutralGreetingLines;
+ ::std::vector< OUString> aNeutralGreetingLines;
sal_Int32 nCurrentNeutralGreeting;
- ::rtl::OUString sFemaleGenderValue;
- uno::Sequence< ::rtl::OUString> aSavedDocuments;
+ OUString sFemaleGenderValue;
+ uno::Sequence< OUString> aSavedDocuments;
sal_Bool bIsGreetingLineInMail;
sal_Bool bIsIndividualGreetingLineInMail;
//mail settings
- ::rtl::OUString sMailDisplayName;
- ::rtl::OUString sMailAddress;
- ::rtl::OUString sMailReplyTo;
- ::rtl::OUString sMailServer;
- ::rtl::OUString sMailUserName;
- ::rtl::OUString sMailPassword;
+ OUString sMailDisplayName;
+ OUString sMailAddress;
+ OUString sMailReplyTo;
+ OUString sMailServer;
+ OUString sMailUserName;
+ OUString sMailPassword;
sal_Bool bIsSMPTAfterPOP;
- ::rtl::OUString sInServerName;
+ OUString sInServerName;
sal_Int16 nInServerPort;
sal_Bool bInServerPOP;
- ::rtl::OUString sInServerUserName;
- ::rtl::OUString sInServerPassword;
+ OUString sInServerUserName;
+ OUString sInServerPassword;
sal_Int16 nMailPort;
sal_Bool bIsMailReplyTo;
@@ -151,24 +150,24 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
sal_Bool bIsGreetingLine_LastUserSetting;
- const Sequence< ::rtl::OUString>& GetPropertyNames();
+ const Sequence< OUString>& GetPropertyNames();
public:
SwMailMergeConfigItem_Impl();
~SwMailMergeConfigItem_Impl();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- const Sequence< ::rtl::OUString>
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
+ const Sequence< OUString>
GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const;
void SetAddressBlocks(
- const Sequence< ::rtl::OUString>& rBlocks,
+ const Sequence< OUString>& rBlocks,
sal_Bool bConvertFromConfig = sal_False);
- const uno::Sequence< ::rtl::OUString>
+ const uno::Sequence< OUString>
GetGreetings(SwMailMergeConfigItem::Gender eType,
sal_Bool bConvertToConfig = sal_False) const;
void SetGreetings(SwMailMergeConfigItem::Gender eType,
- const uno::Sequence< ::rtl::OUString>& rBlocks,
+ const uno::Sequence< OUString>& rBlocks,
sal_Bool bConvertFromConfig = sal_False);
void SetCurrentAddressBlockIndex( sal_Int32 nSet );
@@ -223,7 +222,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
case 2: pValues[nProp] >>= sExcludeCountry; break;
case 3:
{
- Sequence< ::rtl::OUString> aBlocks;
+ Sequence< OUString> aBlocks;
pValues[nProp] >>= aBlocks;
SetAddressBlocks(aBlocks, sal_True);
}
@@ -235,7 +234,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
case 8 :
case 9 :
{
- Sequence< ::rtl::OUString> aGreetings;
+ Sequence< OUString> aGreetings;
pValues[nProp] >>= aGreetings;
SetGreetings(SwMailMergeConfigItem::Gender(
SwMailMergeConfigItem::FEMALE + nProp - 7), aGreetings, sal_True);
@@ -288,28 +287,28 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
}
}
//read the list of data base assignments
- Sequence<OUString> aAssignments = GetNodeNames(rtl::OUString::createFromAscii(cAddressDataAssignments));
+ Sequence<OUString> aAssignments = GetNodeNames(OUString::createFromAscii(cAddressDataAssignments));
if(aAssignments.getLength())
{
//create a list of property names to load the URLs of all data bases
const OUString* pAssignments = aAssignments.getConstArray();
- Sequence< ::rtl::OUString > aAssignProperties(4 * aAssignments.getLength());
- ::rtl::OUString* pAssignProperties = aAssignProperties.getArray();
+ Sequence< OUString > aAssignProperties(4 * aAssignments.getLength());
+ OUString* pAssignProperties = aAssignProperties.getArray();
sal_Int32 nAssign;
for(nAssign = 0; nAssign < aAssignProperties.getLength(); nAssign += 4)
{
- String sAssignPath = rtl::OUString::createFromAscii(cAddressDataAssignments);
+ String sAssignPath = OUString::createFromAscii(cAddressDataAssignments);
sAssignPath += '/';
sAssignPath += String(pAssignments[nAssign / 4]);
sAssignPath += '/';
pAssignProperties[nAssign] = sAssignPath;
- pAssignProperties[nAssign] += rtl::OUString::createFromAscii(cDataSourceName);
+ pAssignProperties[nAssign] += OUString::createFromAscii(cDataSourceName);
pAssignProperties[nAssign + 1] = sAssignPath;
- pAssignProperties[nAssign + 1] += rtl::OUString::createFromAscii(cDataTableName);
+ pAssignProperties[nAssign + 1] += OUString::createFromAscii(cDataTableName);
pAssignProperties[nAssign + 2] = sAssignPath;
- pAssignProperties[nAssign + 2] += rtl::OUString::createFromAscii(cDataCommandType);
+ pAssignProperties[nAssign + 2] += OUString::createFromAscii(cDataCommandType);
pAssignProperties[nAssign + 3] = sAssignPath;
- pAssignProperties[nAssign + 3] += rtl::OUString::createFromAscii(cDBColumnAssignments);
+ pAssignProperties[nAssign + 3] += OUString::createFromAscii(cDBColumnAssignments);
}
Sequence<Any> aAssignValues = GetProperties(aAssignProperties);
const Any* pAssignValues = aAssignValues.getConstArray();
@@ -327,8 +326,8 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
//check if the saved documents still exist
if(aSavedDocuments.getLength())
{
- uno::Sequence< ::rtl::OUString > aTempDocuments(aSavedDocuments.getLength());
- ::rtl::OUString* pTempDocuments = aTempDocuments.getArray();
+ uno::Sequence< OUString > aTempDocuments(aSavedDocuments.getLength());
+ OUString* pTempDocuments = aTempDocuments.getArray();
sal_Int32 nIndex = 0;
for(sal_Int32 i = 0; i < aSavedDocuments.getLength(); ++i)
{
@@ -392,7 +391,7 @@ static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeader
{
//convert the strings used for UI to numbers used for the configuration
String sBlock(rBlock);
- sBlock.SearchAndReplaceAllAscii("\n", rtl::OUString("\\n"));
+ sBlock.SearchAndReplaceAllAscii("\n", OUString("\\n"));
for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i)
{
String sHeader = rHeaders.GetString( i );
@@ -410,7 +409,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead
//convert the numbers used for the configuration to strings used for UI to numbers
//doesn't use ReplaceAll to prevent expansion of numbers inside of the headers
String sBlock(rBlock);
- sBlock.SearchAndReplaceAllAscii("\\n", rtl::OUString('\n'));
+ sBlock.SearchAndReplaceAllAscii("\\n", OUString('\n'));
SwAddressIterator aGreetingIter(sBlock);
sBlock.Erase();
while(aGreetingIter.HasMore())
@@ -497,7 +496,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
return aNames;
}
-void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwMailMergeConfigItem_Impl::Commit()
{
@@ -582,7 +581,7 @@ void SwMailMergeConfigItem_Impl::Commit()
//store the changed / new assignments
//load the existing node names to find new names
- Sequence<OUString> aAssignments = GetNodeNames(rtl::OUString::createFromAscii(cAddressDataAssignments));
+ Sequence<OUString> aAssignments = GetNodeNames(OUString::createFromAscii(cAddressDataAssignments));
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
for(aAssignIter = aAddressDataAssignments.begin();
@@ -595,7 +594,7 @@ void SwMailMergeConfigItem_Impl::Commit()
aAssignIter->sConfigNodeName :
lcl_CreateNodeName(aAssignments);
OUString sSlash = "/";
- OUString sNodePath = rtl::OUString::createFromAscii(cAddressDataAssignments);
+ OUString sNodePath = OUString::createFromAscii(cAddressDataAssignments);
sNodePath += sSlash;
sNodePath += sNewNode;
sNodePath += sSlash;
@@ -603,30 +602,30 @@ void SwMailMergeConfigItem_Impl::Commit()
Sequence< PropertyValue > aNewValues(4);
PropertyValue* pNewValues = aNewValues.getArray();
pNewValues[0].Name = sNodePath;
- pNewValues[0].Name += rtl::OUString::createFromAscii(cDataSourceName);
+ pNewValues[0].Name += OUString::createFromAscii(cDataSourceName);
pNewValues[0].Value <<= aAssignIter->aDBData.sDataSource;
pNewValues[1].Name = sNodePath;
- pNewValues[1].Name += rtl::OUString::createFromAscii(cDataTableName);
+ pNewValues[1].Name += OUString::createFromAscii(cDataTableName);
pNewValues[1].Value <<= aAssignIter->aDBData.sCommand;
pNewValues[2].Name = sNodePath;
- pNewValues[2].Name += rtl::OUString::createFromAscii(cDataCommandType);
+ pNewValues[2].Name += OUString::createFromAscii(cDataCommandType);
pNewValues[2].Value <<= aAssignIter->aDBData.nCommandType;
pNewValues[3].Name = sNodePath;
- pNewValues[3].Name += rtl::OUString::createFromAscii(cDBColumnAssignments);
+ pNewValues[3].Name += OUString::createFromAscii(cDBColumnAssignments);
pNewValues[3].Value <<= aAssignIter->aDBColumnAssignments;
- SetSetProperties(rtl::OUString::createFromAscii(cAddressDataAssignments), aNewValues);
+ SetSetProperties(OUString::createFromAscii(cAddressDataAssignments), aNewValues);
}
}
bUserSettingWereOverwritten = sal_False;
}
-const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
+const Sequence< OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
sal_Bool bConvertToConfig) const
{
- Sequence< ::rtl::OUString> aRet(aAddressBlocks.size());
- ::rtl::OUString* pRet = aRet.getArray();
+ Sequence< OUString> aRet(aAddressBlocks.size());
+ OUString* pRet = aRet.getArray();
for(sal_uInt32 nBlock = 0; nBlock < aAddressBlocks.size(); nBlock++)
{
pRet[nBlock] = aAddressBlocks[nBlock];
@@ -637,7 +636,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
}
void SwMailMergeConfigItem_Impl::SetAddressBlocks(
- const Sequence< ::rtl::OUString>& rBlocks,
+ const Sequence< OUString>& rBlocks,
sal_Bool bConvertFromConfig)
{
aAddressBlocks.clear();
@@ -652,15 +651,15 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks(
SetModified();
}
-const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings(
+const Sequence< OUString> SwMailMergeConfigItem_Impl::GetGreetings(
SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const
{
- const ::std::vector< ::rtl::OUString>& rGreetings =
+ const ::std::vector< OUString>& rGreetings =
eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines :
eType == SwMailMergeConfigItem::MALE ? aMaleGreetingLines :
aNeutralGreetingLines;
- Sequence< ::rtl::OUString> aRet(rGreetings.size());
- ::rtl::OUString* pRet = aRet.getArray();
+ Sequence< OUString> aRet(rGreetings.size());
+ OUString* pRet = aRet.getArray();
for(sal_uInt32 nGreeting = 0; nGreeting < rGreetings.size(); nGreeting++)
{
pRet[nGreeting] = rGreetings[nGreeting];
@@ -672,10 +671,10 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings(
void SwMailMergeConfigItem_Impl::SetGreetings(
SwMailMergeConfigItem::Gender eType,
- const Sequence< ::rtl::OUString>& rSetGreetings,
+ const Sequence< OUString>& rSetGreetings,
sal_Bool bConvertFromConfig)
{
- ::std::vector< ::rtl::OUString>& rGreetings =
+ ::std::vector< OUString>& rGreetings =
eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines :
eType == SwMailMergeConfigItem::MALE ? aMaleGreetingLines :
aNeutralGreetingLines;
@@ -774,12 +773,12 @@ const ResStringArray& SwMailMergeConfigItem::GetDefaultAddressHeaders() const
}
void SwMailMergeConfigItem::SetAddressBlocks(
- const Sequence< ::rtl::OUString>& rBlocks)
+ const Sequence< OUString>& rBlocks)
{
m_pImpl->SetAddressBlocks(rBlocks);
}
-const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetAddressBlocks() const
+const Sequence< OUString> SwMailMergeConfigItem::GetAddressBlocks() const
{
return m_pImpl->GetAddressBlocks();
}
@@ -818,12 +817,12 @@ sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const
return m_pImpl->bIncludeCountry;
}
-rtl::OUString& SwMailMergeConfigItem::GetExcludeCountry() const
+OUString& SwMailMergeConfigItem::GetExcludeCountry() const
{
return m_pImpl->sExcludeCountry;
}
-void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUString& rCountry)
+void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const OUString& rCountry)
{
if(m_pImpl->sExcludeCountry != rCountry ||
m_pImpl->bIncludeCountry != bSet)
@@ -941,12 +940,12 @@ void SwMailMergeConfigItem::DisposeResultSet()
}
}
-::rtl::OUString& SwMailMergeConfigItem::GetFilter() const
+OUString& SwMailMergeConfigItem::GetFilter() const
{
return m_pImpl->sFilter;
}
-void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter)
+void SwMailMergeConfigItem::SetFilter(OUString& rFilter)
{
if(m_pImpl->sFilter != rFilter)
{
@@ -1098,15 +1097,15 @@ Sequence< Any > SwMailMergeConfigItem::GetSelection() const
return aRet;
}
-const uno::Sequence< ::rtl::OUString>&
+const uno::Sequence< OUString>&
SwMailMergeConfigItem::GetSavedDocuments() const
{
return m_pImpl->aSavedDocuments;
}
-void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName)
+void SwMailMergeConfigItem::AddSavedDocument(OUString rName)
{
- const ::rtl::OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray();
+ const OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray();
bool bFound = false;
for(sal_Int32 nDoc = 0; nDoc < m_pImpl->aSavedDocuments.getLength(); ++nDoc)
{
@@ -1191,14 +1190,14 @@ void SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail
}
}
-const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetGreetings(
+const Sequence< OUString> SwMailMergeConfigItem::GetGreetings(
Gender eType ) const
{
return m_pImpl->GetGreetings(eType);
}
void SwMailMergeConfigItem::SetGreetings(
- Gender eType, const Sequence< ::rtl::OUString>& rSetGreetings)
+ Gender eType, const Sequence< OUString>& rSetGreetings)
{
m_pImpl->SetGreetings( eType, rSetGreetings);
}
@@ -1214,12 +1213,12 @@ void SwMailMergeConfigItem::SetCurrentGreeting(Gender eType, sal_Int32 nIndex)
m_pImpl->SetCurrentGreeting(eType, nIndex);
}
-const ::rtl::OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const
+const OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const
{
return m_pImpl->sFemaleGenderValue;
}
-void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
+void SwMailMergeConfigItem::SetFemaleGenderValue(const OUString rValue)
{
if( m_pImpl->sFemaleGenderValue != rValue )
{
@@ -1228,10 +1227,10 @@ void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue)
}
}
-Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
+Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment(
const SwDBData& rDBData ) const
{
- Sequence< ::rtl::OUString> aRet;
+ Sequence< OUString> aRet;
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
for(aAssignIter = m_pImpl->aAddressDataAssignments.begin();
aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter)
@@ -1247,10 +1246,10 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
// returns the name that is assigned as e-mail column of the current data base
-::rtl::OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const
+OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const
{
- ::rtl::OUString sRet;
- Sequence< ::rtl::OUString> aAssignment = GetColumnAssignment( m_pImpl->aDBData );
+ OUString sRet;
+ Sequence< OUString> aAssignment = GetColumnAssignment( m_pImpl->aDBData );
if(aAssignment.getLength() > sal::static_int_cast< sal_Int32, sal_uInt32>(nColumn) && !aAssignment[nColumn].isEmpty())
sRet = aAssignment[nColumn];
else if(nColumn < m_pImpl->m_AddressHeaderSA.Count())
@@ -1259,7 +1258,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
}
void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
- const Sequence< ::rtl::OUString>& rList)
+ const Sequence< OUString>& rList)
{
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
bool bFound = false;
@@ -1298,10 +1297,10 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
const ResStringArray& rHeaders = GetDefaultAddressHeaders();
- Sequence< ::rtl::OUString> aAssignment =
+ Sequence< OUString> aAssignment =
GetColumnAssignment( GetCurrentDBData() );
- const ::rtl::OUString* pAssignment = aAssignment.getConstArray();
- const Sequence< ::rtl::OUString> aBlocks = GetAddressBlocks();
+ const OUString* pAssignment = aAssignment.getConstArray();
+ const Sequence< OUString> aBlocks = GetAddressBlocks();
if(aBlocks.getLength() <= m_pImpl->GetCurrentAddressBlockIndex())
return false;
@@ -1348,21 +1347,21 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
const ResStringArray& rHeaders = GetDefaultAddressHeaders();
uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
- Sequence< ::rtl::OUString> aAssignment =
+ Sequence< OUString> aAssignment =
GetColumnAssignment( GetCurrentDBData() );
- const ::rtl::OUString* pAssignment = aAssignment.getConstArray();
+ const OUString* pAssignment = aAssignment.getConstArray();
- const Sequence< ::rtl::OUString> rFemaleEntries = GetGreetings(SwMailMergeConfigItem::FEMALE);
+ const Sequence< OUString> rFemaleEntries = GetGreetings(SwMailMergeConfigItem::FEMALE);
sal_Int32 nCurrentFemale = GetCurrentGreeting(SwMailMergeConfigItem::FEMALE);
- const Sequence< ::rtl::OUString> rMaleEntries = GetGreetings(SwMailMergeConfigItem::MALE);
+ const Sequence< OUString> rMaleEntries = GetGreetings(SwMailMergeConfigItem::MALE);
sal_Int32 nCurrentMale = GetCurrentGreeting(SwMailMergeConfigItem::MALE);
- ::rtl::OUString sMale, sFemale;
+ OUString sMale, sFemale;
if(rFemaleEntries.getLength() > nCurrentFemale)
sFemale = rFemaleEntries[nCurrentFemale];
if(rMaleEntries.getLength() > nCurrentMale)
sMale = rMaleEntries[nCurrentMale];
- ::rtl::OUString sAddress( sFemale );
+ OUString sAddress( sFemale );
sAddress += sMale;
SwAddressIterator aIter(sAddress);
while(aIter.HasMore())
@@ -1393,12 +1392,12 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
return bResult;
}
-::rtl::OUString SwMailMergeConfigItem::GetMailDisplayName() const
+OUString SwMailMergeConfigItem::GetMailDisplayName() const
{
return m_pImpl->sMailDisplayName;
}
-void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
+void SwMailMergeConfigItem::SetMailDisplayName(const OUString& rName)
{
if(m_pImpl->sMailDisplayName != rName)
{
@@ -1407,12 +1406,12 @@ void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetMailAddress() const
+OUString SwMailMergeConfigItem::GetMailAddress() const
{
return m_pImpl->sMailAddress;
}
-void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress)
+void SwMailMergeConfigItem::SetMailAddress(const OUString& rAddress)
{
if(m_pImpl->sMailAddress != rAddress )
{
@@ -1435,12 +1434,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetMailReplyTo() const
+OUString SwMailMergeConfigItem::GetMailReplyTo() const
{
return m_pImpl->sMailReplyTo;
}
-void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
+void SwMailMergeConfigItem::SetMailReplyTo(const OUString& rReplyTo)
{
if(m_pImpl->sMailReplyTo != rReplyTo)
{
@@ -1449,12 +1448,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetMailServer() const
+OUString SwMailMergeConfigItem::GetMailServer() const
{
return m_pImpl->sMailServer;
}
-void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress)
+void SwMailMergeConfigItem::SetMailServer(const OUString& rAddress)
{
if(m_pImpl->sMailServer != rAddress)
{
@@ -1508,12 +1507,12 @@ void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetMailUserName() const
+OUString SwMailMergeConfigItem::GetMailUserName() const
{
return m_pImpl->sMailUserName;
}
-void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
+void SwMailMergeConfigItem::SetMailUserName(const OUString& rName)
{
if(m_pImpl->sMailUserName != rName)
{
@@ -1522,12 +1521,12 @@ void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetMailPassword() const
+OUString SwMailMergeConfigItem::GetMailPassword() const
{
return m_pImpl->sMailPassword;
}
-void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword)
+void SwMailMergeConfigItem::SetMailPassword(const OUString& rPassword)
{
if(m_pImpl->sMailPassword != rPassword)
{
@@ -1550,12 +1549,12 @@ void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetInServerName() const
+OUString SwMailMergeConfigItem::GetInServerName() const
{
return m_pImpl->sInServerName;
}
-void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer)
+void SwMailMergeConfigItem::SetInServerName(const OUString& rServer)
{
if(m_pImpl->sInServerName != rServer)
{
@@ -1592,12 +1591,12 @@ void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetInServerUserName() const
+OUString SwMailMergeConfigItem::GetInServerUserName() const
{
return m_pImpl->sInServerUserName;
}
-void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
+void SwMailMergeConfigItem::SetInServerUserName(const OUString& rName)
{
if( m_pImpl->sInServerUserName != rName)
{
@@ -1606,12 +1605,12 @@ void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName)
}
}
-::rtl::OUString SwMailMergeConfigItem::GetInServerPassword() const
+OUString SwMailMergeConfigItem::GetInServerPassword() const
{
return m_pImpl->sInServerPassword;
}
-void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword)
+void SwMailMergeConfigItem::SetInServerPassword(const OUString& rPassword)
{
if(m_pImpl->sInServerPassword != rPassword)
{
@@ -1625,7 +1624,7 @@ void SwMailMergeConfigItem::DocumentReloaded()
m_bMergeDone = false;
m_bGreetingInserted = false;
m_bAddressInserted = false;
- m_rAddressBlockFrame = ::rtl::OUString();
+ m_rAddressBlockFrame = OUString();
}
bool SwMailMergeConfigItem::IsMailAvailable() const
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 329016c3b86a..c8551a5ef25c 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -80,7 +80,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent
m_aBrowseDocPB.SetClickHdl(aFileSelectHdl);
m_aBrowseTemplatePB.SetClickHdl(aFileSelectHdl);
- const uno::Sequence< ::rtl::OUString >& rDocs =
+ const uno::Sequence< OUString >& rDocs =
m_pWizard->GetConfigItem().GetSavedDocuments();
for(sal_Int32 nDoc = 0; nDoc < rDocs.getLength(); ++nDoc)
{
@@ -134,7 +134,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() );
SfxObjectFactory &rFact = m_pWizard->GetSwView()->GetDocShell()->GetFactory();
- SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) );
+ SfxFilterMatcher aMatcher( OUString::createFromAscii(rFact.GetShortName()) );
SfxFilterMatcherIter aIter( aMatcher );
Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
const SfxFilter* pFlt = aIter.First();
@@ -171,7 +171,7 @@ sal_Bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageRea
bool bNext = _eReason == ::svt::WizardTypes::eTravelForward;
if(bNext || _eReason == ::svt::WizardTypes::eValidate )
{
- ::rtl::OUString sReloadDocument;
+ OUString sReloadDocument;
bReturn = m_aCurrentDocRB.IsChecked() ||
m_aNewDocRB.IsChecked() ||
(!(sReloadDocument = m_sLoadFileName).isEmpty() && m_aLoadDocRB.IsChecked() )||
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index bc85f5ffbe47..c1126eb3908a 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -38,7 +38,7 @@ static void lcl_FillGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
{
- const Sequence< ::rtl::OUString> rEntries = rConfig.GetGreetings(eType);
+ const Sequence< OUString> rEntries = rConfig.GetGreetings(eType);
for(sal_Int32 nEntry = 0; nEntry < rEntries.getLength(); ++nEntry)
rBox.InsertEntry(rEntries[nEntry]);
rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType));
@@ -48,7 +48,7 @@ static void lcl_FillGreetingsBox(ComboBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
{
- const Sequence< ::rtl::OUString> rEntries = rConfig.GetGreetings(eType);
+ const Sequence< OUString> rEntries = rConfig.GetGreetings(eType);
for(sal_Int32 nEntry = 0; nEntry < rEntries.getLength(); ++nEntry)
rBox.InsertEntry(rEntries[nEntry]);
rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType));
@@ -58,8 +58,8 @@ static void lcl_StoreGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
{
- Sequence< ::rtl::OUString> aEntries(rBox.GetEntryCount());
- ::rtl::OUString* pEntries = aEntries.getArray();
+ Sequence< OUString> aEntries(rBox.GetEntryCount());
+ OUString* pEntries = aEntries.getArray();
for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry)
pEntries[nEntry] = rBox.GetEntry(nEntry);
rConfig.SetGreetings(eType, aEntries);
@@ -70,8 +70,8 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox,
SwMailMergeConfigItem& rConfig,
SwMailMergeConfigItem::Gender eType)
{
- Sequence< ::rtl::OUString> aEntries(rBox.GetEntryCount());
- ::rtl::OUString* pEntries = aEntries.getArray();
+ Sequence< OUString> aEntries(rBox.GetEntryCount());
+ OUString* pEntries = aEntries.getArray();
for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry)
pEntries[nEntry] = rBox.GetEntry(nEntry);
rConfig.SetGreetings(eType, aEntries);
@@ -160,8 +160,8 @@ void SwMailMergeGreetingsPage::UpdatePreview()
bool bNoValue = !m_pFemaleColumnLB->IsEnabled();
if( !bNoValue )
{
- ::rtl::OUString sFemaleValue = m_aFemaleFieldCB.GetText();
- ::rtl::OUString sFemaleColumn = m_aFemaleColumnLB.GetSelectEntry();
+ OUString sFemaleValue = m_aFemaleFieldCB.GetText();
+ OUString sFemaleColumn = m_aFemaleColumnLB.GetSelectEntry();
Reference< sdbcx::XColumnsSupplier > xColsSupp( m_pWizard->GetConfigItem().GetResultSet(), UNO_QUERY);
Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0;
if(!sFemaleValue.isEmpty() && !sFemaleColumn.isEmpty() &&
@@ -176,19 +176,19 @@ void SwMailMergeGreetingsPage::UpdatePreview()
{
try
{
- ::rtl::OUString sFemaleColumnValue = xColumn->getString();
+ OUString sFemaleColumnValue = xColumn->getString();
bFemale = sFemaleColumnValue == sFemaleValue;
//bNoValue = !sFemaleColumnValue.getLength();
if( !bNoValue )
{
//no last name value marks the greeting also als neutral
SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
- ::rtl::OUString sLastNameColumn = rConfig.GetAssignedColumn(MM_PART_LASTNAME);
+ OUString sLastNameColumn = rConfig.GetAssignedColumn(MM_PART_LASTNAME);
if ( xColAccess->hasByName(sLastNameColumn) )
{
aCol = xColAccess->getByName(sLastNameColumn);
aCol >>= xColumn;
- ::rtl::OUString sLastNameColumnValue = xColumn->getString();
+ OUString sLastNameColumnValue = xColumn->getString();
bNoValue = sLastNameColumnValue.isEmpty();
}
}
@@ -338,12 +338,12 @@ void SwMailMergeGreetingsPage::ActivatePage()
if(xColsSupp.is())
{
Reference < container::XNameAccess> xColAccess = xColsSupp->getColumns();
- Sequence< ::rtl::OUString > aColumns = xColAccess->getElementNames();
+ Sequence< OUString > aColumns = xColAccess->getElementNames();
for(sal_Int32 nName = 0; nName < aColumns.getLength(); ++nName)
m_aFemaleColumnLB.InsertEntry(aColumns[nName]);
}
- ::rtl::OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER);
+ OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER);
m_aFemaleColumnLB.SelectEntry(sGenderColumn);
m_aFemaleColumnLB.SaveValue();
@@ -361,7 +361,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue())
{
const SwDBData& rDBData = rConfig.GetCurrentDBData();
- Sequence< ::rtl::OUString> aAssignment = rConfig.GetColumnAssignment( rDBData );
+ Sequence< OUString> aAssignment = rConfig.GetColumnAssignment( rDBData );
if(aAssignment.getLength() <= MM_PART_GENDER)
aAssignment.realloc(MM_PART_GENDER + 1);
aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry();
@@ -516,12 +516,12 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard)
if(xColsSupp.is())
{
Reference < container::XNameAccess> xColAccess = xColsSupp->getColumns();
- Sequence< ::rtl::OUString > aColumns = xColAccess->getElementNames();
+ Sequence< OUString > aColumns = xColAccess->getElementNames();
for(sal_Int32 nName = 0; nName < aColumns.getLength(); ++nName)
m_aFemaleColumnLB.InsertEntry(aColumns[nName]);
}
- ::rtl::OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER);
+ OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER);
m_aFemaleColumnLB.SelectEntry(sGenderColumn);
m_aFemaleColumnLB.SaveValue();
@@ -551,14 +551,14 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl)
if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue())
{
const SwDBData& rDBData = rConfigItem.GetCurrentDBData();
- Sequence< ::rtl::OUString> aAssignment = rConfigItem.GetColumnAssignment( rDBData );
+ Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rDBData );
sal_Int32 nPos = m_aFemaleColumnLB.GetSelectEntryPos();
if(aAssignment.getLength() < MM_PART_GENDER)
aAssignment.realloc(MM_PART_GENDER);
if( nPos > 0 )
aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry();
else
- aAssignment[MM_PART_GENDER] = ::rtl::OUString();
+ aAssignment[MM_PART_GENDER] = OUString();
rConfigItem.SetColumnAssignment( rDBData, aAssignment );
}
if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue())
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 19a810f53692..f9ccc48d7208 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -108,7 +108,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString( FILTER_XML ),
+ OUString( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
//save the current document into a temporary file
{
@@ -124,7 +124,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
- pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+ pValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( m_sExampleURL, aValues );
@@ -139,9 +139,9 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP);
m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP);
- m_aZoomLB.InsertEntry(rtl::OUString("50 %"), 1);
- m_aZoomLB.InsertEntry(rtl::OUString("75 %"), 2);
- m_aZoomLB.InsertEntry(rtl::OUString("100 %"), 3);
+ m_aZoomLB.InsertEntry(OUString("50 %"), 1);
+ m_aZoomLB.InsertEntry(OUString("75 %"), 2);
+ m_aZoomLB.InsertEntry(OUString("100 %"), 3);
m_aZoomLB.SelectEntryPos(0); //page size
m_aZoomLB.SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl));
@@ -309,7 +309,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
OSL_ENSURE( pRet, "Fly not inserted" );
rShell.UnSelectFrm();
- const Sequence< ::rtl::OUString> aBlocks = rConfigItem.GetAddressBlocks();
+ const Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks();
if(bExample)
{
rShell.Insert(aBlocks[0]);
@@ -335,14 +335,14 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry();
sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
- const ::rtl::OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
+ const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
String sCountryColumn = rHeaders.GetString(MM_PART_COUNTRY);
- Sequence< ::rtl::OUString> aAssignment =
+ Sequence< OUString> aAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
- const ::rtl::OUString* pAssignment = aAssignment.getConstArray();
+ const OUString* pAssignment = aAssignment.getConstArray();
if(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty())
sCountryColumn = aAssignment[MM_PART_COUNTRY];
//
@@ -499,7 +499,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE;
eGender <= SwMailMergeConfigItem::NEUTRAL; ++eGender)
{
- Sequence< ::rtl::OUString > aEntries =
+ Sequence< OUString > aEntries =
rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender);
sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting((SwMailMergeConfigItem::Gender)eGender);
if( nCurrent >= 0 && nCurrent < aEntries.getLength())
@@ -520,7 +520,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
String sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER);
String sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME);
- const ::rtl::OUString& rFemaleGenderValue = rConfigItem.GetFemaleGenderValue();
+ const OUString& rFemaleGenderValue = rConfigItem.GetFemaleGenderValue();
sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
const SwDBData& rData = rConfigItem.GetCurrentDBData();
String sConditionBase(rData.sDataSource);
@@ -554,7 +554,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE;
eGender <= SwMailMergeConfigItem::NEUTRAL; ++eGender)
{
- Sequence< ::rtl::OUString> aEntries = rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender);
+ Sequence< OUString> aEntries = rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender);
sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting((SwMailMergeConfigItem::Gender)eGender);
if( nCurrent >= 0 && nCurrent < aEntries.getLength())
{
@@ -600,9 +600,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
}
//now the text has to be inserted
const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
- Sequence< ::rtl::OUString> aAssignment =
+ Sequence< OUString> aAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
- const ::rtl::OUString* pAssignment = aAssignment.getConstArray();
+ const OUString* pAssignment = aAssignment.getConstArray();
SwAddressIterator aIter(sGreeting);
while(aIter.HasMore())
{
@@ -641,7 +641,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
}
else
{
- Sequence< ::rtl::OUString> aEntries = rConfigItem.GetGreetings(SwMailMergeConfigItem::NEUTRAL);
+ Sequence< OUString> aEntries = rConfigItem.GetGreetings(SwMailMergeConfigItem::NEUTRAL);
sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting(SwMailMergeConfigItem::NEUTRAL);
if( nCurrent >= 0 && nCurrent < aEntries.getLength())
sGreeting = aEntries[nCurrent];
@@ -693,7 +693,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
Any aZoom;
aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE;
- m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
+ m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
const SwFmtFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize();
@@ -717,9 +717,9 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox)
}
Any aZoom;
aZoom <<= eType;
- m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
+ m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
aZoom <<= nZoom;
- m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
+ m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
}
return 0;
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index 647f2007e975..8864d327015d 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -51,7 +51,7 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) :
{
FreeResource();
String sTemp(m_aEditFI.GetText());
- sTemp.SearchAndReplace(rtl::OUString("%1"), m_aEditPB.GetText());
+ sTemp.SearchAndReplace(OUString("%1"), m_aEditPB.GetText());
m_aEditFI.SetText(sTemp);
m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage, EditDocumentHdl_Impl));
m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl ));
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 297e550a5b4f..cf3d9b06b20e 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -73,21 +73,21 @@ using namespace ::com::sun::star::uno;
static String lcl_GetExtensionForDocType(sal_uLong nDocType)
{
- rtl::OUString sExtension;
+ OUString sExtension;
switch( nDocType )
{
- case MM_DOCTYPE_OOO : sExtension = rtl::OUString( "odt" ); break;
- case MM_DOCTYPE_PDF : sExtension = rtl::OUString( "pdf" ); break;
- case MM_DOCTYPE_WORD: sExtension = rtl::OUString( "doc" ); break;
- case MM_DOCTYPE_HTML: sExtension = rtl::OUString( "html" ); break;
- case MM_DOCTYPE_TEXT: sExtension = rtl::OUString( "txt" ); break;
+ case MM_DOCTYPE_OOO : sExtension = OUString( "odt" ); break;
+ case MM_DOCTYPE_PDF : sExtension = OUString( "pdf" ); break;
+ case MM_DOCTYPE_WORD: sExtension = OUString( "doc" ); break;
+ case MM_DOCTYPE_HTML: sExtension = OUString( "html" ); break;
+ case MM_DOCTYPE_TEXT: sExtension = OUString( "txt" ); break;
}
return sExtension;
}
-static ::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess )
+static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < container::XNameAccess>& rxColAccess )
{
- ::rtl::OUString sRet;
+ OUString sRet;
try
{
if (rxColAccess->hasByName(rColumn))
@@ -378,7 +378,7 @@ SwMailMergeOutputPage::~SwMailMergeOutputPage()
void SwMailMergeOutputPage::ActivatePage()
{
//fill printer ListBox
- const std::vector<rtl::OUString>& rPrinters = Printer::GetPrinterQueues();
+ const std::vector<OUString>& rPrinters = Printer::GetPrinterQueues();
unsigned int nCount = rPrinters.size();
if ( nCount )
{
@@ -546,10 +546,10 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
uno::Reference< sdbcx::XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY);
//get the name of the actual columns
uno::Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0;
- uno::Sequence< ::rtl::OUString > aFields;
+ uno::Sequence< OUString > aFields;
if(xColAccess.is())
aFields = xColAccess->getElementNames();
- const ::rtl::OUString* pFields = aFields.getConstArray();
+ const OUString* pFields = aFields.getConstArray();
for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField)
m_aMailToLB.InsertEntry(pFields[nField]);
@@ -557,7 +557,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
// then select the right one - may not be available
const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
String sEMailColumn = rHeaders.GetString( MM_PART_E_MAIL );
- Sequence< ::rtl::OUString> aAssignment =
+ Sequence< OUString> aAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
if(aAssignment.getLength() > MM_PART_E_MAIL && !aAssignment[MM_PART_E_MAIL].isEmpty())
sEMailColumn = aAssignment[MM_PART_E_MAIL];
@@ -669,7 +669,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
- pValues[0].Value <<= ::rtl::OUString(sFilter);
+ pValues[0].Value <<= OUString(sFilter);
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
sal_uInt32 nErrorCode = ERRCODE_NONE;
@@ -715,13 +715,13 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
INetURLObject(), utl::TempFile::CreateTempName(),
URIHelper::GetMaybeFileHdl());
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString( FILTER_XML ),
+ OUString( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
- pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+ pValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
sal_uInt32 nErrorCode = ERRCODE_NONE;
@@ -791,7 +791,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
pTargetView->GetWrtShell().EndAction();
//then save it
String sOutPath = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
- String sCounter = rtl::OUString('_');
+ String sCounter = OUString('_');
sCounter += OUString::number(nDoc);
sOutPath.Insert(sCounter, sOutPath.Len() - sExtension.Len() - 1);
@@ -803,7 +803,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
bool bFailed = false;
try
{
- pValues[0].Value <<= ::rtl::OUString(sFilter);
+ pValues[0].Value <<= OUString(sFilter);
uno::Reference< frame::XStorable > xTempStore( xTempDocShell->GetModel(), uno::UNO_QUERY);
xTempStore->storeToURL( sOutPath, aValues );
}
@@ -906,9 +906,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin);
SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1);
- rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget ));
- sPages += rtl::OUString(" - ");
- sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget );
+ OUString sPages(OUString::valueOf( rStartInfo.nStartPageInTarget ));
+ sPages += OUString(" - ");
+ sPages += OUString::valueOf( rEndInfo.nEndPageInTarget );
SwWrtShell& rSh = pTargetView->GetWrtShell();
pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False);
@@ -928,9 +928,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
m_pWizard->enableButtons(WZB_CANCEL, sal_False);
uno::Sequence < beans::PropertyValue > aProps( 2 );
- aProps[0]. Name = rtl::OUString("MonitorVisible");
+ aProps[0]. Name = OUString("MonitorVisible");
aProps[0].Value <<= sal_True;
- aProps[1]. Name = rtl::OUString("Pages");
+ aProps[1]. Name = OUString("Pages");
aProps[1]. Value <<= sPages;
pTargetView->ExecPrint( aProps, false, true );
@@ -1046,14 +1046,14 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
//Make sure we don't pick e.g. the flat xml filter
//for this format
pSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString( FILTER_XML ),
+ OUString( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
}
break;
case MM_DOCTYPE_PDF:
{
pSfxFlt = pFilterContainer->GetFilter4FilterName(
- ::rtl::OUString("writer_pdf_Export"),
+ OUString("writer_pdf_Export"),
SFX_FILTER_EXPORT);
}
break;
@@ -1096,7 +1096,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
if(!pSfxFlt)
return 0;
- ::rtl::OUString sMimeType = pSfxFlt->GetMimeType();
+ OUString sMimeType = pSfxFlt->GetMimeType();
if(m_aSubjectED.GetText().isEmpty())
{
@@ -1154,13 +1154,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
INetURLObject(), utl::TempFile::CreateTempName(),
URIHelper::GetMaybeFileHdl());
const SfxFilter *pTargetSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString( FILTER_XML ),
+ OUString( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
- pValues[0].Value <<= ::rtl::OUString(pTargetSfxFlt->GetFilterName());
+ pValues[0].Value <<= OUString(pTargetSfxFlt->GetFilterName());
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( sTargetTempURL, aValues );
@@ -1208,11 +1208,11 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
uno::Sequence< beans::PropertyValue > aFilterValues(MM_DOCTYPE_TEXT == nDocType ? 2 : 1);
beans::PropertyValue* pFilterValues = aFilterValues.getArray();
pFilterValues[0].Name = "FilterName";
- pFilterValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName());
+ pFilterValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
if(MM_DOCTYPE_TEXT == nDocType)
{
pFilterValues[1].Name = "FilterOptions";
- pFilterValues[1].Value <<= ::rtl::OUString(sFilterOptions);
+ pFilterValues[1].Value <<= OUString(sFilterOptions);
}
uno::Reference< frame::XStorable > xTempStore( pTempView->GetDocShell()->GetModel(), uno::UNO_QUERY);
@@ -1224,10 +1224,10 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
(void)nTarget;
OSL_ENSURE( sEMailColumn.Len(), "No email column selected");
- ::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
+ OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
SwMailDescriptor aDesc;
aDesc.sEMail = sEMail;
- rtl::OUString sBody;
+ OUString sBody;
if(bAsBody)
{
{
@@ -1241,12 +1241,12 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
OSL_FAIL("no output file created?");
continue;
}
- rtl::OString sLine;
+ OString sLine;
sal_Bool bDone = pInStream->ReadLine( sLine );
while ( bDone )
{
- sBody += rtl::OStringToOUString(sLine, eEncoding);
- sBody += rtl::OUString('\n');
+ sBody += OStringToOUString(sLine, eEncoding);
+ sBody += OUString('\n');
bDone = pInStream->ReadLine( sLine );
}
}
@@ -1271,14 +1271,14 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
if(rConfigItem.IsGreetingLine(sal_True))
{
- ::rtl::OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME);
- ::rtl::OUString sName = lcl_GetColumnValueOf(sNameColumn, xColAccess);
+ OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME);
+ OUString sName = lcl_GetColumnValueOf(sNameColumn, xColAccess);
String sGreeting;
if(!sName.isEmpty() && rConfigItem.IsIndividualGreeting(sal_True))
{
- ::rtl::OUString sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER);
- const ::rtl::OUString& sFemaleValue = rConfigItem.GetFemaleGenderValue();
- ::rtl::OUString sGenderValue = lcl_GetColumnValueOf(sGenderColumn, xColAccess);
+ OUString sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER);
+ const OUString& sFemaleValue = rConfigItem.GetFemaleGenderValue();
+ OUString sGenderValue = lcl_GetColumnValueOf(sGenderColumn, xColAccess);
SwMailMergeConfigItem::Gender eGenderType = sGenderValue == sFemaleValue ?
SwMailMergeConfigItem::FEMALE :
SwMailMergeConfigItem::MALE;
@@ -1296,7 +1296,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
}
sGreeting += '\n';
- ::rtl::OUString sTemp( sGreeting );
+ OUString sTemp( sGreeting );
sTemp += sBody;
sBody = sTemp;
}
@@ -1304,13 +1304,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
aDesc.sBodyContent = sBody;
if(MM_DOCTYPE_HTML == nDocType)
{
- aDesc.sBodyMimeType = ::rtl::OUString("text/html; charset=");
- aDesc.sBodyMimeType += ::rtl::OUString::createFromAscii(
+ aDesc.sBodyMimeType = OUString("text/html; charset=");
+ aDesc.sBodyMimeType += OUString::createFromAscii(
rtl_getBestMimeCharsetFromTextEncoding( eEncoding ));
}
else
aDesc.sBodyMimeType =
- ::rtl::OUString("text/plain; charset=UTF-8; format=flowed");
+ OUString("text/plain; charset=UTF-8; format=flowed");
aDesc.sSubject = m_aSubjectED.GetText();
aDesc.sCC = m_sCC;
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index b1ffd57c5f12..1956d2bd9691 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -136,17 +136,17 @@ public:
struct SwMailDescriptor
{
- ::rtl::OUString sEMail;
- ::rtl::OUString sAttachmentURL;
- ::rtl::OUString sAttachmentName;
- ::rtl::OUString sMimeType;
- ::rtl::OUString sSubject;
- ::rtl::OUString sBodyMimeType;
- ::rtl::OUString sBodyContent;
+ OUString sEMail;
+ OUString sAttachmentURL;
+ OUString sAttachmentName;
+ OUString sMimeType;
+ OUString sSubject;
+ OUString sBodyMimeType;
+ OUString sBodyContent;
- ::rtl::OUString sCC;
- ::rtl::OUString sBCC;
+ OUString sCC;
+ OUString sBCC;
};
struct SwSendMailDialog_Impl;
class SwMailMergeConfigItem;
@@ -217,7 +217,7 @@ public:
void DocumentSent( ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage>,
bool bResult,
- const ::rtl::OUString* pError );
+ const OUString* pError );
void AllMailsSent();
};
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index c2f127542833..2e146ff66c60 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-using ::rtl::OUString;
SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) :
svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)),
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 833130c65227..aa9003593b03 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -103,8 +103,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
if(xTSupplier.is())
{
Reference<XNameAccess> xTbls = xTSupplier->getTables();
- Sequence<rtl::OUString> aTbls = xTbls->getElementNames();
- const rtl::OUString* pTbls = aTbls.getConstArray();
+ Sequence<OUString> aTbls = xTbls->getElementNames();
+ const OUString* pTbls = aTbls.getConstArray();
for(long i = 0; i < aTbls.getLength(); i++)
{
String sEntry = pTbls[i];
@@ -118,8 +118,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
if(xQSupplier.is())
{
Reference<XNameAccess> xQueries = xQSupplier->getQueries();
- Sequence<rtl::OUString> aQueries = xQueries->getElementNames();
- const rtl::OUString* pQueries = aQueries.getConstArray();
+ Sequence<OUString> aQueries = xQueries->getElementNames();
+ const OUString* pQueries = aQueries.getConstArray();
for(long i = 0; i < aQueries.getLength(); i++)
{
String sEntry = pQueries[i];
@@ -140,10 +140,10 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
SvTreeListEntry* pEntry = m_aTableLB.FirstSelected();
if(pEntry)
{
- ::rtl::OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0);
+ OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0);
sal_Int32 nCommandType = 0 == pEntry->GetUserData() ? 0 : 1;
- ::rtl::OUString sDataSourceName;
+ OUString sDataSourceName;
Reference<XChild> xChild(m_xConnection, UNO_QUERY);
if(xChild.is())
{
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index 4a9e97b168d0..14cce3b67a91 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -104,7 +104,7 @@ void SwDbtoolsClient::registerClient()
OSL_ENSURE(NULL == getDbToolsClientFactoryFunction(), "SwDbtoolsClient::registerClient: inconsistence: already have a factory function!");
#ifndef DISABLE_DYNLOADING
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools")));
+ const OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools")));
// load the dbtools library
getDbToolsClientModule() = osl_loadModuleRelative(
@@ -113,7 +113,7 @@ void SwDbtoolsClient::registerClient()
if (NULL != getDbToolsClientModule())
{
// get the symbol for the method creating the factory
- const ::rtl::OUString sFactoryCreationFunc("createDataAccessToolsFactory");
+ const OUString sFactoryCreationFunc("createDataAccessToolsFactory");
// reinterpret_cast<createDataAccessToolsFactoryFunction> removed for gcc permissive
getDbToolsClientFactoryFunction() = reinterpret_cast< createDataAccessToolsFactoryFunction >(
osl_getFunctionSymbol(getDbToolsClientModule(), sFactoryCreationFunc.pData));
@@ -190,7 +190,7 @@ void SwDbtoolsClient::getFactory()
}
Reference< XDataSource > SwDbtoolsClient::getDataSource(
- const ::rtl::OUString& rRegisteredName,
+ const OUString& rRegisteredName,
const Reference<XComponentContext>& rxContext
)
{
@@ -214,7 +214,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
return nRet;
}
-::rtl::OUString SwDbtoolsClient::getFormattedValue(
+OUString SwDbtoolsClient::getFormattedValue(
const uno::Reference< beans::XPropertySet>& _rxColumn,
const uno::Reference< util::XNumberFormatter>& _rxFormatter,
const lang::Locale& _rLocale,
@@ -224,7 +224,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat(
{
::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > xConversion =
getAccessTypeConversion();
- rtl::OUString sRet;
+ OUString sRet;
if(xConversion.is())
sRet = xConversion->getFormattedValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate);
return sRet;
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 89f47ff02034..fefcfd0dc043 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -157,7 +157,7 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow (
_pParent, nId, pBindings, pInfo),
m_pSpellState(new SpellState)
{
- rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE);
+ OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE);
SvtLinguConfig().GetProperty( aPropName ) >>= m_bIsGrammarCheckingOn;
}
@@ -493,7 +493,7 @@ void SwSpellDialogChildWindow::SetGrammarChecking(bool bOn)
uno::Any aVal;
aVal <<= bOn;
m_bIsGrammarCheckingOn = bOn;
- rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE);
+ OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE);
SvtLinguConfig().SetProperty( aPropName, aVal );
// set current spell position to the start of the current sentence to
// continue with this sentence after grammar checking state has been changed
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 762a22ec6e0b..4dd1c6641003 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -74,7 +74,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SwAsciiOptions aOpt;
{
- const rtl::OUString sFindNm = rtl::OUString::createFromAscii(
+ const OUString sFindNm = OUString::createFromAscii(
pStream ? sDialogImpExtraData
: sDialogExpExtraData);
sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm );
@@ -290,7 +290,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
rOptions.WriteUserData( sData );
if( sData.Len() )
{
- const rtl::OUString sFindNm = rtl::OUString::createFromAscii(
+ const OUString sFindNm = OUString::createFromAscii(
aFontLB.IsVisible() ? sDialogImpExtraData
: sDialogExpExtraData);
sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm );
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index b2fcd7adc19d..7ede33eece2b 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -158,7 +158,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
if(aFile.Len() || aSub.Len())
{
- String sLinkFileName = rtl::OUString(sfx2::cTokenSeperator);
+ String sLinkFileName = OUString(sfx2::cTokenSeperator);
sLinkFileName += sfx2::cTokenSeperator;
sLinkFileName.SetToken(0, sfx2::cTokenSeperator,aFile);
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx
index a52850c9e132..5a28bc33a640 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -41,11 +41,11 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
#ifndef DISABLE_DYNLOADING
SwFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
- static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True));
+ static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ),
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
- aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory"));
+ aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory"));
if ( fp )
return fp();
return 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 62e75620bbd9..8f467bd14d97 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -239,12 +239,12 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A
pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
}
-rtl::OString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const
+OString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState(nMask);
}
-void AbstractDropDownFieldDialog_Impl::SetWindowState( const rtl::OString& rStr )
+void AbstractDropDownFieldDialog_Impl::SetWindowState( const OString& rStr )
{
pDlg->SetWindowState(rStr);
}
@@ -405,12 +405,12 @@ String AbstractGlossaryDlg_Impl::GetCurrShortName() const
return pDlg->GetCurrShortName();
}
-void AbstractFldInputDlg_Impl::SetWindowState( const rtl::OString& rStr )
+void AbstractFldInputDlg_Impl::SetWindowState( const OString& rStr )
{
pDlg->SetWindowState( rStr );
}
-rtl::OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
+OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState( nMask );
}
@@ -428,7 +428,7 @@ String AbstractInsFootNoteDlg_Impl::GetStr()
{
return pDlg->GetStr();
}
-void AbstractInsFootNoteDlg_Impl::SetHelpId( const rtl::OString& sHelpId )
+void AbstractInsFootNoteDlg_Impl::SetHelpId( const OString& sHelpId )
{
pDlg->SetHelpId( sHelpId );
}
@@ -472,7 +472,7 @@ sal_uInt16 AbstractMailMergeDlg_Impl::GetMergeType()
return pDlg->GetMergeType();
}
-const ::rtl::OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const
+const OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const
{
return pDlg->GetSaveFilter();
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 836afb6d0e18..17762297fe9b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -180,8 +180,8 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog
{
DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
- virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
- virtual void SetWindowState( const rtl::OString& rStr );//this method inherit from SystemWindow
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
+ virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow
};
//add for DropDownFieldDialog end
@@ -276,8 +276,8 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
{
DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg)
//from class SalFrame
- virtual void SetWindowState( const rtl::OString & rStr ) ;
- virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
+ virtual void SetWindowState( const OString & rStr ) ;
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
};
//for SwFldInputDlg end
@@ -290,7 +290,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
virtual sal_Bool IsEndNote();
virtual String GetStr();
//from class Window
- virtual void SetHelpId( const rtl::OString& sHelpId );
+ virtual void SetHelpId( const OString& sHelpId );
virtual void SetText( const OUString& rStr );
};
//for SwInsFootNoteDlg end
@@ -325,7 +325,7 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
{
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
virtual sal_uInt16 GetMergeType() ;
- virtual const ::rtl::OUString& GetSaveFilter() const;
+ virtual const OUString& GetSaveFilter() const;
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
virtual bool IsSaveIndividualDocs() const;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 4e7f724b0e71..cce674b46011 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1081,7 +1081,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl)
Application::SetDefDialogParent( this );
delete m_pDocInserter;
m_pDocInserter =
- new ::sfx2::DocumentInserter( rtl::OUString("swriter") );
+ new ::sfx2::DocumentInserter( OUString("swriter") );
m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) );
return 0;
}
@@ -1422,7 +1422,7 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
{
//if necessary fill the names bookmarks/sections/tables now
- rtl::OUString sFileName = aFileNameED.GetText();
+ OUString sFileName = aFileNameED.GetText();
if(!sFileName.isEmpty())
{
SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
@@ -1831,7 +1831,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl)
Application::SetDefDialogParent( this );
delete m_pDocInserter;
m_pDocInserter = new ::sfx2::DocumentInserter(
- rtl::OUString("swriter") );
+ OUString("swriter") );
m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) );
return 0;
}
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 66b64fa669b5..50035a895a37 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -50,7 +50,7 @@ namespace
{
void setValue(FixedText *pWidget, sal_uLong nValue)
{
- rtl::OUString sValue(OUString::number(nValue));
+ OUString sValue(OUString::number(nValue));
pWidget->SetText(sValue);
}
}
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 39d3ad220ac7..09925ec98238 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -738,7 +738,7 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String& rName )
{
const SfxFilter* pFilter = 0;
SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, 0, 0 );
- SfxFilterMatcher aMatcher( rtl::OUString("swriter") );
+ SfxFilterMatcher aMatcher( OUString("swriter") );
pMed->UseInteractionHandler( sal_True );
if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) )
{
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index ecc0928f2ddb..6f65056af733 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -707,7 +707,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
xWrt->SetShowProgress( sal_False );
#if defined(DEBUGPASTE)
- SvFileStream aPasteDebug(rtl::OUString(
+ SvFileStream aPasteDebug(OUString(
"PASTEBUFFER.debug"), STREAM_WRITE|STREAM_TRUNC);
SwWriter aDbgWrt( aPasteDebug, *pDoc );
aDbgWrt.Write( xWrt );
@@ -1553,7 +1553,7 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
SotStorageStreamRef xStrm;
SvStream* pStream = 0;
SwRead pRead = 0;
- rtl::OUString sData;
+ OUString sData;
switch( nFmt )
{
case SOT_FORMAT_STRING:
@@ -1710,7 +1710,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
// temporary storage until the object is inserted
uno::Reference< embed::XStorage > xTmpStor;
uno::Reference < embed::XEmbeddedObject > xObj;
- ::rtl::OUString aName;
+ OUString aName;
comphelper::EmbeddedObjectContainer aCnt;
if ( xStrm.is() )
@@ -1734,12 +1734,12 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
{
xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage();
uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator(
- ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ),
+ ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ),
uno::UNO_QUERY_THROW );
embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard(
xTmpStor,
- ::rtl::OUString( "DummyName" ),
+ OUString( "DummyName" ),
uno::Sequence< beans::PropertyValue >() );
// TODO/LATER: in future InsertedObjectInfo will be used to get container related information
@@ -1776,7 +1776,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
// it is important to have an icon, let an empty graphic be used
// if no other graphic is provided
// TODO/LATER: in future a default bitmap could be used
- ::rtl::OUString aMimeType;
+ OUString aMimeType;
MapMode aMapMode( MAP_100TH_MM );
aGraphic.SetPrefSize( Size( 2500, 2500 ) );
aGraphic.SetPrefMapMode( aMapMode );
@@ -1996,7 +1996,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
int nRet = rData.GetGraphic( nFormat, aGrf );
if( nRet )
{
- rtl::OUString sLnkTyp("DDE");
+ OUString sLnkTyp("DDE");
if ( bReReadGrf )
rWrtShell.ReRead( aCmd, sLnkTyp, &aGrf );
else
@@ -3458,8 +3458,8 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
::sw::mark::IMark* pMark = rSh.SetBookmark(
KeyCode(),
- ::rtl::OUString(),
- ::rtl::OUString(),
+ OUString(),
+ OUString(),
IDocumentMarkAccess::DDE_BOOKMARK);
if(pMark)
{
@@ -3515,11 +3515,11 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
return sal_False;
rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
- const rtl::OString aAppNm(rtl::OUStringToOString(
+ const OString aAppNm(OUStringToOString(
GetpApp()->GetAppName(), eEncoding));
- const rtl::OString aTopic(rtl::OUStringToOString(
+ const OString aTopic(OUStringToOString(
pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding));
- const rtl::OString aName(rtl::OUStringToOString(sName, eEncoding));
+ const OString aName(OUStringToOString(sName, eEncoding));
sal_Char* pMem = new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ];
@@ -3555,7 +3555,7 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
aPaM.SetMark();
*aPaM.GetMark() = pMark->GetMarkEnd();
}
- ::rtl::OUString sMarkName = pMark->GetName();
+ OUString sMarkName = pMark->GetName();
// remove mark
pServerObject->SetNoServer(); // this removes the connection between SwServerObject and mark
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx
index 74180748345a..7329f8e22678 100644
--- a/sw/source/ui/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx
@@ -157,7 +157,7 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ )
aFont.SetWeight(WEIGHT_MEDIUM);
SetFont( aFont );
DrawText( aRect ,
- rtl::OUString("Edit Note"),
+ OUString("Edit Note"),
TEXT_DRAW_CENTER );
SetFont( aOldFont );
}
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index ccc836950637..7aaa4e317be8 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -85,7 +85,7 @@ void SwAnnotationWin::SetPostItText()
//If the new text is the same as the old text, keep the same insertion
//point .e.g. fdo#33599
mpFld = static_cast<SwPostItField*>(mpFmtFld->GetFld());
- rtl::OUString sNewText = mpFld->GetPar2();
+ OUString sNewText = mpFld->GetPar2();
bool bTextUnchanged = sNewText.equals(Engine()->GetEditEngine().GetText());
ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection());
@@ -229,9 +229,9 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, pWin->GetAuthor());
aText = aRewriter.Apply(aText);
- aText.Append(String(rtl::OUString(" (") +
- String(rLocalData.getDate( pWin->GetDate())) + rtl::OUString(", ") +
- String(rLocalData.getTime( pWin->GetTime(),false)) + rtl::OUString("): \"")));
+ aText.Append(String(OUString(" (") +
+ String(rLocalData.getDate( pWin->GetDate())) + OUString(", ") +
+ String(rLocalData.getTime( pWin->GetTime(),false)) + OUString("): \"")));
GetOutlinerView()->InsertText(aText,false);
// insert old, selected text or "..."
@@ -239,8 +239,8 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
if (pText->GetTextObject().GetText(0).Len())
GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject());
else
- GetOutlinerView()->InsertText(rtl::OUString("..."),false);
- GetOutlinerView()->InsertText(rtl::OUString("\"\n"),false);
+ GetOutlinerView()->InsertText(OUString("..."),false);
+ GetOutlinerView()->InsertText(OUString("\"\n"),false);
GetOutlinerView()->SetSelection(ESelection(0x0,0x0,0xFFFF,0xFFFF));
SfxItemSet aAnswerSet( DocView().GetDocShell()->GetPool() );
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index d10b3b165b35..a438ac0c865d 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1923,6 +1923,6 @@ void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm,
}
void SwNoteProps::Commit() {}
-void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 36effb9dcd9b..efa8fb886a67 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -378,11 +378,11 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
}
}
-rtl::OUString SidebarTxtControl::GetSurroundingText() const
+OUString SidebarTxtControl::GetSurroundingText() const
{
if (GetTextView())
return GetTextView()->GetSurroundingText();
- return rtl::OUString();
+ return OUString();
}
Selection SidebarTxtControl::GetSurroundingTextSelection() const
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx
index 7f3ab6658350..157c2120e75b 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.hxx
@@ -47,7 +47,7 @@ class SidebarTxtControl : public Control
virtual void Command( const CommandEvent& rCEvt );
virtual void LoseFocus();
virtual void RequestHelp(const HelpEvent &rEvt);
- virtual rtl::OUString GetSurroundingText() const;
+ virtual OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
DECL_LINK( Select, Menu* );
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 45f367d5e4dd..37cb17d517f5 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -78,7 +78,7 @@ namespace sw { namespace sidebarwindows {
#define POSTIT_META_HEIGHT (sal_Int32) 30
#define POSTIT_MINIMUMSIZE_WITHOUT_META 50
-#define EMPTYSTRING rtl::OUString()
+#define EMPTYSTRING OUString()
SwSidebarWin::SwSidebarWin( SwEditWin& rEditWin,
WinBits nBits,
@@ -409,7 +409,7 @@ void SwSidebarWin::CheckMetaText()
}
if (GetTime()!=0)
{
- sMeta = sMeta + rtl::OUString(" ") + rLocalData.getTime( GetTime(),false );
+ sMeta = sMeta + OUString(" ") + rLocalData.getTime( GetTime(),false );
}
if ( mpMetadataDate->GetText() != sMeta )
{
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index fca328133816..39a946fa3cbc 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -873,8 +873,8 @@ void SwEditWin::FlushInBuffer()
sal_Int16 nCheckMode = rCTLOptions.IsCTLSequenceCheckingRestricted() ?
i18n::InputSequenceCheckMode::STRICT : i18n::InputSequenceCheckMode::BASIC;
- rtl::OUString aOldText( aLeftText );
- rtl::OUString aNewText( aOldText );
+ OUString aOldText( aLeftText );
+ OUString aNewText( aOldText );
if (rCTLOptions.IsCTLSequenceCheckingTypeAndReplace())
{
for (xub_StrLen k = 0; k < m_aInBuffer.Len(); ++k)
@@ -916,7 +916,7 @@ void SwEditWin::FlushInBuffer()
if (xISC->checkInputSequence( aNewText, nTmpPos - 1, cChar, nCheckMode ))
{
// character can be inserted:
- aNewText += rtl::OUString( (sal_Unicode) cChar );
+ aNewText += OUString( (sal_Unicode) cChar );
++nTmpPos;
}
}
@@ -2343,7 +2343,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
else if(!rSh.HasReadonlySel())
{
sal_Bool bIsNormalChar = GetAppCharClass().isLetterNumeric(
- rtl::OUString( aCh ), 0 );
+ OUString( aCh ), 0 );
if( bAppendSpace && bIsNormalChar &&
(m_aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() ))
{
@@ -2380,7 +2380,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
}
else
{
- rtl::OUStringBuffer aBuf(m_aInBuffer);
+ OUStringBuffer aBuf(m_aInBuffer);
comphelper::string::padToLength(aBuf,
m_aInBuffer.Len() + aKeyEvent.GetRepeat() + 1, aCh);
m_aInBuffer = aBuf.makeStringAndClear();
@@ -5017,7 +5017,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
aEvent.ExecutePosition.X = aPixPos.X();
aEvent.ExecutePosition.Y = aPixPos.Y();
Menu* pMenu = 0;
- ::rtl::OUString sMenuName("private:resource/ReadonlyContextMenu");
+ OUString sMenuName("private:resource/ReadonlyContextMenu");
if( GetView().TryContextMenuInterception( *pROPopup, sMenuName, pMenu, aEvent ) )
{
if ( pMenu )
@@ -5922,7 +5922,7 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
m_bUseInputLanguage = bNew;
}
-rtl::OUString SwEditWin::GetSurroundingText() const
+OUString SwEditWin::GetSurroundingText() const
{
String sReturn;
SwWrtShell& rSh = m_rView.GetWrtShell();
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 555d8100471f..db7a10e04f9a 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -146,7 +146,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
#ifdef DBG_UTIL
case SwContentAtPos::SW_TABLEBOXVALUE:
{
- sTxt = rtl::OStringToOUString(rtl::OString::valueOf(
+ sTxt = OStringToOUString(OString::valueOf(
((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()),
osl_getThreadTextEncoding());
}
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 542201c287c1..29fd6332a93b 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -70,7 +70,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize)
// Notify for page number update
void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
- const rtl::OUString& rPgStr)
+ const OUString& rPgStr)
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
if ( pSfxVwSh && pSfxVwSh->ISA(SwView) &&
@@ -121,7 +121,7 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect )
((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect );
}
-bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark )
+bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark )
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
if( pSfxVwSh && pSfxVwSh->ISA( SwView ) )
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index cf1872970ab6..4eefa5ed5897 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -262,9 +262,9 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
osl::MutexGuard g(mutex_);
notifier_ = n;
}
- css::uno::Sequence< rtl::OUString > s(2);
- s[0] = rtl::OUString("FontHeight");
- s[1] = rtl::OUString("FontName");
+ css::uno::Sequence< OUString > s(2);
+ s[0] = OUString("FontHeight");
+ s[1] = OUString("FontName");
n->addPropertiesChangeListener(s, listener_.get());
}
@@ -548,7 +548,7 @@ void SwSrcEditWindow::InitScrollBars()
pVScrollbar->SetThumbPos( pTextView->GetStartDocPos().Y() );
pHScrollbar->SetVisibleSize( aOutSz.Width() );
pHScrollbar->SetPageSize( aOutSz.Width() * 8 / 10 );
- pHScrollbar->SetLineSize( pOutWin->GetTextWidth(rtl::OUString('x')) );
+ pHScrollbar->SetLineSize( pOutWin->GetTextWidth(OUString('x')) );
pHScrollbar->SetThumbPos( pTextView->GetStartDocPos().X() );
}
@@ -948,9 +948,9 @@ static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLan
}
void SwSrcEditWindow::SetFont()
{
- rtl::OUString sFontName(
+ OUString sFontName(
officecfg::Office::Common::Font::SourceViewFont::FontName::get().
- get_value_or(rtl::OUString()));
+ get_value_or(OUString()));
if(sFontName.isEmpty())
{
LanguageType aLanguages[5] =
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index d7760d8fc150..3597753d2dc0 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -36,7 +36,7 @@
#include <unomid.h>
#ifdef WNT
-#define NEXTLINE rtl::OUString("\r\n")
+#define NEXTLINE OUString("\r\n")
#else
#define NEXTLINE '\n'
#endif
@@ -44,7 +44,6 @@
using namespace utl;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
@@ -269,9 +268,9 @@ void SwEnvCfgItem::Commit()
PutProperties(aNames, aValues);
}
-void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
-Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
+Sequence<OUString> SwEnvCfgItem::GetPropertyNames()
{
static const char* aPropNames[] =
{
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 9ffa4154c3cf..ab201c2d9750 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -72,7 +72,7 @@ void SwLabDlg::_ReplaceGroup( const String &rMake )
{
// Remove old entries
pRecs->erase(pRecs->begin() + 1, pRecs->end());
- aLabelsCfg.FillLabels(rtl::OUString(rMake), *pRecs);
+ aLabelsCfg.FillLabels(OUString(rMake), *pRecs);
aLstGroup = rMake;
}
@@ -153,7 +153,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
pRecs->insert( pRecs->begin(), pRec );
sal_uInt16 nLstGroup = 0;
- const std::vector<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
+ const std::vector<OUString>& rMan = aLabelsCfg.GetManufacturers();
for(sal_uInt16 nMan = 0; nMan < rMan.size(); nMan++)
{
aMakes.push_back(rMan[nMan]);
@@ -274,7 +274,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
const sal_uInt16 nCount = (sal_uInt16)GetParentSwLabDlg()->Makes().size();
for(size_t i = 0; i < nCount; ++i)
{
- rtl::OUString& rStr = GetParentSwLabDlg()->Makes()[i];
+ OUString& rStr = GetParentSwLabDlg()->Makes()[i];
aMakeBox.InsertEntry( rStr );
if ( rStr == aItem.aLstMake)
@@ -489,8 +489,8 @@ void SwLabPage::InitDatabaseBox()
if( GetNewDBMgr() )
{
aDatabaseLB.Clear();
- ::com::sun::star::uno::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
- const rtl::OUString* pDataNames = aDataNames.getConstArray();
+ ::com::sun::star::uno::Sequence<OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+ const OUString* pDataNames = aDataNames.getConstArray();
for (long i = 0; i < aDataNames.getLength(); i++)
aDatabaseLB.InsertEntry(pDataNames[i]);
String sDBName = sActDBName.GetToken( 0, DB_DELIM );
@@ -558,7 +558,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
aAddrBox .Check ( aItem.bAddr );
aWritingEdit.SetText ( aWriting );
- for(std::vector<rtl::OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
+ for(std::vector<OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
{
if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
aMakeBox.InsertEntry(*i);
@@ -600,7 +600,7 @@ void SwVisitingCardPage::ClearUserData()
}
void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
- const rtl::OUString* pNames, const rtl::OUString* pValues )
+ const OUString* pNames, const OUString* pValues )
{
for( sal_uInt32 i = 0; i < nCnt; ++i )
{
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index eb7cd6b6ab19..6aaee0be304b 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -132,8 +132,8 @@ SwLabelConfig::SwLabelConfig() :
assert(res == xmlreader::XmlReader::RESULT_DONE);
// add to m_aLabels and m_aManufacturers the custom labels
- const Sequence<rtl::OUString>& rMan = GetNodeNames( OUString() );
- const rtl::OUString* pMan = rMan.getConstArray();
+ const Sequence<OUString>& rMan = GetNodeNames( OUString() );
+ const OUString* pMan = rMan.getConstArray();
for ( sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++ )
{
sManufacturer = pMan[nMan];
@@ -169,7 +169,7 @@ SwLabelConfig::~SwLabelConfig()
// the config item is not writable ?:
void SwLabelConfig::Commit() {}
-void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
static SwLabRec* lcl_CreateSwLabRec(const OUString& rType, const OUString& rMeasure, const OUString& rManufacturer)
{
@@ -257,7 +257,7 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab
rLabArr.push_back( lcl_CreateSwLabRec(it->first, it->second.m_aMeasure, rManufacturer) );
}
-sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
+sal_Bool SwLabelConfig::HasLabel(const OUString& rManufacturer, const OUString& rType)
{
return ( ( m_aLabels.find(rManufacturer) != m_aLabels.end() ) &&
( m_aLabels[rManufacturer].find(rType) != m_aLabels[rManufacturer].end() ) );
@@ -274,8 +274,8 @@ static bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
// label is always saved as a custom label
// predefined labels can NOT be overwritten by custom labels with same manufacturer/name
-void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
- const rtl::OUString& rType, const SwLabRec& rRec )
+void SwLabelConfig::SaveLabel( const OUString& rManufacturer,
+ const OUString& rType, const SwLabRec& rRec )
{
OUString sFoundNode;
bool bManufacturerNodeFound;
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index f3ae13ffa629..eb8384e89b30 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::uno;
using namespace ::comphelper;
-using ::rtl::OUString;
#ifdef SW_PROP_NAME_STR
#undef SW_PROP_NAME_STR
@@ -57,7 +56,7 @@ void SwVisitingCardPage::InitFrameControl()
uno::Sequence<OUString> aNames = m_xAutoText->getElementNames();
const OUString* pGroups = aNames.getConstArray();
- OUString uTitleName( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) );
+ OUString uTitleName( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) );
for(sal_uInt16 i = 0; i < aNames.getLength(); i++)
{
@@ -184,7 +183,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
static const struct _SwLabItemMap {
const char* pName;
- rtl::OUString SwLabItem:: *pValue;
+ OUString SwLabItem:: *pValue;
} aArr[] = {
{ "BC_PRIV_FIRSTNAME" , &SwLabItem::aPrivFirstName },
{ "BC_PRIV_NAME" , &SwLabItem::aPrivName },
@@ -223,8 +222,8 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
try
{
- rtl::OUString sFldName("com.sun.star.text.FieldMaster.User.");
- OUString uCntName( rtl::OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT )));
+ OUString sFldName("com.sun.star.text.FieldMaster.User.");
+ OUString uCntName( OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT )));
for( const _SwLabItemMap* p = aArr; p->pName; ++p )
{
String sCurFldName( sFldName );
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 7cfe36022b79..93e71b16c4d1 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -36,7 +36,6 @@ using namespace utl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
#define ROUND(x) ((sal_uInt16) ((x) + .5))
@@ -83,7 +82,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
lPWidthWidth = GetTextWidth(aPWidthStr);
lPHeightWidth = GetTextWidth(aPHeightStr);
lXHeight = GetTextHeight();
- lXWidth = GetTextWidth(rtl::OUString('X'));
+ lXWidth = GetTextWidth(OUString('X'));
// Scale factor
float fx = (float)(lOutWPix - (2 * (lLeftWidth + 15))) / (float)lOutWPix;
@@ -577,7 +576,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
{
bModified = false;
const std::vector<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
- std::vector<rtl::OUString>& rMakes(GetParentSwLabDlg()->Makes());
+ std::vector<OUString>& rMakes(GetParentSwLabDlg()->Makes());
if(rMakes.size() < rMan.size())
{
rMakes = rMan;
@@ -637,8 +636,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
}
String sTmp(aQueryMB.GetMessText());
String sQuery(sTmp);
- sQuery.SearchAndReplace(rtl::OUString("%1"), sMake);
- sQuery.SearchAndReplace(rtl::OUString("%2"), sType);
+ sQuery.SearchAndReplace(OUString("%1"), sMake);
+ sQuery.SearchAndReplace(OUString("%2"), sType);
aQueryMB.SetMessText(sQuery);
short eRet = aQueryMB.Execute();
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index b22159b1d553..2ecf0676c1f7 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -161,7 +161,7 @@ class SwSaveLabelDlg : public ModalDialog
public:
SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec);
- void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType)
+ void SetLabel(const OUString& rMake, const OUString& rType)
{
aMakeCB.SetText(String(rMake));
aTypeED.SetText(String(rType));
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 112776b3ceeb..a5b29cd4e752 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -32,7 +32,6 @@
using namespace utl;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
SwLabItem::SwLabItem() :
@@ -192,7 +191,7 @@ SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const
return new SwLabItem(*this);
}
-Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
+Sequence<OUString> SwLabCfgItem::GetPropertyNames()
{
static const char* aLabelPropNames[] =
{
@@ -397,7 +396,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
}
}
-void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwLabCfgItem::Commit()
{
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 810adf4599f7..de6a37ed61d3 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -60,7 +60,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
SvtCommandOptions aCmdOpts;
if ( aCmdOpts.Lookup(
SvtCommandOptions::CMDOPTION_DISABLED,
- rtl::OUString( "Print" ) ) )
+ OUString( "Print" ) ) )
{
aPrinterInfo.Hide();
aPrtSetup.Hide();
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index c7dba1a214f6..d6c235048c78 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::ui::dialogs;
-using ::rtl::OUString;
struct SwMailMergeDlg_Impl
{
@@ -369,7 +368,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++)
aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
- aAddressFldLB.SelectEntry(rtl::OUString("EMAIL"));
+ aAddressFldLB.SelectEntry(OUString("EMAIL"));
String sPath(pModOpt->GetMailingPath());
if(!sPath.Len())
@@ -385,7 +384,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
if (!bColumn )
{
- aColumnLB.SelectEntry(rtl::OUString("NAME"));
+ aColumnLB.SelectEntry(OUString("NAME"));
}
else
aColumnLB.SelectEntry(pModOpt->GetNameFromColumn());
@@ -416,7 +415,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG);
sCommand += ":default_first";
uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
- const ::rtl::OUString sName("Name");
+ const OUString sName("Name");
sal_uInt16 nODT = USHRT_MAX;
while(xList->hasMoreElements())
{
@@ -426,7 +425,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
uno::Any aProps = xFilterFactory->getByName(sFilter);
uno::Sequence< beans::PropertyValue > aFilterProperties;
aProps >>= aFilterProperties;
- ::rtl::OUString sUIName2;
+ OUString sUIName2;
const beans::PropertyValue* pFilterProperties = aFilterProperties.getConstArray();
for(int nProp = 0; nProp < aFilterProperties.getLength(); nProp++)
{
@@ -441,7 +440,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
sal_uInt16 nFilter = aFilterLB.InsertEntry( sUIName2 );
if( 0 == sFilter.compareToAscii("writer8") )
nODT = nFilter;
- aFilterLB.SetEntryData( nFilter, new ::rtl::OUString( sFilter ) );
+ aFilterLB.SetEntryData( nFilter, new OUString( sFilter ) );
}
}
aFilterLB.SelectEntryPos( nODT );
@@ -463,7 +462,7 @@ SwMailMergeDlg::~SwMailMergeDlg()
for( sal_uInt16 nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter )
{
- ::rtl::OUString* pData = reinterpret_cast< ::rtl::OUString* >( aFilterLB.GetEntryData(nFilter) );
+ OUString* pData = reinterpret_cast< OUString* >( aFilterLB.GetEntryData(nFilter) );
delete pData;
}
delete pImpl;
@@ -679,7 +678,7 @@ bool SwMailMergeDlg::ExecQryShell()
URIHelper::SmartRel2Abs(
aAbs, aPathED.GetText(), URIHelper::GetMaybeFileHdl()));
pModOpt->SetMailingPath(sPath);
- String sDelim = rtl::OUString(INET_PATH_TOKEN);
+ String sDelim = OUString(INET_PATH_TOKEN);
if (sPath.Len() >= sDelim.Len() &&
sPath.Copy(sPath.Len()-sDelim.Len()).CompareTo(sDelim) != COMPARE_EQUAL)
@@ -692,12 +691,12 @@ bool SwMailMergeDlg::ExecQryShell()
pMgr->SetEMailColumn(aColumnLB.GetSelectEntry());
pModOpt->SetNameFromColumn(aColumnLB.GetSelectEntry());
if( aFilterLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- m_sSaveFilter = *static_cast<const ::rtl::OUString*>(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() ));
+ m_sSaveFilter = *static_cast<const OUString*>(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() ));
}
else
{
//#i97667# reset column name - otherwise it's remembered from the last run
- pMgr->SetEMailColumn(::rtl::OUString());
+ pMgr->SetEMailColumn(OUString());
//start save as dialog
String sFilter;
sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter);
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 7b439450ed15..70fb0c3bc317 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -117,8 +117,8 @@ class SwVisitingCardPage : public SfxTabPage
using SfxTabPage::SetUserData;
void SetUserData( sal_uInt32 nCnt,
- const rtl::OUString* pNames,
- const rtl::OUString* pValues );
+ const OUString* pNames,
+ const OUString* pValues );
SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet);
~SwVisitingCardPage();
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 6c10fb72cbf6..d6834dd3705a 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -70,8 +70,8 @@ sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS,
String sTitle = GetText();
sTitle += pDropField->GetPar2();
SetText(sTitle);
- uno::Sequence< rtl::OUString > aItems = pDropField->GetItemSequence();
- const rtl::OUString* pArray = aItems.getConstArray();
+ uno::Sequence< OUString > aItems = pDropField->GetItemSequence();
+ const OUString* pArray = aItems.getConstArray();
for(sal_Int32 i = 0; i < aItems.getLength(); i++)
aListItemsLB.InsertEntry(pArray[i]);
aListItemsLB.SelectEntry(pDropField->GetSelectedItem());
@@ -92,7 +92,7 @@ void sw::DropDownFieldDialog::Apply()
{
if(pDropField)
{
- rtl::OUString sSelect = aListItemsLB.GetSelectEntry();
+ OUString sSelect = aListItemsLB.GetSelectEntry();
if(pDropField->GetPar1() != sSelect)
{
rSh.StartAllAction();
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index b5bd607d31f1..bed40d1b8c6f 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -101,8 +101,8 @@ void SwChangeDBDlg::FillDBPopup()
std::vector<String> aAllDBNames;
- Sequence< ::rtl::OUString > aDBNames = xDBContext->getElementNames();
- const ::rtl::OUString* pDBNames = aDBNames.getConstArray();
+ Sequence< OUString > aDBNames = xDBContext->getElementNames();
+ const OUString* pDBNames = aDBNames.getConstArray();
sal_Int32 nDBCount = aDBNames.getLength();
for(sal_Int32 i = 0; i < nDBCount; i++)
{
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 1d10f652069d..322a7afe60b0 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -368,7 +368,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
{
aValueED.SetText(aEmptyStr);
if (bCond)
- aConditionED.SetText(rtl::OUString("TRUE"));
+ aConditionED.SetText(OUString("TRUE"));
else
aConditionED.SetText(aEmptyStr);
}
@@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
void SwFldDBPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 0304bc08f947..68cb2a7b3e2c 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -126,7 +126,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32());
}
- std::vector<rtl::OUString> aLst;
+ std::vector<OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
for(size_t i = 0; i < aLst.size(); ++i)
{
@@ -146,7 +146,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
for (sal_Int32 n=0; n < rProperties.getLength(); n++)
{
- rtl::OUString sEntry = rProperties[n].Name;
+ OUString sEntry = rProperties[n].Name;
pEntry = aTypeTLB.InsertEntry(sEntry, pInfo);
if(m_sOldCustomFieldName.equals( sEntry ))
{
@@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
if( nSubType == DI_CUSTOM )
{
//find out which type the custom field has - for a start set to DATE format
- ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry);
+ OUString sName = aTypeTLB.GetEntryText(pSelEntry);
try
{
uno::Any aVal = xCustomPropertySet->getPropertyValue( sName );
@@ -424,7 +424,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& )
sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos();
- ::rtl::OUString aName;
+ OUString aName;
if (DI_CUSTOM == nSubType)
aName = aTypeTLB.GetEntryText(pSelEntry);
@@ -462,7 +462,7 @@ sal_uInt16 SwFldDokInfPage::GetGroup()
void SwFldDokInfPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
SvTreeListEntry* pEntry = aTypeTLB.FirstSelected();
sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX;
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index a56f996af7f8..71bcfb1849f5 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -50,7 +50,7 @@ class SwFldDokInfPage : public SwFldPage
sal_uInt16 nOldSel;
sal_uLong nOldFormat;
- ::rtl::OUString m_sOldCustomFieldName;
+ OUString m_sOldCustomFieldName;
DECL_LINK(TypeHdl, void * = 0);
DECL_LINK(SubTypeHdl, void * = 0);
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 6a37ce214f19..fbffd1b754dc 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -201,7 +201,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
if (nTypeId != USHRT_MAX)
{
- std::vector<rtl::OUString> aLst;
+ std::vector<OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
if (nTypeId != TYP_AUTHORFLD)
@@ -641,7 +641,7 @@ sal_uInt16 SwFldDokPage::GetGroup()
void SwFldDokPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index a00eaaf0c4eb..41320d4c774e 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -201,7 +201,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup)
SetTabPage(pTabPage);
String sTitle(GetText());
- sTitle.Insert(rtl::OUString(": "), 0);
+ sTitle.Insert(OUString(": "), 0);
sTitle.Insert(SW_RESSTR(STR_FLD_EDIT_DLG), 0);
SetText(sTitle);
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 86fe43d574ea..f8eec49e6c70 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
-using rtl::OUString;
SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ),
@@ -486,7 +485,7 @@ void SwFldFuncPage::UpdateSubType()
aSelectionLB.SetUpdateMode(sal_False);
aSelectionLB.Clear();
- std::vector<rtl::OUString> aLst;
+ std::vector<OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
size_t nCount = aLst.size();
@@ -647,7 +646,7 @@ sal_uInt16 SwFldFuncPage::GetGroup()
void SwFldFuncPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index a3470a023fb3..2dbee73a9670 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -76,7 +76,6 @@
#include <fldui.hrc>
#include <tox.hxx>
-using rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
using namespace com::sun::star::lang;
@@ -490,7 +489,7 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
Description: localise subtypes of a field
--------------------------------------------------------------------*/
-bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& rToFill)
+bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
{
bool bRet = false;
SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
@@ -1262,7 +1261,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam )
if (nLevel != 0x7f && cSeparator == 0)
cSeparator = '.';
- pTyp->SetDelimiter(rtl::OUString(cSeparator));
+ pTyp->SetDelimiter(OUString(cSeparator));
SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId);
bExp = true;
pFld = pExpFld;
@@ -1485,7 +1484,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
if( SVX_NUM_CHAR_SPECIAL == nFormat )
{
((SwPageNumberField*)pCurFld)->SetUserString( sPar2 );
- sPar2 = rtl::OUString("-1");
+ sPar2 = OUString("-1");
}
else
{
@@ -1664,7 +1663,7 @@ sal_Bool SwFldMgr::ChooseMacro(const String&)
sal_Bool bRet = sal_False;
// choose script dialog
- ::rtl::OUString aScriptURL = SfxApplication::ChooseScript();
+ OUString aScriptURL = SfxApplication::ChooseScript();
// the script selector dialog returns a valid script URL
if ( !aScriptURL.isEmpty() )
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 13d3cc2eeaf2..c5a8ee62a938 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -92,9 +92,9 @@ void SwFldPage::Init()
{
SwDoc* pDoc = pSh->GetDoc();
pSh->InsertFldType( SwSetExpFieldType( pDoc,
- rtl::OUString("HTML_ON"), 1));
+ OUString("HTML_ON"), 1));
pSh->InsertFldType( SwSetExpFieldType(pDoc,
- rtl::OUString("HTML_OFF"), 1));
+ OUString("HTML_OFF"), 1));
}
}
}
@@ -171,7 +171,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const Str
{
aReq.AppendItem(SfxStringItem(FN_INSERT_FIELD, rPar1));
aReq.AppendItem(SfxStringItem
- (FN_PARAM_3, rtl::OUString(cSeparator)));
+ (FN_PARAM_3, OUString(cSeparator)));
aReq.AppendItem(SfxUInt16Item(FN_PARAM_FIELD_SUBTYPE, nSubType));
}
aReq.AppendItem(SfxUInt16Item(FN_PARAM_FIELD_TYPE , nTypeId));
@@ -242,7 +242,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const Str
{
SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pTmpFld->GetTyp();
pTyp->SetOutlineLvl( static_cast< sal_uInt8 >(nSubType & 0xff));
- pTyp->SetDelimiter(rtl::OUString(cSeparator));
+ pTyp->SetDelimiter(OUString(cSeparator));
nSubType = nsSwGetSetExpType::GSE_SEQ;
}
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 62d115466c1b..1f9d3549ad07 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -608,7 +608,7 @@ void SwFldRefPage::UpdateSubType()
}
else
{
- std::vector<rtl::OUString> aLst;
+ std::vector<OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
for(size_t i = 0; i < aLst.size(); ++i)
aSelectionLB.InsertEntry(aLst[i]);
@@ -967,7 +967,7 @@ sal_uInt16 SwFldRefPage::GetGroup()
void SwFldRefPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 9b841752f12d..237693183894 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -89,14 +89,14 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
utl::OConfigurationTreeRoot aCfgRoot
= utl::OConfigurationTreeRoot::createWithComponentContext(
::comphelper::getProcessComponentContext(),
- rtl::OUString(
+ OUString(
"/org.openoffice.Office.DataAccess/Policies/Features/Writer" ),
-1,
utl::OConfigurationTreeRoot::CM_READONLY);
sal_Bool bDatabaseFields = sal_True;
aCfgRoot.getNodeValue(
- rtl::OUString("DatabaseFields")) >>= bDatabaseFields;
+ OUString("DatabaseFields")) >>= bDatabaseFields;
if (bDatabaseFields)
AddTabPage(TP_FLD_DB, SwFldDBPage::Create, 0);
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index a3242c2b5474..7ef720a8fdea 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -588,7 +588,7 @@ void SwFldVarPage::UpdateSubType()
aSelectionLB.SetUpdateMode(sal_False);
aSelectionLB.Clear();
- std::vector<rtl::OUString> aList;
+ std::vector<OUString> aList;
GetFldMgr().GetSubTypes(nTypeId, aList);
size_t nCount = aList.size();
size_t nPos;
@@ -1203,7 +1203,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
else
{
nSubType--;
- OUString sSeparator = rtl::OUString(aSeparatorED.GetText()[0]);
+ OUString sSeparator = OUString(aSeparatorED.GetText()[0]);
cSeparator = !sSeparator.isEmpty() ? sSeparator[0] : ' ';
}
break;
@@ -1274,7 +1274,7 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
void SwFldVarPage::FillUserData()
{
- String sData(rtl::OUString(USER_DATA_VERSION));
+ String sData(OUString(USER_DATA_VERSION));
sData += ';';
sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 42fbb50bf59a..1b4dbe07d0a5 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -141,7 +141,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
void SwFldInputDlg::Apply()
{
- rtl::OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
+ OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
rSh.StartAllAction();
bool bModified = false;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 2dc77ce8880f..4d27dd6636c1 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -254,7 +254,7 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn )
pFileDlg = new ::sfx2::FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- SFXWB_INSERT, rtl::OUString("swriter") );
+ SFXWB_INSERT, OUString("swriter") );
}
pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) );
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index 1529f2e49903..61624c9f3394 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -62,7 +62,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName
SwNewDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() :
::GetActiveView()->GetWrtShell().GetNewDBMgr();
- ::rtl::OUString sSource(rDBName);
+ OUString sSource(rDBName);
Reference< XConnection> xConnection =
pDBMgr->RegisterConnection(sSource);
@@ -125,7 +125,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName
Any aCol = xCols->getByName(rFldName);
Reference <XPropertySet> xCol;
aCol >>= xCol;
- Any aType = xCol->getPropertyValue(rtl::OUString("Type"));
+ Any aType = xCol->getPropertyValue(OUString("Type"));
sal_Int32 eDataType = 0;
aType >>= eDataType;
switch(eDataType)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 85093848937b..fa6692ba268d 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -884,7 +884,7 @@ void SwColumnPage::UpdateCols()
void SwColumnPage::SetLabels( sal_uInt16 nVis )
{
- rtl::OUString sLbl( '~' );
+ OUString sLbl( '~' );
String sLbl2( OUString::number( nVis + 1 ));
String tmp1(sLbl2);
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ba236522f5f0..c7b2f0b75d9b 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -84,7 +84,7 @@ public:
String GetCharacterStyle() const;
};
-String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption separator text
+String SwCaptionDialog::our_aSepTextSave = OUString(": "); // Caption separator text
SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ),
@@ -432,7 +432,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
RES_SETEXPFLD, aFldTypeName );
sal_Unicode nLvl = MAXLEVEL;
- rtl::OUString sDelim(": ");
+ OUString sDelim(": ");
if( pFldType )
{
sDelim = pFldType->GetDelimiter();
@@ -463,14 +463,14 @@ void SwSequenceOptionDialog::Apply()
bool bUpdate = true;
if( pFldType )
{
- pFldType->SetDelimiter( rtl::OUString(cDelim) );
+ pFldType->SetDelimiter( OUString(cDelim) );
pFldType->SetOutlineLvl( nLvl );
}
else if( aFldTypeName.Len() && nLvl < MAXLEVEL )
{
// then we have to insert that
SwSetExpFieldType aFldType( rSh.GetDoc(), aFldTypeName, nsSwGetSetExpType::GSE_SEQ );
- aFldType.SetDelimiter( rtl::OUString(cDelim) );
+ aFldType.SetDelimiter( OUString(cDelim) );
aFldType.SetOutlineLvl( nLvl );
rSh.InsertFldType( aFldType );
}
@@ -508,7 +508,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt )
if(nTmpCode != KEY_BACKSPACE && nTmpCode != KEY_RETURN
&& nTmpCode != KEY_TAB && nTmpCode != KEY_ESCAPE)
{
- rtl::OUString sKey( pEvent->GetCharCode() );
+ OUString sKey( pEvent->GetCharCode() );
String sName( GetText() );
Selection aSel( GetSelection() );
aSel.Justify();
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a387a377cde6..3750852f1157 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -68,7 +68,6 @@
#include <vcl/graphicfilter.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
using namespace ::sfx2;
#define SwFPos SvxSwFramePosString
diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/ui/inc/HeaderFooterWin.hxx
index 04a0a814cba8..14e3ecbee291 100644
--- a/sw/source/ui/inc/HeaderFooterWin.hxx
+++ b/sw/source/ui/inc/HeaderFooterWin.hxx
@@ -39,7 +39,7 @@
*/
class SwHeaderFooterWin : public MenuButton, public SwFrameControl
{
- rtl::OUString m_sLabel;
+ OUString m_sLabel;
bool m_bIsHeader;
PopupMenu* m_pPopupMenu;
Window* m_pLine;
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx
index f9c077277809..c220de09e4ea 100644
--- a/sw/source/ui/inc/SwXFilterOptions.hxx
+++ b/sw/source/ui/inc/SwXFilterOptions.hxx
@@ -37,8 +37,8 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper5<
::com::sun::star::document::XExporter,
::com::sun::star::lang::XServiceInfo >
{
- ::rtl::OUString sFilterName;
- ::rtl::OUString sFilterOptions;
+ OUString sFilterName;
+ OUString sFilterOptions;
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xInputStream;
@@ -50,8 +50,8 @@ public:
SwXFilterOptions();
virtual ~SwXFilterOptions();
- static ::rtl::OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static();
+ static OUString getImplementationName_Static();
+ static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static();
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
@@ -65,7 +65,7 @@ public:
::com::sun::star::uno::RuntimeException);
// XExecutableDialog
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+ virtual void SAL_CALL setTitle( const OUString& aTitle )
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException);
@@ -82,11 +82,11 @@ public:
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index d808d7a8e4b4..223516670c72 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.hxx
@@ -68,12 +68,12 @@ public:
TableNameEdit(Window* pWin, const ResId& rResId)
: NoSpaceEdit(pWin, rResId)
{
- SetForbiddenChars(rtl::OUString(" .<>"));
+ SetForbiddenChars(OUString(" .<>"));
}
TableNameEdit(Window* pWin)
: NoSpaceEdit(pWin)
{
- SetForbiddenChars(rtl::OUString(" .<>"));
+ SetForbiddenChars(OUString(" .<>"));
}
};
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx
index 786f3f4ad5e2..75adc8ca0c8d 100644
--- a/sw/source/ui/inc/barcfg.hxx
+++ b/sw/source/ui/inc/barcfg.hxx
@@ -24,14 +24,14 @@ class SwToolbarConfigItem : public utl::ConfigItem
{
sal_Int32 aTbxIdArray[5];
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwToolbarConfigItem( bool bWeb );
~SwToolbarConfigItem();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
};
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx
index 345235cdf2d4..3dc05c481c43 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/ui/inc/caption.hxx
@@ -32,7 +32,7 @@ private:
SvGlobalName aOleId;
String sCategory;
sal_uInt16 nNumType;
- ::rtl::OUString sNumberSeparator;
+ OUString sNumberSeparator;
String sCaption;
sal_uInt16 nPos;
sal_uInt16 nLevel;
@@ -62,8 +62,8 @@ public:
inline sal_uInt16 GetNumType() const { return nNumType; }
inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; }
- const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; }
- void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;}
+ const OUString& GetNumSeparator() const { return sNumberSeparator; }
+ void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;}
inline const String& GetCaption() const { return sCaption; }
inline void SetCaption(const String& rCap) { sCaption = rCap; }
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 561e6ef04d46..e0a21c16115e 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -135,7 +135,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
- const rtl::OUString &GetFax() const { return sFaxName; }
+ const OUString &GetFax() const { return sFaxName; }
void SetFax( const String& rFax) { sFaxName = rFax; }
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx
index 7f91549cc684..39a712e7f147 100644
--- a/sw/source/ui/inc/concustomshape.hxx
+++ b/sw/source/ui/inc/concustomshape.hxx
@@ -35,7 +35,7 @@ class SfxRequest;
class ConstCustomShape : public SwDrawBase
{
- rtl::OUString aCustomShape;
+ OUString aCustomShape;
void SetAttributes( SdrObject* pObj );
@@ -49,8 +49,8 @@ class ConstCustomShape : public SwDrawBase
virtual void Activate(const sal_uInt16 nSlotId); // activate function
- rtl::OUString GetShapeType() const;
- static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq );
+ OUString GetShapeType() const;
+ static OUString GetShapeTypeFromRequest( SfxRequest& rReq );
virtual void CreateDefaultObject();
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 1ef4253c6fd8..6fe6342adfdf 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -243,7 +243,7 @@ private:
static const SfxObjectShell* pShowShell;
void InsertRegion( const SwGlblDocContent* _pContent,
- const com::sun::star::uno::Sequence< ::rtl::OUString >& _rFiles );
+ const com::sun::star::uno::Sequence< OUString >& _rFiles );
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx
index 91186e76e6a5..6757ac0b1840 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/ui/inc/dbconfig.hxx
@@ -26,7 +26,7 @@ struct SwDBData;
class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem
{
- SW_DLLPRIVATE const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ SW_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
SwDBData* pAdrImpl;
SwDBData* pBibImpl;
@@ -39,7 +39,7 @@ public:
const SwDBData& GetAddressSource();
const SwDBData& GetBibliographySource();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
};
#endif
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 02488d163044..aa1207fc553f 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -56,7 +56,7 @@ typedef boost::ptr_vector<_DB_Column> _DB_Columns;
struct SwInsDBColumn
{
- rtl::OUString sColumn, sUsrNumFmt;
+ OUString sColumn, sUsrNumFmt;
sal_Int32 nDBNumFmt;
sal_uInt32 nUsrNumFmt;
LanguageType eUsrNumFmtLng;
@@ -153,7 +153,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
using SfxModalDialog::Notify;
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
virtual void Commit();
void Load();
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 7f4084bf5d8a..99cbf594a81f 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -207,7 +207,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual rtl::OUString GetSurroundingText() const;
+ virtual OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg,
diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx
index e7b3fccd0d7d..1c072c799fcd 100644
--- a/sw/source/ui/inc/envimg.hxx
+++ b/sw/source/ui/inc/envimg.hxx
@@ -42,9 +42,9 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem
{
public:
- rtl::OUString aAddrText; // text for reciever
+ OUString aAddrText; // text for reciever
sal_Bool bSend; // sender?
- rtl::OUString aSendText; // text for sender
+ OUString aSendText; // text for sender
sal_Int32 lAddrFromLeft; // left gap for reciever (twips)
sal_Int32 lAddrFromTop; // upper gap for reciever (twips)
sal_Int32 lSendFromLeft; // left gap for sender (twips)
@@ -75,7 +75,7 @@ class SwEnvCfgItem : public utl::ConfigItem
{
SwEnvItem aEnvItem;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwEnvCfgItem();
~SwEnvCfgItem();
@@ -83,7 +83,7 @@ public:
SwEnvItem& GetItem() {return aEnvItem;}
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
};
#endif
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index c42cd34fb221..d745c41484b5 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -193,7 +193,7 @@ public:
static sal_uInt16 GetPos(sal_uInt16 nTypeId);
// subtypes to a type
- bool GetSubTypes(sal_uInt16 nId, std::vector<rtl::OUString>& rToFill);
+ bool GetSubTypes(sal_uInt16 nId, std::vector<OUString>& rToFill);
// format to a type
sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode = sal_False) const;
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index f6b6198b7cb3..f71e124dc449 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
String sDefaultFonts[DEF_FONT_COUNT];
sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT];
- SW_DLLPRIVATE com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ SW_DLLPRIVATE com::sun::star::uno::Sequence<OUString> GetPropertyNames();
void ChangeString(sal_uInt16 nFontType, const String& rSet)
{
@@ -77,7 +77,7 @@ public:
~SwStdFontConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
const String& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
const String& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index 99673dcbcb38..65a1a08f5b36 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -82,7 +82,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog
PushButton* m_pDelPB;
PushButton* m_pRenamePB;
- typedef std::vector< ::rtl::OUString> OUVector_t;
+ typedef std::vector< OUString> OUVector_t;
OUVector_t m_RemovedArr;
OUVector_t m_InsertedArr;
OUVector_t m_RenamedArr;
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index d721b0f5b841..6ab31ac73c86 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -79,7 +79,7 @@ public:
*/
::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup >
GetAutoTextGroup(
- const ::rtl::OUString& _rGroupName,
+ const OUString& _rGroupName,
bool _bCreate = false
);
@@ -100,8 +100,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry >
GetAutoTextEntry(
const String& _rCompleteGroupName,
- const ::rtl::OUString& _rGroupName,
- const ::rtl::OUString& _rEntryName,
+ const OUString& _rGroupName,
+ const OUString& _rEntryName,
bool _bCreate = false
);
@@ -118,7 +118,7 @@ public:
static String GetDefName();
static String GetExtension();
- String GetCompleteGroupName( const ::rtl::OUString& GroupName );
+ String GetCompleteGroupName( const OUString& GroupName );
sal_Bool NewGroupDoc(String &rGroupName, const String& rTitle);
sal_Bool RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle);
diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx
index 333506a1f731..319a92b4fae3 100644
--- a/sw/source/ui/inc/imaildsplistener.hxx
+++ b/sw/source/ui/inc/imaildsplistener.hxx
@@ -63,7 +63,7 @@ public:
Called for every mail message whose delivery
failed.
*/
- virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0;
+ virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0;
};
#endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index a9c7e119472d..d183268de96a 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -46,8 +46,8 @@ private:
PushButton* m_pPrevBtn;
PushButton* m_pNextBtn;
- rtl::OUString aText;
- rtl::OUString aType;
+ OUString aText;
+ OUString aType;
sal_Bool bNew;
sal_Bool bIsUrl;
@@ -77,9 +77,9 @@ public:
SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh);
~SwJavaEditDialog();
- rtl::OUString GetText() { return aText; }
+ OUString GetText() { return aText; }
- rtl::OUString GetType() { return aType; }
+ OUString GetType() { return aType; }
sal_Bool IsUrl() { return bIsUrl; }
sal_Bool IsNew() { return bNew; }
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index 6ee47ea64cdf..65cd0a4d6e28 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -38,7 +38,7 @@ class SwLabDlg : public SfxTabDialog
SwLabPrtPage* pPrtPage;
std::vector<sal_uInt16> aTypeIds;
- std::vector<rtl::OUString> aMakes;
+ std::vector<OUString> aMakes;
SwLabRecs* pRecs;
String aLstGroup;
@@ -64,8 +64,8 @@ public:
std::vector<sal_uInt16> &TypeIds() { return aTypeIds; }
const std::vector<sal_uInt16> &TypeIds() const { return aTypeIds; }
- std::vector<rtl::OUString> &Makes() { return aMakes; }
- const std::vector<rtl::OUString> &Makes() const { return aMakes; }
+ std::vector<OUString> &Makes() { return aMakes; }
+ const std::vector<OUString> &Makes() const { return aMakes; }
Printer *GetPrt();
inline void ReplaceGroup( const String &rMake );
diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx
index 216bef4b9ac2..42f357693165 100644
--- a/sw/source/ui/inc/labelcfg.hxx
+++ b/sw/source/ui/inc/labelcfg.hxx
@@ -36,7 +36,7 @@ struct SwLabelMeasure
class SW_DLLPUBLIC SwLabelConfig : public utl::ConfigItem
{
- std::vector<rtl::OUString> m_aManufacturers;
+ std::vector<OUString> m_aManufacturers;
std::map< OUString, std::map<OUString, SwLabelMeasure> > m_aLabels;
public:
@@ -44,15 +44,15 @@ public:
virtual ~SwLabelConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
- void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr);
- const std::vector<rtl::OUString>& GetManufacturers() const {return m_aManufacturers;}
+ void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr);
+ const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;}
- sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType);
- bool IsPredefinedLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
+ sal_Bool HasLabel(const OUString& rManufacturer, const OUString& rType);
+ bool IsPredefinedLabel(const OUString& rManufacturer, const OUString& rType)
{ return m_aLabels[rManufacturer][rType].m_bPredefined; };
- void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType,
+ void SaveLabel(const OUString& rManufacturer, const OUString& rType,
const SwLabRec& rRec);
};
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx
index 2107a07aa3d4..e4c63d52ba8d 100644
--- a/sw/source/ui/inc/labimg.hxx
+++ b/sw/source/ui/inc/labimg.hxx
@@ -41,14 +41,14 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
- rtl::OUString aLstMake; // remember last selection
- rtl::OUString aLstType;
- rtl::OUString sDBName; // used database
-
- rtl::OUString aWriting; // label
- rtl::OUString aMake; // label mark
- rtl::OUString aType; // label type
- rtl::OUString aBin; // printer shaft
+ OUString aLstMake; // remember last selection
+ OUString aLstType;
+ OUString sDBName; // used database
+
+ OUString aWriting; // label
+ OUString aMake; // label mark
+ OUString aType; // label type
+ OUString aBin; // printer shaft
sal_Int32 lHDist; // horizontal distance (user)
sal_Int32 lVDist; // vertical distance (user)
sal_Int32 lWidth; // width (user)
@@ -67,41 +67,41 @@ public:
sal_Bool bSynchron;// synchronise all labels
//parts of the business card
- rtl::OUString aPrivFirstName;
- rtl::OUString aPrivName;
- rtl::OUString aPrivShortCut;
- rtl::OUString aPrivFirstName2;
- rtl::OUString aPrivName2;
- rtl::OUString aPrivShortCut2;
- rtl::OUString aPrivStreet;
- rtl::OUString aPrivZip;
- rtl::OUString aPrivCity;
- rtl::OUString aPrivCountry;
- rtl::OUString aPrivState;
- rtl::OUString aPrivTitle;
- rtl::OUString aPrivProfession;
- rtl::OUString aPrivPhone;
- rtl::OUString aPrivMobile;
- rtl::OUString aPrivFax;
- rtl::OUString aPrivWWW;
- rtl::OUString aPrivMail;
- rtl::OUString aCompCompany;
- rtl::OUString aCompCompanyExt;
- rtl::OUString aCompSlogan;
- rtl::OUString aCompStreet;
- rtl::OUString aCompZip;
- rtl::OUString aCompCity;
- rtl::OUString aCompCountry;
- rtl::OUString aCompState;
- rtl::OUString aCompPosition;
- rtl::OUString aCompPhone;
- rtl::OUString aCompMobile;
- rtl::OUString aCompFax;
- rtl::OUString aCompWWW;
- rtl::OUString aCompMail;
-
- rtl::OUString sGlossaryGroup;
- rtl::OUString sGlossaryBlockName;
+ OUString aPrivFirstName;
+ OUString aPrivName;
+ OUString aPrivShortCut;
+ OUString aPrivFirstName2;
+ OUString aPrivName2;
+ OUString aPrivShortCut2;
+ OUString aPrivStreet;
+ OUString aPrivZip;
+ OUString aPrivCity;
+ OUString aPrivCountry;
+ OUString aPrivState;
+ OUString aPrivTitle;
+ OUString aPrivProfession;
+ OUString aPrivPhone;
+ OUString aPrivMobile;
+ OUString aPrivFax;
+ OUString aPrivWWW;
+ OUString aPrivMail;
+ OUString aCompCompany;
+ OUString aCompCompanyExt;
+ OUString aCompSlogan;
+ OUString aCompStreet;
+ OUString aCompZip;
+ OUString aCompCity;
+ OUString aCompCountry;
+ OUString aCompState;
+ OUString aCompPosition;
+ OUString aCompPhone;
+ OUString aCompMobile;
+ OUString aCompFax;
+ OUString aCompWWW;
+ OUString aCompMail;
+
+ OUString sGlossaryGroup;
+ OUString sGlossaryBlockName;
};
// class SwLabCfgItem -------------------------------------------------------
@@ -110,14 +110,14 @@ class SwLabCfgItem : public utl::ConfigItem
SwLabItem aItem;
sal_Bool bIsLabel;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwLabCfgItem(sal_Bool bLabel);
SwLabItem& GetItem() {return aItem;}
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
};
#endif
diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx
index 29a49ce3dc3f..aa73d7ead564 100644
--- a/sw/source/ui/inc/mailmergehelper.hxx
+++ b/sw/source/ui/inc/mailmergehelper.hxx
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace mail {
namespace SwMailMergeHelper
{
SW_DLLPUBLIC String CallSaveAsDialog(String& rFilter);
- SW_DLLPUBLIC bool CheckMailAddress( const ::rtl::OUString& rMailAddress );
+ SW_DLLPUBLIC bool CheckMailAddress( const OUString& rMailAddress );
SW_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::mail::XSmtpService >
ConnectToSmtpServer( SwMailMergeConfigItem& rConfigItem,
com::sun::star::uno::Reference< com::sun::star::mail::XMailService >& xInMailService,
@@ -71,7 +71,7 @@ class SW_DLLPUBLIC SwAddressPreview : public Window
SwAddressPreview_Impl* pImpl;
Link m_aSelectHdl;
- void DrawText_Impl( const ::rtl::OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected);
+ void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected);
virtual void Paint(const Rectangle&);
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -92,16 +92,16 @@ public:
AddAddress appends the new address to the already added ones.
Initially the first added address will be selected
*/
- void AddAddress(const ::rtl::OUString& rAddress);
+ void AddAddress(const OUString& rAddress);
// for preview mode - replaces the currently used address by the given one
- void SetAddress(const ::rtl::OUString& rAddress);
+ void SetAddress(const OUString& rAddress);
// removes all addresses
void Clear();
// returns the selected address
sal_uInt16 GetSelectedAddress() const;
void SelectAddress(sal_uInt16 nSelect);
- void ReplaceSelectedAddress(const ::rtl::OUString&);
+ void ReplaceSelectedAddress(const OUString&);
void RemoveSelectedAddress();
// set the number of rows and columns of addresses
@@ -110,9 +110,9 @@ public:
// fill the actual data into a string (address block or greeting)
static String FillData(
- const ::rtl::OUString& rAddress,
+ const OUString& rAddress,
SwMailMergeConfigItem& rConfigItem,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString>* pAssignments = 0);
+ const ::com::sun::star::uno::Sequence< OUString>* pAssignments = 0);
void SetSelectHdl (const Link& rLink) {m_aSelectHdl = rLink;}
};
@@ -146,35 +146,35 @@ public:
class SW_DLLPUBLIC SwAuthenticator :
public cppu::WeakImplHelper1< ::com::sun::star::mail::XAuthenticator>
{
- ::rtl::OUString m_aUserName;
- ::rtl::OUString m_aPassword;
+ OUString m_aUserName;
+ OUString m_aPassword;
Window* m_pParentWindow;
public:
SwAuthenticator() : m_pParentWindow(0) {}
- SwAuthenticator(const ::rtl::OUString& username, const ::rtl::OUString& password, Window* pParent) :
+ SwAuthenticator(const OUString& username, const OUString& password, Window* pParent) :
m_aUserName(username),
m_aPassword(password),
m_pParentWindow( pParent )
{}
~SwAuthenticator();
- virtual ::rtl::OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException);
};
class SW_DLLPUBLIC SwConnectionContext :
public cppu::WeakImplHelper1< ::com::sun::star::uno::XCurrentContext >
{
- ::rtl::OUString m_sMailServer;
+ OUString m_sMailServer;
sal_Int16 m_nPort;
- ::rtl::OUString m_sConnectionType;
+ OUString m_sConnectionType;
public:
- SwConnectionContext(const ::rtl::OUString& rMailServer, sal_Int16 nPort, const ::rtl::OUString& rConnectionType);
+ SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType);
~SwConnectionContext();
- virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const ::rtl::OUString& Name )
+ virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
throw (::com::sun::star::uno::RuntimeException);
};
@@ -214,15 +214,15 @@ class SwMailTransferable :
::com::sun::star::beans::XPropertySet
>
{
- rtl::OUString m_aMimeType;
- rtl::OUString m_sBody;
- rtl::OUString m_aURL;
- rtl::OUString m_aName;
+ OUString m_aMimeType;
+ OUString m_sBody;
+ OUString m_aURL;
+ OUString m_aName;
bool m_bIsBody;
public:
- SwMailTransferable(const rtl::OUString& rURL, const rtl::OUString& rName, const rtl::OUString& rMimeType);
- SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType);
+ SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType);
+ SwMailTransferable(const OUString& rBody, const OUString& rMimeType);
~SwMailTransferable();
virtual ::com::sun::star::uno::Any SAL_CALL
getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
@@ -236,12 +236,12 @@ class SwMailTransferable :
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
@@ -249,17 +249,17 @@ class SwMailMessage :
public SwMutexBase,
public cppu::WeakComponentImplHelper1< ::com::sun::star::mail::XMailMessage >
{
- ::rtl::OUString m_sSenderName;
- ::rtl::OUString m_sSenderAddress;
- ::rtl::OUString m_sReplyToAddress;
- ::rtl::OUString m_sSubject;
+ OUString m_sSenderName;
+ OUString m_sSenderAddress;
+ OUString m_sReplyToAddress;
+ OUString m_sSubject;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> m_xBody;
// ::com::sun::star::mail::MailMessageBody m_aBody;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aRecipients;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aCcRecipients;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aBccRecipients;
+ ::com::sun::star::uno::Sequence< OUString > m_aRecipients;
+ ::com::sun::star::uno::Sequence< OUString > m_aCcRecipients;
+ ::com::sun::star::uno::Sequence< OUString > m_aBccRecipients;
// ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachmentDescriptor > m_aAttachments;
::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > m_aAttachments;
public:
@@ -267,12 +267,12 @@ public:
~SwMailMessage();
// attributes
- virtual ::rtl::OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setReplyToAddress( const ::rtl::OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setSubject( const ::rtl::OUString& _subject ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL
getBody()
@@ -281,22 +281,22 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// methods
- virtual void SAL_CALL addRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addCcRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addBccRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getRecipients( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addAttachment( const ::com::sun::star::mail::MailAttachment& aMailAttachment )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > SAL_CALL
getAttachments( ) throw (::com::sun::star::uno::RuntimeException);
- void SetSenderName(const ::rtl::OUString& rSenderName)
+ void SetSenderName(const OUString& rSenderName)
{m_sSenderName = rSenderName;}
- void SetSenderAddress(const ::rtl::OUString& rSenderAddress)
+ void SetSenderAddress(const OUString& rSenderAddress)
{m_sSenderAddress = rSenderAddress;}
};
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index 45b4a1af85b9..e170af00f748 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -113,7 +113,7 @@ class SwMailMergeDlg : public SvxStandardDialog
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
Size m_aDialogSize;
- ::rtl::OUString m_sSaveFilter;
+ OUString m_sSaveFilter;
DECL_LINK( ButtonHdl, Button* pBtn );
@@ -144,7 +144,7 @@ public:
String GetColumnName() const { return aColumnLB.GetSelectEntry();}
String GetPath() const { return aPathED.GetText();}
- const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;}
+ const OUString& GetSaveFilter() const {return m_sSaveFilter;}
inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx
index 51b301ae64a4..8011cfe85570 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/ui/inc/mmconfigitem.hxx
@@ -48,20 +48,20 @@ struct SwDocMergeInfo
class SW_DLLPUBLIC SwMailMergeConfigItem
{
-// com::sun::star::uno::Sequence< ::rtl::OUString> m_aSavedDocuments;
+// com::sun::star::uno::Sequence< OUString> m_aSavedDocuments;
SwMailMergeConfigItem_Impl* m_pImpl;
//session information - not stored in configuration
bool m_bAddressInserted;
bool m_bMergeDone;
bool m_bGreetingInserted;
sal_Int32 m_nGreetingMoves;
- ::rtl::OUString m_rAddressBlockFrame;
+ OUString m_rAddressBlockFrame;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection;
sal_uInt16 m_nStartPrint;
sal_uInt16 m_nEndPrint;
- ::rtl::OUString m_sSelectedPrinter;
+ OUString m_sSelectedPrinter;
SwView* m_pSourceView;
SwView* m_pTargetView;
@@ -99,8 +99,8 @@ public:
void DisposeResultSet();
- ::rtl::OUString& GetFilter() const;
- void SetFilter(::rtl::OUString&);
+ OUString& GetFilter() const;
+ void SetFilter(OUString&);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>
GetSelection()const;
@@ -117,9 +117,9 @@ public:
bool IsRecordExcluded(sal_Int32 nRecord);
void ExcludeRecord(sal_Int32 nRecord, bool bExclude);
- const com::sun::star::uno::Sequence< ::rtl::OUString>&
+ const com::sun::star::uno::Sequence< OUString>&
GetSavedDocuments() const;
- void AddSavedDocument(::rtl::OUString rName);
+ void AddSavedDocument(OUString rName);
sal_Bool IsOutputToLetter()const;
void SetOutputToLetter(sal_Bool bSet);
@@ -130,16 +130,16 @@ public:
sal_Bool IsHideEmptyParagraphs() const;
void SetHideEmptyParagraphs(sal_Bool bSet);
- const com::sun::star::uno::Sequence< ::rtl::OUString>
+ const com::sun::star::uno::Sequence< OUString>
GetAddressBlocks() const;
- void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks);
+ void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks);
void SetCurrentAddressBlockIndex( sal_Int32 nSet );
sal_Int32 GetCurrentAddressBlockIndex() const;
sal_Bool IsIncludeCountry() const;
- rtl::OUString& GetExcludeCountry() const;
- void SetCountrySettings(sal_Bool bSet, const rtl::OUString& sCountry);
+ OUString& GetExcludeCountry() const;
+ void SetCountrySettings(sal_Bool bSet, const OUString& sCountry);
sal_Bool IsIndividualGreeting(sal_Bool bInEMail) const;
void SetIndividualGreeting(sal_Bool bSet, sal_Bool bInEMail);
@@ -147,42 +147,42 @@ public:
sal_Bool IsGreetingLine(sal_Bool bInEMail) const;
void SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail);
- const com::sun::star::uno::Sequence< ::rtl::OUString>
+ const com::sun::star::uno::Sequence< OUString>
GetGreetings(Gender eType) const;
- void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks);
+ void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< OUString>& rBlocks);
sal_Int32 GetCurrentGreeting(Gender eType) const;
void SetCurrentGreeting(Gender eType, sal_Int32 nIndex);
//the content of the gender column that marks it as female
- const ::rtl::OUString& GetFemaleGenderValue() const;
- void SetFemaleGenderValue(const ::rtl::OUString rValue);
+ const OUString& GetFemaleGenderValue() const;
+ void SetFemaleGenderValue(const OUString rValue);
//returns the assignment in the order of the default headers (GetDefaultAddressHeaders())
- com::sun::star::uno::Sequence< ::rtl::OUString >
+ com::sun::star::uno::Sequence< OUString >
GetColumnAssignment( const SwDBData& rDBData ) const;
void SetColumnAssignment(
const SwDBData& rDBData,
- const com::sun::star::uno::Sequence< ::rtl::OUString>& );
+ const com::sun::star::uno::Sequence< OUString>& );
bool IsAddressFieldsAssigned() const;
bool IsGreetingFieldsAssigned() const;
//e-Mail settings:
- ::rtl::OUString GetMailDisplayName() const;
- void SetMailDisplayName(const ::rtl::OUString& rName);
+ OUString GetMailDisplayName() const;
+ void SetMailDisplayName(const OUString& rName);
- ::rtl::OUString GetMailAddress() const;
- void SetMailAddress(const ::rtl::OUString& rAddress);
+ OUString GetMailAddress() const;
+ void SetMailAddress(const OUString& rAddress);
sal_Bool IsMailReplyTo() const;
void SetMailReplyTo(sal_Bool bSet);
- ::rtl::OUString GetMailReplyTo() const;
- void SetMailReplyTo(const ::rtl::OUString& rReplyTo);
+ OUString GetMailReplyTo() const;
+ void SetMailReplyTo(const OUString& rReplyTo);
- ::rtl::OUString GetMailServer() const;
- void SetMailServer(const ::rtl::OUString& rAddress);
+ OUString GetMailServer() const;
+ void SetMailServer(const OUString& rAddress);
sal_Int16 GetMailPort() const;
void SetMailPort(sal_Int16 nSet);
@@ -193,17 +193,17 @@ public:
sal_Bool IsAuthentication() const;
void SetAuthentication(sal_Bool bSet);
- ::rtl::OUString GetMailUserName() const;
- void SetMailUserName(const ::rtl::OUString& rName);
+ OUString GetMailUserName() const;
+ void SetMailUserName(const OUString& rName);
- ::rtl::OUString GetMailPassword() const;
- void SetMailPassword(const ::rtl::OUString& rPassword);
+ OUString GetMailPassword() const;
+ void SetMailPassword(const OUString& rPassword);
sal_Bool IsSMTPAfterPOP() const;
void SetSMTPAfterPOP(sal_Bool bSet);
- ::rtl::OUString GetInServerName() const;
- void SetInServerName(const ::rtl::OUString& rServer);
+ OUString GetInServerName() const;
+ void SetInServerName(const OUString& rServer);
sal_Int16 GetInServerPort() const;
void SetInServerPort(sal_Int16 nSet);
@@ -211,15 +211,15 @@ public:
sal_Bool IsInServerPOP() const;
void SetInServerPOP(sal_Bool bSet);
- ::rtl::OUString GetInServerUserName() const;
- void SetInServerUserName(const ::rtl::OUString& rName);
+ OUString GetInServerUserName() const;
+ void SetInServerUserName(const OUString& rName);
- ::rtl::OUString GetInServerPassword() const;
- void SetInServerPassword(const ::rtl::OUString& rPassword);
+ OUString GetInServerPassword() const;
+ void SetInServerPassword(const OUString& rPassword);
//session information
bool IsAddressInserted() const { return m_bAddressInserted; }
- void SetAddressInserted(const ::rtl::OUString& rFrameName)
+ void SetAddressInserted(const OUString& rFrameName)
{ m_bAddressInserted = true;
m_rAddressBlockFrame = rFrameName;
}
@@ -251,8 +251,8 @@ public:
sal_uInt16 GetPrintRangeStart() const {return m_nStartPrint;}
sal_uInt16 GetPrintRangeEnd() const {return m_nEndPrint;}
- const ::rtl::OUString& GetSelectedPrinter() const {return m_sSelectedPrinter;}
- void SetSelectedPrinter(const ::rtl::OUString& rSet )
+ const OUString& GetSelectedPrinter() const {return m_sSelectedPrinter;}
+ void SetSelectedPrinter(const OUString& rSet )
{m_sSelectedPrinter = rSet;}
@@ -263,7 +263,7 @@ public:
void SetSourceView(SwView* pView);
//helper methods
- ::rtl::OUString GetAssignedColumn(sal_uInt32 nColumn)const;
+ OUString GetAssignedColumn(sal_uInt32 nColumn)const;
};
#endif
diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx
index 1e297cb86fe3..0c1ca4a6c75f 100644
--- a/sw/source/ui/inc/navicfg.hxx
+++ b/sw/source/ui/inc/navicfg.hxx
@@ -31,14 +31,14 @@ class SwNavigationConfig : public utl::ConfigItem
sal_Bool bIsSmall; //ShowListBox
sal_Bool bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwNavigationConfig();
~SwNavigationConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
sal_Int32 GetRootType()const {return nRootType;}
void SetRootType(sal_Int32 nSet){
diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx
index 15fdb8979d69..260fc05cc06a 100644
--- a/sw/source/ui/inc/numberingtypelistbox.hxx
+++ b/sw/source/ui/inc/numberingtypelistbox.hxx
@@ -40,7 +40,7 @@ public:
SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER );
~SwNumberingTypeListBox();
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
void Reload(sal_uInt16 nTypeFlags);
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx
index 0fa5ddac75ea..2a56b37c1ca4 100644
--- a/sw/source/ui/inc/olmenu.hxx
+++ b/sw/source/ui/inc/olmenu.hxx
@@ -45,16 +45,16 @@ class SwSpellPopup : public PopupMenu
::com::sun::star::linguistic2::ProofreadingResult xGrammarResult;
sal_Int32 nGrammarError;
- ::com::sun::star::uno::Sequence< rtl::OUString > aSuggestions;
- rtl::OUString sExplanationLink;
+ ::com::sun::star::uno::Sequence< OUString > aSuggestions;
+ OUString sExplanationLink;
LanguageType nCheckedLanguage;
LanguageType nGuessLangWord;
LanguageType nGuessLangPara;
- std::map< sal_Int16, ::rtl::OUString > aLangTable_Text;
- std::map< sal_Int16, ::rtl::OUString > aLangTable_Paragraph;
-// std::map< sal_Int16, ::rtl::OUString > aLangTable_Document;
+ std::map< sal_Int16, OUString > aLangTable_Text;
+ std::map< sal_Int16, OUString > aLangTable_Paragraph;
+// std::map< sal_Int16, OUString > aLangTable_Document;
String aDicNameSingle;
bool bGrammarResults; // show grammar results? Or show spellcheck results?
@@ -62,8 +62,8 @@ class SwSpellPopup : public PopupMenu
Image aInfo16;
void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh,
- std::map< sal_Int16, ::rtl::OUString > &rLangTable );
+ ::com::sun::star::uno::Sequence< OUString > aSeq, SwWrtShell* pWrtSh,
+ std::map< sal_Int16, OUString > &rLangTable );
using PopupMenu::Execute;
@@ -76,7 +76,7 @@ public:
SwSpellPopup( SwWrtShell *pWrtSh,
const ::com::sun::star::linguistic2::ProofreadingResult &rResult,
sal_Int32 nErrorInResult,
- const ::com::sun::star::uno::Sequence< rtl::OUString > &rSuggestions,
+ const ::com::sun::star::uno::Sequence< OUString > &rSuggestions,
const String & rParaText );
sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin );
diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx
index e00cb8293c82..c4032257ecbc 100644
--- a/sw/source/ui/inc/stmenu.hxx
+++ b/sw/source/ui/inc/stmenu.hxx
@@ -62,7 +62,7 @@ class SwSmartTagPopup : public PopupMenu
public:
SwSmartTagPopup( SwView* _pSwView,
- ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes,
+ ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange );
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx
index c83e9857b720..5ab37a589191 100644
--- a/sw/source/ui/inc/tablemgr.hxx
+++ b/sw/source/ui/inc/tablemgr.hxx
@@ -73,7 +73,7 @@ public:
/// @return the XModel of the newly inserted chart if successful
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
+ InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
};
inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) :
diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx
index 8813d430d11c..e04e3d3ec789 100644
--- a/sw/source/ui/inc/unoatxt.hxx
+++ b/sw/source/ui/inc/unoatxt.hxx
@@ -70,22 +70,22 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
//XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
//XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
//XAutoTextContainer
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const rtl::OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removeByName(const rtl::OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
};
@@ -101,14 +101,14 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper6
{
const SfxItemPropertySet* pPropSet;
SwGlossaries* pGlossaries;
- rtl::OUString sName;
+ OUString sName;
String m_sGroupName; // prefix m_ to disambiguate from some local vars in the implementation
protected:
virtual ~SwXAutoTextGroup(); // ref-counted objects are not to be deleted from outside -> protected dtor
public:
- SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss);
+ SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss);
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -117,41 +117,41 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
//XAutoTextGroup
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL renameByName(const rtl::OUString& aElementName, const rtl::OUString& aNewElementName, const rtl::OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const rtl::OUString& aName, const rtl::OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removeByName(const rtl::OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException );
//XNamed
- virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException );
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
//XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
//XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//
void Invalidate();
@@ -213,7 +213,7 @@ public:
//XText
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
@@ -222,16 +222,16 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
//XAutoTextEntry
virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
// XEventsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException );
@@ -246,7 +246,7 @@ public:
/** Implement the XNameAccess for the AutoText events */
class SwAutoTextEventDescriptor : public SvBaseEventDescriptor
{
- ::rtl::OUString sSwAutoTextEventDescriptor;
+ OUString sSwAutoTextEventDescriptor;
SwXAutoTextEntry& rAutoTextEntry;
@@ -258,7 +258,7 @@ public:
~SwAutoTextEventDescriptor();
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
protected:
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index d87303037df9..2ee0e010a44d 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -67,7 +67,7 @@ public:
~SwXDispatchProviderInterceptor();
//XDispatchProvider
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException);
//XDispatchProviderInterceptor
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx
index 26481ebff902..28dcf159786c 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -106,12 +106,12 @@ class SwXMailMerge :
com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > xResultSet;
com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > xConnection;
com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel;
- rtl::OUString aDataSourceName;
- rtl::OUString aDataCommand;
- rtl::OUString aFilter;
- rtl::OUString aDocumentURL;
- rtl::OUString aOutputURL;
- rtl::OUString aFileNamePrefix;
+ OUString aDataSourceName;
+ OUString aDataCommand;
+ OUString aFilter;
+ OUString aDocumentURL;
+ OUString aOutputURL;
+ OUString aFileNamePrefix;
sal_Int32 nDataCommandType;
sal_Int16 nOutputType;
sal_Bool bEscapeProcessing;
@@ -119,23 +119,23 @@ class SwXMailMerge :
sal_Bool bFileNameFromColumn;
- ::rtl::OUString sInServerPassword;
- ::rtl::OUString sOutServerPassword;
- ::rtl::OUString sSubject;
- ::rtl::OUString sAddressFromColumn;
- ::rtl::OUString sMailBody;
- ::rtl::OUString sAttachmentName;
- ::rtl::OUString sAttachmentFilter;
- com::sun::star::uno::Sequence< ::rtl::OUString > aCopiesTo;
- com::sun::star::uno::Sequence< ::rtl::OUString > aBlindCopiesTo;
+ OUString sInServerPassword;
+ OUString sOutServerPassword;
+ OUString sSubject;
+ OUString sAddressFromColumn;
+ OUString sMailBody;
+ OUString sAttachmentName;
+ OUString sAttachmentFilter;
+ com::sun::star::uno::Sequence< OUString > aCopiesTo;
+ com::sun::star::uno::Sequence< OUString > aBlindCopiesTo;
sal_Bool bSendAsHTML;
sal_Bool bSendAsAttachment;
com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintSettings;
sal_Bool bSaveAsSingleFile;
- ::rtl::OUString sSaveFilter;
- ::rtl::OUString sSaveFilterOptions;
+ OUString sSaveFilter;
+ OUString sSaveFilterOptions;
com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData;
@@ -161,12 +161,12 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XMailMergeBroadcaster
virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -178,14 +178,14 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
};
-extern com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
-extern rtl::OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
+extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
+extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception );
////////////////////////////////////////////////////////////
diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx
index e807e22e7805..ef7c511c4370 100644
--- a/sw/source/ui/inc/unomod.hxx
+++ b/sw/source/ui/inc/unomod.hxx
@@ -63,11 +63,11 @@ public:
throw( ::com::sun::star::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
};
@@ -107,11 +107,11 @@ public:
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void)
+ virtual OUString SAL_CALL getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
};
@@ -151,9 +151,9 @@ public:
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
sal_Bool IsValid() const {return bObjectValid;}
void Invalidate() {bObjectValid = sal_False;}
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index d49def24ae13..30c5fb17c4a4 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -120,17 +120,17 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
//XTransferableSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException);
@@ -200,8 +200,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
//XScreenCursor
virtual sal_Bool SAL_CALL screenDown(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -221,23 +221,23 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx
index 216930f0f283..a18cb1ad28dd 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/ui/inc/usrpref.hxx
@@ -33,13 +33,13 @@ class SwContentViewConfig : public utl::ConfigItem
SwMasterUsrPref& rParent;
sal_Bool bWeb;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwContentViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
~SwContentViewConfig();
// utl::ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+ virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames );
virtual void Commit();
void Load();
@@ -51,12 +51,12 @@ class SwLayoutViewConfig : public utl::ConfigItem
SwMasterUsrPref& rParent;
sal_Bool bWeb;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
~SwLayoutViewConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
virtual void Commit();
void Load();
void SetModified(){ConfigItem::SetModified();}
@@ -66,13 +66,13 @@ class SwGridConfig : public utl::ConfigItem
{
SwMasterUsrPref& rParent;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
~SwGridConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -81,13 +81,13 @@ class SwCursorConfig : public utl::ConfigItem
{
SwMasterUsrPref& rParent;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwCursorConfig(SwMasterUsrPref& rParent);
~SwCursorConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -95,14 +95,14 @@ class SwCursorConfig : public utl::ConfigItem
class SwWebColorConfig : public utl::ConfigItem
{
SwMasterUsrPref& rParent;
- com::sun::star::uno::Sequence<rtl::OUString> aPropNames;
+ com::sun::star::uno::Sequence<OUString> aPropNames;
public:
SwWebColorConfig(SwMasterUsrPref& rParent);
~SwWebColorConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
void Load();
void SetModified(){ConfigItem::SetModified();}
};
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 7276016b46bb..89030ce024c9 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -387,9 +387,9 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
void MoveCrsr( sal_Bool bWithSelect = sal_False );
// update input fields
- sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, rtl::OString* pWindowState = 0);
+ sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0);
// update DropDown fields
- sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, rtl::OString* pWindowState = 0);
+ sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, OString* pWindowState = 0);
//"Handler" for changes at DrawView - for controls.
virtual void DrawSelChanged( );
@@ -397,7 +397,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
// jump to bookmark and set the "selctions-flags" correctly again
sal_Bool GotoMark( const ::sw::mark::IMark* const pMark );
sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart );
- sal_Bool GotoMark( const ::rtl::OUString& rName );
+ sal_Bool GotoMark( const OUString& rName );
sal_Bool GoNextBookmark(); // sal_True when there still was one
sal_Bool GoPrevBookmark();
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index a695b02cb2db..33c1d906f2b8 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -62,7 +62,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::ui::dialogs;
-using ::rtl::OUString;
#ifdef SW_PROP_NAME_STR
@@ -74,7 +73,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
const char* pPropName, const String& rValue)
{
- OUString uPropName(rtl::OUString::createFromAscii(pPropName));
+ OUString uPropName(OUString::createFromAscii(pPropName));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -94,7 +93,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
sal_uInt16 nId, sal_Int16 nValue )
{
- OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
+ OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -108,7 +107,7 @@ static void lcl_SetBOOLProp(
uno::Reference< beans::XPropertySet > & xProps,
sal_uInt16 nId, sal_Bool bValue )
{
- OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
+ OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -136,7 +135,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl)
uno::Reference< container::XNameAccess > xSections =
xSectionSupplier->getTextSections();
- rtl::OUString sSectionName("IndexSection_");
+ OUString sSectionName("IndexSection_");
for(int i = 0; i < 7; ++i )
{
String sTmp( sSectionName ); sTmp += OUString::number(i);
@@ -207,7 +206,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
uno::Reference< text::XTextRange > xRg(xCrsr, uno::UNO_QUERY);
xCrsr->getText()->insertTextContent(xRg, xContent, sal_False);
}
- OUString uIsVisible(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE)));
+ OUString uIsVisible(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE)));
for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++)
{
uno::Reference< beans::XPropertySet > xSectPr(pxIndexSectionsArr[i]->xContainerSection, uno::UNO_QUERY);
@@ -233,10 +232,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
//stylenames
sal_uInt16 nContentOptions = rDesc.GetContentOptions();
- if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))))
+ if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))))
{
sal_Bool bOn = 0!=(nContentOptions&nsSwTOXElement::TOX_TEMPLATE );
- uno::Any aStyleNames(xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))));
+ uno::Any aStyleNames(xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))));
uno::Reference< container::XIndexReplace > xAcc;
aStyleNames >>= xAcc;
@@ -309,7 +308,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
nEndLevel = pForm->GetFormMax() - 1;
}
- if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))))
+ if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))))
{
for(sal_uInt16 nCurrLevel = nStartLevel; nCurrLevel <= nEndLevel; nCurrLevel++)
{
@@ -406,7 +405,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
}
aSequPropVals.realloc(nTokenIndex);
- uno::Any aFormatAccess = xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)));
+ uno::Any aFormatAccess = xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)));
OSL_ENSURE(aFormatAccess.getValueType() == ::getCppuType((uno::Reference<container::XIndexReplace>*)0),
"wrong property type");
@@ -439,11 +438,11 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
}
for(sal_uInt16 i = 1; i < nEndLevel; i++)
{
- String sPropName(rtl::OUString("ParaStyleLevel"));
+ String sPropName(OUString("ParaStyleLevel"));
sPropName += OUString::number( i );
lcl_SetProp(xInfo,
xIdxProps,
- rtl::OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(),
pForm->GetTemplate(i + nOffset));
}
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7d516a3f4fde..73089dae4c53 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -82,14 +82,13 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::ui::dialogs;
-using ::rtl::OUString;
using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
static const sal_Unicode aDeliStart = '['; // for the form
static const sal_Unicode aDeliEnd = ']'; // for the form
-#define IDX_FILE_EXTENSION rtl::OUString("*.sdi")
+#define IDX_FILE_EXTENSION OUString("*.sdi")
static String lcl_CreateAutoMarkFileDlg( const String& rURL,
const String& rFileString, bool bOpen )
@@ -298,7 +297,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
}
else
{
- pDescArr[nArrayIndex]->SetAuthBrackets(rtl::OUString("[]"));
+ pDescArr[nArrayIndex]->SetAuthBrackets(OUString("[]"));
}
}
}
@@ -439,14 +438,14 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
if(pFType)
{
- String sBrackets = rtl::OUString(pFType->GetPrefix());
+ String sBrackets = OUString(pFType->GetPrefix());
sBrackets += pFType->GetSuffix();
pDescArr[nIndex]->SetAuthBrackets(sBrackets);
pDescArr[nIndex]->SetAuthSequence(pFType->IsSequence());
}
else
{
- pDescArr[nIndex]->SetAuthBrackets(rtl::OUString("[]"));
+ pDescArr[nIndex]->SetAuthBrackets(OUString("[]"));
}
}
else if(TOX_INDEX == eType.eType)
@@ -491,7 +490,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
if(!pExampleFrame && !bExampleCreated)
{
bExampleCreated = sal_True;
- String sTemplate(rtl::OUString("internal"));
+ String sTemplate(OUString("internal"));
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") );
String sTemplateWithoutExt( sTemplate );
@@ -1963,10 +1962,10 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aSortDocPosRB.Check();
aFillCharCB.SetMaxTextLen(1);
- aFillCharCB.InsertEntry(rtl::OUString(' '));
- aFillCharCB.InsertEntry(rtl::OUString('.'));
- aFillCharCB.InsertEntry(rtl::OUString('-'));
- aFillCharCB.InsertEntry(rtl::OUString('_'));
+ aFillCharCB.InsertEntry(OUString(' '));
+ aFillCharCB.InsertEntry(OUString('.'));
+ aFillCharCB.InsertEntry(OUString('-'));
+ aFillCharCB.InsertEntry(OUString('_'));
aButtonPositions[0] = aEntryNoPB.GetPosPixel();
aButtonPositions[1] = aEntryPB.GetPosPixel();
@@ -2347,7 +2346,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton)
String sToInsert(aAuthFieldsLB.GetSelectEntry());
SwFormToken aInsert(TOKEN_AUTHORITY);
aInsert.nAuthorityField = (sal_uInt16)(sal_uIntPtr)aAuthFieldsLB.GetEntryData(nSelPos);
- aTokenWIN.InsertAtSelection(rtl::OUString::createFromAscii(
+ aTokenWIN.InsertAtSelection(OUString::createFromAscii(
SwForm::aFormAuth), aInsert);
aAuthFieldsLB.RemoveEntry(sToInsert);
aAuthFieldsLB.SelectEntryPos( nSelPos ? nSelPos - 1 : 0);
@@ -2579,7 +2578,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
{
aTabPosMF.SetValue(aTabPosMF.Normalize(pToken->nTabStopPosition), FUNIT_TWIP);
aAutoRightCB.Check(SVX_TAB_ADJUST_END == pToken->eTabAlign);
- aFillCharCB.SetText(rtl::OUString(pToken->cTabFillChar));
+ aFillCharCB.SetText(OUString(pToken->cTabFillChar));
aTabPosFT.Enable(!aAutoRightCB.IsChecked());
aTabPosMF.Enable(!aAutoRightCB.IsChecked());
}
@@ -2903,8 +2902,8 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
default:; //prevent warning
}
- InsertItem( pTmp ? rtl::OUString::createFromAscii(pTmp)
- : rtl::OUString(), aToken );
+ InsertItem( pTmp ? OUString::createFromAscii(pTmp)
+ : OUString(), aToken );
bLastWasText = false;
}
@@ -3327,9 +3326,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
const long nSpace = aCtrlParentWin.GetSizePixel().Width();
#if OSL_DEBUG_LEVEL > 1
//find all start/end positions and print it
- String sMessage(rtl::OUString("Space: "));
+ String sMessage(OUString("Space: "));
sMessage += OUString::number(nSpace);
- sMessage += rtl::OUString(" | ");
+ sMessage += OUString(" | ");
for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
{
@@ -3339,9 +3338,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
long nDebugWidth = pDebugCtrl->GetSizePixel().Width();
sMessage += OUString::number( nDebugXPos );
- sMessage += rtl::OUString(" ");
+ sMessage += OUString(" ");
sMessage += OUString::number(nDebugXPos + nDebugWidth);
- sMessage += rtl::OUString(" | ");
+ sMessage += OUString(" | ");
}
#endif
@@ -4116,7 +4115,7 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
AutoMarkEntry* pEntry = &aEntryArr[i];
if(pEntry->sComment.Len())
{
- String sWrite = rtl::OUString('#');
+ String sWrite = OUString('#');
sWrite += pEntry->sComment;
rOutStr.WriteByteStringLine( sWrite, eTEnc );
}
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index f0069317db12..c5b5abf7a183 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -74,7 +74,6 @@ using namespace com::sun::star;
using namespace com::sun::star::i18n;
using namespace com::sun::star::lang;
using namespace com::sun::star::util;
-using ::rtl::OUString;
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 07ba3d950a98..82b5e9fbb38e 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -38,7 +38,6 @@
#define PSH (&pView->GetWrtShell())
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Description: interactive separation
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 6745622568c1..4cd00b2c73bc 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -94,7 +94,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq );
@@ -203,7 +202,7 @@ void SwSpellPopup::fillLangPopupMenu(
sal_uInt16 nLangItemIdStart,
uno::Sequence< OUString > aSeq,
SwWrtShell* pWrtSh,
- std::map< sal_Int16, ::rtl::OUString > &rLangTable )
+ std::map< sal_Int16, OUString > &rLangTable )
{
if (!pPopupMenu)
return;
@@ -527,7 +526,7 @@ SwSpellPopup::SwSpellPopup(
aKeyboardLang = aLanguageTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLanguageTable.GetString( nLang );
@@ -682,7 +681,7 @@ aInfo16( SW_RES(IMG_INFO_16) )
aKeyboardLang = aLanguageTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLanguageTable.GetString( nLang );
@@ -872,16 +871,16 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
{
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
- xSystemShellExecute->execute( sExplanationLink, rtl::OUString(),
+ xSystemShellExecute->execute( sExplanationLink, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch (const uno::Exception&)
{
uno::Any exc( ::cppu::getCaughtException() );
- rtl::OUString msg( ::comphelper::anyToString( exc ) );
+ OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
- aErrorBox.SetText( rtl::OUString::createFromAscii( "Explanations" ) );
+ aErrorBox.SetText( OUString::createFromAscii( "Explanations" ) );
aErrorBox.Execute();
}
}
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index a76beb2b5fed..3c55f5d45c2f 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -43,7 +43,6 @@
#include <edtwin.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
//////////////////////////////////////////////////////////////////////
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 05ccf296c5bb..90a2d41e3d55 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -31,7 +31,7 @@
#include "IMark.hxx"
#include "globals.hrc"
-const String BookmarkCombo::aForbiddenChars = rtl::OUString("/\\@:*?\";,.#");
+const String BookmarkCombo::aForbiddenChars = OUString("/\\@:*?\";,.#");
IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
{
@@ -227,7 +227,7 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
if( EVENT_KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode() )
{
- rtl::OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
+ OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
if(STRING_NOTFOUND != aForbiddenChars.Search(sKey))
nHandled = 1;
}
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c3ef20f16d40..4ecc12e743db 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -156,11 +156,11 @@ void SwGlossaryGroupDlg::Apply()
for (OUVector_t::const_iterator it(m_RenamedArr.begin());
it != m_RenamedArr.end(); ++it)
{
- ::rtl::OUString const sOld(
+ OUString const sOld(
::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM));
String sNew(
::comphelper::string::getToken(*it, 1, RENAME_TOKEN_DELIM));
- ::rtl::OUString const sTitle(
+ OUString const sTitle(
::comphelper::string::getToken(*it, 2, RENAME_TOKEN_DELIM));
pGlosHdl->RenameGroup(sOld, sNew, sTitle);
if (it == m_RenamedArr.begin())
@@ -239,7 +239,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton )
return 0;
}
GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
- ::rtl::OUString const sEntry(pUserData->sGroupName);
+ OUString const sEntry(pUserData->sGroupName);
// if the name to be deleted is among the new ones - get rid of it
bool bDelete = true;
for (OUVector_t::iterator it(m_InsertedArr.begin());
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 46f214c21692..38be8d4c9476 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -78,7 +78,7 @@ static String lcl_CheckFileName( const String& rNewFilePath,
{
String rSG = SwGlossaries::GetExtension();
//generate generic name
- utl::TempFile aTemp(rtl::OUString("group"),
+ utl::TempFile aTemp(OUString("group"),
&rSG, &rNewFilePath );
aTemp.EnableKillingFile();
@@ -93,7 +93,7 @@ static String lcl_CheckFileName( const String& rNewFilePath,
------------------------------------------------------------------------*/
String SwGlossaries::GetDefName()
{
- return rtl::OUString("standard");
+ return OUString("standard");
}
@@ -475,7 +475,7 @@ void SwGlossaries::ShowError()
String SwGlossaries::GetExtension()
{
- return rtl::OUString(".bau");
+ return OUString(".bau");
}
void SwGlossaries::RemoveFileFromList( const String& rGroup )
@@ -487,7 +487,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
{
if (*it == rGroup)
{
- rtl::OUString aUName = rGroup;
+ OUString aUName = rGroup;
{
// tell the UNO AutoTextGroup object that it's not valid anymore
for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin();
@@ -537,7 +537,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
}
}
-String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName )
+String SwGlossaries::GetCompleteGroupName( const OUString& GroupName )
{
sal_uInt16 nCount = GetGroupCnt();
// when the group name was created internally the path is here as well
@@ -590,7 +590,7 @@ void SwGlossaries::InvalidateUNOOjects()
m_aGlossaryEntries.swap( aTmpe );
}
-Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::OUString& _rGroupName, bool _bCreate )
+Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName, bool _bCreate )
{
// first, find the name with path-extension
String sCompleteGroupName = GetCompleteGroupName( _rGroupName );
@@ -644,7 +644,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O
return xGroup;
}
-Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const ::rtl::OUString& _rGroupName, const ::rtl::OUString& _rEntryName,
+Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const OUString& _rGroupName, const OUString& _rEntryName,
bool _bCreate )
{
//standard must be created
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 02fe69133241..b55516c8c069 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -78,7 +78,6 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::comphelper;
using namespace ::ucbhelper;
-using ::rtl::OUString;
using namespace ::sfx2;
static String lcl_GetValidShortCut( const String& rName )
@@ -92,7 +91,7 @@ static String lcl_GetValidShortCut( const String& rName )
while( rName.GetChar( nStart-1 ) == ' ' && nStart < nSz )
nStart++;
- String aBuf = rtl::OUString(rName.GetChar(nStart-1));
+ String aBuf = OUString(rName.GetChar(nStart-1));
for( ; nStart < nSz; ++nStart )
{
@@ -568,7 +567,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
xFP->setDisplayDirectory(aPathOpt.GetWorkPath() );
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
- SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()) );
+ SfxFilterMatcher aMatcher( OUString::createFromAscii(SwDocShell::Factory().GetShortName()) );
SfxFilterMatcherIter aIter( aMatcher );
const SfxFilter* pFilter = aIter.First();
while ( pFilter )
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 4a7b87e6d4b5..5aa6859f807a 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -55,17 +55,17 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
get(m_pNumberingOnCB, "shownumbering");
String sIntervalName = m_pDivIntervalFT->GetAccessibleName();
- sIntervalName += rtl::OUString("(");
+ sIntervalName += OUString("(");
sIntervalName += m_pDivRowsFT->GetAccessibleName();
- sIntervalName += rtl::OUString(")");
+ sIntervalName += OUString(")");
m_pDivIntervalNF->SetAccessibleName(sIntervalName);
Window *pNumIntervalFT = get<Window>("interval");
Window *pNumRowsFT = get<Window>("intervallines");
sIntervalName = pNumIntervalFT->GetAccessibleName();
- sIntervalName += rtl::OUString("(");
+ sIntervalName += OUString("(");
sIntervalName += pNumRowsFT->GetAccessibleName();
- sIntervalName += rtl::OUString(")");
+ sIntervalName += OUString(")");
m_pNumIntervalNF->SetAccessibleName(sIntervalName);
// char styles
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 7b0aa290f323..02335fd19f53 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -151,7 +151,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
// insert levels
for(sal_uInt16 i = 1; i <= MAXLEVEL; i++)
m_pLevelLB->InsertEntry(OUString::number(i));
- String sEntry(rtl::OUString("1 - "));
+ String sEntry(OUString("1 - "));
sEntry += OUString::number(MAXLEVEL);
m_pLevelLB->InsertEntry(sEntry);
m_pLevelLB->SelectEntry(sEntry);
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 8c2618bc4654..7b837f5a2fea 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star;
-using ::rtl::OUString;
struct SwNumberingTypeListBox_Impl
{
@@ -59,7 +58,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) :
pImpl->xInfo = uno::Reference<text::XNumberingTypeInfo>(xDefNum, uno::UNO_QUERY);
}
-bool SwNumberingTypeListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue)
{
if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type")))
Reload(rValue.toInt32());
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f460f79d6923..073b7acd7942 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -874,7 +874,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
aFont.SetSize(rSize);
aFont.SetTransparent(sal_True);
pVDev->SetFont( aFont );
- rtl::OUString aText(rFmt.GetBulletChar());
+ OUString aText(rFmt.GetBulletChar());
pVDev->DrawText( Point(nXStart, nYStart), aText );
sal_uInt16 nRet = (sal_uInt16)pVDev->GetTextWidth(aText);
@@ -1033,7 +1033,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
pVDev->SetFont(aStdFont);
- rtl::OUString aText(' ');
+ OUString aText(' ');
pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText);
}
@@ -1140,7 +1140,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
Point(nXStart + nTextOffset, nYStart),
(pOutlineNames == 0
? utl::ConfigManager::getProductName()
- : rtl::OUString(pOutlineNames[nLevel])));
+ : OUString(pOutlineNames[nLevel])));
}
}
}
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 4480b58d925c..695205758b2b 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -368,9 +368,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue )
{
- String aFieldStr = rtl::OUString("( 1 -");
- aFieldStr += rtl::OUString::valueOf(nValue);
- aFieldStr += rtl::OUString(" )");
+ String aFieldStr = OUString("( 1 -");
+ aFieldStr += OUString::valueOf(nValue);
+ aFieldStr += OUString(" )");
rField.SetText( aFieldStr );
}
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 06b13574a0f4..a961620e71ef 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -1058,7 +1058,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
const_cast<SwRedline&>(rRedline).Broadcast(SwRedlineHint(&rRedline,SWREDLINE_FOCUS));
*/
- rtl::OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc();
@@ -1154,7 +1154,7 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData)
{
if (rExtraData.Len())
{
- sal_uInt16 nPos = rExtraData.Search(rtl::OUString("AcceptChgDat:"));
+ sal_uInt16 nPos = rExtraData.Search(OUString("AcceptChgDat:"));
// try to read the alignment string "ALIGN:(...)"; if none existing,
// it's an old version
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 7855c879e11c..aba0a8e62d3a 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -65,7 +65,6 @@ static sal_Unicode cDeli = '\t';
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-using ::rtl::OUString;
static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
{
@@ -223,7 +222,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
m_pDelimTabRB->Check(cDeli == '\t');
if(!m_pDelimTabRB->IsChecked())
{
- m_pDelimEdt->SetText(rtl::OUString(cDeli));
+ m_pDelimEdt->SetText(OUString(cDeli));
m_pDelimFreeRB->Check(sal_True);
DelimHdl(m_pDelimFreeRB);
}
@@ -380,7 +379,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl)
{
SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False );
if ( pItem )
- m_pDelimEdt->SetText( rtl::OUString(pItem->GetValue()) );
+ m_pDelimEdt->SetText( OUString(pItem->GetValue()) );
}
delete pMap;
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx
index c125fd63cb30..20e75b067364 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -56,15 +56,15 @@ ConstCustomShape::ConstCustomShape( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
aCustomShape = ConstCustomShape::GetShapeTypeFromRequest( rReq );
}
-rtl::OUString ConstCustomShape::GetShapeType() const
+OUString ConstCustomShape::GetShapeType() const
{
return aCustomShape;
}
//static
-rtl::OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq )
+OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq )
{
- rtl::OUString aRet;
+ OUString aRet;
const SfxItemSet* pArgs = rReq.GetArgs();
if ( pArgs )
{
@@ -142,7 +142,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj )
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
- std::vector< rtl::OUString > aObjList;
+ std::vector< OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
{
sal_uInt16 i;
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 96000789843c..af4b5cf972b9 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -223,7 +223,7 @@ void SwInputWindow::ShowWin()
// Formel soll immer mit einem "=" beginnen, hier
// also setzen
- String sEdit = rtl::OUString('=');
+ String sEdit = OUString('=');
if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
{
sEdit += pMgr->GetCurFldPar2();
@@ -327,7 +327,7 @@ static const char * const aStrArr[] = {
sal_uInt16 nId = pMenu->GetCurItemId();
if ( nId <= MN_CALC_ROUND )
{
- String aTmp( rtl::OUString::createFromAscii(aStrArr[nId - 1]) );
+ String aTmp( OUString::createFromAscii(aStrArr[nId - 1]) );
aTmp += ' ';
aEdit.ReplaceSelected( aTmp );
}
@@ -467,7 +467,7 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
void SwInputWindow::SetFormula( const String& rFormula, sal_Bool bDelFlag )
{
- String sEdit = rtl::OUString('=');
+ String sEdit = OUString('=');
if( rFormula.Len() )
{
if( '=' == rFormula.GetChar( 0 ) )
@@ -558,7 +558,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
const sal_uInt16 nLen = aActText.Len();
if( !nLen )
{
- String aStr = rtl::OUStringBuffer().
+ String aStr = OUStringBuffer().
append(cOpen).append(aBoxes).append(cClose).
makeStringAndClear();
SetText(aStr);
@@ -610,7 +610,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
}
else
{
- rtl::OUString aTmp = rtl::OUStringBuffer().
+ OUString aTmp = OUStringBuffer().
append(cOpen).append(aBoxes).append(cClose).
makeStringAndClear();
nPos = (sal_uInt16)aSelection.Min();
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index cb8fbe4996e3..39db4ccc7362 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -51,7 +51,6 @@
#error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ??
#endif
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -77,8 +76,8 @@ SwTbxInsertCtrl::~SwTbxInsertCtrl()
void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
{
ToolBox& rTbx = GetToolBox();
- rtl::OUString aSlotURL( "slot:" );
- aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId ));
+ OUString aSlotURL( "slot:" );
+ aSlotURL += OUString::valueOf( sal_Int32( nLastSlotId ));
Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
rTbx.SetItemImage(GetId(), aImage);
@@ -103,8 +102,8 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/,
if( nLastSlotId )
nId = nLastSlotId;
- rtl::OUString aSlotURL( "slot:" );
- aSlotURL += rtl::OUString::valueOf( sal_Int32( nId ));
+ OUString aSlotURL( "slot:" );
+ aSlotURL += OUString::valueOf( sal_Int32( nId ));
ToolBox& rBox = GetToolBox();
Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
rBox.SetItemImage(GetId(), aImage);
@@ -296,7 +295,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
default:
pChar = ".uno:InsertFieldCtrl";
}
- Dispatch( rtl::OUString::createFromAscii( pChar ),aArgs );
+ Dispatch( OUString::createFromAscii( pChar ),aArgs );
}
else
{
@@ -500,11 +499,11 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
SfxBoolItem aNext(FN_SCROLL_NEXT_PREV, NID_NEXT == nSet);
Any a;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( "ScrollNextPrev" );
+ aArgs[0].Name = OUString( "ScrollNextPrev" );
aNext.QueryValue( a );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ),
- rtl::OUString( ".uno:ScrollNextPrev" ),
+ OUString( ".uno:ScrollNextPrev" ),
aArgs );
}
return 0;
@@ -681,12 +680,12 @@ void SwZoomBox_Impl::Select()
{
Any a;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( "PreviewZoom" );
+ aArgs[0].Name = OUString( "PreviewZoom" );
aItem.QueryValue( a );
aArgs[0].Value = a;
SfxToolBoxControl::Dispatch(
m_xDispatchProvider,
- rtl::OUString( ".uno:PreviewZoom" ),
+ OUString( ".uno:PreviewZoom" ),
aArgs );
}
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index c425a66e4d78..8dd405e82ab0 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -340,7 +340,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- pOLV->InsertText( rtl::OUString(cIns));
+ pOLV->InsertText( OUString(cIns));
rReq.Done();
break;
}
@@ -1128,7 +1128,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
+ OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -1138,7 +1138,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString("ParentWindow");
+ aParam.Name = OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -1454,7 +1454,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
{
if( pUndoManager )
{
- rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index c36def954fff..2f200e0568b9 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -848,7 +848,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if( SfxRequest::HasMacroRecorder(pViewFrame) )
{
SfxRequest aReq( pViewFrame, nSlot);
- aReq.AppendItem( SfxStringItem( FN_PARAM_1, rtl::OUString(cDelim) ));
+ aReq.AppendItem( SfxStringItem( FN_PARAM_1, OUString(cDelim) ));
if(bToTable)
{
if(pTAFmt)
@@ -1921,7 +1921,7 @@ SwBaseShell::SwBaseShell(SwView& rVw) :
SwWrtShell& rWrtSh = rView.GetWrtShell();
SetPool(&rWrtSh.GetAttrPool());
- SetName(rtl::OUString("Base"));
+ SetName(OUString("Base"));
rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl));
}
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index d2a17b268524..a5948bd1fec4 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -53,7 +53,7 @@ TYPEINIT1(SwBezierShell,SwBaseShell)
SwBezierShell::SwBezierShell(SwView &_rView):
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Bezier"));
+ SetName(OUString("Bezier"));
SetHelpId(SW_BEZIERSHELL);
SwWrtShell *pSh = &GetShell();
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index a47eba8ab026..eb402f7a5e95 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -352,7 +352,7 @@ SwDrawShell::SwDrawShell(SwView &_rView) :
SwDrawBaseShell(_rView)
{
SetHelpId(SW_DRAWSHELL);
- SetName(rtl::OUString("Draw"));
+ SetName(OUString("Draw"));
}
/*************************************************************************
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index b92a3d74246e..f2c6a79195a1 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -56,7 +56,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM))
{
@@ -122,7 +121,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
{
uno::Any aTmp;
// Ja!
- ::rtl::OUString sLabel("Label");
+ OUString sLabel("Label");
if( xPropInfoSet->hasPropertyByName(sLabel) )
{
aTmp <<= OUString(rHLinkItem.GetName());
@@ -252,7 +251,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) :
{
SetHelpId(SW_DRAWFORMSHELL);
GetShell().NoEdit(true);
- SetName(rtl::OUString("DrawForm"));
+ SetName(OUString("DrawForm"));
}
SwDrawFormShell::~SwDrawFormShell()
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index d0d6f12e5123..5601cc940b5f 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -129,7 +129,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
Init();
rSh.NoEdit(true);
- SetName(rtl::OUString("ObjectText"));
+ SetName(OUString("ObjectText"));
SetHelpId(SW_DRWTXTSHELL);
}
@@ -328,7 +328,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
+ OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -338,7 +338,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString("ParentWindow");
+ aParam.Name = OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -419,7 +419,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- pOLV->InsertText( rtl::OUString(cIns));
+ pOLV->InsertText( OUString(cIns));
rReq.Done();
}
break;
@@ -576,7 +576,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet)
::svl::IUndoManager* pUndoManager = GetUndoManager();
if( pUndoManager )
{
- rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
+ OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWhich )
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index f8725d6caec8..ece47193fb01 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -869,7 +869,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
SwFrameShell::SwFrameShell(SwView &_rView) :
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Frame"));
+ SetName(OUString("Frame"));
SetHelpId(SW_FRAMESHELL);
/* #96392# Use this to announce it is the frame shell who creates the
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index f29eb7486221..555cad4a2d51 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -737,7 +737,7 @@ SwGrfShell::SwGrfShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Graphic"));
+ SetName(OUString("Graphic"));
SetHelpId(SW_GRFSHELL);
}
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index 428c91bee035..d00ec0e89a2c 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -58,11 +58,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
-using ::rtl::OUString;
bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
{
- ::rtl::OUString aURL;
+ OUString aURL;
const SfxItemSet* pReqArgs = rReq.GetArgs();
Window* pWindow = &GetView().GetViewFrame()->GetWindow();
bool bAPI = false, bRet = false;
@@ -123,7 +122,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
else
aSize = Size( 2835, 2835 );
- ::rtl::OUString realURL;
+ OUString realURL;
if (bLink)
{
realURL = aURL;
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index 01c14facd349..b8d503caad29 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -82,14 +82,14 @@ namespace SwLangHelper
aKeyboardLang = aLangTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
SfxItemSet aSet(pOLV->GetAttribs());
nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLangTable.GetString( nLang );
// build sequence for status value
- uno::Sequence< ::rtl::OUString > aSeq( 4 );
+ uno::Sequence< OUString > aSeq( 4 );
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
@@ -138,11 +138,11 @@ namespace SwLangHelper
// setting the new language...
if (aNewLangTxt.Len() > 0)
{
- const rtl::OUString aSelectionLangPrefix("Current_");
- const rtl::OUString aParagraphLangPrefix("Paragraph_");
- const rtl::OUString aDocumentLangPrefix("Default_");
- const String aStrNone( rtl::OUString("LANGUAGE_NONE") );
- const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") );
+ const OUString aSelectionLangPrefix("Current_");
+ const OUString aParagraphLangPrefix("Paragraph_");
+ const OUString aDocumentLangPrefix("Default_");
+ const String aStrNone( OUString("LANGUAGE_NONE") );
+ const String aStrResetLangs( OUString("RESET_LANGUAGES") );
xub_StrLen nPos = 0;
bool bForSelection = true;
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index e1d970bd0271..30c2644d8a93 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -269,7 +269,7 @@ void SwListShell::GetState(SfxItemSet &rSet)
SwListShell::SwListShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("List"));
+ SetName(OUString("List"));
SetHelpId(SW_LISTSHELL);
}
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 85cd1e535f53..5de6dfee7030 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -190,7 +190,7 @@ SwMediaShell::SwMediaShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Media Playback"));
+ SetName(OUString("Media Playback"));
SetHelpId(SW_MEDIASHELL);
}
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index 3cff898e025e..d6dcfc6dbdc0 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -66,7 +66,7 @@ SwNavigationShell::SwNavigationShell(SwView &_rView):
SwBaseShell( _rView )
{
- SetName(rtl::OUString("Navigation"));
+ SetName(OUString("Navigation"));
SetHelpId(SW_NAVIGATIONSHELL);
}
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx
index 8b06595c6ec5..b155637d92f5 100644
--- a/sw/source/ui/shells/olesh.cxx
+++ b/sw/source/ui/shells/olesh.cxx
@@ -49,7 +49,7 @@ SwOleShell::SwOleShell(SwView &_rView) :
SwFrameShell(_rView)
{
- SetName(rtl::OUString("Object"));
+ SetName(OUString("Object"));
SetHelpId(SW_OLESHELL);
}
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 5d3360752c1d..43c57935c176 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -1345,7 +1345,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
SwTableShell::SwTableShell(SwView &_rView) :
SwBaseShell(_rView)
{
- SetName(rtl::OUString("Table"));
+ SetName(OUString("Table"));
SetHelpId(SW_TABSHELL);
}
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx
index 231765b699b9..7438965838ec 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/ui/shells/textdrw.cxx
@@ -40,7 +40,6 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, const String& rTxt)
{
@@ -109,7 +108,7 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con
{
// #105638# OJ
aTmp <<= sal_True;
- xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aTmp );
+ xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aTmp );
}
}
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 81dc574f5be7..b0997d745bbe 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -402,7 +402,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
if (pRedline)
{
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
sal_Bool bTravel = sal_False;
@@ -492,7 +492,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
case FN_JAVAEDIT:
{
- rtl::OUString aType, aText;
+ OUString aType, aText;
sal_Bool bIsUrl=sal_False;
sal_Bool bNew=sal_False;
bool bUpdate = false;
@@ -801,7 +801,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
pSh->SwapPam();
pRedline = pSh->GetCurrRedline();
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment);
pDlg->ShowLastAuthor( pRedline->GetAuthorString(),
@@ -848,7 +848,7 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
pDlg->EnableTravel(sal_True, bEnable);
pRedline = pSh->GetCurrRedline();
- rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
pDlg->SetNote(sComment);
pDlg->ShowLastAuthor(pRedline->GetAuthorString(),
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index b106ceb1fdea..e41a40b04275 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -102,7 +102,6 @@
#include <comcore.hrc>
using namespace ::com::sun::star;
-using ::rtl::OUString;
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
@@ -148,7 +147,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case FN_INSERT_SOFT_HYPHEN:
if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, 0 ) &&
CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, -1 ))
- rSh.Insert( rtl::OUString( CHAR_SOFTHYPHEN ) );
+ rSh.Insert( OUString( CHAR_SOFTHYPHEN ) );
break;
case FN_INSERT_HARDHYPHEN:
@@ -165,7 +164,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
ChgToEnEmDash | SetINetAttr | Autocorrect ))
rSh.AutoCorrect( *pACorr, cIns );
else
- rSh.Insert( rtl::OUString( cIns ) );
+ rSh.Insert( OUString( cIns ) );
}
break;
case SID_INSERT_RLM :
@@ -181,7 +180,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break;
case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break;
}
- rSh.Insert( rtl::OUString( cIns ) );
+ rSh.Insert( OUString( cIns ) );
}
break;
case FN_INSERT_BREAK:
@@ -226,7 +225,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( pURL->SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
{
- ::rtl::OUString aName;
+ OUString aName;
comphelper::EmbeddedObjectContainer aCnt;
svt::EmbeddedObjectRef xObj( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT );
if ( xObj.is() )
@@ -237,8 +236,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
- uno::makeAny( ::rtl::OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) );
+ xSet->setPropertyValue( OUString("PluginURL"),
+ uno::makeAny( OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
@@ -278,7 +277,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
{
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString sName;
+ OUString sName;
xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), sName ),
embed::Aspects::MSOLE_CONTENT );
svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() );
@@ -288,9 +287,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
try
{
if ( sClassLocation.Len() )
- xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
+ xSet->setPropertyValue( OUString("PluginURL"),
uno::makeAny(
- ::rtl::OUString(
+ OUString(
URIHelper::SmartRel2Abs(
INetURLObject(), sClassLocation,
URIHelper::GetMaybeFileHdl()) ) ) );
@@ -298,7 +297,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( aCommandList.size() )
{
aCommandList.FillSequence( aSeq );
- xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aSeq ) );
+ xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aSeq ) );
}
}
catch (const uno::Exception&)
@@ -330,7 +329,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if(pURLItem) // URL is a _must_
{
comphelper::EmbeddedObjectContainer aCnt;
- ::rtl::OUString aName;
+ OUString aName;
xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aName ),
embed::Aspects::MSOLE_CONTENT );
svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() );
@@ -348,27 +347,27 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
aMargin = pMarginItem->GetSize();
if ( pURLItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( pURLItem->GetValue() ) ) );
+ xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( pURLItem->GetValue() ) ) );
if ( pNameItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( ::rtl::OUString( pNameItem->GetValue() ) ) );
+ xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( OUString( pNameItem->GetValue() ) ) );
if ( eScroll == ScrollingAuto )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"),
+ xSet->setPropertyValue( OUString("FrameIsAutoScroll"),
uno::makeAny( sal_True ) );
else
- xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"),
+ xSet->setPropertyValue( OUString("FrameIsScrollingMode"),
uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
if ( pBorderItem )
- xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"),
+ xSet->setPropertyValue( OUString("FrameIsBorder"),
uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) );
if ( pMarginItem )
{
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"),
+ xSet->setPropertyValue( OUString("FrameMarginWidth"),
uno::makeAny( sal_Int32( aMargin.Width() ) ) );
- xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"),
+ xSet->setPropertyValue( OUString("FrameMarginHeight"),
uno::makeAny( sal_Int32( aMargin.Height() ) ) );
}
}
@@ -912,7 +911,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq )
SwTextShell::SwTextShell(SwView &_rView) :
SwBaseShell(_rView), pPostItFldMgr( 0 )
{
- SetName(rtl::OUString("Text"));
+ SetName(OUString("Text"));
SetHelpId(SW_TEXTSHELL);
}
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index e5afbb385a13..f0c07c7476cf 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -318,11 +318,11 @@ void SwTextShell::Execute(SfxRequest &rReq)
// setting the new language...
if (aNewLangTxt.Len() > 0)
{
- const rtl::OUString aSelectionLangPrefix("Current_");
- const rtl::OUString aParagraphLangPrefix("Paragraph_");
- const rtl::OUString aDocumentLangPrefix("Default_");
- const String aStrNone( rtl::OUString("LANGUAGE_NONE") );
- const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") );
+ const OUString aSelectionLangPrefix("Current_");
+ const OUString aParagraphLangPrefix("Paragraph_");
+ const OUString aDocumentLangPrefix("Default_");
+ const String aStrNone( OUString("LANGUAGE_NONE") );
+ const String aStrResetLangs( OUString("RESET_LANGUAGES") );
SfxItemSet aCoreSet( GetPool(),
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
@@ -564,7 +564,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
if ( pItem )
{
- ::rtl::OUString sName = ((SfxStringItem*)pItem)->GetValue();
+ OUString sName = ((SfxStringItem*)pItem)->GetValue();
rWrtSh.SetBookmark( KeyCode(), sName, aEmptyStr );
}
else
@@ -1321,13 +1321,13 @@ void SwTextShell::GetState( SfxItemSet &rSet )
aKeyboardLang = aLangTable.GetString( nLang );
// get the language that is in use
- String aCurrentLang = rtl::OUString("*");
+ String aCurrentLang = OUString("*");
nLang = SwLangHelper::GetCurrentLanguage( rSh );
if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLangTable.GetString( nLang );
// build sequence for status value
- uno::Sequence< ::rtl::OUString > aSeq( 4 );
+ uno::Sequence< OUString > aSeq( 4 );
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
@@ -1573,7 +1573,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case SID_OPEN_SMARTTAGMENU:
{
- uno::Sequence< rtl::OUString > aSmartTagTypes;
+ uno::Sequence< OUString > aSmartTagTypes;
uno::Sequence< uno::Reference< container::XStringKeyMap > > aStringKeyMaps;
uno::Reference<text::XTextRange> xRange;
@@ -1591,8 +1591,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
uno::Reference <frame::XController> xController = GetView().GetController();
const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetAppLanguageTag() ) );
- const rtl::OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
- const rtl::OUString aRangeText = xRange->getString();
+ const OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
+ const OUString aRangeText = xRange->getString();
const SvxSmartTagItem aItem( nWhich,
aActionComponentsSequence,
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 46868899508a..8adea0bb43d3 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -87,7 +87,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
SwNewDBMgr* pNewDBMgr = GetShell().GetNewDBMgr();
sal_uInt16 nSlot = rReq.GetSlot();
- ::rtl::OUString sSourceArg, sCommandArg;
+ OUString sSourceArg, sCommandArg;
sal_Int32 nCommandTypeArg = 0;
const SfxPoolItem* pSourceItem = 0;
@@ -194,7 +194,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
pArgs->GetItemState(FN_DB_COLUMN_ANY, sal_False, &pColumnItem);
pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, sal_False, &pColumnNameItem);
- ::rtl::OUString sColumnName;
+ OUString sColumnName;
if(pColumnNameItem)
((SfxUsrAnyItem*)pColumnNameItem)->GetValue() >>= sColumnName;
String sDBName = sSourceArg;
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx
index cc03f718d448..b77f7b660eca 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
- Sequence< rtl::OUString >& rSmartTagTypes,
+ Sequence< OUString >& rSmartTagTypes,
Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps,
Reference< text::XTextRange > xTextRange ) :
PopupMenu( SW_RES(MN_SMARTTAG_POPUP) ),
@@ -49,10 +49,10 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
sal_uInt16 nMenuId = 1;
sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
- const rtl::OUString aRangeText = mxTextRange->getString();
+ const OUString aRangeText = mxTextRange->getString();
SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get();
- const rtl::OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
+ const OUString aApplicationName( rSmartTagMgr.GetApplicationName() );
Sequence < Sequence< Reference< smarttags::XSmartTagAction > > > aActionComponentsSequence;
Sequence < Sequence< sal_Int32 > > aActionIndicesSequence;
@@ -81,8 +81,8 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
continue;
const sal_Int32 nSmartTagIndex = rActionIndices[0];
- const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
- const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, aLocale );
+ const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
+ const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, aLocale );
// no sub-menus if there's only one smart tag type listed:
PopupMenu* pSbMenu = this;
@@ -94,7 +94,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
}
// sub-menu starts with smart tag caption and separator
- const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText;
+ const OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText;
nSubMenuPos = 0;
pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++);
pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
@@ -107,12 +107,12 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k )
{
const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController );
- rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID,
+ OUString aActionCaption = xAction->getActionCaptionFromID( nActionID,
aApplicationName,
aLocale,
xSmartTagProperties,
aRangeText,
- rtl::OUString(),
+ OUString(),
xController,
mxTextRange );
@@ -159,7 +159,7 @@ sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, Window* pWin )
mxTextRange,
maInvokeActions[ nId ].mxSmartTagProperties,
mxTextRange->getString(),
- rtl::OUString(),
+ OUString(),
SW_BREAKITER()->GetLocale( GetAppLanguageTag() ) );
}
}
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index 81b553853e3d..933a1d85d124 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -60,7 +60,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
@@ -183,7 +182,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
{
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- ::rtl::OUString("com.sun.star.comp.chart2.WizardDialog")
+ OUString("com.sun.star.comp.chart2.WizardDialog")
, xContext), uno::UNO_QUERY);
uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
if( xInit.is() )
@@ -193,10 +192,10 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
- aParam1.Name = ::rtl::OUString("ParentWindow");
+ aParam1.Name = OUString("ParentWindow");
aParam1.Value <<= uno::makeAny(xDialogParentWindow);
beans::PropertyValue aParam2;
- aParam2.Name = ::rtl::OUString("ChartModel");
+ aParam2.Name = OUString("ChartModel");
aParam2.Value <<= uno::makeAny(xChartModel);
pArray[0] <<= uno::makeAny(aParam1);
pArray[1] <<= uno::makeAny(aParam2);
@@ -210,7 +209,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
{
//get dialog size:
awt::Size aDialogAWTSize;
- if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") )
+ if( xDialogProps->getPropertyValue( OUString("Size") )
>>= aDialogAWTSize )
{
Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height );
@@ -222,7 +221,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
aSwRect = pFlyFrmFmt->GetAnchoredObj()->GetObjRectWithSpaces();
Rectangle aRect( aSwRect.SVRect() );
Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect );
- xDialogProps->setPropertyValue( ::rtl::OUString("Position"),
+ xDialogProps->setPropertyValue( OUString("Position"),
uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
}
}
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index d2ea4ca991dd..b05a588ab92e 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -132,7 +132,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
case 3:
mpOtherBtn->Check();
if(uOther)
- mpOtherEd->SetText(rtl::OUString(uOther));
+ mpOtherEd->SetText(OUString(uOther));
break;
}
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index bdc45f99268a..bda054f21a85 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -863,7 +863,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
}
for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ )
{
- String sEntry = rtl::OUString('~');
+ String sEntry = OUString('~');
String sIndex = OUString::number( aValueTbl[i] + 1 );
sEntry += sIndex;
m_pTextArr[i]->SetText( sEntry );
diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx
index bde1c3b4dcd5..9bfe0a932464 100644
--- a/sw/source/ui/table/tablemgr.cxx
+++ b/sw/source/ui/table/tablemgr.cxx
@@ -200,7 +200,7 @@ void SwTableFUNC::UpdateChart()
uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
uno::Reference< chart2::data::XDataProvider > &rxDataProvider,
sal_Bool bFillWithData,
- const rtl::OUString &rCellRange,
+ const OUString &rCellRange,
SwFlyFrmFmt** ppFlyFrmFmt )
{
uno::Reference< frame::XModel > xChartModel;
@@ -223,7 +223,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
}
// insert chart
- ::rtl::OUString aObjName;
+ OUString aObjName;
comphelper::EmbeddedObjectContainer aCnt;
uno::Reference < embed::XEmbeddedObject > xObj =
aCnt.CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aObjName );
@@ -303,16 +303,16 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
uno::Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString("CellRangeRepresentation"), -1,
+ OUString("CellRangeRepresentation"), -1,
uno::makeAny( rCellRange ), beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString("HasCategories"), -1,
+ OUString("HasCategories"), -1,
uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString("FirstCellAsLabel"), -1,
+ OUString("FirstCellAsLabel"), -1,
uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- ::rtl::OUString("DataRowSource"), -1,
+ OUString("DataRowSource"), -1,
uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
xDataReceiver->setArguments( aArgs );
}
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 6506dfdaac25..de217bc56a49 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1175,7 +1175,7 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
mbResetFormDesignMode( false ),
mbFormDesignModeToReset( false )
{
- SetName(rtl::OUString("PageView" ));
+ SetName(OUString("PageView" ));
SetWindow( &aViewWin );
SetHelpId(SW_PAGEPREVIEW);
_CreateScrollbar( sal_True );
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 9a345c6458a0..1405cd46d190 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -94,7 +94,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
-using ::rtl::OUString;
using ::com::sun::star::util::SearchOptions;
@@ -162,7 +161,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1
{
aFont.SetWeight( WEIGHT_NORMAL );
rOutDev.SetFont( aFont );
- String aPageStr( rtl::OUString(" [") );
+ String aPageStr( OUString(" [") );
aPageStr += String( SW_RES( STR_PAGE ) );
aPageStr += ' ';
aPageStr += OUString::number( nCurPage );
@@ -204,7 +203,7 @@ static void lcl_ConvertTabsToSpaces( String& rLine )
if ( rLine.GetChar(nPos) == '\t' )
{
// Nicht 4 Blanks, sondern an 4er TabPos:
- rtl::OUStringBuffer aBlanker;
+ OUStringBuffer aBlanker;
comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' ');
rLine.Erase( nPos, 1 );
rLine.Insert(aBlanker.makeStringAndClear(), nPos);
@@ -236,7 +235,7 @@ SwSrcView::~SwSrcView()
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps
= xDPS->getDocumentProperties();
- ::rtl::OUString url = xDocProps->getAutoloadURL();
+ OUString url = xDocProps->getAutoloadURL();
sal_Int32 delay = xDocProps->getAutoloadSecs();
pDocShell->SetAutoLoad(INetURLObject(url), delay,
(delay != 0) || !url.isEmpty());
@@ -254,7 +253,7 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed)
void SwSrcView::Init()
{
SetHelpId(SW_SRC_VIEWSHELL);
- SetName(rtl::OUString("Source"));
+ SetName(OUString("Source"));
SetWindow( &aEditWin );
SwDocShell* pDocShell = GetDocShell();
// wird das Doc noch geladen, dann muss die DocShell das Load
@@ -304,7 +303,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
// search for an html filter for export
SfxFilterContainer* pFilterCont = GetObjectShell()->GetFactory().GetFilterContainer();
const SfxFilter* pFilter =
- pFilterCont->GetFilter4Extension( rtl::OUString("html"), SFX_FILTER_EXPORT );
+ pFilterCont->GetFilter4Extension( OUString("html"), SFX_FILTER_EXPORT );
if ( pFilter )
{
// filter found -> use its uiname and wildcard
@@ -316,8 +315,8 @@ void SwSrcView::Execute(SfxRequest& rReq)
else
{
// filter not found
- rtl::OUString sHtml("HTML");
- xFltMgr->appendFilter( sHtml, rtl::OUString("*.html;*.htm") );
+ OUString sHtml("HTML");
+ xFltMgr->appendFilter( sHtml, OUString("*.html;*.htm") );
xFltMgr->setCurrentFilter( sHtml ) ;
}
@@ -446,7 +445,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
String aPos( SW_RES(STR_SRCVIEW_ROW) );
TextSelection aSel = pTextView->GetSelection();
aPos += OUString::number( aSel.GetEnd().GetPara()+1 );
- aPos += rtl::OUString(" : ");
+ aPos += OUString(" : ");
aPos += String(SW_RES(STR_SRCVIEW_COL));
aPos += OUString::number( aSel.GetEnd().GetIndex()+1 );
SfxStringItem aItem( nWhich, aPos );
@@ -704,7 +703,7 @@ sal_Int32 SwSrcView::PrintSource(
// nLinepPage stimmt nicht, wenn Zeilen umgebrochen werden muessen...
sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight);
- sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(rtl::OUString('X')));
+ sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(OUString('X')));
sal_uInt16 nParas = static_cast< sal_uInt16 >( pTextEngine->GetParagraphCount() );
sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 );
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 13a577824dfb..2b8d883513b2 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -112,8 +112,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::scanner;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
extern bool bNoInterrupt; // in mainwn.cxx
@@ -765,7 +763,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
_CreateScrollbar( sal_False );
m_pViewImpl = new SwView_Impl(this);
- SetName(rtl::OUString("View"));
+ SetName(OUString("View"));
SetWindow( m_pEditWin );
m_aTimer.SetTimeout( 120 );
@@ -1499,7 +1497,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
beans::PropertyValue *pValue = rSequence.getArray();
sal_uInt16 nViewID( GetViewFrame()->GetCurViewId());
- pValue->Name = rtl::OUString( "ViewId" );
+ pValue->Name = OUString( "ViewId" );
OUStringBuffer sBuffer ( OUString( "view" ) );
::sax::Converter::convertNumber(sBuffer, static_cast<sal_Int32>(nViewID));
pValue->Value <<= sBuffer.makeStringAndClear();
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index d43bece4d415..6863ced87f3b 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -69,7 +69,6 @@
#include <PostItMgr.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
#include <unotools/moduleoptions.hxx>
@@ -498,7 +497,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
pOpt->SetOnlineSpell(bSet);
{
uno::Any aVal( &bSet, ::getCppuBooleanType() );
- rtl::OUString aPropName(UPN_IS_SPELL_AUTO);
+ OUString aPropName(UPN_IS_SPELL_AUTO);
SvtLinguConfig aCfg;
aCfg.SetProperty( aPropName, aVal );
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index e65b1427d191..981d7df778cc 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -137,7 +137,6 @@
const char sStatusDelim[] = " : ";
const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei
-using ::rtl::OUString;
using namespace sfx2;
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
@@ -227,7 +226,7 @@ int SwView::InsertGraphic( const String &rPath, const String &rFilter,
INetURLObject aTemp(
pDocSh->HasName() ?
pDocSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) :
- rtl::OUString());
+ OUString());
String sURL = URIHelper::SmartRel2Abs(
aTemp, rPath, URIHelper::GetMaybeFileHdl() );
@@ -1256,7 +1255,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
const sal_uInt32 stringId = selectionStats.nWord? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
- rtl::OUString wordCount(SW_RES(stringId));
+ OUString wordCount(SW_RES(stringId));
wordCount = wordCount.replaceAll("$1", OUString::number(documentStats.nWord));
wordCount = wordCount.replaceAll("$2", OUString::number(documentStats.nChar));
if (selectionStats.nWord)
@@ -1896,7 +1895,7 @@ bool SwView::JumpToSwMark( const String& rMark )
SearchOptions aSearchOpt(
SearchAlgorithms_ABSOLUTE, 0,
- sName, rtl::OUString(),
+ sName, OUString(),
SvtSysLocale().GetLanguageTag().getLocale(),
0,0,0,
TransliterationModules_IGNORE_CASE );
@@ -2030,7 +2029,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const Strin
}
else
{
- rtl::OUString sFactory = rtl::OUString::createFromAscii( pDocSh->GetFactory().GetShortName() );
+ OUString sFactory = OUString::createFromAscii( pDocSh->GetFactory().GetShortName() );
m_pViewImpl->StartDocumentInserter( sFactory, LINK( this, SwView, DialogClosedHdl ) );
return -1;
}
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 1ab4270abfa7..1f275234b1dd 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -220,8 +220,8 @@ void SwView::ExecDraw(SfxRequest& rReq)
if( pFuncPtr && pFuncPtr->GetSlotId() == SID_DRAW_CS_ID )
{
ConstCustomShape* pConstCustomShape = (ConstCustomShape*)(pFuncPtr);
- rtl::OUString aNew = ConstCustomShape::GetShapeTypeFromRequest( rReq );
- rtl::OUString aOld = pConstCustomShape->GetShapeType();
+ OUString aNew = ConstCustomShape::GetShapeTypeFromRequest( rReq );
+ OUString aOld = pConstCustomShape->GetShapeType();
if( aNew == aOld )
{
bDeselect = true;
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index b30175c5311d..b7f2fcfdfaa7 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -87,7 +87,6 @@
#include <editeng/editerr.hxx>
using namespace sw::mark;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
@@ -121,7 +120,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
+ OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -131,7 +130,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString("ParentWindow");
+ aParam.Name = OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -665,13 +664,13 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
Reference< XSpellAlternatives > xAlt( m_pWrtShell->GetCorrection(&rPt, aToFill) );
ProofreadingResult aGrammarCheckRes;
sal_Int32 nErrorInResult = -1;
- uno::Sequence< rtl::OUString > aSuggestions;
+ uno::Sequence< OUString > aSuggestions;
bool bCorrectionRes = false;
if (!xAlt.is() || xAlt->getAlternatives().getLength() == 0)
{
sal_Int32 nErrorPosInText = -1;
bCorrectionRes = m_pWrtShell->GetGrammarCorrection( aGrammarCheckRes, nErrorPosInText, nErrorInResult, aSuggestions, &rPt, aToFill );
- ::rtl::OUString aMessageText;
+ OUString aMessageText;
if (nErrorInResult >= 0)
aMessageText = aGrammarCheckRes.aErrors[ nErrorInResult ].aShortComment;
// we like to use the grammar checking context menu if we either get
@@ -715,7 +714,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
aEvent.ExecutePosition.Y = aPixPos.Y();
Menu* pMenu = 0;
- ::rtl::OUString sMenuName = bUseGrammarContext ?
+ OUString sMenuName = bUseGrammarContext ?
OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu");
if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent ))
{
@@ -748,7 +747,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
aURL.Complete = aCommand;
xURLTransformer->parseStrict(aURL);
uno::Sequence< beans::PropertyValue > aArgs;
- xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 );
+ xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
if (xDispatch.is())
@@ -796,7 +795,7 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
// get word that was clicked on
// This data structure maps a smart tag type string to the property bag
SwRect aToFill;
- Sequence< rtl::OUString > aSmartTagTypes;
+ Sequence< OUString > aSmartTagTypes;
Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps;
Reference<text::XTextRange> xRange;
@@ -836,13 +835,13 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) :
{
const IFieldmark::parameter_map_t* const pParameters = fieldBM->GetParameters();
- rtl::OUString sListKey = rtl::OUString( ODF_FORMDROPDOWN_LISTENTRY );
+ OUString sListKey = OUString( ODF_FORMDROPDOWN_LISTENTRY );
IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find( sListKey );
if(pListEntries != pParameters->end())
{
- Sequence< ::rtl::OUString > vListEntries;
+ Sequence< OUString > vListEntries;
pListEntries->second >>= vListEntries;
- for( ::rtl::OUString* pCurrent = vListEntries.getArray();
+ for( OUString* pCurrent = vListEntries.getArray();
pCurrent != vListEntries.getArray() + vListEntries.getLength();
++pCurrent)
{
@@ -851,7 +850,7 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) :
}
// Select the current one
- rtl::OUString sResultKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT );
+ OUString sResultKey = OUString( ODF_FORMDROPDOWN_RESULT );
IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find( sResultKey );
if ( pResult != pParameters->end() )
{
@@ -879,7 +878,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
sal_Int32 selection = pBox->GetSelectEntryPos();
if ( selection >= 0 )
{
- rtl::OUString sKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT );
+ OUString sKey = OUString( ODF_FORMDROPDOWN_RESULT );
(*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
pFieldmark->Invalidate();
SwView& rView = ( ( SwEditWin* )GetParent() )->GetView();
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index d4aab1855f7d..db07ebb1f92b 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -708,7 +708,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
m_pWrtShell->GetContentAtPos( aPos, aCnt );
if( aCnt.sStr.Len() )
{
- sPageStr += rtl::OUString(" - ");
+ sPageStr += OUString(" - ");
sPageStr.Insert( aCnt.sStr, 0, 80 );
sPageStr.SearchAndReplaceAll( '\t', ' ' );
sPageStr.SearchAndReplaceAll( 0x0a, ' ' );
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 691431936ea3..ad8c60865d1e 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -181,7 +181,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
InfoBox aInfoBox(&GetEditWin(), SW_RES(MSG_ERR_NO_FAX));
String sMsg = aInfoBox.GetMessText();
sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
- sMsg.SearchAndReplace(rtl::OUString("%1"), String(SW_RES(nResNo)));
+ sMsg.SearchAndReplace(OUString("%1"), String(SW_RES(nResNo)));
aInfoBox.SetMessText(sMsg);
aInfoBox.Execute();
SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 7802df1bd0ad..3778429c7235 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -335,7 +335,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
if( !bApi && ULONG_MAX != nFound)
{
String aText( SW_RES( STR_NB_REPLACED ) );
- const xub_StrLen nPos = aText.Search( rtl::OUString("XX") );
+ const xub_StrLen nPos = aText.Search( OUString("XX") );
aText.Erase( nPos, 2 );
aText.Insert( OUString::number( nFound ), nPos );
Window* pParentWindow = GetParentWindow( m_pSrchDlg );
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 211b55ffdc4e..a2f3e07c5e1f 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -44,7 +44,6 @@
#include "cfgitems.hxx"
#include "prtopt.hxx"
-using rtl::OUString;
using namespace comphelper;
using namespace ::com::sun::star;
@@ -309,7 +308,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
{
if (rInfo.mnAttributes & PropertyAttribute::READONLY)
- throw PropertyVetoException ( OUString( "Property is read-only: " ) + rtl::OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) );
+ throw PropertyVetoException ( OUString( "Property is read-only: " ) + OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) );
switch( rInfo.mnHandle )
{
@@ -706,13 +705,13 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
uno::Sequence< beans::PropertyValue > aInfo;
if ( !( rValue >>= aInfo ) )
throw lang::IllegalArgumentException(
- ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ),
+ OUString( "Value of type Sequence<PropertyValue> expected!" ),
uno::Reference< uno::XInterface >(),
2 );
if ( !mpDocSh->SetModifyPasswordInfo( aInfo ) )
throw beans::PropertyVetoException(
- ::rtl::OUString( "The hash is not allowed to be changed now!" ),
+ OUString( "The hash is not allowed to be changed now!" ),
uno::Reference< uno::XInterface >() );
}
break;
diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx
index 437fed49c815..9ac7fca529c7 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.hxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.hxx
@@ -79,11 +79,11 @@ public:
throw ();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(com::sun::star::uno::RuntimeException);
// XTypeProvider
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index 13b21897c73d..0f7019ea0d0f 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -50,15 +50,15 @@ SwXFilterOptions::~SwXFilterOptions()
{
}
-::rtl::OUString SwXFilterOptions::getImplementationName_Static()
+OUString SwXFilterOptions::getImplementationName_Static()
{
- return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
+ return OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
}
-uno::Sequence< ::rtl::OUString> SwXFilterOptions::getSupportedServiceNames_Static()
+uno::Sequence< OUString> SwXFilterOptions::getSupportedServiceNames_Static()
{
- ::rtl::OUString sService(SWFILTEROPTIONSOBJ_SERVICE);
- return uno::Sequence< ::rtl::OUString> (&sService, 1);
+ OUString sService(SWFILTEROPTIONSOBJ_SERVICE);
+ return uno::Sequence< OUString> (&sService, 1);
}
uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException)
@@ -66,7 +66,7 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro
uno::Sequence<beans::PropertyValue> aRet(1);
beans::PropertyValue* pArray = aRet.getArray();
- pArray[0].Name = rtl::OUString( FILTER_OPTIONS_NAME );
+ pArray[0].Name = OUString( FILTER_OPTIONS_NAME );
pArray[0].Value <<= sFilterOptions;
return aRet;
@@ -81,18 +81,18 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV
for (long i = 0; i < nPropCount; i++)
{
const beans::PropertyValue& rProp = pPropArray[i];
- ::rtl::OUString aPropName = rProp.Name;
+ OUString aPropName = rProp.Name;
if ( aPropName.equalsAscii( SW_PROP_NAME_STR(UNO_NAME_FILTER_NAME) ) )
rProp.Value >>= sFilterName;
- else if ( aPropName == ::rtl::OUString(FILTER_OPTIONS_NAME) )
+ else if ( aPropName == OUString(FILTER_OPTIONS_NAME) )
rProp.Value >>= sFilterOptions;
else if ( aPropName == "InputStream" )
rProp.Value >>= xInputStream;
}
}
-void SwXFilterOptions::setTitle( const ::rtl::OUString& /*rTitle*/ )
+void SwXFilterOptions::setTitle( const OUString& /*rTitle*/ )
throw (uno::RuntimeException)
{
}
@@ -152,18 +152,18 @@ void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& x
xModel = xDoc;
}
-::rtl::OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException)
+OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
+ return OUString(SWFILTEROPTIONSOBJ_IMPLNAME);
}
-sal_Bool SwXFilterOptions::supportsService( const ::rtl::OUString& rServiceName )
+sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName )
throw(uno::RuntimeException)
{
- return rServiceName == ::rtl::OUString(SWFILTEROPTIONSOBJ_SERVICE);
+ return rServiceName == OUString(SWFILTEROPTIONSOBJ_SERVICE);
}
-uno::Sequence< ::rtl::OUString > SwXFilterOptions::getSupportedServiceNames()
+uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames()
throw(uno::RuntimeException)
{
return SwXFilterOptions::getSupportedServiceNames_Static();
diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx
index 69be10d6e90f..9d6fd6ea451d 100644
--- a/sw/source/ui/uno/detreg.cxx
+++ b/sw/source/ui/uno/detreg.cxx
@@ -19,7 +19,6 @@
#include "swdetect.hxx"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 93345da0889f..ac8c54cb87cf 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -38,7 +38,6 @@
#include <wrtsh.hxx>
#include <view.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 556d799a5ca1..97afbfd88b18 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -67,10 +67,10 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp
else
{
//Bug 41417: JP 09.07.97: HTML documents should be loaded by WebWriter
- SfxFilterContainer aFilterContainer( rtl::OUString("swriter/web") );
+ SfxFilterContainer aFilterContainer( OUString("swriter/web") );
if( !pTmp->GetUserData().equals(sHTML) ||
pTmp->GetServiceName() == "com.sun.star.text.WebDocument" ||
- 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( rtl::OUString(sHTML),
+ 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( OUString(sHTML),
&aFilterContainer ) ) )
*ppFilter = pTmp;
}
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index 039bf0906d50..a6233c761866 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -68,7 +68,7 @@ public:
//----------------------------------------------------------------------------------
// XExtendedFilterDetect
//----------------------------------------------------------------------------------
- virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException );
};
#endif
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 11e38933c003..301e84da7232 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -52,7 +52,6 @@
SV_IMPL_REF ( SwDocShell )
using namespace ::com::sun::star;
-using ::rtl::OUString;
uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception )
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 21fe1165d414..6af22e9a214e 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -33,7 +33,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
static const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter";
static const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx
index 7e33fe6a7999..a190eff2f41f 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/ui/uno/unodoc.cxx
@@ -31,20 +31,20 @@ using namespace ::com::sun::star;
//============================================================
// com.sun.star.comp.Writer.TextDocument
-uno::Sequence< ::rtl::OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw()
{
// return only top level services here! All others must be
// resolved by rtti!
- uno::Sequence< ::rtl::OUString > aRet ( 1 );
- ::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString( "com.sun.star.text.TextDocument" );
+ uno::Sequence< OUString > aRet ( 1 );
+ OUString* pArray = aRet.getArray();
+ pArray[0] = OUString( "com.sun.star.text.TextDocument" );
return aRet;
}
-::rtl::OUString SAL_CALL SwTextDocument_getImplementationName() throw()
+OUString SAL_CALL SwTextDocument_getImplementationName() throw()
{
- return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
+ return OUString( "com.sun.star.comp.Writer.TextDocument" );
}
uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance(
@@ -60,20 +60,20 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance(
//============================================================
// com.sun.star.comp.Writer.WebDocument
-uno::Sequence< ::rtl::OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw()
{
// return only top level services here! All others must be
// resolved by rtti!
- uno::Sequence< ::rtl::OUString > aRet ( 1 );
- ::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString( "com.sun.star.text.WebDocument" );
+ uno::Sequence< OUString > aRet ( 1 );
+ OUString* pArray = aRet.getArray();
+ pArray[0] = OUString( "com.sun.star.text.WebDocument" );
return aRet;
}
-::rtl::OUString SAL_CALL SwWebDocument_getImplementationName() throw()
+OUString SAL_CALL SwWebDocument_getImplementationName() throw()
{
- return ::rtl::OUString( "com.sun.star.comp.Writer.WebDocument" );
+ return OUString( "com.sun.star.comp.Writer.WebDocument" );
}
uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance(
@@ -89,18 +89,18 @@ uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance(
//============================================================
// com.sun.star.comp.Writer.GlobalDocument
-uno::Sequence< ::rtl::OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw()
{
- uno::Sequence< ::rtl::OUString > aRet ( 1 );
- ::rtl::OUString* pArray = aRet.getArray();
- pArray[0] = ::rtl::OUString( "com.sun.star.text.GlobalDocument" );
+ uno::Sequence< OUString > aRet ( 1 );
+ OUString* pArray = aRet.getArray();
+ pArray[0] = OUString( "com.sun.star.text.GlobalDocument" );
return aRet;
}
-::rtl::OUString SAL_CALL SwGlobalDocument_getImplementationName() throw()
+OUString SAL_CALL SwGlobalDocument_getImplementationName() throw()
{
- return ::rtl::OUString( "com.sun.star.comp.Writer.GlobalDocument" );
+ return OUString( "com.sun.star.comp.Writer.GlobalDocument" );
}
uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance(
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index 15e49e2abd4d..cda4584fa608 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
// module
extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw();
@@ -127,8 +126,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL LayoutDumpFilter_createInstanc
namespace comp_FinalThreadManager {
// component and service helper functions:
-::rtl::OUString SAL_CALL _getImplementationName();
-com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
+OUString SAL_CALL _getImplementationName();
+com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context );
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 7e6c4140e590..2f3e4ec8efd2 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -80,7 +80,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::text;
-using ::rtl::OUString;
using namespace SWUnoHelper;
////////////////////////////////////////////////////////////
@@ -728,7 +727,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aURLObj.SetSmartURL( aCurOutputURL );
String aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
- String aDelim = rtl::OUString(INET_PATH_TOKEN);
+ String aDelim = OUString(INET_PATH_TOKEN);
if (aPath.Len() >= aDelim.Len() &&
aPath.Copy( aPath.Len()-aDelim.Len() ).CompareTo( aDelim ) != COMPARE_EQUAL)
aPath += aDelim;
@@ -776,7 +775,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// save document with temporary filename
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
- rtl::OUString( FILTER_XML ),
+ OUString( FILTER_XML ),
SwDocShell::Factory().GetFilterContainer() );
String aExtension(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*'));
TempFile aTempFile( OUString("SwMM"), &aExtension );
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index a606d298fdac..d194ccfbe164 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::comphelper;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
enum SwViewSettingsPropertyHandles
{
@@ -713,7 +711,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
break;
default:
throw IllegalArgumentException(
- ::rtl::OUString( "SwXViewSettings: invalid zoom type"), 0, 0);
+ OUString( "SwXViewSettings: invalid zoom type"), 0, 0);
}
mpViewOption->SetZoomType( eZoom );
mbApplyZoom = sal_True;
@@ -747,7 +745,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
INetURLObject aHID( sHelpURL );
if ( aHID.GetProtocol() == INET_PROT_HID )
- pView->GetEditWin().SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
+ pView->GetEditWin().SetHelpId( OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
else
throw IllegalArgumentException ();
}
@@ -930,7 +928,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
OUStringBuffer sHelpURL;
sHelpURL.appendAscii ( INET_HID_SCHEME );
SwEditWin &rEditWin = pView->GetEditWin();
- sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
+ sHelpURL.append( OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
rValue <<= sHelpURL.makeStringAndClear();
}
else
diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx
index 63f80f3b8eb1..b5612a2110d1 100644
--- a/sw/source/ui/uno/unomodule.hxx
+++ b/sw/source/ui/uno/unomodule.hxx
@@ -68,12 +68,12 @@ public:
// XDispatchProvider
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ;
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL ,
- const ::rtl::OUString & sTargetFrameName,
+ const OUString & sTargetFrameName,
sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException);
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException);
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException);
};
#endif
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 3e4e50ed8864..64ca3060ae97 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -142,7 +142,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
-using ::rtl::OUString;
using ::osl::FileBase;
#define SW_CREATE_DASH_TABLE 0x01
@@ -2128,7 +2127,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
case WID_DOC_VBA_DOCOBJ:
{
beans::PropertyValue aProp;
- aProp.Name = rtl::OUString("ThisWordDoc");
+ aProp.Name = OUString("ThisWordDoc");
aProp.Value <<= pDocShell->GetModel();
aAny <<= aProp;
}
@@ -2491,7 +2490,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
SolarMutexGuard aGuard;
if(!IsValid())
{
- throw DisposedException( ::rtl::OUString(),
+ throw DisposedException( OUString(),
static_cast< XTextDocument* >(this) );
}
@@ -2664,7 +2663,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
SolarMutexGuard aGuard;
if(!IsValid())
{
- throw DisposedException( ::rtl::OUString(),
+ throw DisposedException( OUString(),
static_cast< XTextDocument* >(this) );
}
@@ -2930,7 +2929,7 @@ void SAL_CALL SwXTextDocument::render(
SolarMutexGuard aGuard;
if(!IsValid())
{
- throw DisposedException( ::rtl::OUString(),
+ throw DisposedException( OUString(),
static_cast< XTextDocument* >(this) );
}
@@ -2999,7 +2998,7 @@ void SAL_CALL SwXTextDocument::render(
if(pVwSh && pOut && m_pRenderData->HasSwPrtOptions())
{
- const rtl::OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() );
+ const OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() );
const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", sal_False );
bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport );
@@ -3086,7 +3085,7 @@ Reference<XNameContainer> SAL_CALL SwXTextDocument::getXForms()
{
SolarMutexGuard aGuard;
if ( !pDocShell )
- throw DisposedException( ::rtl::OUString(), static_cast< XTextDocument* >( this ) );
+ throw DisposedException( OUString(), static_cast< XTextDocument* >( this ) );
SwDoc* pDoc = pDocShell->GetDoc();
return pDoc->getXForms();
}
@@ -3158,7 +3157,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
const bool bComplex = 0 != (nScriptTypes & nComplex);
if (nScriptTypes < nLatin || nScriptTypes > (nLatin | nAsian | nComplex))
- throw IllegalArgumentException(::rtl::OUString("nScriptTypes ranges from 1 to 7!"), Reference< XInterface >(), 1);
+ throw IllegalArgumentException(OUString("nScriptTypes ranges from 1 to 7!"), Reference< XInterface >(), 1);
if (!pDocShell)
throw DisposedException();
SwDoc* pDoc = pDocShell->GetDoc();
@@ -3355,10 +3354,10 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
if(!pxDoc)
throw RuntimeException();
String sToCompare(rName);
- String sSuffix = rtl::OUString('|');
+ String sSuffix = OUString('|');
if(sToCompare == sTables)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToTable);
+ sSuffix += OUString::createFromAscii(pMarkToTable);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
pxDoc->getTextTables(), sToCompare, sSuffix );
@@ -3367,7 +3366,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
}
else if(sToCompare == sFrames)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToFrame);
+ sSuffix += OUString::createFromAscii(pMarkToFrame);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
pxDoc->getTextFrames(), sToCompare, sSuffix );
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
@@ -3375,7 +3374,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
}
else if(sToCompare == sSections)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToRegion);
+ sSuffix += OUString::createFromAscii(pMarkToRegion);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
pxDoc->getTextSections(), sToCompare, sSuffix );
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
@@ -3383,7 +3382,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
}
else if(sToCompare == sGraphics)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToGraphic);
+ sSuffix += OUString::createFromAscii(pMarkToGraphic);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
pxDoc->getGraphicObjects(), sToCompare, sSuffix );
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
@@ -3391,7 +3390,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
}
else if(sToCompare == sOLEs)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToOLE);
+ sSuffix += OUString::createFromAscii(pMarkToOLE);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
pxDoc->getEmbeddedObjects(), sToCompare, sSuffix );
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
@@ -3399,7 +3398,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
}
else if(sToCompare == sOutlines)
{
- sSuffix += rtl::OUString::createFromAscii(pMarkToOutline);
+ sSuffix += OUString::createFromAscii(pMarkToOutline);
Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper(
*pxDoc, sToCompare, sSuffix );
Reference< XPropertySet > xRet(xTbls, UNO_QUERY);
@@ -3570,8 +3569,8 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void)
sal_uInt16 nOutlineCount = rOutlineNodes.size();
aRet.realloc(nOutlineCount);
OUString* pResArr = aRet.getArray();
- String sSuffix = rtl::OUString('|');
- sSuffix += rtl::OUString::createFromAscii(pMarkToOutline);
+ String sSuffix = OUString('|');
+ sSuffix += OUString::createFromAscii(pMarkToOutline);
const SwNumRule* pOutlRule = pDoc->GetOutlineNumRule();
for (sal_uInt16 i = 0; i < nOutlineCount; ++i)
{
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 81061b5a7428..cefcc8bc5243 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -85,7 +85,6 @@ using namespace ::com::sun::star::frame;
using ::com::sun::star::util::URL;
using comphelper::HelperBaseNoState;
-using ::rtl::OUString;
SwXTextView::SwXTextView(SwView* pSwView) :
SfxBaseController(pSwView),
@@ -562,16 +561,16 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
pRet[n].realloc(5);
PropertyValue* pValues = pRet[n].getArray();
- pValues[0].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_BASE_TEXT));
+ pValues[0].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_BASE_TEXT));
pValues[0].Value <<= OUString(rEntryText);
- pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT));
+ pValues[1].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT));
pValues[1].Value <<= OUString(rAttr.GetText());
- pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME));
+ pValues[2].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME));
SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
pValues[2].Value <<= OUString( aString );
- pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST));
+ pValues[3].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST));
pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment();
- pValues[4].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_IS_ABOVE));
+ pValues[4].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_IS_ABOVE));
sal_Bool bVal = !rAttr.GetPosition();
pValues[4].Value.setValue(&bVal, ::getBooleanCppuType());
}
@@ -716,7 +715,7 @@ namespace {
void SwXTextView::NotifyDBChanged()
{
URL aURL;
- aURL.Complete = rtl::OUString::createFromAscii(SwXDispatch::GetDBChangeURL());
+ aURL.Complete = OUString::createFromAscii(SwXDispatch::GetDBChangeURL());
m_SelChangedListeners.forEach<XDispatch>(
DispatchListener(aURL, Sequence<PropertyValue>(0)));
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index b2bf48511783..4c2e5d572066 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -1115,7 +1115,7 @@ SfxItemPresentation SwGammaGrf::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
OUString &rText, const IntlWrapper* /*pIntl*/) const
{
- rtl::OUStringBuffer aText;
+ OUStringBuffer aText;
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NAMELESS:
diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx
index f9859f4e2267..4dc9956f91ff 100644
--- a/sw/source/ui/utlui/condedit.cxx
+++ b/sw/source/ui/utlui/condedit.cxx
@@ -23,7 +23,6 @@
#include <condedit.hxx>
#include <svx/dbaexchange.hxx>
using namespace ::svx;
-using ::rtl::OUString;
using namespace ::com::sun::star::uno;
// STATIC DATA
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 2ba3e048753d..4b71f62d8e49 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -214,7 +214,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
{
case CONTENT_TYPE_OUTLINE :
{
- sTypeToken = rtl::OUString::createFromAscii(pMarkToOutline);
+ sTypeToken = OUString::createFromAscii(pMarkToOutline);
sal_uInt16 nOutlineCount = nMemberCount =
static_cast<sal_uInt16>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount());
if(nOutlineLevel < MAXLEVEL)
@@ -230,7 +230,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
break;
case CONTENT_TYPE_TABLE :
- sTypeToken = rtl::OUString::createFromAscii(pMarkToTable);
+ sTypeToken = OUString::createFromAscii(pMarkToTable);
nMemberCount = pWrtShell->GetTblFrmFmtCount(true);
bEdit = true;
break;
@@ -240,16 +240,16 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
case CONTENT_TYPE_OLE :
{
FlyCntType eType = FLYCNTTYPE_FRM;
- sTypeToken = rtl::OUString::createFromAscii(pMarkToFrame);
+ sTypeToken = OUString::createFromAscii(pMarkToFrame);
if(nContentType == CONTENT_TYPE_OLE)
{
eType = FLYCNTTYPE_OLE;
- sTypeToken = rtl::OUString::createFromAscii(pMarkToOLE);
+ sTypeToken = OUString::createFromAscii(pMarkToOLE);
}
else if(nContentType == CONTENT_TYPE_GRAPHIC)
{
eType = FLYCNTTYPE_GRF;
- sTypeToken = rtl::OUString::createFromAscii(pMarkToGraphic);
+ sTypeToken = OUString::createFromAscii(pMarkToGraphic);
}
nMemberCount = pWrtShell->GetFlyCount(eType);
bEdit = true;
@@ -317,7 +317,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
}
}
nMemberCount = pMember->size();
- sTypeToken = rtl::OUString::createFromAscii(pMarkToRegion);
+ sTypeToken = OUString::createFromAscii(pMarkToRegion);
bEdit = true;
bDelete = false;
if(pOldMember)
@@ -642,10 +642,10 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
break;
case CONTENT_TYPE_REFERENCE:
{
- std::vector<rtl::OUString> aRefMarks;
+ std::vector<OUString> aRefMarks;
nMemberCount = pWrtShell->GetRefMarks( &aRefMarks );
- for(std::vector<rtl::OUString>::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i)
+ for(std::vector<OUString>::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i)
{
// References sorted alphabetically
SwContent* pCnt = new SwContent(this, *i, 0);
@@ -785,7 +785,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) :
SvTreeListBox( pParent, rResId ),
- sSpace(rtl::OUString(" ")),
+ sSpace(OUString(" ")),
sRemoveIdx(SW_RES(ST_REMOVE_INDEX)),
sUpdateIdx(SW_RES(ST_UPDATE)),
@@ -990,9 +990,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
if(pHiddenShell)
{
String sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle();
- sHiddenEntry += rtl::OUString(" ( ");
+ sHiddenEntry += OUString(" ( ");
sHiddenEntry += aContextStrings[ ST_HIDDEN - ST_CONTEXT_FIRST];
- sHiddenEntry += rtl::OUString(" )");
+ sHiddenEntry += OUString(" )");
pSubPop3->InsertItem(nId, sHiddenEntry);
}
@@ -2465,7 +2465,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
if(((SwContent*)pUserData)->IsInvisible())
{
if(sEntry.Len())
- sEntry += rtl::OUString(", ");
+ sEntry += OUString(", ");
sEntry += sInvisible;
bRet = true;
}
@@ -2897,11 +2897,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode)
String sForbiddenChars;
if(CONTENT_TYPE_BOOKMARK == nType)
{
- sForbiddenChars = rtl::OUString("/\\@:*?\";,.#");
+ sForbiddenChars = OUString("/\\@:*?\";,.#");
}
else if(CONTENT_TYPE_TABLE == nType)
{
- sForbiddenChars = rtl::OUString(" .<>");
+ sForbiddenChars = OUString(" .<>");
}
pDlg->SetForbiddenChars(sForbiddenChars);
pDlg->Execute();
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 339b7804af4a..26dd383a071e 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -57,7 +57,6 @@
#include "swabstdlg.hxx"
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
// Context menu for GlobalTree
#define CTX_INSERT_ANY_INDEX 10
@@ -714,7 +713,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF
Application::SetDefDialogParent( this );
delete pDocInserter;
pDocInserter = new ::sfx2::DocumentInserter(
- rtl::OUString("swriter"), true );
+ OUString("swriter"), true );
pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) );
}
else if ( pFileName->Len() )
@@ -1180,7 +1179,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
SfxStringItem aURL(SID_FILE_NAME,
sFileName);
SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_False);
- SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") );
+ SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") );
SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle());
pActiveShell->GetView().GetViewFrame()->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON,
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index d0cd0e0cae9a..dda31eb4b604 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -238,14 +238,14 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector<String>& rLst )
#ifdef WNT
// For Windows, a special treatment is necessary because MS has
// forgotten some characters in the dialog font here.
- p.SearchAndReplace(rtl::OUString("%1"), rtl::OUString(",,"));
- p.SearchAndReplace(rtl::OUString("%2"), rtl::OUString("''"));
+ p.SearchAndReplace(OUString("%1"), OUString(",,"));
+ p.SearchAndReplace(OUString("%2"), OUString("''"));
#else
const SvtSysLocale aSysLocale;
const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData();
// With real operating systems it also works without special handling.
- p.SearchAndReplace(rtl::OUString("%1"), rLclD.getDoubleQuotationMarkStart());
- p.SearchAndReplace(rtl::OUString("%2"), rLclD.getDoubleQuotationMarkEnd());
+ p.SearchAndReplace(OUString("%1"), rLclD.getDoubleQuotationMarkStart());
+ p.SearchAndReplace(OUString("%2"), rLclD.getDoubleQuotationMarkEnd());
#endif
}
rLst.insert(rLst.begin() + n, p);
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index 7cfc2c4b93ba..54065a3f29fe 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -114,7 +114,7 @@ void SwNavigationConfig::Commit()
PutProperties(aNames, aValues);
}
-void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 89a53b8e0530..a82cb2355379 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -503,7 +503,7 @@ void SwNavigationPI::MakeMark()
IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
// collect and sort navigator reminder names
- ::std::vector< ::rtl::OUString > vNavMarkNames;
+ ::std::vector< OUString > vNavMarkNames;
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin();
ppMark != pMarkAccess->getMarksEnd();
++ppMark)
@@ -517,7 +517,7 @@ void SwNavigationPI::MakeMark()
if(vNavMarkNames.size() == MAX_MARKS)
pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx]));
- rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
+ rSh.SetBookmark(KeyCode(), OUString(), OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
SwView::SetActMark( nAutoMarkIdx );
if(++nAutoMarkIdx == MAX_MARKS)
@@ -1042,7 +1042,7 @@ void SwNavigationPI::UpdateListBox()
if ( !pDoc->IsHelpDocument() )
{
String sEntry = pDoc->GetTitle();
- sEntry += rtl::OUString(" (");
+ sEntry += OUString(" (");
if (pView == pActView)
{
nAct = nCount;
@@ -1068,7 +1068,7 @@ void SwNavigationPI::UpdateListBox()
{
String sEntry = aContentTree.GetHiddenWrtShell()->GetView().
GetDocShell()->GetTitle();
- sEntry += rtl::OUString(" (");
+ sEntry += OUString(" (");
sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST];
sEntry += ')';
aDocListBox.InsertEntry(sEntry);
@@ -1185,7 +1185,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
DELETEZ( pxObjectShell);
}
SfxStringItem aFileItem(SID_FILE_NAME, sFileName );
- SfxStringItem aOptionsItem( SID_OPTIONS, rtl::OUString("HRC") );
+ SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") );
SfxLinkItem aLink( SID_DONELINK,
LINK( this, SwNavigationPI, DoneLink ) );
GetActiveView()->GetViewFrame()->GetDispatcher()->Execute(
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 12d869dcb254..00aa1d71e508 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -34,7 +34,7 @@ PercentField::PercentField( Window* pWin, const ResId& rResId ) :
nOldSpinSize = GetSpinSize();
nRefValue = DenormalizePercent(MetricField::GetMax(FUNIT_TWIP));
nOldDigits = GetDecimalDigits();
- SetCustomUnitText(rtl::OUString('%'));
+ SetCustomUnitText(OUString('%'));
}
PercentFieldWrap::PercentFieldWrap()
@@ -53,7 +53,7 @@ void PercentFieldWrap::set(MetricField *pField)
nOldSpinSize = m_pField->GetSpinSize();
nRefValue = DenormalizePercent(m_pField->GetMax(FUNIT_TWIP));
nOldDigits = m_pField->GetDecimalDigits();
- m_pField->SetCustomUnitText(rtl::OUString('%'));
+ m_pField->SetCustomUnitText(OUString('%'));
}
void PercentField::SetRefValue(sal_Int64 nValue)
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 1b18b30b21ec..31979e3ddf6b 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -51,7 +51,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin,
uno::Reference< container::XNamed > & xN,
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 4b029f2b0348..1779833bc2c8 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -779,7 +779,7 @@ bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16
aURL.Complete = sCommand;
uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create(::comphelper::getProcessComponentContext() ) );
xTrans->parseStrict( aURL );
- uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
+ uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
if( xDisp.is() )
{
uno::Sequence< beans::PropertyValue > aSeq;
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index 2d426e9fe472..a0fd65d2b7c8 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -54,7 +54,6 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
const sal_Char cFrameControl[] = "com.sun.star.frame.FrameControl";
const sal_Char cFactory[] = "private:factory/swriter";
@@ -94,7 +93,7 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent)
if(SwOneExampleFrame::bShowServiceNotAvailableMessage)
{
String sInfo(SW_RES(STR_SERVICE_UNAVAILABLE));
- sInfo += rtl::OUString(cFrameControl);
+ sInfo += OUString(cFrameControl);
InfoBox(pParent, sInfo).Execute();
SwOneExampleFrame::bShowServiceNotAvailableMessage = false;
}
@@ -130,7 +129,7 @@ void SwOneExampleFrame::CreateControl()
uno::Reference< beans::XPropertySet > xPrSet(xInst, uno::UNO_QUERY);
uno::Any aURL;
// create new doc
- rtl::OUString sTempURL(cFactory);
+ OUString sTempURL(cFactory);
if(sArgumentURL.Len())
sTempURL = sArgumentURL;
aURL <<= sTempURL;
@@ -181,14 +180,14 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps,
//To reproduce this problem, in edit->autotext and click through
//the examples and see if the preview gets a horizontal scrollbar
uno::Any aFalseSet(uno::makeAny(sal_False));
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet);
if (bEnableOnlineMode)
{
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True));
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True));
}
}
@@ -234,32 +233,32 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
if( !bIsInitialized )
{
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet);
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet);
if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT))
{
uno::Any aZoom;
aZoom <<= (sal_Int16)view::DocumentZoomType::PAGE_WIDTH_EXACT;
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
}
else
{
uno::Any aZoom;
aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE;
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
sal_Int16 nZoomValue = 50;
if(EX_SHOW_BUSINESS_CARDS == nStyleFlags)
@@ -267,7 +266,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
nZoomValue = 80;
}
aZoom <<= nZoomValue;
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
}
// set onlinelayout property after setting the zoom
@@ -334,7 +333,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
uno::Reference< beans::XPropertySet > xCrsrProp(_xCursor, uno::UNO_QUERY);
uno::Any aPageStyle = xCrsrProp->getPropertyValue(
- rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME)));
+ OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME)));
OUString sPageStyle;
aPageStyle >>= sPageStyle;
@@ -350,17 +349,17 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
uno::Reference< style::XStyle > xPStyle;
aPStyle >>= xPStyle;
uno::Reference< beans::XPropertySet > xPProp(xPStyle, uno::UNO_QUERY);
- uno::Any aSize = xPProp->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)));
+ uno::Any aSize = xPProp->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)));
awt::Size aPSize;
aSize >>= aPSize;
//TODO: set page width to card width
aPSize.Width = 10000;
aSize.setValue(&aPSize, ::getCppuType((awt::Size*)0));
- xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize);
+ xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize);
uno::Any aZero; aZero <<= (sal_Int32)0;
- xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero);
- xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero);
+ xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero);
+ xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero);
}
uno::Reference< awt::XWindow > xWin( _xControl, uno::UNO_QUERY );
@@ -466,7 +465,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
uno::Reference< view::XViewSettingsSupplier > xSettings(_xController, uno::UNO_QUERY);
uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings();
- uno::Any aZoom = xViewProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)));
+ uno::Any aZoom = xViewProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)));
sal_Int16 nZoom = 0;
aZoom >>= nZoom;
@@ -475,7 +474,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
{
String sTemp;
sTemp = OUString::number(nZoomValues[i]);
- sTemp += rtl::OUString(" %");
+ sTemp += OUString(" %");
aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp);
if(nZoom == nZoomValues[i])
aSubPop1.CheckItem(ITEM_ZOOM + i + 1);
@@ -499,9 +498,9 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu )
uno::Any aZoom;
aZoom <<= nZoom;
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom);
aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE;
- xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
+ xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
}
else if(ITEM_UP == nId || ITEM_DOWN == nId)
{
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index c785ba94f58a..6e4fbd3de59f 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -155,7 +155,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
aViewLayout.QueryValue( a );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( "ViewLayout" );
+ aArgs[0].Name = OUString( "ViewLayout" );
aArgs[0].Value = a;
execute( aArgs );
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index dbe5f9c05409..f8e03294d9e5 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -25,7 +25,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
+SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload )
{
}
@@ -34,21 +34,21 @@ SwVbaAddin::~SwVbaAddin()
{
}
-::rtl::OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException)
{
- rtl::OUString sName;
+ OUString sName;
INetURLObject aURL( msFileURL );
::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
return sName;
}
void SAL_CALL
-SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
+SwVbaAddin::setName( const OUString& ) throw ( css::uno::RuntimeException )
{
- throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() );
}
-::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException)
{
INetURLObject aURL( msFileURL );
aURL.CutLastName();
@@ -74,20 +74,20 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt
}
}
-rtl::OUString
+OUString
SwVbaAddin::getServiceImplName()
{
- return rtl::OUString("SwVbaAddin");
+ return OUString("SwVbaAddin");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaAddin::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Addin" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Addin" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index b026f4db67f4..30b74ac6154c 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -28,25 +28,25 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE;
class SwVbaAddin : public SwVbaAddin_BASE
{
private:
- rtl::OUString msFileURL;
+ OUString msFileURL;
sal_Bool mbAutoload;
sal_Bool mbInstalled;
public:
- SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
+ SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
virtual ~SwVbaAddin();
// Attributes
- virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException);
virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_ADDIN_HXX */
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index b72e98837e50..de2de86614dc 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -36,14 +36,14 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
SvtPathOptions aPathOpt;
// FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin
String aAddinPath = aPathOpt.GetAddinPath();
- OSL_TRACE("lcl_getAddinCollection: %s", rtl::OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("lcl_getAddinCollection: %s", OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() );
if( xSFA->isFolder( aAddinPath ) )
{
- uno::Sequence< rtl::OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False );
+ uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False );
sal_Int32 nEntry = sEntries.getLength();
for( sal_Int32 index = 0; index < nEntry; ++index )
{
- rtl::OUString sUrl = sEntries[ index ];
+ OUString sUrl = sEntries[ index ];
if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
{
maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) );
@@ -79,20 +79,20 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaAddins::getServiceImplName()
{
- return rtl::OUString("SwVbaAddins");
+ return OUString("SwVbaAddins");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaAddins::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Addins");
+ sNames[0] = OUString("ooo.vba.word.Addins");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx
index 0f6bfb8bd29a..a036e8cb70ab 100644
--- a/sw/source/ui/vba/vbaaddins.hxx
+++ b/sw/source/ui/vba/vbaaddins.hxx
@@ -37,8 +37,8 @@ public:
// SwVbaAddins_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_ADDINS_HXX */
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 88cf4786edb0..35e6d6ec60c2 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::uno::UNO_QUERY;
-using ::rtl::OUString;
SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
{
@@ -57,10 +56,10 @@ SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XMod
return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) );
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaApplication::getName() throw (uno::RuntimeException)
{
- static rtl::OUString appName("Microsoft Word" );
+ static OUString appName("Microsoft Word" );
return appName;
}
@@ -172,20 +171,20 @@ SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
return getCurrentWordDoc( mxContext );
}
-rtl::OUString
+OUString
SwVbaApplication::getServiceImplName()
{
- return rtl::OUString("SwVbaApplication");
+ return OUString("SwVbaApplication");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaApplication::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Application" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Application" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index c15f6e8c9a63..1009c877dbc5 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -42,7 +42,7 @@ public:
virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
// XApplication
- virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
@@ -59,8 +59,8 @@ public:
virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException);
virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
protected:
virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
};
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index 0d3f165b4985..e46b0c8dd745 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -41,14 +41,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
if( pWhere )
{
uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange();
- xTextRange->setString( rtl::OUString("x") ); // set marker
+ xTextRange->setString( OUString("x") ); // set marker
uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd();
- xEndMarker->setString( rtl::OUString("x") ); // set marker
+ xEndMarker->setString( OUString("x") ); // set marker
uno::Reference< text::XText > xText = pWhere->getXText();
mxEntry->applyTo( xEndMarker->getStart() );
uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() );
xTC->goRight( 1, sal_True );
- xTC->setString( rtl::OUString("") ); // remove marker
+ xTC->setString( OUString("") ); // remove marker
// remove the blank paragraph if it is a rich text
sal_Bool bRich = sal_False;
_richtext >>= bRich;
@@ -63,32 +63,32 @@ 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 );
- rtl::OUString url = rtl::OUString( ".uno:Delete");
+ OUString url = OUString( ".uno:Delete");
dispatchRequests( xModel,url );
xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False );
}
}
- xEndMarker->setString( rtl::OUString("") ); // remove marker
+ xEndMarker->setString( OUString("") ); // remove marker
xTC = xText->createTextCursorByRange( xEndMarker->getEnd() );
pWhere->setXTextCursor( xTC );
}
return uno::Reference< word::XRange >( pWhere );
}
-rtl::OUString
+OUString
SwVbaAutoTextEntry::getServiceImplName()
{
- return rtl::OUString("SwVbaAutoTextEntry");
+ return OUString("SwVbaAutoTextEntry");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaAutoTextEntry::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.AutoTextEntry" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.AutoTextEntry" );
}
return aServiceNames;
}
@@ -107,7 +107,7 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
uno::Reference< container::XEnumeration >
SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Any
@@ -117,20 +117,20 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) );
}
-rtl::OUString
+OUString
SwVbaAutoTextEntries::getServiceImplName()
{
- return rtl::OUString("SwVbaAutoTextEntries");
+ return OUString("SwVbaAutoTextEntries");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaAutoTextEntries::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.AutoTextEntries");
+ sNames[0] = OUString("ooo.vba.word.AutoTextEntries");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx
index 38349473300a..e286b0f05b05 100644
--- a/sw/source/ui/vba/vbaautotextentry.hxx
+++ b/sw/source/ui/vba/vbaautotextentry.hxx
@@ -42,8 +42,8 @@ public:
virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
@@ -65,8 +65,8 @@ public:
// SwVbaAutoTextEntries_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_AUTOTEXTENTRY_HXX */
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index 0120130fb669..cafe3bef44c3 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -32,7 +32,7 @@ using namespace ::ooo::vba;
using namespace ::com::sun::star;
SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
- const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) :
+ const css::uno::Reference< frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ) :
SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( true )
{
uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW );
@@ -46,7 +46,7 @@ SwVbaBookmark::~SwVbaBookmark()
void SwVbaBookmark::checkVality() throw ( uno::RuntimeException )
{
if( !mbValid )
- throw uno::RuntimeException( rtl::OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() );
}
void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException )
@@ -64,12 +64,12 @@ void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException )
xSelectSupp->select( uno::makeAny( mxBookmark ) );
}
-rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException )
+OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException )
{
return maName;
}
-void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException )
+void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw ( uno::RuntimeException )
{
uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW );
xNamed->setName( _name );
@@ -83,20 +83,20 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) );
}
-rtl::OUString
+OUString
SwVbaBookmark::getServiceImplName()
{
- return rtl::OUString("SwVbaBookmark");
+ return OUString("SwVbaBookmark");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaBookmark::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Bookmark" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Bookmark" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index 7343a541096f..a49b292da25b 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -32,7 +32,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE
private:
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::text::XTextContent > mxBookmark;
- rtl::OUString maName;
+ OUString maName;
bool mbValid;
private:
@@ -40,19 +40,19 @@ private:
public:
SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
- const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
+ const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException );
virtual ~SwVbaBookmark();
// Methods
- virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
- virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException );
virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException );
virtual void SAL_CALL Select() throw ( css::uno::RuntimeException );
virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_BOOKMARK_HXX */
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index aae43bfb1eb5..08515b1f9f8d 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -39,7 +39,7 @@ public:
virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
- rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) );
}
@@ -62,17 +62,17 @@ public:
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return mxIndexAccess->getElementType(); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); }
// XNameAcess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
return cachePos;
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
return mxNameAccess->getElementNames();
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
if( mxNameAccess->hasByName( aName ) )
{
@@ -84,7 +84,7 @@ public:
for( sal_Int32 nIndex = 0; nIndex < mxIndexAccess->getCount(); nIndex++ )
{
uno::Reference< container::XNamed > xNamed( mxIndexAccess->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
- rtl::OUString aBookmarkName = xNamed->getName();
+ OUString aBookmarkName = xNamed->getName();
if( aName.equalsIgnoreAsciiCase( aBookmarkName ) )
{
cachePos <<= xNamed;
@@ -127,27 +127,27 @@ uno::Any
SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
{
uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW );
- rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
}
-void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException)
+void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) throw (uno::RuntimeException)
{
uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW );
word::getXTextViewCursor( mxModel )->getText()->removeTextContent( xBookmark );
}
-void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
+void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
{
uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW );
- uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW );
uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW );
xNamed->setName( rName );
rTextRange->getText()->insertTextContent( rTextRange, xBookmark, sal_False );
}
uno::Any SAL_CALL
-SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
+SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
{
uno::Reference< text::XTextRange > xTextRange;
uno::Reference< word::XRange > xRange;
@@ -164,7 +164,7 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw
}
// remove the exist bookmark
- rtl::OUString aName = rName;
+ OUString aName = rName;
if( m_xNameAccess->hasByName( aName ) )
removeBookmarkByName( aName );
@@ -198,26 +198,26 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx
}
sal_Bool SAL_CALL
-SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
+SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException)
{
sal_Bool bExist = m_xNameAccess->hasByName( rName );
return bExist;
}
-rtl::OUString
+OUString
SwVbaBookmarks::getServiceImplName()
{
- return rtl::OUString("SwVbaBookmarks");
+ return OUString("SwVbaBookmarks");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaBookmarks::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Bookmarks");
+ sNames[0] = OUString("ooo.vba.word.Bookmarks");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx
index d0eb92333ae6..4016233b7707 100644
--- a/sw/source/ui/vba/vbabookmarks.hxx
+++ b/sw/source/ui/vba/vbabookmarks.hxx
@@ -38,21 +38,21 @@ private:
css::uno::Reference< css::text::XText > mxText;
private:
- void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
+ void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException);
public:
SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
virtual ~SwVbaBookmarks() {}
- static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
+ static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SwVbaBookmarks_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
// XBookmarks
virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException);
@@ -60,8 +60,8 @@ public:
virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException);
virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException);
};
#endif /* SW_VBA_BOOKMARKS_HXX */
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 293b56189f20..38825f64f531 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -39,7 +39,7 @@ typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
// borders, the enumeration will match the order in this list
static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical };
-const static rtl::OUString sTableBorder("TableBorder");
+const static OUString sTableBorder("TableBorder");
// Equiv widths in in 1/100 mm
const static sal_Int32 OOLineThin = 35;
@@ -140,18 +140,18 @@ private:
}
SwVbaBorder(); // no impl
protected:
- virtual rtl::OUString getServiceImplName()
+ virtual OUString getServiceImplName()
{
- return rtl::OUString("SwVbaBorder");
+ return OUString("SwVbaBorder");
}
- virtual css::uno::Sequence<rtl::OUString> getServiceNames()
+ virtual css::uno::Sequence<OUString> getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Border" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Border" );
}
return aServiceNames;
}
@@ -226,12 +226,12 @@ public:
break;
}
default:
- throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() );
}
setBorderLine( aBorderLine );
}
else
- throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() );
}
};
@@ -351,20 +351,20 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim
// TODO:
}
-rtl::OUString
+OUString
SwVbaBorders::getServiceImplName()
{
- return rtl::OUString("SwVbaBorders");
+ return OUString("SwVbaBorders");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaBorders::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Borders" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Borders" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx
index 3e32f3c93d45..61e0679177dc 100644
--- a/sw/source/ui/vba/vbaborders.hxx
+++ b/sw/source/ui/vba/vbaborders.hxx
@@ -47,8 +47,8 @@ public:
virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException);
virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException);
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif //SW_VBA_BORDERS_HXX
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index 4ffbf5d4d232..7756099e6423 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -88,20 +88,20 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw (
setHeight( uno::makeAny( height ) );
}
-rtl::OUString
+OUString
SwVbaCell::getServiceImplName()
{
- return rtl::OUString("SwVbaCell");
+ return OUString("SwVbaCell");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaCell::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Cell" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Cell" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx
index 4d116e7da586..40ee0e1d182b 100644
--- a/sw/source/ui/vba/vbacell.hxx
+++ b/sw/source/ui/vba/vbacell.hxx
@@ -50,8 +50,8 @@ public:
virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_CELL_HXX */
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index d70b9cd9b4d5..37028bfd6a16 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -192,20 +192,20 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaCells::getServiceImplName()
{
- return rtl::OUString("SwVbaCells");
+ return OUString("SwVbaCells");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaCells::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Cells");
+ sNames[0] = OUString("ooo.vba.word.Cells");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index 0e3f2a1e4fbb..95dd41f52cf7 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -55,8 +55,8 @@ public:
// SwVbaCells_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_CELLS_HXX */
diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx
index 7eafde40289d..f5d6e9c9ee29 100644
--- a/sw/source/ui/vba/vbacheckbox.cxx
+++ b/sw/source/ui/vba/vbacheckbox.cxx
@@ -30,10 +30,10 @@ using namespace ::com::sun::star;
SwVbaCheckBox::SwVbaCheckBox( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel, const uno::Reference< text::XFormField >& xFormField ) throw ( uno::RuntimeException ) : SwVbaCheckBox_BASE( rParent, rContext ), mxModel( rModel ), mxFormField( xFormField )
{
- rtl::OUString sType = mxFormField->getFieldType();
+ OUString sType = mxFormField->getFieldType();
if( !sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX ) )
{
- throw uno::RuntimeException( rtl::OUString(
+ throw uno::RuntimeException( OUString(
"It is not a CheckBox"), uno::Reference< uno::XInterface >() );
}
}
@@ -62,24 +62,24 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException )
void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeException )
{
- rtl::OUString sValue = value ? rtl::OUString("on") : rtl::OUString("off");
- mxFormField->addParam( rtl::OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True );
+ OUString sValue = value ? OUString("on") : OUString("off");
+ mxFormField->addParam( OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True );
}
-rtl::OUString
+OUString
SwVbaCheckBox::getServiceImplName()
{
- return rtl::OUString("SwVbaCheckBox");
+ return OUString("SwVbaCheckBox");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaCheckBox::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.word.CheckBox" );
+ aServiceNames[ 0 ] = OUString( "ooo.vba.word.CheckBox" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacheckbox.hxx b/sw/source/ui/vba/vbacheckbox.hxx
index d450f11996c6..d305ea26c56f 100644
--- a/sw/source/ui/vba/vbacheckbox.hxx
+++ b/sw/source/ui/vba/vbacheckbox.hxx
@@ -41,8 +41,8 @@ public:
void SAL_CALL setValue( sal_Bool value ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_CHECKBOX_HXX */
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index a4a20c3bd597..2093e4b9aae2 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -62,35 +62,35 @@ SwVbaColumn::Select( ) throw ( uno::RuntimeException )
void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw ( uno::RuntimeException )
{
- rtl::OUStringBuffer aRangeName;
- rtl::OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn );
+ OUStringBuffer aRangeName;
+ OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn );
aRangeName.append(sStartCol).append(sal_Int32( 1 ) );
- rtl::OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn );
+ OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn );
sal_Int32 nRowCount = xTextTable->getRows()->getCount();
aRangeName.append(':').append( sEndCol ).append( sal_Int32( nRowCount ) );
uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW );
- rtl::OUString sSelRange = aRangeName.makeStringAndClear();
+ OUString sSelRange = aRangeName.makeStringAndClear();
uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange );
uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
xSelection->select( uno::makeAny( xSelRange ) );
}
-rtl::OUString
+OUString
SwVbaColumn::getServiceImplName()
{
- return rtl::OUString("SwVbaColumn");
+ return OUString("SwVbaColumn");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaColumn::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Column" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Column" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index 1165069f5a2f..b116b690d798 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -47,8 +47,8 @@ public:
static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_COLUMN_HXX */
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index b9a9afb2c195..f41d6a4bcba0 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -104,11 +104,11 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*
{
if( nIndex <= 0 || nIndex > getCount() )
{
- throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
}
return uno::makeAny( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) );
}
- throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
}
// XEnumerationAccess
@@ -129,20 +129,20 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaColumns::getServiceImplName()
{
- return rtl::OUString("SwVbaColumns");
+ return OUString("SwVbaColumns");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaColumns::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Columns");
+ sNames[0] = OUString("ooo.vba.word.Columns");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx
index 1c91eab497e9..023e2ab4405c 100644
--- a/sw/source/ui/vba/vbacolumns.hxx
+++ b/sw/source/ui/vba/vbacolumns.hxx
@@ -57,8 +57,8 @@ public:
// SwVbaColumns_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_COLUMNS_HXX */
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index 547ba47f8f49..73397041d631 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -37,33 +37,33 @@ static const WordDialogTable aWordDialogTable[] =
{ 0, 0 }
};
-rtl::OUString
+OUString
SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
{
for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ )
{
if( nIndex == pTable->wdDialog )
{
- return rtl::OUString::createFromAscii( pTable->ooDialog );
+ return OUString::createFromAscii( pTable->ooDialog );
}
}
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString
+OUString
SwVbaDialog::getServiceImplName()
{
- return rtl::OUString("SwVbaDialog");
+ return OUString("SwVbaDialog");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaDialog::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialog" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialog" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx
index 633515df8c7b..2036cea8dc5d 100644
--- a/sw/source/ui/vba/vbadialog.hxx
+++ b/sw/source/ui/vba/vbadialog.hxx
@@ -33,10 +33,10 @@ public:
virtual ~SwVbaDialog() {}
// Methods
- virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
+ virtual OUString mapIndexToName( sal_Int32 nIndex );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_DIALOG_HXX */
diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx
index ac1e5bc5cd87..db1f53019836 100644
--- a/sw/source/ui/vba/vbadialogs.cxx
+++ b/sw/source/ui/vba/vbadialogs.cxx
@@ -32,20 +32,20 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
return uno::Any( aDialog );
}
-rtl::OUString
+OUString
SwVbaDialogs::getServiceImplName()
{
- return rtl::OUString("SwVbaDialogs");
+ return OUString("SwVbaDialogs");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaDialogs::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialogs" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialogs" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx
index d4a1187bfb44..f4bf15bd765c 100644
--- a/sw/source/ui/vba/vbadialogs.hxx
+++ b/sw/source/ui/vba/vbadialogs.hxx
@@ -38,8 +38,8 @@ public:
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_DIALOGS_HXX */
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index fa2402e0adbe..829d44d51960 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -118,7 +118,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno
}
catch(const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
}
}
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
@@ -240,10 +240,10 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) );
}
-rtl::OUString
+OUString
SwVbaDocument::getServiceImplName()
{
- return rtl::OUString("SwVbaDocument");
+ return OUString("SwVbaDocument");
}
uno::Any SAL_CALL
@@ -253,7 +253,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
uno::Reference<document::XDocumentPropertiesSupplier> const xDocPropSupp(
getModel(), uno::UNO_QUERY_THROW);
uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
- rtl::OUString sTemplateUrl = xDocProps->getTemplateURL();
+ OUString sTemplateUrl = xDocProps->getTemplateURL();
xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateUrl );
return uno::makeAny( xTemplate );
@@ -262,12 +262,12 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException)
void SAL_CALL
SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException)
{
- rtl::OUString sTemplate;
+ OUString sTemplate;
if( !( _attachedtemplate >>= sTemplate ) )
{
throw uno::RuntimeException();
}
- rtl::OUString aURL;
+ OUString aURL;
INetURLObject aObj;
aObj.SetURL( sTemplate );
bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
@@ -326,7 +326,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( ::sal_Bool /*_updatestyleson
// check this property only in default paragraph style
sal_Bool IsAutoHyphenation = sal_False;
uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation;
+ xParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation;
return IsAutoHyphenation;
}
@@ -334,7 +334,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( ::sal_Bool _autohyphenation ) t
{
//TODO
uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) );
+ xParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) );
}
::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException)
@@ -353,7 +353,7 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*
//TODO
sal_Int16 nHyphensLimit = 0;
uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->getPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit;
+ xParaProps->getPropertyValue( OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit;
return nHyphensLimit;
}
@@ -361,7 +361,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv
{
sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit );
uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->setPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) );
+ xParaProps->setPropertyValue( OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) );
}
void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException)
@@ -377,13 +377,13 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno
void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException)
{
- rtl::OUString url = rtl::OUString( ".uno:PrintPreview");
+ OUString url = OUString( ".uno:PrintPreview");
dispatchRequests( mxModel,url );
}
void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException)
{
- rtl::OUString url = rtl::OUString( ".uno:ClosePreview");
+ OUString url = OUString( ".uno:ClosePreview");
dispatchRequests( mxModel,url );
}
@@ -410,7 +410,7 @@ SwVbaDocument::Frames( const uno::Any& index ) throw (uno::RuntimeException)
}
uno::Any
-SwVbaDocument::getControlShape( const ::rtl::OUString& sName )
+SwVbaDocument::getControlShape( const OUString& sName )
{
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
@@ -440,38 +440,38 @@ SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException)
}
uno::Any SAL_CALL
-SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf",
- rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
throw uno::RuntimeException(); // unsupported operation
}
void SAL_CALL
-SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
throw uno::RuntimeException(); // unsupported operation
}
uno::Any SAL_CALL
-SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
- uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW );
+ uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW );
uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) );
return uno::makeAny( xControl );
}
::sal_Bool SAL_CALL
-SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
+SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException)
{
return sal_False;
}
::sal_Bool SAL_CALL
-SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException)
{
uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
if ( xFormControls.is() )
@@ -499,14 +499,14 @@ SwVbaDocument::getFormControls()
return xFormControls;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaDocument::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Document" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Document" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index 3760139840fe..c1f4469dbada 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -32,7 +32,7 @@ private:
css::uno::Reference< css::text::XTextDocument > mxTextDocument;
void Initialize();
- css::uno::Any getControlShape( const rtl::OUString& sName );
+ css::uno::Any getControlShape( const OUString& sName );
css::uno::Reference< css::container::XNameAccess > getFormControls();
public:
@@ -79,15 +79,15 @@ public:
// XInvocation
virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_DOCUMENT_HXX */
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index db8f40865ce6..9a3701a033c8 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -74,8 +74,8 @@ public:
uno::UNO_SET_THROW);
}
virtual ~PropertGetSetHelper() {}
- virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0;
- virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0;
+ virtual uno::Any getPropertyValue( const OUString& rPropName ) = 0;
+ virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) = 0;
virtual uno::Reference< beans::XPropertySet > getUserDefinedProperties() {
return uno::Reference<beans::XPropertySet>(
m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -89,7 +89,7 @@ public:
BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel )
{
}
- virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
+ virtual uno::Any getPropertyValue( const OUString& rPropName )
{
if ( rPropName == "EditingDuration" )
{
@@ -150,7 +150,7 @@ public:
return getUserDefinedProperties()->getPropertyValue(rPropName);
}
}
- virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
+ virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue )
{
if ("EditingDuration" == rPropName)
{
@@ -270,12 +270,12 @@ public:
CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel )
{
}
- virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
+ virtual uno::Any getPropertyValue( const OUString& rPropName )
{
return getUserDefinedProperties()->getPropertyValue(rPropName);
}
virtual void setPropertyValue(
- const rtl::OUString& rPropName, const uno::Any& rValue)
+ const OUString& rPropName, const uno::Any& rValue)
{
return getUserDefinedProperties()->setPropertyValue(rPropName, rValue);
}
@@ -291,7 +291,7 @@ public:
mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW );
mpDocShell = word::getDocShell( xModel );
}
- virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
+ virtual uno::Any getPropertyValue( const OUString& rPropName )
{
try
{
@@ -336,7 +336,7 @@ public:
return aReturn;
}
- virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
+ virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue )
{
uno::Sequence< beans::NamedValue > stats(
m_xDocProps->getDocumentStatistics());
@@ -357,11 +357,11 @@ public:
class DocPropInfo
{
public:
- rtl::OUString msMSODesc;
- rtl::OUString msOOOPropName;
+ OUString msMSODesc;
+ OUString msOOOPropName;
boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
- static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
+ static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
{
DocPropInfo aItem;
aItem.msMSODesc = sDesc;
@@ -372,7 +372,7 @@ public:
static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
{
- return createDocPropInfo( rtl::OUString::createFromAscii( sDesc ), rtl::OUString::createFromAscii( sPropName ), rHelper );
+ return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper );
}
uno::Any getValue()
{
@@ -453,21 +453,21 @@ public:
SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
// XDocumentProperty
virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
//XDefaultProperty
- virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString("Value"); }
+ virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return OUString("Value"); }
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual uno::Sequence<OUString> getServiceNames();
};
class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty
@@ -479,10 +479,10 @@ public:
virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
};
@@ -504,21 +504,21 @@ SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw
{
}
-rtl::OUString
+OUString
SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException)
{
// #FIXME we need to store the link content somewhere
- return rtl::OUString();
+ return OUString();
}
void
-SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// #FIXME we need to store the link source somewhere
}
void SAL_CALL
-SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// setName on existing property ?
// #FIXME
@@ -551,14 +551,14 @@ SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno
throw uno::RuntimeException();
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return mPropInfo.msMSODesc;
}
void SAL_CALL
-SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaBuiltInDocumentProperty::setName( const OUString& ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
@@ -605,7 +605,7 @@ SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::B
mPropInfo.setValue( Value );
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
@@ -613,26 +613,26 @@ SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorExcepti
}
void SAL_CALL
-SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// not valid for Builtin
throw uno::RuntimeException();
}
-rtl::OUString
+OUString
SwVbaBuiltInDocumentProperty::getServiceImplName()
{
- return rtl::OUString("SwVbaBuiltinDocumentProperty");
+ return OUString("SwVbaBuiltinDocumentProperty");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaBuiltInDocumentProperty::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperty" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperty" );
}
return aServiceNames;
}
@@ -663,7 +663,7 @@ public:
}
};
-typedef boost::unordered_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName;
+typedef boost::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName;
class BuiltInPropertiesImpl : public PropertiesImpl_BASE
{
@@ -699,7 +699,7 @@ protected:
throw lang::IndexOutOfBoundsException();
return uno::makeAny( it->second );
}
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
@@ -707,17 +707,17 @@ protected:
return uno::Any( it->second );
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > aNames( getCount() );
- rtl::OUString* pName = aNames.getArray();
+ uno::Sequence< OUString > aNames( getCount() );
+ OUString* pName = aNames.getArray();
DocPropsByName::iterator it_end = mNamedDocProps.end();
for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName )
*pName = it->first;
return aNames;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
DocPropsByName::iterator it = mNamedDocProps.find( aName );
if ( it == mNamedDocProps.end() )
@@ -744,10 +744,10 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer
}
uno::Reference< XDocumentProperty > SAL_CALL
-SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
throw uno::RuntimeException(
- rtl::OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() );
+ OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() );
}
// XEnumerationAccess
@@ -773,20 +773,20 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaBuiltinDocumentProperties::getServiceImplName()
{
- return rtl::OUString("SwVbaBuiltinDocumentProperties");
+ return OUString("SwVbaBuiltinDocumentProperties");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaBuiltinDocumentProperties::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperties" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperties" );
}
return aServiceNames;
}
@@ -822,7 +822,7 @@ public:
return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
}
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
@@ -831,21 +831,21 @@ public:
return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
- uno::Sequence< rtl::OUString > aNames( aProps.getLength() );
- rtl::OUString* pString = aNames.getArray();
- rtl::OUString* pEnd = ( pString + aNames.getLength() );
+ uno::Sequence< OUString > aNames( aProps.getLength() );
+ OUString* pString = aNames.getArray();
+ OUString* pEnd = ( pString + aNames.getLength() );
beans::Property* pProp = aProps.getArray();
for ( ; pString != pEnd; ++pString, ++pProp )
*pString = pProp->Name;
return aNames;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
- OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
+ OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
}
@@ -873,7 +873,7 @@ public:
return new DocPropEnumeration( simpleDocPropSnapShot );
}
- void addProp( const ::rtl::OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value )
+ void addProp( const OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value )
{
sal_Int16 attributes = 128;
uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
@@ -892,13 +892,13 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen
}
uno::Reference< XDocumentProperty > SAL_CALL
-SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
+SwVbaCustomDocumentProperties::Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
{
CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
uno::Reference< XDocumentProperty > xDocProp;
if ( pCustomProps )
{
- rtl::OUString sLinkSource;
+ OUString sLinkSource;
pCustomProps->addProp( Name, Type, Value );
xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW );
@@ -911,10 +911,10 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaCustomDocumentProperties::getServiceImplName()
{
- return rtl::OUString("SwVbaCustomDocumentProperties");
+ return OUString("SwVbaCustomDocumentProperties");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx
index 5842039f13b3..cbe1b7b81fd3 100644
--- a/sw/source/ui/vba/vbadocumentproperties.hxx
+++ b/sw/source/ui/vba/vbadocumentproperties.hxx
@@ -34,7 +34,7 @@ public:
SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
// XDocumentProperties
- virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
@@ -42,8 +42,8 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
@@ -51,9 +51,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
public:
SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
// XDocumentProperties
- virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
+ virtual OUString getServiceImplName();
};
#endif /* SW_VBA_DOCUMENTPROPERTY_HXX */
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 5e55df3a67c9..b05bdd1bca90 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -107,7 +107,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource )
uno::Any SAL_CALL
SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException)
{
- rtl::OUString sFileName;
+ OUString sFileName;
if( Template.hasValue() && ( Template >>= sFileName ) )
{
return Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any());
@@ -128,10 +128,10 @@ SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*Origin
// #TODO# #FIXME# can any of the unused params below be used?
uno::Any SAL_CALL
-SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException)
+SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException)
{
// we need to detect if this is a URL, if not then assume its a file path
- rtl::OUString aURL;
+ OUString aURL;
INetURLObject aObj;
aObj.SetURL( Filename );
bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
@@ -150,20 +150,20 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm
return aRet;
}
-rtl::OUString
+OUString
SwVbaDocuments::getServiceImplName()
{
- return rtl::OUString("SwVbaDocuments");
+ return OUString("SwVbaDocuments");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaDocuments::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Documents");
+ sNames[0] = OUString("ooo.vba.word.Documents");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index 69d37d76a0b5..aaf1529995ff 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -41,12 +41,12 @@ public:
// SwVbaDocuments_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
// Methods
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
};
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index c5c9e93add22..2e0e533be8a3 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -75,11 +75,11 @@ void SwVbaEventsHelper::implPostProcessEvent( EventQueue& /*rEventQueue*/,
// nothing to do after any event
}
-::rtl::OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/,
+OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/,
const uno::Sequence< uno::Any >& /*rArgs*/ ) const throw (lang::IllegalArgumentException)
{
// TODO: get actual codename from document
- return ::rtl::OUString( "ThisDocument" );
+ return OUString( "ThisDocument" );
}
// ============================================================================
diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx
index 8e405334396c..92f7d62d1c65 100644
--- a/sw/source/ui/vba/vbaeventshelper.hxx
+++ b/sw/source/ui/vba/vbaeventshelper.hxx
@@ -36,7 +36,7 @@ protected:
virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException);
virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException);
virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException);
+ virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException);
};
// ============================================================================
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 4e5150fa7dd4..df729ad1c553 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -51,20 +51,20 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException)
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaField::getServiceImplName()
{
- return rtl::OUString("SwVbaField");
+ return OUString("SwVbaField");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaField::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Field" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Field" );
}
return aServiceNames;
}
@@ -323,7 +323,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
{
sal_Int32 nType = word::WdFieldType::wdFieldEmpty;
Type >>= nType;
- rtl::OUString sText;
+ OUString sText;
Text >>= sText;
String sFieldName;
@@ -331,7 +331,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
{
SwVbaReadFieldParams aReadParam(sText);
sFieldName = aReadParam.GetFieldName();
- OSL_TRACE("SwVbaFields::Add, the field name is %s ",rtl::OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("SwVbaFields::Add, the field name is %s ",OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() );
}
uno::Reference< text::XTextContent > xTextField;
@@ -345,7 +345,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
}
else
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() );
@@ -355,9 +355,9 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) );
}
-uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException)
+uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString _text ) throw (uno::RuntimeException)
{
- uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW );
sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
if( !_text.isEmpty() )
{
@@ -375,14 +375,14 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl
aReadParam.SkipToNextToken();
break;
default:
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
break;
}
}
}
uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( rtl::OUString("FileFormat"), uno::makeAny( nFileFormat ) );
+ xProps->setPropertyValue( OUString("FileFormat"), uno::makeAny( nFileFormat ) );
return xTextField;
}
@@ -424,7 +424,7 @@ static const DocPropertyTable aDocPropertyTables[] =
{ NULL, NULL }
};
-uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const rtl::OUString _text ) throw (uno::RuntimeException)
+uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString _text ) throw (uno::RuntimeException)
{
String aDocProperty;
SwVbaReadFieldParams aReadParam( _text );
@@ -444,21 +444,21 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
}
}
aDocProperty = comphelper::string::remove(aDocProperty, '"');
- OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",rtl::OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() );
if( aDocProperty.Len() == 0 )
{
throw uno::RuntimeException();
}
bool bCustom = true;
- rtl::OUString sFieldService;
+ OUString sFieldService;
// find the build in document properties
for( const DocPropertyTable* pTable = aDocPropertyTables; pTable->sDocPropertyName != NULL; pTable++ )
{
if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) )
{
if( pTable->sFieldService != NULL )
- sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService);
+ sFieldService = OUString::createFromAscii(pTable->sFieldService);
bCustom = false;
break;
}
@@ -466,11 +466,11 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
if( bCustom )
{
- sFieldService = rtl::OUString( "com.sun.star.text.textfield.docinfo.Custom" );
+ sFieldService = OUString( "com.sun.star.text.textfield.docinfo.Custom" );
}
else if( sFieldService.isEmpty() )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( sFieldService ), uno::UNO_QUERY_THROW );
@@ -478,8 +478,8 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
if( bCustom )
{
uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW );
- rtl::OUString sDocPropertyName( aDocProperty );
- xProps->setPropertyValue( rtl::OUString("Name"), uno::makeAny( sDocPropertyName ) );
+ OUString sDocPropertyName( aDocProperty );
+ xProps->setPropertyValue( OUString("Name"), uno::makeAny( sDocPropertyName ) );
}
return xTextField;
@@ -517,10 +517,10 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException)
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaFields::getServiceImplName()
{
- return rtl::OUString("SwVbaFields");
+ return OUString("SwVbaFields");
}
// XEnumerationAccess
@@ -530,14 +530,14 @@ SwVbaFields::getElementType() throw (uno::RuntimeException)
return word::XField::static_type(0);
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaFields::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Fields" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Fields" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 56092a2af856..8bafae282fde 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -36,8 +36,8 @@ public:
virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
// *** SwVbaFields ***********************************************
@@ -49,8 +49,8 @@ class SwVbaFields : public SwVbaFields_BASE
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
private:
- css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException);
- css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const rtl::OUString _text ) throw (css::uno::RuntimeException);
+ css::uno::Reference< css::text::XTextField > Create_Field_FileName( const OUString _text ) throw (css::uno::RuntimeException);
+ css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString _text ) throw (css::uno::RuntimeException);
public:
SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
@@ -64,8 +64,8 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 0dce30854922..bc6deacf8680 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -57,13 +57,13 @@ bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrent
return false;
}
-void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException)
+void SwVbaFind::SetReplaceWith( const OUString& rText ) throw (uno::RuntimeException)
{
mxPropertyReplace->setReplaceString( rText );
mbReplace = true;
}
-rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException)
+OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException)
{
return mxPropertyReplace->getReplaceString();
}
@@ -175,12 +175,12 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
return result;
}
-::rtl::OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException)
{
return mxPropertyReplace->getSearchString();
}
-void SAL_CALL SwVbaFind::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaFind::setText( const OUString& _text ) throw (uno::RuntimeException)
{
mxPropertyReplace->setSearchString( _text );
}
@@ -192,20 +192,20 @@ uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException)
void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException)
{
sal_Bool bBackward = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchBackwards") ) >>= bBackward;
+ mxPropertyReplace->getPropertyValue( OUString("SearchBackwards") ) >>= bBackward;
return !bBackward;
}
void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException)
{
sal_Bool bBackward = !_forward;
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchBackwards"), uno::makeAny( bBackward ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchBackwards"), uno::makeAny( bBackward ) );
}
::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException)
@@ -233,76 +233,76 @@ void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeExce
::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException)
{
sal_Bool value = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchCaseSensitive") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchCaseSensitive") ) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException)
{
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) );
}
::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException)
{
sal_Bool value = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchWords") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchWords") ) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException)
{
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchWords"), uno::makeAny( _matchwholeword ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchWords"), uno::makeAny( _matchwholeword ) );
}
::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException)
{
sal_Bool value = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchRegularExpression") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchRegularExpression") ) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException)
{
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) );
}
::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException)
{
sal_Bool value = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException)
{
// seems not accurate
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) );
}
::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException)
{
sal_Bool value = sal_False;
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value;
if( value )
- mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarityRelax") ) >>= value;
+ mxPropertyReplace->getPropertyValue( OUString("SearchSimilarityRelax") ) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException)
{
// seems not accurate
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) );
- mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) );
+ mxPropertyReplace->setPropertyValue( OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) );
}
uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
sal_Bool SAL_CALL
@@ -311,7 +311,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
sal_Bool result = sal_False;
if( FindText.hasValue() )
{
- rtl::OUString sText;
+ OUString sText;
FindText >>= sText;
setText( sText );
}
@@ -368,7 +368,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
if( ReplaceWith.hasValue() )
{
- rtl::OUString sValue;
+ OUString sValue;
ReplaceWith >>= sValue;
SetReplaceWith( sValue );
}
@@ -392,20 +392,20 @@ SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException)
mxPropertyReplace->setSearchAttributes( aSearchAttribs );
}
-rtl::OUString
+OUString
SwVbaFind::getServiceImplName()
{
- return rtl::OUString("SwVbaFind");
+ return OUString("SwVbaFind");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaFind::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Find" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Find" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index 219260269e4d..55167b340e41 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -48,8 +48,8 @@ private:
bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
void SetReplace( sal_Int32 type );
- void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException );
- rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException );
+ void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException );
+ OUString GetReplaceWith() throw ( css::uno::RuntimeException );
css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
sal_Bool SearchReplace() throw ( css::uno::RuntimeException );
@@ -58,8 +58,8 @@ public:
virtual ~SwVbaFind();
// Attributes
- virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException);
virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException);
@@ -86,8 +86,8 @@ public:
virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_FIND_HXX */
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index ac74b19eebad..7866611bed55 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -74,9 +74,9 @@ private:
}
}
public:
- static rtl::OUString propName()
+ static OUString propName()
{
- static rtl::OUString sPropName("CharUnderline");
+ static OUString sPropName("CharUnderline");
return sPropName;
}
@@ -126,10 +126,10 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeExcepti
}
}
-rtl::OUString
+OUString
SwVbaFont::getServiceImplName()
{
- return rtl::OUString("SwVbaFont");
+ return OUString("SwVbaFont");
}
void SAL_CALL
@@ -220,14 +220,14 @@ SwVbaFont::getShadow() throw (uno::RuntimeException)
return aLongAnyFalse;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaFont::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Font" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Font" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx
index 814318ac43d6..b4b3721e681f 100644
--- a/sw/source/ui/vba/vbafont.hxx
+++ b/sw/source/ui/vba/vbafont.hxx
@@ -44,8 +44,8 @@ public:
virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx
index 2fdc03fbbb7d..7384dd6a120a 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -37,10 +37,10 @@ SwVbaFormField::~SwVbaFormField()
{
}
-rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException )
+OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException )
{
- rtl::OUString sResult;
- rtl::OUString sType = mxFormField->getFieldType();
+ OUString sResult;
+ OUString sType = mxFormField->getFieldType();
if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) )
{
uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW );
@@ -63,18 +63,18 @@ rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException
}
}
- sResult = rtl::OUString::valueOf( nValue );
+ sResult = OUString::valueOf( nValue );
}
else
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
return sResult;
}
-void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( uno::RuntimeException )
+void SAL_CALL SwVbaFormField::setResult( const OUString& result ) throw ( uno::RuntimeException )
{
- rtl::OUString sType = mxFormField->getFieldType();
+ OUString sType = mxFormField->getFieldType();
if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) )
{
uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW );
@@ -87,7 +87,7 @@ void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( u
}
else
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
@@ -107,20 +107,20 @@ uno::Any SAL_CALL SwVbaFormField::CheckBox() throw ( uno::RuntimeException )
return uno::makeAny( uno::Reference< word::XCheckBox >( new SwVbaCheckBox( this, mxContext, mxModel, mxFormField ) ) );
}
-rtl::OUString
+OUString
SwVbaFormField::getServiceImplName()
{
- return rtl::OUString("SwVbaFormField");
+ return OUString("SwVbaFormField");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaFormField::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.FormField" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.FormField" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfield.hxx b/sw/source/ui/vba/vbaformfield.hxx
index 2d55d5a463df..d99849b91a19 100644
--- a/sw/source/ui/vba/vbaformfield.hxx
+++ b/sw/source/ui/vba/vbaformfield.hxx
@@ -37,15 +37,15 @@ public:
virtual ~SwVbaFormField();
// Methods
- rtl::OUString SAL_CALL getResult() throw ( css::uno::RuntimeException );
- void SAL_CALL setResult( const rtl::OUString& result ) throw ( css::uno::RuntimeException );
+ OUString SAL_CALL getResult() throw ( css::uno::RuntimeException );
+ void SAL_CALL setResult( const OUString& result ) throw ( css::uno::RuntimeException );
sal_Bool SAL_CALL getEnabled() throw ( css::uno::RuntimeException );
void SAL_CALL setEnabled( sal_Bool enabled ) throw ( css::uno::RuntimeException );
css::uno::Any SAL_CALL CheckBox() throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_FORMFIELD_HXX */
diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx
index a421088d96ea..ba554fb07fd4 100644
--- a/sw/source/ui/vba/vbaformfields.cxx
+++ b/sw/source/ui/vba/vbaformfields.cxx
@@ -32,16 +32,16 @@ typedef std::vector< uno::Reference< text::XFormField > > XFormFieldVec;
typedef ::cppu::WeakImplHelper1< container::XEnumeration > FormFiledEnumeration_BASE;
typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > FormFieldCollectionHelper_BASE;
-rtl::OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField )
+OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField )
{
- rtl::OUString sName;
+ OUString sName;
sal_Int32 nCount = xFormField->getParamCount();
for( sal_Int32 i = 0; i < nCount; i++ )
{
if( xFormField->getParamName(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
{
sName = xFormField->getParamValue(i);
- OSL_TRACE("lcl_getFormFieldName: %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE("lcl_getFormFieldName: %s", OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
break;
}
}
@@ -101,17 +101,17 @@ public:
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return word::XFormField::static_type(0); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; }
// XNameAcess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
uno::Reference< text::XFormField > xFormField( *cachePos, uno::UNO_QUERY_THROW );
return uno::makeAny( uno::Reference< word::XFormField >( new SwVbaFormField( mxParent, mxContext, mxModel, xFormField ) ) );
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > sNames( mxFormFields.size() );
- rtl::OUString* pString = sNames.getArray();
+ uno::Sequence< OUString > sNames( mxFormFields.size() );
+ OUString* pString = sNames.getArray();
XFormFieldVec::iterator it = mxFormFields.begin();
XFormFieldVec::iterator it_end = mxFormFields.end();
for ( ; it != it_end; ++it, ++pString )
@@ -121,7 +121,7 @@ public:
}
return sNames;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
cachePos = mxFormFields.begin();
XFormFieldVec::iterator it_end = mxFormFields.end();
@@ -174,20 +174,20 @@ SwVbaFormFields::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaFormFields::getServiceImplName()
{
- return rtl::OUString("SwVbaFormFields");
+ return OUString("SwVbaFormFields");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaFormFields::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.FormFields");
+ sNames[0] = OUString("ooo.vba.word.FormFields");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx
index 7b81688385b8..8ce86466a04d 100644
--- a/sw/source/ui/vba/vbaformfields.hxx
+++ b/sw/source/ui/vba/vbaformfields.hxx
@@ -42,8 +42,8 @@ public:
// SwVbaFormFields_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_FORMFIELDS_HXX */
diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx
index 3dc5bad28821..4b1564dde8f1 100644
--- a/sw/source/ui/vba/vbaframe.cxx
+++ b/sw/source/ui/vba/vbaframe.cxx
@@ -43,20 +43,20 @@ void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException )
xSelectSupp->select( uno::makeAny( mxTextFrame ) );
}
-rtl::OUString
+OUString
SwVbaFrame::getServiceImplName()
{
- return rtl::OUString("SwVbaFrame");
+ return OUString("SwVbaFrame");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaFrame::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Frame" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Frame" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx
index 2fb130f6bf34..7bde2fc94376 100644
--- a/sw/source/ui/vba/vbaframe.hxx
+++ b/sw/source/ui/vba/vbaframe.hxx
@@ -40,8 +40,8 @@ public:
virtual void SAL_CALL Select() throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_FRAME_HXX */
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 259584f003d7..84863a268cd0 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -78,20 +78,20 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) );
}
-rtl::OUString
+OUString
SwVbaFrames::getServiceImplName()
{
- return rtl::OUString("SwVbaFrames");
+ return OUString("SwVbaFrames");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaFrames::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Frames");
+ sNames[0] = OUString("ooo.vba.word.Frames");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx
index 363631b720b9..c2df6683df4c 100644
--- a/sw/source/ui/vba/vbaframes.hxx
+++ b/sw/source/ui/vba/vbaframes.hxx
@@ -42,8 +42,8 @@ public:
// SwVbaFrames_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 3088dd116542..6772cd5384ff 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
using namespace ::ooo::vba;
-rtl::OUString sDocCtxName("WordDocumentContext");
+OUString sDocCtxName("WordDocumentContext");
// =============================================================================
// SwVbaGlobals
@@ -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 = rtl::OUString("Application");
+ aInitArgs[ 0 ].Name = OUString("Application");
aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
aInitArgs[ 1 ].Name = sDocCtxName;
aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
@@ -85,7 +85,7 @@ SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
return getApplication()->getActiveWindow();
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaGlobals::getName() throw (uno::RuntimeException)
{
return getApplication()->getName();
@@ -138,35 +138,35 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (un
return getApplication()->CentimetersToPoints( _Centimeters );
}
-rtl::OUString
+OUString
SwVbaGlobals::getServiceImplName()
{
- return rtl::OUString("SwVbaGlobals");
+ return OUString("SwVbaGlobals");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaGlobals::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Globals" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Globals" );
}
return aServiceNames;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
{
static bool bInit = false;
- static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
+ static uno::Sequence< OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
if ( !bInit )
{
- rtl::OUString names[] = {
- ::rtl::OUString( "ooo.vba.word.Document" ),
+ OUString names[] = {
+ OUString( "ooo.vba.word.Document" ),
// #FIXME #TODO make Application a proper service
-// ::rtl::OUString( "ooo.vba.word.Application" ),
+// OUString( "ooo.vba.word.Application" ),
};
sal_Int32 nWordServices = SAL_N_ELEMENTS( names );
sal_Int32 startIndex = serviceNames.getLength();
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index ac452f28b028..2b848dc90060 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -51,7 +51,7 @@ public:
virtual ~SwVbaGlobals();
// XGlobals
- virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
@@ -64,11 +64,11 @@ public:
virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
// XMultiServiceFactory
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_GLOBALS_HXX */
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index e13eafda4ce3..9714e7623616 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -51,18 +51,18 @@ void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious
uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException)
{
- rtl::OUString sPropsNameText;
+ OUString sPropsNameText;
if( mbHeader )
{
- sPropsNameText = rtl::OUString("HeaderText");
+ sPropsNameText = OUString("HeaderText");
}
else
{
- sPropsNameText = rtl::OUString("FooterText");
+ sPropsNameText = OUString("FooterText");
}
if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages )
{
- sPropsNameText = sPropsNameText.concat( rtl::OUString("Left") );
+ sPropsNameText = sPropsNameText.concat( OUString("Left") );
}
uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW );
@@ -83,20 +83,20 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
return uno::makeAny( xCol );
}
-rtl::OUString
+OUString
SwVbaHeaderFooter::getServiceImplName()
{
- return rtl::OUString("SwVbaHeaderFooter");
+ return OUString("SwVbaHeaderFooter");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaHeaderFooter::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index 199314d2dd72..2b934a429947 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -46,8 +46,8 @@ public:
virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_HEADERFOOTER_HXX */
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 15d5e9263c32..23d9551d9a84 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -42,7 +42,7 @@ sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel
sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
- rtl::OUString aImplName = xServiceInfo->getImplementationName();
+ OUString aImplName = xServiceInfo->getImplementationName();
if ( aImplName == "SwXHeadFootText" )
return sal_True;
return sal_False;
@@ -54,8 +54,8 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM
if( !isHeaderFooter( xCurrentText ) )
return sal_False;
- rtl::OUString aPropIsShared = rtl::OUString("HeaderIsShared");
- rtl::OUString aPropText = rtl::OUString("HeaderText");
+ OUString aPropIsShared = OUString("HeaderIsShared");
+ OUString aPropText = OUString("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 = rtl::OUString("HeaderTextLeft");
+ aPropText = OUString("HeaderTextLeft");
else
- aPropText = rtl::OUString("HeaderTextRight");
+ aPropText = OUString("HeaderTextRight");
}
uno::Reference< text::XText > xHeaderText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
@@ -104,7 +104,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo
{
uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
sal_Bool isShared = sal_False;
- xStyleProps->getPropertyValue( rtl::OUString("HeaderIsShared")) >>= isShared;
+ xStyleProps->getPropertyValue( OUString("HeaderIsShared")) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
@@ -120,8 +120,8 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM
if( !isHeaderFooter( xCurrentText ) )
return sal_False;
- rtl::OUString aPropIsShared = rtl::OUString("FooterIsShared");
- rtl::OUString aPropText = rtl::OUString("FooterText");
+ OUString aPropIsShared = OUString("FooterIsShared");
+ OUString aPropText = OUString("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 = rtl::OUString("FooterTextLeft");
+ aPropText = OUString("FooterTextLeft");
else
- aPropText = rtl::OUString("FooterTextRight");
+ aPropText = OUString("FooterTextRight");
}
uno::Reference< text::XText > xFooterText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
@@ -169,7 +169,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo
{
uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
sal_Bool isShared = sal_False;
- xStyleProps->getPropertyValue( rtl::OUString("FooterIsShared")) >>= isShared;
+ xStyleProps->getPropertyValue( OUString("FooterIsShared")) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index ec41e33d025f..b85be8af0fc8 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -119,20 +119,20 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaHeadersFooters::getServiceImplName()
{
- return rtl::OUString("SwVbaHeadersFooters");
+ return OUString("SwVbaHeadersFooters");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaHeadersFooters::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.HeadersFooters");
+ sNames[0] = OUString("ooo.vba.word.HeadersFooters");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index ac1f65c75ba5..c51f7c14be89 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -44,8 +44,8 @@ public:
// SwVbaHeadersFooters_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_HEADERSFOOTERS_HXX */
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index ea7cf40fd5e2..bfb58d413e5c 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -68,17 +68,17 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
if( isFirstElement )
{
sal_Bool isNumberingRestart = !bContinuePreviousList;
- xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) );
+ xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) );
if( isNumberingRestart )
{
sal_Int16 nStartValue = 1;
- xProps->setPropertyValue( rtl::OUString("NumberingStartValue"), uno::makeAny( nStartValue ) );
+ xProps->setPropertyValue( OUString("NumberingStartValue"), uno::makeAny( nStartValue ) );
}
isFirstElement = sal_False;
}
else
{
- xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) );
+ xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) );
}
pListTemplate->applyListTemplate( xProps );
}
@@ -86,23 +86,23 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
-rtl::OUString
+OUString
SwVbaListFormat::getServiceImplName()
{
- return rtl::OUString("SwVbaListFormat");
+ return OUString("SwVbaListFormat");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaListFormat::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListFormat" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.ListFormat" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx
index e666f0173b58..b6d940bbba3f 100644
--- a/sw/source/ui/vba/vbalistformat.hxx
+++ b/sw/source/ui/vba/vbalistformat.hxx
@@ -43,8 +43,8 @@ public:
virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTFORMAT_HXX */
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx
index d25cbf0c415f..37ce9015bef2 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -62,7 +62,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A
|| nIndex == word::WdListGalleryType::wdOutlineNumberGallery )
return uno::makeAny( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) );
}
- throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
}
// XEnumerationAccess
@@ -84,20 +84,20 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaListGalleries::getServiceImplName()
{
- return rtl::OUString("SwVbaListGalleries");
+ return OUString("SwVbaListGalleries");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaListGalleries::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.ListGalleries");
+ sNames[0] = OUString("ooo.vba.word.ListGalleries");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx
index 3895b325cd81..bbbb8bf04632 100644
--- a/sw/source/ui/vba/vbalistgalleries.hxx
+++ b/sw/source/ui/vba/vbalistgalleries.hxx
@@ -43,8 +43,8 @@ public:
// SwVbaListGalleries_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTGALLERIES_HXX */
diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx
index b7127f994b6d..812e930d73cb 100644
--- a/sw/source/ui/vba/vbalistgallery.cxx
+++ b/sw/source/ui/vba/vbalistgallery.cxx
@@ -41,20 +41,20 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeExce
return uno::makeAny( xCol );
}
-rtl::OUString
+OUString
SwVbaListGallery::getServiceImplName()
{
- return rtl::OUString("SwVbaListGallery");
+ return OUString("SwVbaListGallery");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaListGallery::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListGallery" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.ListGallery" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx
index 402ccd88c13c..92369b411c51 100644
--- a/sw/source/ui/vba/vbalistgallery.hxx
+++ b/sw/source/ui/vba/vbalistgallery.hxx
@@ -41,8 +41,8 @@ public:
virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTGALLERY_HXX */
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index c0974226993b..8cd6c854f62e 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -60,17 +60,17 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
{
case word::WdListGalleryType::wdBulletGallery:
{
- msStyleName = rtl::OUString(WORD_BULLET_GALLERY );
+ msStyleName = OUString(WORD_BULLET_GALLERY );
break;
}
case word::WdListGalleryType::wdNumberGallery:
{
- msStyleName = rtl::OUString(WORD_NUMBER_GALLERY );
+ msStyleName = OUString(WORD_NUMBER_GALLERY );
break;
}
case word::WdListGalleryType::wdOutlineNumberGallery:
{
- msStyleName = rtl::OUString(WORD_OUTLINE_NUMBER_GALLERY );
+ msStyleName = OUString(WORD_OUTLINE_NUMBER_GALLERY );
break;
}
default:
@@ -78,29 +78,29 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
throw uno::RuntimeException();
}
}
- msStyleName += rtl::OUString::valueOf( mnTemplateType );
+ msStyleName += OUString::valueOf( mnTemplateType );
// get the numbering style
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
- mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(rtl::OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW );
- OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", rtl::OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW );
+ OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() );
if( mxStyleFamily->hasByName( msStyleName ) )
{
mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW );
- mxNumberingRules.set( mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW );
+ mxNumberingRules.set( mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW );
}
else
{
// create new numbering style
uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW );
- mxStyleProps.set( xDocMSF->createInstance( rtl::OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW );
+ mxStyleProps.set( xDocMSF->createInstance( OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW );
// insert this style into style family, or the property NumberingRules doesn't exist.
mxStyleFamily->insertByName( msStyleName, uno::makeAny( mxStyleProps ) );
- mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ) >>= mxNumberingRules;
+ mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ) >>= mxNumberingRules;
CreateListTemplate();
- mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) );
+ mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) );
}
}
@@ -136,47 +136,47 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti
sal_Int32 nLevel = 0;
uno::Sequence< beans::PropertyValue > aPropertyValues;
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- rtl::OUString sCharStyleName( "Bullet Symbols" );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) );
+ OUString sCharStyleName( "Bullet Symbols" );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) );
sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- rtl::OUString aBulletChar;
+ OUString aBulletChar;
switch( mnTemplateType )
{
case 1:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) );
break;
}
case 2:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_EMPTY_DOT ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_EMPTY_DOT ) );
break;
}
case 3:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) );
break;
}
case 4:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_STAR_SYMBOL ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_STAR_SYMBOL ) );
break;
}
case 5:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) );
break;
}
case 6:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) );
break;
}
case 7:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_CHECK_MARK ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_CHECK_MARK ) );
break;
}
default:
@@ -185,7 +185,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti
throw css::uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
@@ -198,49 +198,49 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
sal_Int16 nNumberingType = 0;
- rtl::OUString sSuffix;
+ OUString sSuffix;
switch( mnTemplateType )
{
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ARABIC;
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 4:
{
nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 6:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 7:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
default:
@@ -249,8 +249,8 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti
throw css::uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
@@ -305,8 +305,8 @@ void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::Runtime
void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeException )
{
sal_Int16 nNumberingType = 0;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
+ OUString sPrefix;
+ OUString sSuffix;
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
@@ -318,57 +318,57 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 4:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 5:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
default:
@@ -376,9 +376,9 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
throw uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
}
@@ -387,18 +387,18 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce
{
sal_Int16 nNumberingType = style::NumberingType::ARABIC;
sal_Int16 nParentNumbering = 0;
- rtl::OUString sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ OUString sSuffix = OUString::valueOf( sal_Unicode('.') );
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
if( nLevel != 0 )
{
nParentNumbering = sal_Int16( nLevel - 1 );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
}
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
@@ -407,44 +407,44 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce
void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeException )
{
sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL;
- rtl::OUString sCharStyleName( "Bullet Symbols" );
- rtl::OUString aBulletChar;
+ OUString sCharStyleName( "Bullet Symbols" );
+ OUString aBulletChar;
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) );
switch( nLevel )
{
case 0:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) );
break;
}
case 1:
case 5:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) );
break;
}
case 2:
case 6:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) );
break;
}
case 3:
case 7:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) );
break;
}
case 4:
case 8:
{
- aBulletChar = rtl::OUString( sal_Unicode( CHAR_DIAMOND ) );
+ aBulletChar = OUString( sal_Unicode( CHAR_DIAMOND ) );
break;
}
default:
@@ -452,7 +452,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce
throw uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
}
@@ -460,8 +460,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce
void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeException )
{
sal_Int16 nNumberingType = 0;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
+ OUString sPrefix;
+ OUString sSuffix;
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
@@ -472,66 +472,66 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
case 0:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
sal_Int16 nParentNumbering = 0;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
break;
}
case 2:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 4:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
default:
@@ -539,9 +539,9 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
throw uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
}
@@ -555,11 +555,11 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
if( nLevel != 0 )
{
nParentNumbering = sal_Int16( nLevel - 1 );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
}
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
@@ -568,8 +568,8 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce
void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeException )
{
sal_Int16 nNumberingType = 0;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
+ OUString sPrefix;
+ OUString sSuffix;
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
@@ -580,64 +580,64 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
case 0:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 1:
{
nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 3:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString();
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString();
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 4:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode(')') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode(')') );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = rtl::OUString::valueOf( sal_Unicode('(') );
- sSuffix = rtl::OUString::valueOf( sal_Unicode('.') );
+ sPrefix = OUString::valueOf( sal_Unicode('(') );
+ sSuffix = OUString::valueOf( sal_Unicode('.') );
break;
}
default:
@@ -645,9 +645,9 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
throw uno::RuntimeException();
}
}
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
}
@@ -656,31 +656,31 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce
{
sal_Int16 nNumberingType = style::NumberingType::ARABIC;
uno::Sequence< beans::PropertyValue > aPropertyValues;
- rtl::OUString sPrefix("Chapter ");
+ OUString sPrefix("Chapter ");
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
- setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) );
+ setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
}
}
-uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException )
+uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException )
{
uno::Sequence< beans::PropertyValue > aPropertyValues;
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
return getPropertyValue( aPropertyValues, sName );
}
-void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException )
+void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException )
{
uno::Sequence< beans::PropertyValue > aPropertyValues;
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
setOrAppendPropertyValue( aPropertyValues, sName, aValue );
mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
- mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) );
+ mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index 0e862fa0dd2c..2d755d70e10b 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -47,7 +47,7 @@ private:
css::uno::Reference< css::beans::XPropertySet > mxStyleProps;
sal_Int32 mnGalleryType;
sal_Int32 mnTemplateType;
- rtl::OUString msStyleName;
+ OUString msStyleName;
void Init() throw( css::uno::RuntimeException );
void CreateListTemplate() throw( css::uno::RuntimeException );
@@ -67,8 +67,8 @@ public:
sal_Int32 getGalleryType() const { return mnGalleryType; }
css::uno::Reference< css::container::XIndexReplace > getNumberingRules() const { return mxNumberingRules; }
- css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException );
- void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException );
+ css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException );
+ void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException );
};
diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx
index b18754c0e590..0166b254baa0 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -39,7 +39,7 @@ SwVbaListLevel::~SwVbaListLevel()
::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException)
{
sal_Int16 nAlignment = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust") ) >>= nAlignment;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust") ) >>= nAlignment;
switch( nAlignment )
{
case text::HoriOrientation::LEFT:
@@ -90,17 +90,17 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno:
throw uno::RuntimeException();
}
}
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust"), uno::makeAny( nAlignment ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust"), uno::makeAny( nAlignment ) );
}
uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException)
@@ -108,24 +108,24 @@ void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::X
return mnLevel + 1;
}
-::rtl::OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException)
{
// TODO:
- return rtl::OUString();
+ return OUString();
}
-void SAL_CALL SwVbaListLevel::setLinkedStyle( const ::rtl::OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException)
{
// TODO:
}
-::rtl::OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException)
{
// TODO::
- return rtl::OUString();
+ return OUString();
}
-void SAL_CALL SwVbaListLevel::setNumberFormat( const ::rtl::OUString& /*_numberformat*/ ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) throw (uno::RuntimeException)
{
// TODO::
}
@@ -135,8 +135,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException)
// indentAt + firstlineindent
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent;
sal_Int32 nResult = nIndentAt + nFirstLineIndent;
@@ -148,16 +148,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (
sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition );
sal_Int32 nIndentAt = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt;
sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException)
{
sal_Int16 nNumberingType = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType") ) >>= nNumberingType;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType") ) >>= nNumberingType;
switch( nNumberingType )
{
case style::NumberingType::CHAR_SPECIAL:
@@ -212,7 +212,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
return nNumberingType;
@@ -285,11 +285,11 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw (
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType"), uno::makeAny( nNumberingType ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType"), uno::makeAny( nNumberingType ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException)
@@ -306,20 +306,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ )
::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException)
{
sal_Int16 nStartWith = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith") ) >>= nStartWith;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith") ) >>= nStartWith;
return nStartWith;
}
void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException)
{
sal_Int16 nStartWith = (sal_Int16)_startat;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith"), uno::makeAny( nStartWith ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith"), uno::makeAny( nStartWith ) );
}
float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException)
{
sal_Int32 nTabPosition = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition") ) >>= nTabPosition;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition") ) >>= nTabPosition;
return static_cast< float >( Millimeter::getInPoints( nTabPosition ) );
}
@@ -327,14 +327,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException)
void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException)
{
sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition );
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) );
}
float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException)
{
// indentAt
sal_Int32 nIndentAt = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt;
return static_cast< float >( Millimeter::getInPoints( nIndentAt ) );
}
@@ -343,21 +343,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno:
{
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent;
sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent;
nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition );
nFirstLineIndent = nAlignedAt - nIndentAt;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt"), uno::makeAny( nIndentAt ) );
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt"), uno::makeAny( nIndentAt ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException)
{
sal_Int16 nLabelFollowedBy= 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy") ) >>= nLabelFollowedBy;
+ pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy") ) >>= nLabelFollowedBy;
return nLabelFollowedBy;
}
@@ -365,23 +365,23 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno:
void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException)
{
sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) );
+ pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) );
}
-rtl::OUString
+OUString
SwVbaListLevel::getServiceImplName()
{
- return rtl::OUString("SwVbaListLevel");
+ return OUString("SwVbaListLevel");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaListLevel::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListLevel" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.ListLevel" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx
index 3d41ebf599c2..1fd51d1e8049 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -44,10 +44,10 @@ public:
virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setLinkedStyle( const ::rtl::OUString& _linkedstyle ) throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setNumberFormat( const ::rtl::OUString& _numberformat ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException);
virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException);
virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException);
@@ -64,8 +64,8 @@ public:
virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTLEVEL_HXX */
diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx
index 470e5763cdb9..81ff8a67c387 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any&
if( ( Index1 >>= nIndex ) == sal_False )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
- throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
return uno::makeAny( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) );
}
@@ -87,20 +87,20 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaListLevels::getServiceImplName()
{
- return rtl::OUString("SwVbaListLevels");
+ return OUString("SwVbaListLevels");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaListLevels::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.ListLevels");
+ sNames[0] = OUString("ooo.vba.word.ListLevels");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx
index 1879ea898338..acd8f9ab4ad7 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -44,8 +44,8 @@ public:
// SwVbaListLevels_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTLEVELS_HXX */
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index 485a5278398b..122ba191a9b0 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -45,23 +45,23 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept
void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException)
{
uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules();
- xProps->setPropertyValue( rtl::OUString("NumberingRules") , uno::makeAny( xNumberingRules ) );
+ xProps->setPropertyValue( OUString("NumberingRules") , uno::makeAny( xNumberingRules ) );
}
-rtl::OUString
+OUString
SwVbaListTemplate::getServiceImplName()
{
- return rtl::OUString("SwVbaListTemplate");
+ return OUString("SwVbaListTemplate");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaListTemplate::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListTemplate" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.ListTemplate" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx
index d46b830d3223..02c574dc3283 100644
--- a/sw/source/ui/vba/vbalisttemplate.hxx
+++ b/sw/source/ui/vba/vbalisttemplate.hxx
@@ -43,8 +43,8 @@ public:
virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTTEMPLATE_HXX */
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx
index 01b56c27a33d..b7ba7fe1256b 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -57,7 +57,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A
if( ( Index1 >>= nIndex ) == sal_False )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
- throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
return uno::makeAny( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) );
}
@@ -81,20 +81,20 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaListTemplates::getServiceImplName()
{
- return rtl::OUString("SwVbaListTemplates");
+ return OUString("SwVbaListTemplates");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaListTemplates::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.ListTemplates");
+ sNames[0] = OUString("ooo.vba.word.ListTemplates");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx
index 87a76ef9e499..7ad5b7b94c80 100644
--- a/sw/source/ui/vba/vbalisttemplates.hxx
+++ b/sw/source/ui/vba/vbalisttemplates.hxx
@@ -44,8 +44,8 @@ public:
// SwVbaListTemplates_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_LISTTEMPLATES_HXX */
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 898c7939e740..0c21ae0fca93 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -45,44 +45,44 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
{
case word::WdDefaultFilePath::wdDocumentsPath:
{
- msDefaultFilePath = rtl::OUString("Work");
+ msDefaultFilePath = OUString("Work");
break;
}
case word::WdDefaultFilePath::wdPicturesPath:
{
- msDefaultFilePath = rtl::OUString("Gallery");
+ msDefaultFilePath = OUString("Gallery");
break;
}
case word::WdDefaultFilePath::wdUserTemplatesPath:
case word::WdDefaultFilePath::wdWorkgroupTemplatesPath:
{
- msDefaultFilePath = rtl::OUString("Template");
+ msDefaultFilePath = OUString("Template");
break;
}
case word::WdDefaultFilePath::wdStartupPath:
{
- msDefaultFilePath = rtl::OUString("Addin");
+ msDefaultFilePath = OUString("Addin");
break;
}
case word::WdDefaultFilePath::wdUserOptionsPath:
{
- msDefaultFilePath = rtl::OUString("UserConfig");
+ msDefaultFilePath = OUString("UserConfig");
break;
}
case word::WdDefaultFilePath::wdToolsPath:
case word::WdDefaultFilePath::wdProgramPath:
{
- msDefaultFilePath = rtl::OUString("Module");
+ msDefaultFilePath = OUString("Module");
break;
}
case word::WdDefaultFilePath::wdTempFilePath:
{
- msDefaultFilePath = rtl::OUString("Temp");
+ msDefaultFilePath = OUString("Temp");
break;
}
default:
{
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
+ DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
}
}
@@ -91,12 +91,12 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
void SwVbaOptions::setValueEvent( const uno::Any& value )
{
- rtl::OUString sNewPath;
+ OUString sNewPath;
value >>= sNewPath;
- rtl::OUString sNewPathUrl;
+ OUString sNewPathUrl;
::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl );
- uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
- rtl::OUString sOldPathUrl;
+ uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
+ OUString sOldPathUrl;
xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl;
// path could be a multipath, Microsoft doesn't support this feature in Word currently
// only the last path is from interest.
@@ -110,8 +110,8 @@ void SwVbaOptions::setValueEvent( const uno::Any& value )
uno::Any SwVbaOptions::getValueEvent()
{
- uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
- rtl::OUString sPathUrl;
+ uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
+ OUString sPathUrl;
xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl;
// path could be a multipath, Microsoft doesn't support this feature in Word currently
// only the last path is from interest.
@@ -120,7 +120,7 @@ uno::Any SwVbaOptions::getValueEvent()
{
sPathUrl = sPathUrl.copy( nIndex + 1 );
}
- rtl::OUString sPath;
+ OUString sPath;
::osl::File::getSystemPathFromFileURL( sPathUrl, sPath );
return uno::makeAny( sPath );
}
@@ -255,20 +255,20 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof
// not support in Writer
}
-rtl::OUString
+OUString
SwVbaOptions::getServiceImplName()
{
- return rtl::OUString("SwVbaOptions");
+ return OUString("SwVbaOptions");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaOptions::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Options" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Options" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx
index 753d2b6eaba7..dbd89e4aaf23 100644
--- a/sw/source/ui/vba/vbaoptions.hxx
+++ b/sw/source/ui/vba/vbaoptions.hxx
@@ -31,7 +31,7 @@ class SwVbaOptions : public SwVbaOptions_BASE,
public PropListener
{
private:
- rtl::OUString msDefaultFilePath;
+ OUString msDefaultFilePath;
css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
public:
SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException );
@@ -73,8 +73,8 @@ public:
virtual css::uno::Any getValueEvent();
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_OPTIONS_HXX */
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index ffa2c69cf1bb..b7d3d140c4b8 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -59,9 +59,9 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc
double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException)
{
sal_Bool isHeaderOn = sal_False;
- mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn;
+ mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn;
if( !isHeaderOn )
- mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) );
return VbaPageSetupBase::getHeaderMargin();
}
@@ -82,29 +82,29 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
sal_Int32 aktSpacing = 0;
sal_Int32 aktHeaderHeight = 0;
- mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn;
+ mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn;
if( !isHeaderOn )
- mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) );
- mxPageProps->getPropertyValue( rtl::OUString("TopMargin")) >>= aktTopMargin;
- mxPageProps->getPropertyValue( rtl::OUString("HeaderBodyDistance")) >>= aktSpacing;
- mxPageProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= aktHeaderHeight;
+ mxPageProps->getPropertyValue( OUString("TopMargin")) >>= aktTopMargin;
+ mxPageProps->getPropertyValue( OUString("HeaderBodyDistance")) >>= aktSpacing;
+ mxPageProps->getPropertyValue( OUString("HeaderHeight")) >>= aktHeaderHeight;
sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin );
sal_Int32 height = aktHeaderHeight - aktSpacing;
sal_Int32 newHeaderHeight = newSpacing + height;
- mxPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( newHeaderDistance ) );
- mxPageProps->setPropertyValue( rtl::OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) );
- mxPageProps->setPropertyValue( rtl::OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) );
+ mxPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( newHeaderDistance ) );
+ mxPageProps->setPropertyValue( OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) );
+ mxPageProps->setPropertyValue( OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) );
}
double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException)
{
sal_Bool isFooterOn = sal_False;
- mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn;
+ mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn;
if( !isFooterOn )
- mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) );
return VbaPageSetupBase::getFooterMargin();
}
@@ -116,26 +116,26 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw
sal_Int32 aktSpacing = 0;
sal_Int32 aktFooterHeight = 0;
- mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn;
+ mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn;
if( !isFooterOn )
- mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) );
- mxPageProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= aktBottomMargin;
- mxPageProps->getPropertyValue( rtl::OUString("FooterBodyDistance")) >>= aktSpacing;
- mxPageProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= aktFooterHeight;
+ mxPageProps->getPropertyValue( OUString("BottomMargin")) >>= aktBottomMargin;
+ mxPageProps->getPropertyValue( OUString("FooterBodyDistance")) >>= aktSpacing;
+ mxPageProps->getPropertyValue( OUString("FooterHeight")) >>= aktFooterHeight;
sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin );
sal_Int32 height = aktFooterHeight - aktSpacing;
sal_Int32 newFooterHeight = newSpacing + height;
- mxPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( newFooterDistance ) );
- mxPageProps->setPropertyValue( rtl::OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) );
- mxPageProps->setPropertyValue( rtl::OUString("FooterHeight"), uno::makeAny( newFooterHeight ) );
+ mxPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( newFooterDistance ) );
+ mxPageProps->setPropertyValue( OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) );
+ mxPageProps->setPropertyValue( OUString("FooterHeight"), uno::makeAny( newFooterHeight ) );
}
sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException)
{
- rtl::OUString pageStyle = getStyleOfFirstPage();
+ OUString pageStyle = getStyleOfFirstPage();
if ( pageStyle == "First Page" )
return sal_True;
@@ -147,34 +147,34 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
if( status == getDifferentFirstPageHeaderFooter() )
return;
- rtl::OUString newStyle;
+ OUString newStyle;
if( status )
- newStyle = rtl::OUString("First Page");
+ newStyle = OUString("First Page");
else
- newStyle = rtl::OUString("Standard");
+ newStyle = OUString("Standard");
uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
sal_Int32 nTopMargin = 0;
- xStyleProps->getPropertyValue( rtl::OUString("TopMargin")) >>= nTopMargin;
+ xStyleProps->getPropertyValue( OUString("TopMargin")) >>= nTopMargin;
sal_Int32 nBottomMargin = 0;
- xStyleProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= nBottomMargin;
+ xStyleProps->getPropertyValue( OUString("BottomMargin")) >>= nBottomMargin;
sal_Int32 nLeftMargin = 0;
- xStyleProps->getPropertyValue( rtl::OUString("LeftMargin")) >>= nLeftMargin;
+ xStyleProps->getPropertyValue( OUString("LeftMargin")) >>= nLeftMargin;
sal_Int32 nRightMargin = 0;
- xStyleProps->getPropertyValue( rtl::OUString("RightMargin")) >>= nRightMargin;
+ xStyleProps->getPropertyValue( OUString("RightMargin")) >>= nRightMargin;
sal_Int32 nHeaderHeight = 0;
- xStyleProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= nHeaderHeight;
+ xStyleProps->getPropertyValue( OUString("HeaderHeight")) >>= nHeaderHeight;
sal_Int32 nFooterHeight = 0;
- xStyleProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= nFooterHeight;
+ xStyleProps->getPropertyValue( OUString("FooterHeight")) >>= nFooterHeight;
sal_Bool isHeaderOn = sal_False;
- xStyleProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn;
+ xStyleProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn;
if( isHeaderOn )
{
nTopMargin += nHeaderHeight;
nBottomMargin += nFooterHeight;
- xStyleProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_False ) );
- xStyleProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_False ) );
+ xStyleProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_False ) );
+ xStyleProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_False ) );
}
uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
if( xPageCursor->getPage() != 1 )
@@ -183,26 +183,26 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
}
uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
- uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY );
if( xTableProps.is() )
{
- xTableProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) );
+ xTableProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) );
}
else
{
- xCursorProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) );
+ xCursorProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) );
}
uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
- xFirstPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( nTopMargin ) );
- xFirstPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( nBottomMargin ) );
- xFirstPageProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nLeftMargin ) );
- xFirstPageProps->setPropertyValue( rtl::OUString("RightMargin"), uno::makeAny( nRightMargin ) );
+ xFirstPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( nTopMargin ) );
+ xFirstPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( nBottomMargin ) );
+ xFirstPageProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nLeftMargin ) );
+ xFirstPageProps->setPropertyValue( OUString("RightMargin"), uno::makeAny( nRightMargin ) );
}
-rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
+OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
{
- rtl::OUString styleFirstPage;
+ OUString styleFirstPage;
uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
if( xPageCursor->getPage() != 1 )
{
@@ -210,14 +210,14 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
}
uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW );
- uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY );
if( xTableProps.is() )
{
- xTableProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage;
+ xTableProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage;
}
else
{
- xCursorProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage;
+ xCursorProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage;
}
return styleFirstPage;
}
@@ -227,7 +227,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
// FIXME:
sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW );
- rtl::OUString sStyleName = xNamed->getName();
+ OUString sStyleName = xNamed->getName();
if ( sStyleName == "Left Page" )
wdSectionStart = word::WdSectionStart::wdSectionEvenPage;
else if ( sStyleName == "Right Page" )
@@ -243,20 +243,20 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t
// #FIXME:
}
-rtl::OUString
+OUString
SwVbaPageSetup::getServiceImplName()
{
- return rtl::OUString("SwVbaPageSetup");
+ return OUString("SwVbaPageSetup");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaPageSetup::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.PageSetup" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.PageSetup" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx
index 641479ef7acb..310b5808e238 100644
--- a/sw/source/ui/vba/vbapagesetup.hxx
+++ b/sw/source/ui/vba/vbapagesetup.hxx
@@ -31,7 +31,7 @@ typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSet
class SwVbaPageSetup : public SwVbaPageSetup_BASE
{
private:
- rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
+ OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
public:
SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent,
@@ -53,8 +53,8 @@ public:
virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx
index f0e8e35bc3b7..40b9e163c485 100644
--- a/sw/source/ui/vba/vbapane.cxx
+++ b/sw/source/ui/vba/vbapane.cxx
@@ -43,24 +43,24 @@ SwVbaPane::View() throw ( css::uno::RuntimeException )
void SAL_CALL
SwVbaPane::Close( ) throw ( css::uno::RuntimeException )
{
- rtl::OUString url = rtl::OUString( ".uno:CloseWin");
+ OUString url = OUString( ".uno:CloseWin");
dispatchRequests( mxModel,url );
}
-rtl::OUString
+OUString
SwVbaPane::getServiceImplName()
{
- return rtl::OUString("SwVbaPane");
+ return OUString("SwVbaPane");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaPane::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx
index 78f86311bebb..61eed74bb916 100644
--- a/sw/source/ui/vba/vbapane.hxx
+++ b/sw/source/ui/vba/vbapane.hxx
@@ -40,8 +40,8 @@ public:
virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_PANE_HXX */
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index d3a62629a915..f7971f784260 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -96,20 +96,20 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaPanes::getServiceImplName()
{
- return rtl::OUString("SwVbaPanes");
+ return OUString("SwVbaPanes");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaPanes::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Panes");
+ sNames[0] = OUString("ooo.vba.word.Panes");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx
index 257566c1e33a..9f15784adbdc 100644
--- a/sw/source/ui/vba/vbapanes.hxx
+++ b/sw/source/ui/vba/vbapanes.hxx
@@ -42,8 +42,8 @@ public:
// SwVbaPanes_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_PANES_HXX */
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 1618a1167555..da478a8ac2f3 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -54,20 +54,20 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException
xRange->setStyle( style );
}
-rtl::OUString
+OUString
SwVbaParagraph::getServiceImplName()
{
- return rtl::OUString("SwVbaParagraph");
+ return OUString("SwVbaParagraph");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaParagraph::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Paragraph" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Paragraph" );
}
return aServiceNames;
}
@@ -100,7 +100,7 @@ public:
while( xParEnum->hasMoreElements() )
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) )
{
nCount++;
}
@@ -116,7 +116,7 @@ public:
while( xParEnum->hasMoreElements() )
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) )
{
if( Index == nCount )
return uno::makeAny( xServiceInfo );
@@ -157,20 +157,20 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) );
}
-rtl::OUString
+OUString
SwVbaParagraphs::getServiceImplName()
{
- return rtl::OUString("SwVbaParagraphs");
+ return OUString("SwVbaParagraphs");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaParagraphs::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Paragraphs");
+ sNames[0] = OUString("ooo.vba.word.Paragraphs");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx
index 23465f44d646..8fd5a3637046 100644
--- a/sw/source/ui/vba/vbaparagraph.hxx
+++ b/sw/source/ui/vba/vbaparagraph.hxx
@@ -46,8 +46,8 @@ public:
virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
@@ -68,8 +68,8 @@ public:
// SwVbaParagraphs_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_PARAGRAPH_HXX */
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index 2caa2e64001c..df635ecc8a47 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -48,33 +48,33 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat()
sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException)
{
style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT;
- mxParaProps->getPropertyValue( rtl::OUString("ParaAdjust") ) >>= aParaAdjust;
+ mxParaProps->getPropertyValue( OUString("ParaAdjust") ) >>= aParaAdjust;
return getMSWordAlignment( aParaAdjust );
}
void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException)
{
style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment );
- mxParaProps->setPropertyValue( rtl::OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) );
+ mxParaProps->setPropertyValue( OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) );
}
float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException)
{
sal_Int32 indent = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaFirstLineIndent") ) >>= indent;
+ mxParaProps->getPropertyValue( OUString("ParaFirstLineIndent") ) >>= indent;
return (float)( Millimeter::getInPoints( indent ) );
}
void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException)
{
sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent );
- mxParaProps->setPropertyValue( rtl::OUString("ParaFirstLineIndent"), uno::makeAny( indent ) );
+ mxParaProps->setPropertyValue( OUString("ParaFirstLineIndent"), uno::makeAny( indent ) );
}
uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException)
{
sal_Bool bKeep = sal_False;
- mxParaProps->getPropertyValue( rtl::OUString("ParaKeepTogether") ) >>= bKeep;
+ mxParaProps->getPropertyValue( OUString("ParaKeepTogether") ) >>= bKeep;
return uno::makeAny ( bKeep );
}
@@ -83,18 +83,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
sal_Bool bKeep = sal_False;
if( _keeptogether >>= bKeep )
{
- mxParaProps->setPropertyValue( rtl::OUString("ParaKeepTogether"), uno::makeAny( bKeep ) );
+ mxParaProps->setPropertyValue( OUString("ParaKeepTogether"), uno::makeAny( bKeep ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException)
{
sal_Bool bKeep = sal_False;
- mxParaProps->getPropertyValue( rtl::OUString("ParaSplit") ) >>= bKeep;
+ mxParaProps->getPropertyValue( OUString("ParaSplit") ) >>= bKeep;
return uno::makeAny ( bKeep );
}
@@ -103,18 +103,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
sal_Bool bKeep = sal_False;
if( _keepwithnext >>= bKeep )
{
- mxParaProps->setPropertyValue( rtl::OUString("ParaSplit"), uno::makeAny( bKeep ) );
+ mxParaProps->setPropertyValue( OUString("ParaSplit"), uno::makeAny( bKeep ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException)
{
sal_Bool bHypn = sal_False;
- mxParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= bHypn;
+ mxParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= bHypn;
return uno::makeAny ( bHypn );
}
@@ -123,46 +123,46 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation
sal_Bool bHypn = sal_False;
if( _hyphenation >>= bHypn )
{
- mxParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) );
+ mxParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException)
{
style::LineSpacing aLineSpacing;
- mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing;
+ mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing;
return getMSWordLineSpacing( aLineSpacing );
}
void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException)
{
style::LineSpacing aLineSpacing;
- mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing;
+ mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing;
aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode );
- mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) );
+ mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) );
}
sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException)
{
style::LineSpacing aLineSpacing;
- mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing;
+ mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing;
return getMSWordLineSpacingRule( aLineSpacing );
}
void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException)
{
style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule );
- mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) );
+ mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) );
}
uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException)
{
sal_Bool noLineNum = sal_False;
- mxParaProps->getPropertyValue( rtl::OUString("ParaLineNumberCount") ) >>= noLineNum;
+ mxParaProps->getPropertyValue( OUString("ParaLineNumberCount") ) >>= noLineNum;
return uno::makeAny ( noLineNum );
}
@@ -171,20 +171,20 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb
sal_Bool noLineNum = sal_False;
if( _nolinenumber >>= noLineNum )
{
- mxParaProps->setPropertyValue( rtl::OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) );
+ mxParaProps->setPropertyValue( OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException)
{
sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText;
- rtl::OUString aHeading;
- const rtl::OUString HEADING = rtl::OUString("Heading");
- mxParaProps->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aHeading;
+ OUString aHeading;
+ const OUString HEADING = OUString("Heading");
+ mxParaProps->getPropertyValue( OUString("ParaStyleName") ) >>= aHeading;
if( aHeading.indexOf( HEADING ) == 0 )
{
// get the sub string after "Heading"
@@ -204,7 +204,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t
uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException)
{
style::BreakType aBreakType;
- mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType;
+ mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType;
sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
return uno::makeAny( bBreakBefore );
}
@@ -215,7 +215,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
if( _breakbefore >>= bBreakBefore )
{
style::BreakType aBreakType;
- mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType;
+ mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType;
if( bBreakBefore )
{
if( aBreakType == style::BreakType_NONE )
@@ -230,64 +230,64 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
else if ( aBreakType == style::BreakType_PAGE_BEFORE )
aBreakType = style::BreakType_PAGE_AFTER;
}
- mxParaProps->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( aBreakType ) );
+ mxParaProps->setPropertyValue( OUString("BreakType"), uno::makeAny( aBreakType ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException)
{
sal_Int32 nSpace = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaTopMargin") ) >>= nSpace;
+ mxParaProps->getPropertyValue( OUString("ParaTopMargin") ) >>= nSpace;
return (float)( Millimeter::getInPoints( nSpace ) );
}
void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException)
{
sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
- mxParaProps->setPropertyValue( rtl::OUString("ParaTopMargin"), uno::makeAny( nSpace ) );
+ mxParaProps->setPropertyValue( OUString("ParaTopMargin"), uno::makeAny( nSpace ) );
}
float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException)
{
sal_Int32 nSpace = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaBottomMargin") ) >>= nSpace;
+ mxParaProps->getPropertyValue( OUString("ParaBottomMargin") ) >>= nSpace;
return (float)( Millimeter::getInPoints( nSpace ) );
}
void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException)
{
sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
- mxParaProps->setPropertyValue( rtl::OUString("ParaBottomMargin"), uno::makeAny( nSpace ) );
+ mxParaProps->setPropertyValue( OUString("ParaBottomMargin"), uno::makeAny( nSpace ) );
}
float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException)
{
sal_Int32 nIndent = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaLeftMargin") ) >>= nIndent;
+ mxParaProps->getPropertyValue( OUString("ParaLeftMargin") ) >>= nIndent;
return (float)( Millimeter::getInPoints( nIndent ) );
}
void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException)
{
sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent );
- mxParaProps->setPropertyValue( rtl::OUString("ParaLeftMargin"), uno::makeAny( nIndent ) );
+ mxParaProps->setPropertyValue( OUString("ParaLeftMargin"), uno::makeAny( nIndent ) );
}
float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException)
{
sal_Int32 nIndent = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaRightMargin") ) >>= nIndent;
+ mxParaProps->getPropertyValue( OUString("ParaRightMargin") ) >>= nIndent;
return (float)( Millimeter::getInPoints( nIndent ) );
}
void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException)
{
sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent );
- mxParaProps->setPropertyValue( rtl::OUString("ParaRightMargin"), uno::makeAny( nIndent ) );
+ mxParaProps->setPropertyValue( OUString("ParaRightMargin"), uno::makeAny( nIndent ) );
}
uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException)
@@ -297,16 +297,16 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeExcepti
void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException)
{
sal_Bool bWidow = sal_False;
sal_Int8 nWidow = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaWidows") ) >>= nWidow;
+ mxParaProps->getPropertyValue( OUString("ParaWidows") ) >>= nWidow;
sal_Int8 nOrphan = 0;
- mxParaProps->getPropertyValue( rtl::OUString("ParaOrphans") ) >>= nOrphan;
+ mxParaProps->getPropertyValue( OUString("ParaOrphans") ) >>= nOrphan;
// if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
// true is retured.
bWidow = ( nWidow > 1 && nOrphan == nWidow );
@@ -321,12 +321,12 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr
if( _widowcontrol >>= bWidow )
{
sal_Int8 nControl = bWidow? 2:1;
- mxParaProps->setPropertyValue( rtl::OUString("ParaWidows"), uno::makeAny( nControl ) );
- mxParaProps->setPropertyValue( rtl::OUString("ParaOrphans"), uno::makeAny( nControl ) );
+ mxParaProps->setPropertyValue( OUString("ParaWidows"), uno::makeAny( nControl ) );
+ mxParaProps->setPropertyValue( OUString("ParaOrphans"), uno::makeAny( nControl ) );
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -404,7 +404,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _l
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
break;
}
}
@@ -469,7 +469,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
return wdLineSpacing;
@@ -478,7 +478,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL
sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
{
float fCharHeight = 0.0;
- mxParaProps->getPropertyValue( rtl::OUString("CharHeight") ) >>= fCharHeight;
+ mxParaProps->getPropertyValue( OUString("CharHeight") ) >>= fCharHeight;
return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) );
}
@@ -509,7 +509,7 @@ sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment )
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
return nParaAjust;
@@ -542,26 +542,26 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment )
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
}
return wdAlignment;
}
-rtl::OUString
+OUString
SwVbaParagraphFormat::getServiceImplName()
{
- return rtl::OUString("SwVbaParagraphFormat");
+ return OUString("SwVbaParagraphFormat");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaParagraphFormat::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ParagraphFormat" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.ParagraphFormat" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index f80081ddcbcc..b095d670ad7e 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -81,8 +81,8 @@ public:
virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_PARAGRAPHFORMAT_HXX */
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 9553b343aa36..95f275006680 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -72,7 +72,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c
mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
if( !mxTextCursor.is() )
- throw uno::RuntimeException( rtl::OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() );
mxTextCursor->collapseToStart();
if( rEnd.is() )
@@ -93,10 +93,10 @@ SwVbaRange::getXTextRange() throw (uno::RuntimeException)
* an issue that the last paragraph in a document does not have a trailing CRLF.
* @return
*/
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaRange::getText() throw ( uno::RuntimeException )
{
- rtl::OUString aText = mxTextCursor->getString();
+ OUString aText = mxTextCursor->getString();
sal_Int32 nLen = aText.getLength();
// FIXME: should add a line separator if the range includes the last paragraph
@@ -123,11 +123,11 @@ SwVbaRange::getText() throw ( uno::RuntimeException )
}
void SAL_CALL
-SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
+SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException )
{
// Emulate the MSWord behavior, Don't delete the bookmark
// which contains no text string in current inserting position,
- rtl::OUString sName;
+ OUString sName;
uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW );
try
{
@@ -145,7 +145,7 @@ SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException
if( rText.indexOf( '\n' ) != -1 )
{
- mxTextCursor->setString( rtl::OUString() );
+ mxTextCursor->setString( OUString() );
// process CR in strings
SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
}
@@ -192,22 +192,22 @@ void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::
case word::WdBreakType::wdSectionBreakNextPage:
case word::WdBreakType::wdSectionBreakOddPage:
case word::WdBreakType::wdTextWrappingBreak:
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
+ DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
default:
- DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
}
if( eBreakType != style::BreakType_NONE )
{
if( !mxTextCursor->isCollapsed() )
{
- mxTextCursor->setString( rtl::OUString() );
+ mxTextCursor->setString( OUString() );
mxTextCursor->collapseToStart();
}
uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( eBreakType ) );
+ xProp->setPropertyValue( OUString("BreakType"), uno::makeAny( eBreakType ) );
}
}
@@ -223,7 +223,7 @@ SwVbaRange::Select() throw ( uno::RuntimeException )
void SAL_CALL
SwVbaRange::InsertParagraph() throw ( uno::RuntimeException )
{
- mxTextCursor->setString( rtl::OUString("") );
+ mxTextCursor->setString( OUString("") );
InsertParagraphBefore();
}
@@ -252,31 +252,31 @@ SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException )
void SAL_CALL
SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
-void SwVbaRange::GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( uno::RuntimeException )
+void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( uno::RuntimeException )
{
uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
- if( ( xProp->getPropertyValue( rtl::OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() )
+ if( ( xProp->getPropertyValue( OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() )
{
- aStyleType = rtl::OUString("CharacterStyles");
+ aStyleType = OUString("CharacterStyles");
}
- else if( ( xProp->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() )
+ else if( ( xProp->getPropertyValue( OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() )
{
- aStyleType = rtl::OUString("ParagraphStyles");
+ aStyleType = OUString("ParagraphStyles");
}
if( aStyleType.isEmpty() )
{
- DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
+ DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
}
}
uno::Any SAL_CALL
SwVbaRange::getStyle() throw ( uno::RuntimeException )
{
- rtl::OUString aStyleName;
- rtl::OUString aStyleType;
+ OUString aStyleName;
+ OUString aStyleType;
GetStyleInfo( aStyleName, aStyleType );
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
@@ -322,11 +322,11 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
- rtl::OUString aPageStyleName;
- xParaProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName;
+ OUString aPageStyleName;
+ xParaProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName;
uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) );
}
@@ -407,20 +407,20 @@ SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException)
return uno::makeAny( xCol );
}
-rtl::OUString
+OUString
SwVbaRange::getServiceImplName()
{
- return rtl::OUString("SwVbaRange");
+ return OUString("SwVbaRange");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaRange::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Range" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Range" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 804e8d4aed62..6ec5ff644d70 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -42,7 +42,7 @@ private:
private:
void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
- void GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( css::uno::RuntimeException );
+ void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
public:
SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
@@ -56,8 +56,8 @@ public:
void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException);
// Attribute
- virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException);
@@ -84,8 +84,8 @@ public:
virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_RANGE_HXX */
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 0c45260159da..e1326a5fa6f1 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -61,7 +61,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
}
-void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
{
sal_Int32 nlastIndex = 0;
sal_Int32 nIndex = 0;
@@ -84,7 +84,7 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa
{
xRange = xRange->getEnd();
- rtl::OUString aWatt = rStr.copy( nlastIndex );
+ OUString aWatt = rStr.copy( nlastIndex );
rText->insertString( xRange, aWatt, _bAbsorb );
}
}
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index db199b49f0ef..537acc05722c 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -29,7 +29,7 @@ class SwVbaRangeHelper
{
public:
static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
- static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
+ static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx
index b983613b1bf7..13ace911d77f 100644
--- a/sw/source/ui/vba/vbareplacement.cxx
+++ b/sw/source/ui/vba/vbareplacement.cxx
@@ -32,12 +32,12 @@ SwVbaReplacement::~SwVbaReplacement()
{
}
-::rtl::OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException)
{
return mxPropertyReplace->getReplaceString();
}
-void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) throw (uno::RuntimeException)
{
mxPropertyReplace->setReplaceString( _text );
}
@@ -48,20 +48,20 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException)
mxPropertyReplace->setReplaceAttributes( aPropValues );
}
-rtl::OUString
+OUString
SwVbaReplacement::getServiceImplName()
{
- return rtl::OUString("SwVbaReplacement");
+ return OUString("SwVbaReplacement");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaReplacement::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Replacement" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Replacement" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx
index 7c49cc51e07b..9569a6c9d90d 100644
--- a/sw/source/ui/vba/vbareplacement.hxx
+++ b/sw/source/ui/vba/vbareplacement.hxx
@@ -36,15 +36,15 @@ public:
virtual ~SwVbaReplacement();
// Attributes
- virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException);
//Methods
virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_REPLACEMENT_HXX */
diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx
index 05fb97c765f9..ae45f7473408 100644
--- a/sw/source/ui/vba/vbarevision.cxx
+++ b/sw/source/ui/vba/vbarevision.cxx
@@ -73,20 +73,20 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException )
pDoc->RejectRedline( GetPosition(), sal_True );
}
-rtl::OUString
+OUString
SwVbaRevision::getServiceImplName()
{
- return rtl::OUString("SwVbaRevision");
+ return OUString("SwVbaRevision");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaRevision::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Revision" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Revision" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx
index 52f970220724..5d28fc488453 100644
--- a/sw/source/ui/vba/vbarevision.hxx
+++ b/sw/source/ui/vba/vbarevision.hxx
@@ -43,8 +43,8 @@ public:
virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_REVISION_HXX */
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 5f240b5bb129..8ad58e83468e 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -157,20 +157,20 @@ void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException)
throw uno::RuntimeException();
}
-rtl::OUString
+OUString
SwVbaRevisions::getServiceImplName()
{
- return rtl::OUString("SwVbaRevisions");
+ return OUString("SwVbaRevisions");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaRevisions::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Revisions");
+ sNames[0] = OUString("ooo.vba.word.Revisions");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index f9971f0cd6f2..acf0dc459436 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.hxx
@@ -48,8 +48,8 @@ public:
// SwVbaRevisions_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_PANES_HXX */
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 333611dc84de..5d3b0eec555b 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -47,7 +47,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException)
return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) );
sal_Int32 nHeight = 0;
- mxRowProps->getPropertyValue( rtl::OUString("Height") ) >>= nHeight;
+ mxRowProps->getPropertyValue( OUString("Height") ) >>= nHeight;
return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) );
}
@@ -57,20 +57,20 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru
_height >>= height;
sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( height );
- mxRowProps->setPropertyValue( rtl::OUString("Height"), uno::makeAny( nHeight ) );
+ mxRowProps->setPropertyValue( OUString("Height"), uno::makeAny( nHeight ) );
}
::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException)
{
sal_Bool isAutoHeight = sal_False;
- mxRowProps->getPropertyValue( rtl::OUString("IsAutoHeight") ) >>= isAutoHeight;
+ mxRowProps->getPropertyValue( OUString("IsAutoHeight") ) >>= isAutoHeight;
return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly;
}
void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException)
{
sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
- mxRowProps->setPropertyValue( rtl::OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) );
+ mxRowProps->setPropertyValue( OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) );
}
void SAL_CALL
@@ -81,17 +81,17 @@ SwVbaRow::Select( ) throw ( uno::RuntimeException )
void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException )
{
- rtl::OUStringBuffer aRangeName;
+ OUStringBuffer aRangeName;
aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) );
SwVbaTableHelper aTableHelper( xTextTable );
sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow );
// FIXME: the column count > 26
//sal_Char cCol = 'A' + nColCount - 1;
- rtl::OUString sCol = aTableHelper.getColumnStr( nColCount - 1);
+ OUString sCol = aTableHelper.getColumnStr( nColCount - 1);
aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) );
uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW );
- rtl::OUString sSelRange = aRangeName.makeStringAndClear();
+ OUString sSelRange = aRangeName.makeStringAndClear();
uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange );
uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -104,20 +104,20 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (c
setHeight( uno::makeAny( height ) );
}
-rtl::OUString
+OUString
SwVbaRow::getServiceImplName()
{
- return rtl::OUString("SwVbaRow");
+ return OUString("SwVbaRow");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaRow::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Row" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Row" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx
index 7169156db747..5eeb78f1e0fc 100644
--- a/sw/source/ui/vba/vbarow.hxx
+++ b/sw/source/ui/vba/vbarow.hxx
@@ -52,8 +52,8 @@ public:
static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_ROW_HXX */
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index d479834c9ae4..1d6140f75ab7 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -79,7 +79,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u
{
sal_Int16 nAlignment = text::HoriOrientation::LEFT;
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
- xTableProps->getPropertyValue( rtl::OUString("HoriOrient") ) >>= nAlignment;
+ xTableProps->getPropertyValue( OUString("HoriOrient") ) >>= nAlignment;
sal_Int32 nRet = 0;
switch( nAlignment )
{
@@ -122,7 +122,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt
}
}
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
- xTableProps->setPropertyValue( rtl::OUString("HoriOrient"), uno::makeAny( nAlignment ) );
+ xTableProps->setPropertyValue( OUString("HoriOrient"), uno::makeAny( nAlignment ) );
}
uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException)
@@ -133,7 +133,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep
{
uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
sal_Bool bSplit = sal_False;
- xRowProps->getPropertyValue( rtl::OUString("IsSplitAllowed") ) >>= bSplit;
+ xRowProps->getPropertyValue( OUString("IsSplitAllowed") ) >>= bSplit;
if( index == 0 )
{
bAllowBreak = bSplit;
@@ -155,7 +155,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac
for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index )
{
uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
- xRowProps->setPropertyValue( rtl::OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) );
+ xRowProps->setPropertyValue( OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) );
}
}
@@ -166,8 +166,8 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException)
uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( 0, mnStartRowIndex ), uno::UNO_QUERY_THROW );
sal_Int32 nLeftBorderDistance = 0;
sal_Int32 nRightBorderDistance = 0;
- xCellProps->getPropertyValue( rtl::OUString("LeftBorderDistance") ) >>= nLeftBorderDistance;
- xCellProps->getPropertyValue( rtl::OUString("RightBorderDistance") ) >>= nRightBorderDistance;
+ xCellProps->getPropertyValue( OUString("LeftBorderDistance") ) >>= nLeftBorderDistance;
+ xCellProps->getPropertyValue( OUString("RightBorderDistance") ) >>= nRightBorderDistance;
return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) );
}
@@ -183,8 +183,8 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th
for( sal_Int32 column = 0; column < nColumns; ++column )
{
uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( column, row ), uno::UNO_QUERY_THROW );
- xCellProps->setPropertyValue( rtl::OUString("LeftBorderDistance"), uno::makeAny( nSpace ) );
- xCellProps->setPropertyValue( rtl::OUString("RightBorderDistance"), uno::makeAny( nSpace ) );
+ xCellProps->setPropertyValue( OUString("LeftBorderDistance"), uno::makeAny( nSpace ) );
+ xCellProps->setPropertyValue( OUString("RightBorderDistance"), uno::makeAny( nSpace ) );
}
}
}
@@ -222,7 +222,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
}
}
}
@@ -231,9 +231,9 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
{
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
sal_Int32 nMargin = 0;
- xTableProps->getPropertyValue( rtl::OUString("LeftMargin") ) >>= nMargin;
+ xTableProps->getPropertyValue( OUString("LeftMargin") ) >>= nMargin;
nMargin += indent;
- xTableProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nMargin ) );
+ xTableProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nMargin ) );
}
void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException)
@@ -255,12 +255,12 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
// calculate the new width and get the proportion between old and new
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
sal_Int32 nWidth = 0;
- xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth;
+ xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth;
sal_Int32 nNewWidth = nWidth - indent;
if ((nNewWidth <= 0) || (nWidth <= 0))
{
throw uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)"
)
@@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
// set the width and position of the table
setIndentWithAdjustNone( indent );
- xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) );
+ xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) );
}
void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException)
@@ -291,7 +291,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
// calculate the new width and get the width of all columns
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
sal_Int32 nWidth = 0;
- xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth;
+ xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth;
sal_Int32 nNewWidth = nWidth - indent;
// get all columns, calculate and set the new width of the columns
@@ -306,7 +306,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
// set the width and position of the table
setIndentWithAdjustNone( indent );
- xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) );
+ xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) );
}
void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException)
@@ -326,11 +326,11 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not
{
if( nIndex <= 0 || nIndex > getCount() )
{
- throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
}
return uno::makeAny( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) );
}
- throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() );
}
// XEnumerationAccess
@@ -351,20 +351,20 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaRows::getServiceImplName()
{
- return rtl::OUString("SwVbaRows");
+ return OUString("SwVbaRows");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaRows::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Rows");
+ sNames[0] = OUString("ooo.vba.word.Rows");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index e394f75dac98..61e44d6abcc3 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -69,8 +69,8 @@ public:
// SwVbaRows_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_ROWS_HXX */
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 925472b9d496..5fb2aff82661 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -65,20 +65,20 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) );
}
-rtl::OUString
+OUString
SwVbaSection::getServiceImplName()
{
- return rtl::OUString("SwVbaSection");
+ return OUString("SwVbaSection");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaSection::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Section" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Section" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx
index 59d3463914e3..dfd297729279 100644
--- a/sw/source/ui/vba/vbasection.hxx
+++ b/sw/source/ui/vba/vbasection.hxx
@@ -45,8 +45,8 @@ public:
virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_SECTION_HXX */
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index f996815dc543..2c9823b980d9 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -65,7 +65,7 @@ public:
{
uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW );
sal_Int32 nCount = xPageStyles->getCount();
for( sal_Int32 index = 0; index < nCount; ++index )
{
@@ -148,7 +148,7 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException)
uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW );
return xSection->PageSetup();
}
- throw uno::RuntimeException( rtl::OUString("There is no section"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("There is no section"), uno::Reference< uno::XInterface >() );
}
// XEnumerationAccess
@@ -171,20 +171,20 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaSections::getServiceImplName()
{
- return rtl::OUString("SwVbaSections");
+ return OUString("SwVbaSections");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaSections::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Sections");
+ sNames[0] = OUString("ooo.vba.word.Sections");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx
index a2a482d983c7..4ac51e54cda6 100644
--- a/sw/source/ui/vba/vbasections.hxx
+++ b/sw/source/ui/vba/vbasections.hxx
@@ -46,8 +46,8 @@ public:
// SwVbaSections_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_SECTIONS_HXX */
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 62ad26645a83..d564c43a0343 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -81,7 +81,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un
{
uno::Reference< text::XTextRange > xTextRange;
uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextRanges") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextRanges") ) )
{
uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW );
if( xTextRanges->getCount() > 0 )
@@ -92,7 +92,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un
}
else
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
return xTextRange;
}
@@ -105,20 +105,20 @@ SwVbaSelection::getRange() throw ( uno::RuntimeException )
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xTextRange->getStart(), xTextRange->getEnd(), mxTextViewCursor->getText() ) );
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaSelection::getText() throw ( uno::RuntimeException )
{
return getRange()->getText();
}
void SAL_CALL
-SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
+SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException )
{
getRange()->setText( rText );
}
void SAL_CALL
-SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
+SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException )
{
// FIXME: handle the property Options.ReplaceSelection, the default value is sal_True
setText( rText );
@@ -154,7 +154,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
}
@@ -189,7 +189,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw (
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
}
@@ -215,11 +215,11 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw (
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
}
- rtl::OUString url = rtl::OUString( ".uno:Delete");
+ OUString url = OUString( ".uno:Delete");
dispatchRequests( mxModel,url );
}
@@ -248,7 +248,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( nExtend == word::WdMovementType::wdExtend )
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
return;
}
NextCell( nCount, eDirection );
@@ -258,7 +258,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW );
if( eDirection == word::MOVE_UP )
@@ -271,7 +271,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
if( word::gotoSelectedObjectAnchor( mxModel ) )
{
@@ -287,7 +287,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
if( xTextTable.is() )
{
uno::Reference< text::XTextRange > xRange( xTextTable->getCellByName( xTextTableCursor->getRangeName()), uno::UNO_QUERY_THROW );
@@ -311,7 +311,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Reference< text::XParagraphCursor > xParagraphCursor( xTextCursor, uno::UNO_QUERY_THROW );
for( sal_Int32 i=0; i<nCount; i++ )
@@ -326,7 +326,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN )
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
uno::Reference< text::XWordCursor > xWordCursor( xTextCursor, uno::UNO_QUERY_THROW );
for( sal_Int32 i=0; i<nCount; i++ )
@@ -343,7 +343,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
}
default:
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
}
@@ -353,16 +353,16 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection )
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
uno::Reference< table::XCell > xCell;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell;
if( !xTextTable.is() || !xCell.is() )
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
return;
}
uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW );
- rtl::OUString aCellName;
- xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= aCellName;
+ OUString aCellName;
+ xCellProps->getPropertyValue( OUString("CellName") ) >>= aCellName;
uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName );
// move the table cursor
switch( eDirection )
@@ -389,7 +389,7 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection )
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
return;
}
}
@@ -548,7 +548,7 @@ SwVbaSelection::getFont() throw ( uno::RuntimeException )
void SAL_CALL
SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException )
{
- rtl::OUString url = rtl::OUString( ".uno:SwBackspace");
+ OUString url = OUString( ".uno:SwBackspace");
dispatchRequests( mxModel,url );
}
@@ -556,7 +556,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
{
sal_Int32 nWhat = 0;
if( ( _what >>= nWhat ) != sal_True )
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
switch( nWhat )
{
case word::WdGoToItem::wdGoToBookmark:
@@ -608,7 +608,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
}
if( _name.hasValue() )
{
- rtl::OUString sName;
+ OUString sName;
_name >>= sName;
sal_Int32 nName = sName.toInt32();
if( nName !=0 )
@@ -648,11 +648,11 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
if( nPage != 0 )
xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) );
else
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
break;
}
default:
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
return getRange();
}
@@ -691,7 +691,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
{
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
if( xTextTable.is() )
result = uno::makeAny( sal_True );
else
@@ -734,8 +734,8 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
case word::WdSeekView::wdSeekFirstPageFooter:
{
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
- rtl::OUString aPageStyleName;
- xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName;
+ OUString aPageStyleName;
+ xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName;
bool bFirstPage = false;
if ( aPageStyleName == "First Page" )
bFirstPage = true;
@@ -764,7 +764,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
break;
}
default:
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
return result;
}
@@ -792,7 +792,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException)
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
if( xTextTable.is() )
{
uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW );
@@ -901,8 +901,8 @@ void SAL_CALL SwVbaSelection::SelectColumn() throw (uno::RuntimeException)
uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::RuntimeException)
{
- rtl::OUString sTLName;
- rtl::OUString sBRName;
+ OUString sTLName;
+ OUString sBRName;
GetSelectedCellRange( sTLName, sBRName );
sal_Int32 nStartRow = 0;
@@ -927,8 +927,8 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::Runt
uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::RuntimeException)
{
- rtl::OUString sTLName;
- rtl::OUString sBRName;
+ OUString sTLName;
+ OUString sBRName;
GetSelectedCellRange( sTLName, sBRName );
sal_Int32 nStartColumn = 0;
sal_Int32 nEndColumn = 0;
@@ -955,7 +955,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R
{
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
return xTextTable;
}
@@ -977,11 +977,11 @@ bool SwVbaSelection::HasSelection() throw( uno::RuntimeException )
return true;
}
-void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw( uno::RuntimeException )
+void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw( uno::RuntimeException )
{
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
- xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable;
+ xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable;
if( !xTextTable.is() )
throw uno::RuntimeException( );
@@ -998,20 +998,20 @@ void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString
if( sTLName.isEmpty() )
{
uno::Reference< table::XCell > xCell;
- xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell;
+ xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell;
if( !xCell.is() )
{
throw uno::RuntimeException( );
}
uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW );
- xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= sTLName;
+ xCellProps->getPropertyValue( OUString("CellName") ) >>= sTLName;
}
}
uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::RuntimeException)
{
- rtl::OUString sTLName;
- rtl::OUString sBRName;
+ OUString sTLName;
+ OUString sBRName;
GetSelectedCellRange( sTLName, sBRName );
sal_Int32 nLeft = 0;
sal_Int32 nTop = 0;
@@ -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)
{
- rtl::OUString url = rtl::OUString( ".uno:Copy");
+ OUString url = OUString( ".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)
{
- rtl::OUString url = rtl::OUString( ".uno:Paste");
+ OUString url = OUString( ".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 );
- rtl::OUString url = rtl::OUString( ".uno:InsertPara");
+ OUString url = OUString( ".uno:InsertPara");
dispatchRequests( mxModel,url );
}
}
@@ -1162,20 +1162,20 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio
return aRet;
}
-rtl::OUString
+OUString
SwVbaSelection::getServiceImplName()
{
- return rtl::OUString("SwVbaSelection");
+ return OUString("SwVbaSelection");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaSelection::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Selection" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Selection" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index ca76d9a214fc..6051b15d1300 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -44,7 +44,7 @@ private:
void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException);
void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ) throw ( css::uno::RuntimeException );
css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
- void GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw ( css::uno::RuntimeException );
+ void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException );
css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException );
bool IsInTable() throw ( css::uno::RuntimeException );
bool HasSelection() throw ( css::uno::RuntimeException );
@@ -54,12 +54,12 @@ public:
virtual ~SwVbaSelection();
// Attribute
- virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException);
virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
- virtual void SAL_CALL TypeText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException);
virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException);
@@ -104,8 +104,8 @@ public:
virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_SELECTION_HXX */
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 5bd5a109311d..ce5cd906af0f 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -37,12 +37,12 @@ SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const
}
void SAL_CALL
-SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
+SwVbaStyle::setName( const OUString& Name ) throw (uno::RuntimeException)
{
mxStyle->setName(Name);
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaStyle::getName() throw (uno::RuntimeException)
{
return mxStyle->getName();
@@ -51,14 +51,14 @@ SwVbaStyle::getName() throw (uno::RuntimeException)
sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException)
{
lang::Locale aLocale;
- xTCProps->getPropertyValue( rtl::OUString("CharLocale") ) >>= aLocale;
+ xTCProps->getPropertyValue( OUString("CharLocale") ) >>= aLocale;
return LanguageTag( aLocale ).getLanguageType( false);
}
void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException)
{
lang::Locale aLocale = LanguageTag( static_cast<LanguageType>(_languageid) ).getLocale();
- xTCProps->setPropertyValue( rtl::OUString("CharLocale"), uno::makeAny( aLocale ) ) ;
+ xTCProps->setPropertyValue( OUString("CharLocale"), uno::makeAny( aLocale ) ) ;
}
::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException)
@@ -75,9 +75,9 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R
{
sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph;
uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.ParagraphStyle") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.style.ParagraphStyle") ) )
nType = word::WdStyleType::wdStyleTypeParagraph;
- else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.CharacterStyle") ) )
+ else if( xServiceInfo->supportsService( OUString("com.sun.star.style.CharacterStyle") ) )
nType = word::WdStyleType::wdStyleTypeCharacter;
else
nType = word::WdStyleType::wdStyleTypeList;
@@ -93,7 +93,7 @@ SwVbaStyle::getFont() throw ( uno::RuntimeException )
void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException)
{
- rtl::OUString sStyle;
+ OUString sStyle;
uno::Reference< word::XStyle > xStyle;
if( rStyle >>= xStyle )
{
@@ -106,23 +106,23 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro
if( !sStyle.isEmpty() )
{
- xParaProps->setPropertyValue( rtl::OUString("ParaStyleName"), uno::makeAny( sStyle ) );
+ xParaProps->setPropertyValue( OUString("ParaStyleName"), uno::makeAny( sStyle ) );
return;
}
throw uno::RuntimeException();
}
-::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException)
+OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException)
{
- rtl::OUString sNameLocal;
- mxStyleProps->getPropertyValue( rtl::OUString("DisplayName") ) >>= sNameLocal;
+ OUString sNameLocal;
+ mxStyleProps->getPropertyValue( OUString("DisplayName") ) >>= sNameLocal;
return sNameLocal;
}
-void SAL_CALL SwVbaStyle::setNameLocal( const ::rtl::OUString& _namelocal ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) throw (uno::RuntimeException)
{
- mxStyleProps->setPropertyValue( rtl::OUString("DisplayName"), uno::makeAny( _namelocal ) );
+ mxStyleProps->setPropertyValue( OUString("DisplayName"), uno::makeAny( _namelocal ) );
}
uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException)
@@ -141,20 +141,20 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat
::sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException)
{
sal_Bool isAutoUpdate = sal_False;
- mxStyleProps->getPropertyValue( rtl::OUString("IsAutoUpdate") ) >>= isAutoUpdate;
+ mxStyleProps->getPropertyValue( OUString("IsAutoUpdate") ) >>= isAutoUpdate;
return isAutoUpdate;
}
void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (uno::RuntimeException)
{
- mxStyleProps->setPropertyValue( rtl::OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) );
+ mxStyleProps->setPropertyValue( OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) );
}
uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException)
{
// ParentStyle
- rtl::OUString sBaseStyle;
- mxStyleProps->getPropertyValue( rtl::OUString("ParentStyle") ) >>= sBaseStyle;
+ OUString sBaseStyle;
+ mxStyleProps->getPropertyValue( OUString("ParentStyle") ) >>= sBaseStyle;
if( !sBaseStyle.isEmpty() )
{
uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) );
@@ -172,8 +172,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno:
_basestyle >>= xStyle;
if( xStyle.is() )
{
- rtl::OUString sBaseStyle = xStyle->getName();
- mxStyleProps->setPropertyValue( rtl::OUString("ParentStyle"), uno::makeAny( sBaseStyle ) );
+ OUString sBaseStyle = xStyle->getName();
+ mxStyleProps->setPropertyValue( OUString("ParentStyle"), uno::makeAny( sBaseStyle ) );
}
else
{
@@ -184,8 +184,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno:
uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeException)
{
//FollowStyle
- rtl::OUString sFollowStyle;
- mxStyleProps->getPropertyValue( rtl::OUString("FollowStyle") ) >>= sFollowStyle;
+ OUString sFollowStyle;
+ mxStyleProps->getPropertyValue( OUString("FollowStyle") ) >>= sFollowStyle;
if( !sFollowStyle.isEmpty() )
{
uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) );
@@ -203,8 +203,8 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs
_nextparagraphstyle >>= xStyle;
if( xStyle.is() )
{
- rtl::OUString sFollowStyle = xStyle->getName();
- mxStyleProps->setPropertyValue( rtl::OUString("FollowStyle"), uno::makeAny( sFollowStyle ) );
+ OUString sFollowStyle = xStyle->getName();
+ mxStyleProps->setPropertyValue( OUString("FollowStyle"), uno::makeAny( sFollowStyle ) );
}
else
{
@@ -215,24 +215,24 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs
::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException)
{
sal_Int16 nNumberingLevel = 0;
- mxStyleProps->getPropertyValue( rtl::OUString("NumberingLevel") ) >>= nNumberingLevel;
+ mxStyleProps->getPropertyValue( OUString("NumberingLevel") ) >>= nNumberingLevel;
return nNumberingLevel;
}
-rtl::OUString
+OUString
SwVbaStyle::getServiceImplName()
{
- return rtl::OUString("SwVbaStyle");
+ return OUString("SwVbaStyle");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaStyle::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyle" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyle" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index a71e0aa09ff1..3e0af4d1f2b4 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -45,14 +45,14 @@ public:
static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
// Attributes
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setName( const rtl::OUString& Name ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setNameLocal( const ::rtl::OUString& _namelocal ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException);
@@ -63,11 +63,11 @@ public:
virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException);
//XDefaultProperty
- virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString("Name"); }
+ virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Name"); }
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif //SW_VBA_AXIS_HXX
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 66d055359635..8c3d66ca1b3c 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -171,23 +171,23 @@ public:
// we only concern about the Paragraph styles
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xStyleFamilies = xStyleSupplier->getStyleFamilies();
- mxParaStyles.set( xStyleFamilies->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW );
+ mxParaStyles.set( xStyleFamilies->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW );
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; }
// XNameAcess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
return cachePos;
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
return mxParaStyles->getElementNames();
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
// search in the MSOStyleName table first
for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ )
@@ -195,7 +195,7 @@ public:
if( aName.equalsIgnoreAsciiCaseAscii( pTable->pMSOStyleName ) )
{
//Found it
- rtl::OUString sStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName );
+ OUString sStyleName = OUString::createFromAscii( pTable->pOOoStyleName );
if( mxParaStyles->hasByName( sStyleName ) )
{
cachePos = mxParaStyles->getByName( sStyleName );
@@ -212,10 +212,10 @@ public:
}
else
{
- uno::Sequence< rtl::OUString > sElementNames = mxParaStyles->getElementNames();
+ uno::Sequence< OUString > sElementNames = mxParaStyles->getElementNames();
for( sal_Int32 j = 0; j < sElementNames.getLength(); j++ )
{
- rtl::OUString aStyleName = sElementNames[j];
+ OUString aStyleName = sElementNames[j];
if( aStyleName.equalsIgnoreAsciiCase( aName ) )
{
cachePos = mxParaStyles->getByName( aStyleName );
@@ -243,7 +243,7 @@ public:
// XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException)
{
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
};
@@ -301,31 +301,31 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::
{
if( nIndex == pTable->wdBuiltinStyle )
{
- rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName );
+ OUString aStyleName = OUString::createFromAscii( pTable->pOOoStyleName );
if( !aStyleName.isEmpty() )
{
- rtl::OUString aStyleType;
+ OUString aStyleType;
switch( pTable->wdStyleType )
{
case word::WdStyleType::wdStyleTypeParagraph:
case word::WdStyleType::wdStyleTypeTable:
{
- aStyleType = rtl::OUString("ParagraphStyles");
+ aStyleType = OUString("ParagraphStyles");
break;
}
case word::WdStyleType::wdStyleTypeCharacter:
{
- aStyleType = rtl::OUString("CharacterStyles");
+ aStyleType = OUString("CharacterStyles");
break;
}
case word::WdStyleType::wdStyleTypeList:
{
// should use Paragraph style and set the property "NumberingStyleName"
- aStyleType = rtl::OUString("ParagraphStyles");
+ aStyleType = OUString("ParagraphStyles");
break;
}
default:
- DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
+ DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
}
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
@@ -333,14 +333,14 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::
// set the property "NumberingStyleName" if it is a listbullet
if( pTable->wdStyleType == word::WdStyleType::wdStyleTypeList )
{
- xStyleProps->setPropertyValue( rtl::OUString("NumberingStyleName"), uno::makeAny( aStyleName ) );
+ xStyleProps->setPropertyValue( OUString("NumberingStyleName"), uno::makeAny( aStyleName ) );
}
return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) );
}
else
{
OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented");
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
}
}
}
@@ -348,20 +348,20 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::
return SwVbaStyles_BASE::Item( Index1, Index2 );
}
-rtl::OUString
+OUString
SwVbaStyles::getServiceImplName()
{
- return rtl::OUString("SwVbaStyles");
+ return OUString("SwVbaStyles");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaStyles::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyles" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyles" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx
index 321b6dee6e9c..eb7a5bdcd8bc 100644
--- a/sw/source/ui/vba/vbastyles.hxx
+++ b/sw/source/ui/vba/vbastyles.hxx
@@ -36,8 +36,8 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index dc690fd77d25..6953bfad1743 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -43,19 +43,19 @@ PrivateProfileStringListener::~PrivateProfileStringListener()
{
}
-void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey )
+void PrivateProfileStringListener::Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey )
{
maFileName = rFileName;
maGroupName = rGroupName;
maKey = rKey;
}
#ifdef WNT
-void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OString& sSubKey )
+void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKey )
{
sal_Int32 nBaseKeyIndex = sKeyInfo.indexOf('\\');
if( nBaseKeyIndex > 0 )
{
- rtl::OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex );
+ OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex );
sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 );
if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) )
{
@@ -84,20 +84,20 @@ void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OStri
uno::Any PrivateProfileStringListener::getValueEvent()
{
// get the private profile string
- rtl::OUString sValue;
+ OUString sValue;
if(!maFileName.isEmpty())
{
// get key/value from a file
Config aCfg( maFileName );
aCfg.SetGroup( maGroupName );
- sValue = rtl::OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW);
+ sValue = OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW);
}
else
{
// get key/value from windows register
#ifdef WNT
HKEY hBaseKey = NULL;
- rtl::OString sSubKey;
+ OString sSubKey;
lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
if( hBaseKey != NULL )
{
@@ -112,13 +112,13 @@ uno::Any PrivateProfileStringListener::getValueEvent()
LPCTSTR lpValueName = TEXT(maKey.getStr());
lResult = RegQueryValueEx( hKey, lpValueName, NULL, NULL, (LPBYTE)szBuffer, &cbData );
RegCloseKey( hKey );
- sValue = rtl::OUString::createFromAscii(szBuffer);
+ sValue = OUString::createFromAscii(szBuffer);
}
}
return uno::makeAny( sValue );
#else
- throw uno::RuntimeException( rtl::OUString("Only support on Windows"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Only support on Windows"), uno::Reference< uno::XInterface >() );
#endif
}
@@ -128,21 +128,21 @@ uno::Any PrivateProfileStringListener::getValueEvent()
void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
{
// set the private profile string
- rtl::OUString aValue;
+ OUString aValue;
value >>= aValue;
if(!maFileName.isEmpty())
{
// set value into a file
Config aCfg( maFileName );
aCfg.SetGroup( maGroupName );
- aCfg.WriteKey( maKey, rtl::OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) );
+ aCfg.WriteKey( maKey, OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) );
}
else
{
//set value into windows register
#ifdef WNT
HKEY hBaseKey = NULL;
- rtl::OString sSubKey;
+ OString sSubKey;
lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
if( hBaseKey != NULL )
{
@@ -152,7 +152,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
lResult = RegCreateKeyEx( hBaseKey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL );
if( ERROR_SUCCESS == lResult )
{
- LPCTSTR szValue = TEXT( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ LPCTSTR szValue = TEXT( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() );
DWORD cbData = sizeof(TCHAR) * (_tcslen(szValue) + 1);
LPCTSTR lpValueName = TEXT(maKey.getStr());
lResult = RegSetValueEx( hKey, lpValueName, 0 /* Reserved */, REG_SZ, (LPBYTE)szValue, cbData );
@@ -161,7 +161,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
}
return;
#else
- throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() );
#endif
}
@@ -229,7 +229,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
break;
}
default:
- throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() );
// TODO: isn't this a flaw in the API? It should be allowed to throw an
// IllegalArgumentException, or so
}
@@ -241,11 +241,11 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
}
uno::Any SAL_CALL
-SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException )
+SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( uno::RuntimeException )
{
// FIXME: need to detect whether it is a relative file path
// we need to detect if this is a URL, if not then assume its a file path
- rtl::OUString sFileUrl;
+ OUString sFileUrl;
if( !rFilename.isEmpty() )
{
INetURLObject aObj;
@@ -257,27 +257,27 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU
osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl);
}
- rtl::OString aGroupName(rtl::OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW));
- rtl::OString aKey(rtl::OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW));
+ OString aGroupName(OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW));
+ OString aKey(OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW));
maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey );
return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) );
}
-rtl::OUString
+OUString
SwVbaSystem::getServiceImplName()
{
- return rtl::OUString("SwVbaSystem");
+ return OUString("SwVbaSystem");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaSystem::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.System" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.System" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx
index c82c16bd5bcb..f6b376e54855 100644
--- a/sw/source/ui/vba/vbasystem.hxx
+++ b/sw/source/ui/vba/vbasystem.hxx
@@ -29,13 +29,13 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BAS
class PrivateProfileStringListener : public PropListener
{
private:
- rtl::OUString maFileName;
- rtl::OString maGroupName;
- rtl::OString maKey;
+ OUString maFileName;
+ OString maGroupName;
+ OString maKey;
public:
PrivateProfileStringListener(){};
virtual ~PrivateProfileStringListener();
- void Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey );
+ void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey );
//PropListener
virtual void setValueEvent( const css::uno::Any& value );
@@ -54,11 +54,11 @@ public:
// XSystem
virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException );
virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException );
- virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException );
+ virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_SYSTEM_HXX */
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index f421ffdbbb9b..7b425c67b245 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -78,7 +78,7 @@ SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*Nest
throw uno::RuntimeException();
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaTable::getName() throw (uno::RuntimeException)
{
uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW );
@@ -117,20 +117,20 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException)
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaTable::getServiceImplName()
{
- return rtl::OUString("SwVbaTable");
+ return OUString("SwVbaTable");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaTable::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Table" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Table" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx
index 6b77d8592a0f..79c74aa771ae 100644
--- a/sw/source/ui/vba/vbatable.hxx
+++ b/sw/source/ui/vba/vbatable.hxx
@@ -38,14 +38,14 @@ public:
virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 7d7029333fe8..59aaf3707c93 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -72,7 +72,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio
return nRet;
}
-sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (uno::RuntimeException)
{
sal_Int32 nRet = 0;
String sCellName(CellName);
@@ -87,7 +87,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) thro
return nRet;
}
-sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& CellName ) throw (uno::RuntimeException)
{
sal_Int32 nRet = 0;
String sCellName(CellName);
@@ -99,7 +99,7 @@ sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) thro
return nRet;
}
-rtl::OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
+OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
{
const sal_Int32 coDiff = 52; // 'A'-'Z' 'a' - 'z'
sal_Int32 nCalc = 0;
@@ -125,14 +125,14 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException)
sal_Int32 nWidth = 0;
sal_Bool isWidthRelatvie = sal_False;
uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
- xTableProps->getPropertyValue( rtl::OUString("IsWidthRelative") ) >>= isWidthRelatvie;
+ xTableProps->getPropertyValue( OUString("IsWidthRelative") ) >>= isWidthRelatvie;
if( isWidthRelatvie )
{
- xTableProps->getPropertyValue( rtl::OUString("RelativeWidth") ) >>= nWidth;
+ xTableProps->getPropertyValue( OUString("RelativeWidth") ) >>= nWidth;
}
else
{
- xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth;
+ xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth;
}
return nWidth;
}
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 1d60af8922fd..aa0b2787dc75 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -42,15 +42,15 @@ public:
~SwVbaTableHelper() {}
sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException);
sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException);
- sal_Int32 getTabRowIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException);
- sal_Int32 getTabColIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException);
+ sal_Int32 getTabRowIndex( const OUString& sCellName ) throw (css::uno::RuntimeException);
+ sal_Int32 getTabColIndex( const OUString& sCellName ) throw (css::uno::RuntimeException);
sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException);
sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException);
void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException);
static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException);
- static rtl::OUString getColumnStr( sal_Int32 nCol );
+ static OUString getColumnStr( sal_Int32 nCol );
};
#endif
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 2eb70b88b254..9e34d29f3a0a 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -38,13 +38,13 @@ SwVbaTableOfContents::~SwVbaTableOfContents()
::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException)
{
sal_Int16 nLevel = 0;
- mxTocProps->getPropertyValue(rtl::OUString("Level") ) >>= nLevel;
+ mxTocProps->getPropertyValue(OUString("Level") ) >>= nLevel;
return nLevel;
}
void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException)
{
- mxTocProps->setPropertyValue( rtl::OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) );
+ mxTocProps->setPropertyValue( OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) );
}
::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException)
@@ -61,25 +61,25 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t
::sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException)
{
sal_Bool bUseFields = sal_False;
- mxTocProps->getPropertyValue(rtl::OUString("CreateFromMarks") ) >>= bUseFields;
+ mxTocProps->getPropertyValue(OUString("CreateFromMarks") ) >>= bUseFields;
return bUseFields;
}
void SAL_CALL SwVbaTableOfContents::setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException)
{
- mxTocProps->setPropertyValue( rtl::OUString("CreateFromMarks"), uno::makeAny( _useFields ) );
+ mxTocProps->setPropertyValue( OUString("CreateFromMarks"), uno::makeAny( _useFields ) );
}
::sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException)
{
sal_Bool bUseOutlineLevels = sal_False;
- mxTocProps->getPropertyValue(rtl::OUString("CreateFromOutline") ) >>= bUseOutlineLevels;
+ mxTocProps->getPropertyValue(OUString("CreateFromOutline") ) >>= bUseOutlineLevels;
return bUseOutlineLevels;
}
void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException)
{
- mxTocProps->setPropertyValue( rtl::OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) );
+ mxTocProps->setPropertyValue( OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) );
}
void SAL_CALL SwVbaTableOfContents::Delete( ) throw (uno::RuntimeException)
@@ -93,20 +93,20 @@ void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException)
mxDocumentIndex->update();
}
-rtl::OUString
+OUString
SwVbaTableOfContents::getServiceImplName()
{
- return rtl::OUString("SwVbaTableOfContents");
+ return OUString("SwVbaTableOfContents");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaTableOfContents::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TableOfContents" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.TableOfContents" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx
index d99e353a8826..fa5d42707cdd 100644
--- a/sw/source/ui/vba/vbatableofcontents.hxx
+++ b/sw/source/ui/vba/vbatableofcontents.hxx
@@ -53,8 +53,8 @@ public:
virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_TABLEOFCONTENTS_HXX */
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 1448b4bd28e7..e3b4f04d1826 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -53,7 +53,7 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab
uno::Reference< text::XTextContent > xTextContent( xTable, uno::UNO_QUERY_THROW );
uno::Reference< text::XText > xText = xTextContent->getAnchor()->getText();
uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
- rtl::OUString aImplName = xServiceInfo->getImplementationName();
+ OUString aImplName = xServiceInfo->getImplementationName();
if ( aImplName == "SwXHeadFootText" )
return true;
return false;
@@ -98,17 +98,17 @@ public:
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return text::XTextTable::static_type(0); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; }
// XNameAcess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW );
return uno::makeAny( xTable );
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
{
- uno::Sequence< rtl::OUString > sNames( mxTables.size() );
- rtl::OUString* pString = sNames.getArray();
+ uno::Sequence< OUString > sNames( mxTables.size() );
+ OUString* pString = sNames.getArray();
XTextTableVec::iterator it = mxTables.begin();
XTextTableVec::iterator it_end = mxTables.end();
for ( ; it != it_end; ++it, ++pString )
@@ -118,7 +118,7 @@ public:
}
return sNames;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException)
{
cachePos = mxTables.begin();
XTextTableVec::iterator it_end = mxTables.end();
@@ -178,7 +178,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N
uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange();
uno::Reference< text::XTextTable > xTable;
- xTable.set( xMsf->createInstance( rtl::OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW );
+ xTable.set( xMsf->createInstance( OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW );
xTable->initialize( nRows, nCols );
uno::Reference< text::XText > xText = xTextRange->getText();
@@ -209,10 +209,10 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource )
}
// XHelperInterface
-rtl::OUString
+OUString
SwVbaTables::getServiceImplName()
{
- return rtl::OUString("SwVbaTables");
+ return OUString("SwVbaTables");
}
// XEnumerationAccess
@@ -222,14 +222,14 @@ SwVbaTables::getElementType() throw (uno::RuntimeException)
return word::XTable::static_type(0);
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaTables::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Tables" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Tables" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx
index a232b68c874f..b9cf16fc6260 100644
--- a/sw/source/ui/vba/vbatables.hxx
+++ b/sw/source/ui/vba/vbatables.hxx
@@ -40,8 +40,8 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 8be4212c2fdb..656259e6887a 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -112,11 +112,11 @@ uno::Reference< word::XTableOfContents > SAL_CALL
SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException)
{
uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW );
- uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW );
sal_Bool isProtected = sal_False;
- xTocProps->setPropertyValue( rtl::OUString("IsProtected"), uno::makeAny( isProtected ) );
+ xTocProps->setPropertyValue( OUString("IsProtected"), uno::makeAny( isProtected ) );
uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) );
@@ -164,20 +164,20 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaTablesOfContents::getServiceImplName()
{
- return rtl::OUString("SwVbaTablesOfContents");
+ return OUString("SwVbaTablesOfContents");
}
-uno::Sequence<rtl::OUString>
+uno::Sequence<OUString>
SwVbaTablesOfContents::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.TablesOfContents");
+ sNames[0] = OUString("ooo.vba.word.TablesOfContents");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx
index 49cd2fc43ec3..02ddb4344aa5 100644
--- a/sw/source/ui/vba/vbatablesofcontents.hxx
+++ b/sw/source/ui/vba/vbatablesofcontents.hxx
@@ -46,8 +46,8 @@ public:
// SwVbaTablesOfContents_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_TABLESOFCONTENTS_HXX */
diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx
index 7ff80c3987e8..d780309e6a2c 100644
--- a/sw/source/ui/vba/vbatabstop.cxx
+++ b/sw/source/ui/vba/vbatabstop.cxx
@@ -31,20 +31,20 @@ SwVbaTabStop::~SwVbaTabStop()
{
}
-rtl::OUString
+OUString
SwVbaTabStop::getServiceImplName()
{
- return rtl::OUString("SwVbaTabStop");
+ return OUString("SwVbaTabStop");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaTabStop::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TabStop" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.TabStop" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx
index a5f4e3697912..441916bb5433 100644
--- a/sw/source/ui/vba/vbatabstop.hxx
+++ b/sw/source/ui/vba/vbatabstop.hxx
@@ -37,8 +37,8 @@ public:
virtual ~SwVbaTabStop();
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_TABSTOP_HXX */
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index c6520cf903e2..0af68076fccc 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -28,13 +28,13 @@ using namespace ::com::sun::star;
static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException)
{
uno::Sequence< style::TabStop > aSeq;
- xParaProps->getPropertyValue( rtl::OUString("ParaTabStops") ) >>= aSeq;
+ xParaProps->getPropertyValue( OUString("ParaTabStops") ) >>= aSeq;
return aSeq;
}
static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException)
{
- xParaProps->setPropertyValue( rtl::OUString("ParaTabStops"), uno::makeAny( aSeq ) );
+ xParaProps->setPropertyValue( OUString("ParaTabStops"), uno::makeAny( aSeq ) );
}
typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
@@ -144,7 +144,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co
case word::WdTabAlignment::wdAlignTabBar:
case word::WdTabAlignment::wdAlignTabList:
{
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
+ DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
}
default:
@@ -249,20 +249,20 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource )
return aSource;
}
-rtl::OUString
+OUString
SwVbaTabStops::getServiceImplName()
{
- return rtl::OUString("SwVbaTabStops");
+ return OUString("SwVbaTabStops");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaTabStops::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.TabStops");
+ sNames[0] = OUString("ooo.vba.word.TabStops");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx
index cc4f646500eb..70e6659a54b8 100644
--- a/sw/source/ui/vba/vbatabstops.hxx
+++ b/sw/source/ui/vba/vbatabstops.hxx
@@ -47,8 +47,8 @@ public:
// SwVbaTabStops_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_TABSTOPS_HXX */
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index e17a2fc87c9c..9abe53aebcee 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -46,7 +46,7 @@ static String lcl_CheckGroupName( const String& rGroupName )
}
-SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rFullUrl )
+SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl )
: SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl )
{
}
@@ -56,10 +56,10 @@ SwVbaTemplate::~SwVbaTemplate()
{
}
-rtl::OUString
+OUString
SwVbaTemplate::getName() throw ( css::uno::RuntimeException )
{
- rtl::OUString sName;
+ OUString sName;
if( !msFullUrl.isEmpty() )
{
INetURLObject aURL( msFullUrl );
@@ -68,14 +68,14 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException )
return sName;
}
-rtl::OUString
+OUString
SwVbaTemplate::getPath() throw ( css::uno::RuntimeException )
{
- rtl::OUString sPath;
+ OUString sPath;
if( !msFullUrl.isEmpty() )
{
INetURLObject aURL( msFullUrl );
- rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
+ OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
::osl::File::getSystemPathFromFileURL( sURL, sPath );
}
@@ -89,8 +89,8 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
uno::Reference< text::XAutoTextContainer2 > xAutoTextContainer = text::AutoTextContainer::create( xContext );
// the default template is "Normal.dot" in Word.
- rtl::OUString sGroup("Normal");
- rtl::OUString sName = getName();
+ OUString sGroup("Normal");
+ OUString sName = getName();
sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') );
if( nIndex > 0 )
{
@@ -105,7 +105,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
}
else
{
- throw uno::RuntimeException( rtl::OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() );
}
uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) );
@@ -114,20 +114,20 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
return uno::makeAny( xCol );
}
-rtl::OUString
+OUString
SwVbaTemplate::getServiceImplName()
{
- return rtl::OUString("SwVbaTemplate");
+ return OUString("SwVbaTemplate");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaTemplate::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Template" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Template" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx
index 2d575ad9525c..ff4221d75469 100644
--- a/sw/source/ui/vba/vbatemplate.hxx
+++ b/sw/source/ui/vba/vbatemplate.hxx
@@ -28,19 +28,19 @@ class SwVbaTemplate : public SwVbaTemplate_BASE
{
private:
css::uno::Reference< css::frame::XModel > mxModel;
- rtl::OUString msFullUrl;
+ OUString msFullUrl;
public:
SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
- const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& );
+ const css::uno::Reference< css::frame::XModel >& rModel, const OUString& );
virtual ~SwVbaTemplate();
// XTemplate
- virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_TEMPLATE_HXX */
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 3cbed2123c7c..780bb08fadfc 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -26,7 +26,7 @@ using namespace ::ooo::vba;
using namespace ::com::sun::star;
SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
- const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) :
+ const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( uno::RuntimeException ) :
SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName )
{
}
@@ -35,16 +35,16 @@ SwVbaVariable::~SwVbaVariable()
{
}
-rtl::OUString SAL_CALL
+OUString SAL_CALL
SwVbaVariable::getName() throw ( css::uno::RuntimeException )
{
return maName;
}
void SAL_CALL
-SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
+SwVbaVariable::setName( const OUString& ) throw ( css::uno::RuntimeException )
{
- throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL
@@ -75,20 +75,20 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException )
return 0;
}
-rtl::OUString
+OUString
SwVbaVariable::getServiceImplName()
{
- return rtl::OUString("SwVbaVariable");
+ return OUString("SwVbaVariable");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaVariable::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Variable" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Variable" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index 8a96490f19aa..128ea1549415 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -30,23 +30,23 @@ class SwVbaVariable : public SwVbaVariable_BASE
{
private:
css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
- rtl::OUString maName;
+ OUString maName;
public:
SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
- const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
+ const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException );
virtual ~SwVbaVariable();
// XVariable
- virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
- virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException );
virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException );
virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException );
virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException );
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_VARIABLE_HXX */
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index b74401a882b1..c1a4b2d6deb6 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -61,33 +61,33 @@ SwVbaVariables::createCollectionObject( const css::uno::Any& aSource )
}
uno::Any SAL_CALL
-SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException)
+SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException)
{
uno::Any aValue;
if( rValue.hasValue() )
aValue = rValue;
else
- aValue <<= rtl::OUString();
+ aValue <<= OUString();
uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW );
xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVABLE, aValue );
return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) );
}
-rtl::OUString
+OUString
SwVbaVariables::getServiceImplName()
{
- return rtl::OUString("SwVbaVariables");
+ return OUString("SwVbaVariables");
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
SwVbaVariables::getServiceNames()
{
- static uno::Sequence< rtl::OUString > sNames;
+ static uno::Sequence< OUString > sNames;
if ( sNames.getLength() == 0 )
{
sNames.realloc( 1 );
- sNames[0] = rtl::OUString("ooo.vba.word.Variables");
+ sNames[0] = OUString("ooo.vba.word.Variables");
}
return sNames;
}
diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx
index 1d13bb5b9e3c..dbd4267f6019 100644
--- a/sw/source/ui/vba/vbavariables.hxx
+++ b/sw/source/ui/vba/vbavariables.hxx
@@ -43,11 +43,11 @@ public:
// SwVbaVariables_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
// XVariables
- virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
};
#endif /* SW_VBA_VARIABLES_HXX */
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 5591eaaee297..483254bd9f10 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -71,13 +71,13 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
uno::Reference< text::XText > xCurrentText = mxViewCursor->getText();
uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextContent > xTextContent;
- while( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent )
+ while( xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent )
{
xCurrentText = xTextContent->getAnchor()->getText();
xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW );
}
uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
- rtl::OUString aImplName = xServiceInfo->getImplementationName();
+ OUString aImplName = xServiceInfo->getImplementationName();
if ( aImplName == "SwXBodyText" )
{
return word::WdSeekView::wdSeekMainDocument;
@@ -105,7 +105,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException)
}
else if ( aImplName == "SwXFootnote" )
{
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Endnote") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.text.Endnote") ) )
return word::WdSeekView::wdSeekEndnotes;
else
return word::WdSeekView::wdSeekFootnotes;
@@ -148,7 +148,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
}
else
{
- DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
+ DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() );
}
break;
}
@@ -163,7 +163,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
}
else
{
- DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
+ DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() );
}
break;
}
@@ -193,14 +193,14 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run
SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
{
sal_Bool bShowTableGridLine = sal_False;
- mxViewSettings->getPropertyValue( rtl::OUString("ShowTableBoundaries")) >>= bShowTableGridLine;
+ mxViewSettings->getPropertyValue( OUString("ShowTableBoundaries")) >>= bShowTableGridLine;
return bShowTableGridLine;
}
void SAL_CALL
SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException)
{
- mxViewSettings->setPropertyValue( rtl::OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) );
+ mxViewSettings->setPropertyValue( OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) );
}
::sal_Int32 SAL_CALL
@@ -208,7 +208,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException)
{
// FIXME: handle wdPrintPreview type
sal_Bool bOnlineLayout = sal_False;
- mxViewSettings->getPropertyValue( rtl::OUString("ShowOnlineLayout")) >>= bOnlineLayout;
+ mxViewSettings->getPropertyValue( OUString("ShowOnlineLayout")) >>= bOnlineLayout;
return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
}
@@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
case word::WdViewType::wdPrintView:
case word::WdViewType::wdNormalView:
{
- mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) );
+ mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) );
break;
}
case word::WdViewType::wdWebView:
{
- mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) );
+ mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) );
break;
}
case word::WdViewType::wdPrintPreview:
@@ -235,7 +235,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
break;
}
default:
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
+ DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
}
}
@@ -244,10 +244,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
{
mxModel->lockControllers();
- rtl::OUString aPropIsOn;
- rtl::OUString aPropIsShared;
- rtl::OUString aPropBodyDistance;
- rtl::OUString aPropText;
+ OUString aPropIsOn;
+ OUString aPropIsShared;
+ OUString aPropBodyDistance;
+ OUString aPropText;
switch( nType )
{
@@ -256,10 +256,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
case word::WdSeekView::wdSeekPrimaryFooter:
case word::WdSeekView::wdSeekEvenPagesFooter:
{
- aPropIsOn = rtl::OUString("FooterIsOn");
- aPropIsShared = rtl::OUString("FooterIsShared");
- aPropBodyDistance = rtl::OUString("FooterBodyDistance");
- aPropText = rtl::OUString("FooterText");
+ aPropIsOn = OUString("FooterIsOn");
+ aPropIsShared = OUString("FooterIsShared");
+ aPropBodyDistance = OUString("FooterBodyDistance");
+ aPropText = OUString("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 = rtl::OUString("HeaderIsOn");
- aPropIsShared = rtl::OUString("HeaderIsShared");
- aPropBodyDistance = rtl::OUString("HeaderBodyDistance");
- aPropText = rtl::OUString("HeaderText");
+ aPropIsOn = OUString("HeaderIsOn");
+ aPropIsShared = OUString("HeaderIsShared");
+ aPropBodyDistance = OUString("HeaderBodyDistance");
+ aPropText = OUString("HeaderText");
break;
}
}
@@ -302,8 +302,8 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
// not shared and the current style is applied to a page with
// an even page number
uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
- rtl::OUString aPageStyleName;
- xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName;
+ OUString aPageStyleName;
+ xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName;
if ( aPageStyleName == "First Page" )
{
// go to the beginning of where the next style is used
@@ -316,7 +316,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) );
if( !hasNextPage )
- DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_ACTION, OUString() );
}
break;
}
@@ -339,15 +339,15 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
}
if( !isShared )
{
- rtl::OUString aTempPropText = aPropText;
+ OUString aTempPropText = aPropText;
if( nType == word::WdSeekView::wdSeekEvenPagesFooter
|| nType == word::WdSeekView::wdSeekEvenPagesHeader )
{
- aTempPropText += rtl::OUString("Left");
+ aTempPropText += OUString("Left");
}
else
{
- aTempPropText += rtl::OUString("Right");
+ aTempPropText += OUString("Right");
}
xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW );
}
@@ -356,7 +356,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
if( nType == word::WdSeekView::wdSeekEvenPagesFooter
|| nType == word::WdSeekView::wdSeekEvenPagesHeader )
{
- DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
+ DebugHelper::exception( SbERR_BAD_ACTION, OUString() );
}
xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
}
@@ -364,26 +364,26 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
mxModel->unlockControllers();
if( !xText.is() )
{
- DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
+ DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
}
uno::Reference< text::XTextRange > xTextRange = word::getFirstObjectPosition( xText );
return xTextRange;
}
-rtl::OUString
+OUString
SwVbaView::getServiceImplName()
{
- return rtl::OUString("SwVbaView");
+ return OUString("SwVbaView");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaView::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.View" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.View" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index fd14f25ef06a..14de7ad7fffb 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -54,8 +54,8 @@ public:
virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif /* SW_VBA_VIEW_HXX */
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index b8a22620c08e..611299a19c05 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -108,7 +108,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE
else if (nwindowState == word::WdWindowState::wdWindowStateNormal)
pWork -> Restore();
else
- throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() );
}
}
@@ -128,20 +128,20 @@ SwVbaWindow::ActivePane() throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) );
}
-rtl::OUString
+OUString
SwVbaWindow::getServiceImplName()
{
- return rtl::OUString("SwVbaWindow");
+ return OUString("SwVbaWindow");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaWindow::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Window" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.Window" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx
index 31dedaa3b03d..8e7d48202292 100644
--- a/sw/source/ui/vba/vbawindow.hxx
+++ b/sw/source/ui/vba/vbawindow.hxx
@@ -48,8 +48,8 @@ public:
virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif //SW_VBA_WINDOW_HXX
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index e8573fefca91..efd8c282e861 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -62,29 +62,29 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
case word::WdWrapType::wdWrapSquare:
{
eTextMode = text::WrapTextMode_PARALLEL;
- m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_False ) );
+ m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_False ) );
break;
}
case word::WdWrapType::wdWrapTight:
{
eTextMode = text::WrapTextMode_PARALLEL;
- m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_True ) );
+ m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_True ) );
break;
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString());
+ DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
}
}
}
- m_xPropertySet->setPropertyValue( rtl::OUString("TextWrap"), uno::makeAny( eTextMode ) );
+ m_xPropertySet->setPropertyValue( OUString("TextWrap"), uno::makeAny( eTextMode ) );
}
::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException)
{
sal_Int32 nType = word::WdWrapType::wdWrapSquare;
text::WrapTextMode eTextMode;
- m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode;
+ m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode;
switch( eTextMode )
{
case text::WrapTextMode_NONE:
@@ -100,7 +100,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
case text::WrapTextMode_PARALLEL:
{
sal_Bool bContour = sal_False;
- m_xPropertySet->getPropertyValue( rtl::OUString("SurroundContour")) >>= bContour;
+ m_xPropertySet->getPropertyValue( OUString("SurroundContour")) >>= bContour;
if( bContour )
nType = word::WdWrapType::wdWrapTight;
else
@@ -132,7 +132,7 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE
{
sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth;
text::WrapTextMode eTextMode;
- m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode;
+ m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode;
switch( eTextMode )
{
case text::WrapTextMode_LEFT:
@@ -159,14 +159,14 @@ void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeE
makeWrap();
}
-float SwVbaWrapFormat::getDistance( const rtl::OUString& sName ) throw (uno::RuntimeException)
+float SwVbaWrapFormat::getDistance( const OUString& sName ) throw (uno::RuntimeException)
{
sal_Int32 nDistance = 0;
m_xPropertySet->getPropertyValue( sName ) >>= nDistance;
return static_cast< float >( Millimeter::getInPoints( nDistance ) );
}
-void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) throw (uno::RuntimeException)
+void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) throw (uno::RuntimeException)
{
sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance );
m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) );
@@ -174,58 +174,58 @@ void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance )
float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException)
{
- return getDistance( rtl::OUString("TopMargin") );
+ return getDistance( OUString("TopMargin") );
}
void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException)
{
- setDistance( rtl::OUString("TopMargin"), _distancetop );
+ setDistance( OUString("TopMargin"), _distancetop );
}
float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException)
{
- return getDistance( rtl::OUString("BottomMargin") );
+ return getDistance( OUString("BottomMargin") );
}
void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException)
{
- setDistance( rtl::OUString("BottomMargin"), _distancebottom );
+ setDistance( OUString("BottomMargin"), _distancebottom );
}
float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException)
{
- return getDistance( rtl::OUString("LeftMargin") );
+ return getDistance( OUString("LeftMargin") );
}
void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException)
{
- setDistance( rtl::OUString("LeftMargin"), _distanceleft );
+ setDistance( OUString("LeftMargin"), _distanceleft );
}
float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException)
{
- return getDistance( rtl::OUString("RightMargin") );
+ return getDistance( OUString("RightMargin") );
}
void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException)
{
- setDistance( rtl::OUString("RightMargin"), _distanceright );
+ setDistance( OUString("RightMargin"), _distanceright );
}
-rtl::OUString
+OUString
SwVbaWrapFormat::getServiceImplName()
{
- return rtl::OUString("SwVbaWrapFormat");
+ return OUString("SwVbaWrapFormat");
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
SwVbaWrapFormat::getServiceNames()
{
- static uno::Sequence< rtl::OUString > aServiceNames;
+ static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.WrapFormat" );
+ aServiceNames[ 0 ] = OUString("ooo.vba.word.WrapFormat" );
}
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx
index bc9c5007e76b..3ebf610ec4b4 100644
--- a/sw/source/ui/vba/vbawrapformat.hxx
+++ b/sw/source/ui/vba/vbawrapformat.hxx
@@ -35,8 +35,8 @@ private:
private:
void makeWrap() throw (css::uno::RuntimeException);
- float getDistance( const rtl::OUString& sName ) throw (css::uno::RuntimeException);
- void setDistance( const rtl::OUString& sName, float _distance ) throw (css::uno::RuntimeException);
+ float getDistance( const OUString& sName ) throw (css::uno::RuntimeException);
+ void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException);
public:
SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
@@ -54,8 +54,8 @@ public:
virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException);
virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException);
- virtual rtl::OUString getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual OUString getServiceImplName();
+ virtual css::uno::Sequence<OUString> getServiceNames();
};
#endif//SW_VBA_XWRAPFORMAT_HXX
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index fa5cdf7ec75f..28d714b3b079 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -72,11 +72,11 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame
uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException)
{
- rtl::OUString aPageStyleName;
- xProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName;
+ OUString aPageStyleName;
+ xProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName;
uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW );
uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
return xStyle;
@@ -93,8 +93,8 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference<
{
uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW );
- uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( rtl::OUString("Standard") ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW );
+ uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( OUString("Standard") ), uno::UNO_QUERY_THROW );
return xStyle;
}
@@ -108,7 +108,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference<
if( xParaEnum->hasMoreElements() )
{
uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextTable") ) )
+ if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextTable") ) )
{
uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW );
uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
@@ -149,14 +149,14 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod
//catch exception "no text selection"
}
uno::Reference< beans::XPropertySet > xVCProps( xTextRange, uno::UNO_QUERY_THROW );
- while( xVCProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent )
+ while( xVCProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent )
{
xText = xTextContent->getAnchor()->getText();
xVCProps.set( xText->createTextCursor(), uno::UNO_QUERY_THROW );
}
if( !xText.is() )
- throw uno::RuntimeException( rtl::OUString( "no text selection" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( OUString( "no text selection" ), uno::Reference< uno::XInterface >() );
return xText;
}
diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx
index 4299025c0621..f2bc20d39eac 100644
--- a/sw/source/ui/web/wgrfsh.cxx
+++ b/sw/source/ui/web/wgrfsh.cxx
@@ -50,7 +50,7 @@ SwWebGrfShell::SwWebGrfShell(SwView &_rView) :
SwGrfShell(_rView)
{
- SetName(rtl::OUString("Graphic"));
+ SetName(OUString("Graphic"));
SetHelpId(SW_GRFSHELL);
}
diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx
index 570f755b742c..cd850143cac3 100644
--- a/sw/source/ui/web/wlistsh.cxx
+++ b/sw/source/ui/web/wlistsh.cxx
@@ -44,7 +44,7 @@ TYPEINIT1(SwWebListShell,SwListShell)
SwWebListShell::SwWebListShell(SwView &_rView) :
SwListShell(_rView)
{
- SetName(rtl::OUString("List"));
+ SetName(OUString("List"));
SetHelpId(SW_LISTSHELL);
}
diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx
index b859462a4633..d45a2444d4b7 100644
--- a/sw/source/ui/web/wolesh.cxx
+++ b/sw/source/ui/web/wolesh.cxx
@@ -45,7 +45,7 @@ SwWebOleShell::SwWebOleShell(SwView &_rView) :
SwOleShell(_rView)
{
- SetName(rtl::OUString("Object"));
+ SetName(OUString("Object"));
SetHelpId(SW_OLESHELL);
}
diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx
index ebf189d5078f..cd9eb53d886c 100644
--- a/sw/source/ui/web/wtabsh.cxx
+++ b/sw/source/ui/web/wtabsh.cxx
@@ -51,7 +51,7 @@ SwWebTableShell::SwWebTableShell(SwView &_rView) :
SwTableShell(_rView)
{
GetShell().UpdateTable();
- SetName(rtl::OUString("Table"));
+ SetName(OUString("Table"));
SetHelpId(SW_TABSHELL);
}
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index fe43439f7b3d..fc03453dceb2 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -227,12 +227,12 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) {
if (xPropSet.is())
{
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) );
+ css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) );
aValue >>= xLayoutManager;
if (xLayoutManager.is())
{
- const ::rtl::OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" );
+ const OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" );
css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
if (!xUIElement.is())
{
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index f414cd2b7088..ac6ef2427dab 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -349,7 +349,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
if ( pName )
{
comphelper::EmbeddedObjectContainer aCnt( xStor );
- ::rtl::OUString aName;
+ OUString aName;
// TODO/LATER: get aspect?
xObj.Assign( aCnt.CreateEmbeddedObject( pName->GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT );
}
@@ -371,16 +371,16 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
{
SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool();
const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId);
- rtl::OString aCmd(".uno:");
+ OString aCmd(".uno:");
aCmd += pSlot->GetUnoName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractInsertObjectDialog* pDlg =
- pFact->CreateInsertObjectDialog( GetWin(), rtl::OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
+ pFact->CreateInsertObjectDialog( GetWin(), OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
if ( pDlg )
{
pDlg->Execute();
bDoVerb = pDlg->IsCreateNew();
- ::rtl::OUString aIconMediaType;
+ OUString aIconMediaType;
uno::Reference< io::XInputStream > xIconMetaFile = pDlg->GetIconIfIconified( &aIconMediaType );
xObj.Assign( pDlg->GetObject(),
xIconMetaFile.is() ? embed::Aspects::MSOLE_ICON : embed::Aspects::MSOLE_CONTENT );
@@ -480,7 +480,7 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
{
try
{
- xSet->setPropertyValue( ::rtl::OUString("Formula"), uno::makeAny( ::rtl::OUString( aMathData ) ) );
+ xSet->setPropertyValue( OUString("Formula"), uno::makeAny( OUString( aMathData ) ) );
bActivate = sal_False;
}
catch (const uno::Exception&)
@@ -533,12 +533,12 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
- xProps->setPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ),
+ xProps->setPropertyValue( OUString( "DisableDataTableDialog" ),
uno::makeAny( sal_False ) );
- xProps->setPropertyValue( ::rtl::OUString( "DisableComplexChartTypes" ),
+ xProps->setPropertyValue( OUString( "DisableComplexChartTypes" ),
uno::makeAny( sal_False ) );
uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
@@ -900,7 +900,7 @@ void SwWrtShell::InsertLineBreak()
if( pACorr )
AutoCorrect( *pACorr, cIns );
else
- SwWrtShell::Insert( rtl::OUString( cIns ) );
+ SwWrtShell::Insert( OUString( cIns ) );
}
}
@@ -1185,8 +1185,8 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast<sal_uInt8>(nLevel)));
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
- aFmt.SetPrefix(::rtl::OUString());
- aFmt.SetSuffix(::rtl::OUString());
+ aFmt.SetPrefix(OUString());
+ aFmt.SetSuffix(OUString());
}
aNumRule.Set(static_cast<sal_uInt16>(nLevel), aFmt);
}
@@ -1243,8 +1243,8 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
aFmt.SetBulletChar( numfunc::GetBulletChar(nLvl) );
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
- aFmt.SetPrefix(::rtl::OUString());
- aFmt.SetSuffix(::rtl::OUString());
+ aFmt.SetPrefix(OUString());
+ aFmt.SetSuffix(OUString());
}
// #i95907#
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index baeabb1a6e52..9aa908f31eb2 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -114,7 +114,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel )
pTmp->PushCrsr();
sal_Bool bCancel = sal_False;
- rtl::OString aDlgPos;
+ OString aDlgPos;
for( sal_uInt16 i = 0; i < nCnt && !bCancel; ++i )
{
pTmp->GotoFieldPos( i );
@@ -137,7 +137,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel )
// Start input dialog for a specific field
sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
- Window* pParentWin, rtl::OString* pWindowState )
+ Window* pParentWin, OString* pWindowState )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -156,7 +156,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
return bRet;
}
-sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, rtl::OString* pWindowState)
+sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, OString* pWindowState)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -358,8 +358,8 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
}
-void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter,
- const rtl::OUString& rTargetFrameName )
+void LoadURL( ViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
+ const OUString& rTargetFrameName )
{
OSL_ENSURE( !rURL.isEmpty(), "what should be loaded here?" );
if( rURL.isEmpty() )
@@ -374,7 +374,7 @@ void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter,
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, "No DocShell?!");
- rtl::OUString sTargetFrame(rTargetFrameName);
+ OUString sTargetFrame(rTargetFrameName);
if (sTargetFrame.isEmpty() && pDShell)
{
using namespace ::com::sun::star;
@@ -399,7 +399,7 @@ void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter,
SfxBoolItem aBrowse( SID_BROWSE, sal_True );
if( nFilter & URLLOAD_NEWVIEW )
- aTargetFrameName.SetValue( rtl::OUString("_blank") );
+ aTargetFrameName.SetValue( OUString("_blank") );
const SfxPoolItem* aArr[] = {
&aName,
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 22e693d1ca23..16e20f4573fe 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -37,7 +37,6 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
extern bool bNoInterrupt; // in mainwn.cxx
@@ -123,7 +122,7 @@ void SwWrtShell::DrawSelChanged( )
bNoInterrupt = bOldVal;
}
-sal_Bool SwWrtShell::GotoMark( const ::rtl::OUString& rName )
+sal_Bool SwWrtShell::GotoMark( const OUString& rName )
{
IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark( rName );
if(ppMark == getIDocumentMarkAccess()->getMarksEnd()) return false;
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx
index e01d7df01fa1..e117b03c3b8b 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/ui/wrtsh/wrtundo.cxx
@@ -96,7 +96,7 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
String SwWrtShell::GetDoString( DoType eDoType ) const
{
- ::rtl::OUString aUndoStr;
+ OUString aUndoStr;
sal_uInt16 nResStr = STR_UNDO;
switch( eDoType )
{
@@ -141,7 +141,7 @@ sal_uInt16 SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs )
String SwWrtShell::GetRepeatString() const
{
- ::rtl::OUString str;
+ OUString str;
GetRepeatInfo(& str);
if (str.isEmpty())