summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx6
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx16
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx6
-rw-r--r--sw/inc/IMark.hxx18
-rw-r--r--sw/inc/PostItMgr.hxx14
-rw-r--r--sw/inc/SwAppletImpl.hxx18
-rw-r--r--sw/inc/SwSmartTagMgr.hxx2
-rw-r--r--sw/inc/SwXMLSectionList.hxx10
-rw-r--r--sw/inc/authfld.hxx2
-rw-r--r--sw/inc/breakit.hxx8
-rw-r--r--sw/inc/ccoll.hxx4
-rw-r--r--sw/inc/charfmt.hxx2
-rw-r--r--sw/inc/crsrsh.hxx8
-rw-r--r--sw/inc/dbfld.hxx30
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx20
-rw-r--r--sw/inc/ddefld.hxx10
-rw-r--r--sw/inc/doc.hxx8
-rw-r--r--sw/inc/docsh.hxx4
-rw-r--r--sw/inc/docstyle.hxx2
-rw-r--r--sw/inc/docufld.hxx96
-rw-r--r--sw/inc/editsh.hxx10
-rw-r--r--sw/inc/expfld.hxx32
-rw-r--r--sw/inc/fldbas.hxx10
-rw-r--r--sw/inc/flddat.hxx4
-rw-r--r--sw/inc/flddropdown.hxx40
-rw-r--r--sw/inc/fmtftntx.hxx12
-rw-r--r--sw/inc/fmtmeta.hxx4
-rw-r--r--sw/inc/fmtrfmrk.hxx6
-rw-r--r--sw/inc/format.hxx2
-rw-r--r--sw/inc/ftninfo.hxx12
-rw-r--r--sw/inc/istyleaccess.hxx2
-rw-r--r--sw/inc/mdiexp.hxx4
-rw-r--r--sw/inc/modcfg.hxx20
-rw-r--r--sw/inc/modeltoviewhelper.hxx4
-rw-r--r--sw/inc/ndtxt.hxx2
-rw-r--r--sw/inc/printdata.hxx12
-rw-r--r--sw/inc/prtopt.hxx4
-rw-r--r--sw/inc/reffld.hxx10
-rw-r--r--sw/inc/splargs.hxx2
-rw-r--r--sw/inc/swabstdlg.hxx12
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swdbtoolsclient.hxx4
-rw-r--r--sw/inc/swfltopt.hxx2
-rw-r--r--sw/inc/swscanner.hxx10
-rw-r--r--sw/inc/swundo.hxx2
-rw-r--r--sw/inc/swurl.hxx4
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/undobj.hxx4
-rw-r--r--sw/inc/unobaseclass.hxx4
-rw-r--r--sw/inc/unochart.hxx54
-rw-r--r--sw/inc/unocoll.hxx90
-rw-r--r--sw/inc/unocrsrhelper.hxx18
-rw-r--r--sw/inc/unodraw.hxx36
-rw-r--r--sw/inc/unofieldcoll.hxx18
-rw-r--r--sw/inc/unoframe.hxx52
-rw-r--r--sw/inc/unoidxcoll.hxx12
-rw-r--r--sw/inc/unoparagraph.hxx54
-rw-r--r--sw/inc/unoredline.hxx12
-rw-r--r--sw/inc/unoredlines.hxx12
-rw-r--r--sw/inc/unosett.hxx102
-rw-r--r--sw/inc/unosrch.hxx26
-rw-r--r--sw/inc/unostyle.hxx146
-rw-r--r--sw/inc/unotbl.hxx148
-rw-r--r--sw/inc/unotext.hxx22
-rw-r--r--sw/inc/unotextbodyhf.hxx12
-rw-r--r--sw/inc/unotextcursor.hxx52
-rw-r--r--sw/inc/unotextrange.hxx46
-rw-r--r--sw/inc/unotxdoc.hxx92
-rw-r--r--sw/inc/usrfld.hxx10
-rw-r--r--sw/inc/viewopt.hxx6
-rw-r--r--sw/qa/core/filters-test.cxx34
-rw-r--r--sw/qa/core/layout-test.cxx18
-rw-r--r--sw/qa/core/macros-test.cxx40
-rw-r--r--sw/qa/core/uwriter.cxx136
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx2
-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
739 files changed, 5698 insertions, 5872 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 669660ac1296..52ed3d3b45fe 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -239,7 +239,7 @@ class SwEnhancedPDFExportHelper
SwEnhancedPDFExportHelper( SwEditShell& rSh,
OutputDevice& rOut,
- const rtl::OUString& rPageRange,
+ const OUString& rPageRange,
bool bSkipEmptyPages,
bool bEditEngineOnly );
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 96be5ad97db1..a4c5a6aee1e0 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -48,11 +48,11 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
/** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents.
*/
- virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
+ virtual bool GetData(const OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
- virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
+ virtual bool SetData(const OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
- virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem) = 0;
+ virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) = 0;
/** Embed all local links (ranges/graphics).
*/
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 21e2d0c88cbb..a01915479cc0 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -77,15 +77,15 @@ class IDocumentMarkAccess
a pointer to the new mark (name might have changed).
*/
virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM,
- const ::rtl::OUString& rProposedName,
+ const OUString& rProposedName,
MarkType eMark) =0;
virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType) = 0;
+ const OUString& rName,
+ const OUString& rType) = 0;
virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM,
- const rtl::OUString& rName,
- const rtl::OUString& rType) = 0;
+ const OUString& rName,
+ const OUString& rType) = 0;
/** Returns a mark in the document for a paragraph.
If there is none, a mark will be created.
@@ -123,7 +123,7 @@ class IDocumentMarkAccess
@returns false, if renaming failed (because the name is already in use)
*/
virtual bool renameMark(::sw::mark::IMark* io_pMark,
- const ::rtl::OUString& rNewName) =0;
+ const OUString& rNewName) =0;
/** Corrects marks (absolute)
This method ignores the previous position of the mark in the paragraph
@@ -207,7 +207,7 @@ class IDocumentMarkAccess
@returns
an iterator pointing to the mark, or pointing to getMarksEnd() if nothing was found.
*/
- virtual const_iterator_t findMark(const ::rtl::OUString& rMark) const =0;
+ virtual const_iterator_t findMark(const OUString& rMark) const =0;
// interface IBookmarks (BOOKMARK, CROSSREF_NUMITEM_BOOKMARK, CROSSREF_HEADING_BOOKMARK)
@@ -232,7 +232,7 @@ class IDocumentMarkAccess
@returns
an iterator pointing to the bookmark, or getBookmarksEnd() if nothing was found.
*/
- virtual const_iterator_t findBookmark(const ::rtl::OUString& rMark) const =0;
+ virtual const_iterator_t findBookmark(const OUString& rMark) const =0;
// Fieldmarks
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 313fc29ce8e1..26e76f0b838f 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -142,7 +142,7 @@ public:
@param o_pId if not 0, receives Id of last Undo action.
@return true if there is a Undo action, false if none
*/
- virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr,
+ virtual bool GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId) const = 0;
/** Get comments of Undo actions.
@@ -160,7 +160,7 @@ public:
@param o_pStr if not 0, receives comment of first Redo action.
@return true if there is a Redo action, false if none
*/
- virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const = 0;
+ virtual bool GetFirstRedoInfo(OUString *const o_pStr) const = 0;
/** Get comments of Redo actions.
@return comments of all top-level Redo actions.
@@ -179,7 +179,7 @@ public:
@return Id of last Undo action if it is Repeat capable,
or UNDO_EMPTY if there is none or it is not Repeat capable.
*/
- virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const = 0;
+ virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const = 0;
/** Add new Undo action.
Takes over ownership of pUndo.
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 49f5d67f8f71..1087ef25cf70 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -48,7 +48,7 @@ namespace sw { namespace mark
virtual const SwPosition& GetOtherMarkPos() const =0;
virtual const SwPosition& GetMarkStart() const =0;
virtual const SwPosition& GetMarkEnd() const =0;
- virtual const ::rtl::OUString& GetName() const =0;
+ virtual const OUString& GetName() const =0;
virtual bool IsExpanded() const =0;
virtual bool IsCoveringPosition(const SwPosition& rPos) const =0;
@@ -71,16 +71,16 @@ namespace sw { namespace mark
bool EndsAfter(const SwPosition& rPos) const
{ return GetMarkEnd() > rPos; }
- virtual rtl::OUString ToString( ) const =0;
+ virtual OUString ToString( ) const =0;
};
class SAL_DLLPUBLIC_EXPORT IBookmark
: virtual public IMark
{
public:
- virtual const ::rtl::OUString& GetShortName() const =0;
+ virtual const OUString& GetShortName() const =0;
virtual const KeyCode& GetKeyCode() const =0;
- virtual void SetShortName(const ::rtl::OUString&) =0;
+ virtual void SetShortName(const OUString&) =0;
virtual void SetKeyCode(const KeyCode&) =0;
};
@@ -88,16 +88,16 @@ namespace sw { namespace mark
: virtual public IMark
{
public:
- typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any> parameter_map_t;
+ typedef ::std::map< OUString, ::com::sun::star::uno::Any> parameter_map_t;
//getters
- virtual ::rtl::OUString GetFieldname() const =0;
- virtual ::rtl::OUString GetFieldHelptext() const =0;
+ virtual OUString GetFieldname() const =0;
+ virtual OUString GetFieldHelptext() const =0;
virtual parameter_map_t* GetParameters() =0;
virtual const parameter_map_t* GetParameters() const =0;
//setters
- virtual void SetFieldname(const ::rtl::OUString& rFieldname) =0;
- virtual void SetFieldHelptext(const ::rtl::OUString& rFieldHelptext) =0;
+ virtual void SetFieldname(const OUString& rFieldname) =0;
+ virtual void SetFieldHelptext(const OUString& rFieldHelptext) =0;
virtual void Invalidate() = 0;
};
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 9bfad8414fc6..c8dc4323bc42 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -102,10 +102,10 @@ class SwNoteProps: public utl::ConfigItem
bool bIsShowAnchor;
public:
SwNoteProps()
- : ConfigItem(::rtl::OUString("Office.Writer/Notes"))
+ : ConfigItem(OUString("Office.Writer/Notes"))
, bIsShowAnchor(false)
{
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
+ const ::com::sun::star::uno::Sequence< OUString >& rNames = GetPropertyNames();
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames);
const ::com::sun::star::uno::Any* pValues = aValues.getConstArray();
OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties failed");
@@ -117,20 +117,20 @@ class SwNoteProps: public utl::ConfigItem
{
return bIsShowAnchor;
}
- ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames()
+ ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames()
{
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames;
+ static ::com::sun::star::uno::Sequence< OUString > aNames;
if(!aNames.getLength())
{
aNames.realloc(1);
- ::rtl::OUString* pNames = aNames.getArray();
- pNames[0] = ::rtl::OUString("ShowAnkor");
+ OUString* pNames = aNames.getArray();
+ pNames[0] = OUString("ShowAnkor");
}
return aNames;
}
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 );
};
class SwPostItMgr: public SfxListener
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index cf5bdd97c565..70579083fe2a 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -45,25 +45,25 @@ class SwApplet_Impl
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet;
SvCommandList aCommandList;
SfxItemSet aItemSet;
- ::rtl::OUString sAlt;
+ OUString sAlt;
public:
- static sal_uInt16 GetOptionType( const ::rtl::OUString& rName, sal_Bool bApplet );
+ static sal_uInt16 GetOptionType( const OUString& rName, sal_Bool bApplet );
SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 );
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
~SwApplet_Impl();
- void CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUString& rName,
- sal_Bool bMayScript, const ::rtl::OUString& rCodeBase,
- const ::rtl::OUString& rBaseURL );
+ void CreateApplet( const OUString& rCode, const OUString& rName,
+ sal_Bool bMayScript, const OUString& rCodeBase,
+ const OUString& rBaseURL );
#ifdef SOLAR_JAVA
- sal_Bool CreateApplet( const ::rtl::OUString& rBaseURL );
- void AppendParam( const ::rtl::OUString& rName, const ::rtl::OUString& rValue );
+ sal_Bool CreateApplet( const OUString& rBaseURL );
+ void AppendParam( const OUString& rName, const OUString& rValue );
#endif
void FinishApplet();
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetApplet() { return xApplet; }
SfxItemSet& GetItemSet() { return aItemSet; }
- const ::rtl::OUString& GetAltText() const { return sAlt; }
- void SetAltText( const ::rtl::OUString& rAlt ) {sAlt = rAlt;}
+ const OUString& GetAltText() const { return sAlt; }
+ void SetAltText( const OUString& rAlt ) {sAlt = rAlt;}
};
#endif
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 71c9f3445366..6480ab2d5b2e 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -34,7 +34,7 @@ class SwSmartTagMgr : public SmartTagMgr
private:
static SwSmartTagMgr* mpTheSwSmartTagMgr;
- SwSmartTagMgr( const rtl::OUString& rModuleName );
+ SwSmartTagMgr( const OUString& rModuleName );
virtual ~SwSmartTagMgr();
public:
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 75e20d35f6e2..8c6abc060881 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -28,7 +28,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 );
public:
@@ -49,11 +49,11 @@ private:
public:
SvXMLSectionListContext ( SwXMLSectionList& 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 );
~SvXMLSectionListContext ( void );
@@ -66,11 +66,11 @@ private:
public:
SvXMLIgnoreSectionListContext ( SwXMLSectionList& 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 );
~SvXMLIgnoreSectionListContext ( void );
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 067a494f2822..44732969b774 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -156,7 +156,7 @@ public:
const String& GetFieldText(ToxAuthorityField eField) const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual void SetPar1(const OUString& rStr);
virtual SwFieldType* ChgTyp( SwFieldType* );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 8319dea8c544..ff3d86d71948 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -113,12 +113,12 @@ public:
return *m_pForbidden;
}
- sal_uInt16 GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const;
- sal_uInt16 GetAllScriptsOfText( const rtl::OUString& rTxt ) const;
+ sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const;
+ sal_uInt16 GetAllScriptsOfText( const OUString& rTxt ) const;
- sal_Int32 getGraphemeCount(const rtl::OUString& rStr,
+ sal_Int32 getGraphemeCount(const OUString& rStr,
sal_Int32 nStart, sal_Int32 nEnd) const;
- sal_Int32 getGraphemeCount(const rtl::OUString& rStr) const
+ sal_Int32 getGraphemeCount(const OUString& rStr) const
{
return getGraphemeCount(rStr, 0, rStr.getLength());
}
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index afc1fe25aef4..4aee3bb02333 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -53,8 +53,8 @@ struct CommandStruct
//***********************************************************
-sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName );
-rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex );
+sal_Int16 GetCommandContextIndex( const OUString &rContextName );
+OUString GetCommandContextByIndex( sal_Int16 nIndex );
//***********************************************************
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 08da53c9ee6a..06a865cd62e7 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -30,7 +30,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt
SwCharFmt *pDerivedFrom )
: SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
{}
- SwCharFmt( SwAttrPool& rPool, const rtl::OUString &rFmtName,
+ SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName,
SwCharFmt *pDerivedFrom )
: SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
{}
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 4f9d783da7f5..2ddb6d56e13c 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -548,8 +548,8 @@ public:
// at CurCrsr.SPoint
::sw::mark::IMark* SetBookmark(
const KeyCode&,
- const ::rtl::OUString& rName,
- const ::rtl::OUString& rShortName,
+ const OUString& rName,
+ const OUString& rShortName,
IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::BOOKMARK);
bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurCrsr.SPoint
bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
@@ -757,12 +757,12 @@ public:
// get smart tags at point position
void GetSmartTagTerm( const Point& rPt,
SwRect& rSelectRect,
- ::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>& rRange );
// get smart tags at current cursor position
- void GetSmartTagTerm( ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes,
+ void GetSmartTagTerm( ::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>& rRange ) const;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index a92279e06c27..b4f55a9ee3d7 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -34,7 +34,7 @@ class SwFrm;
class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
{
SwDBData aDBData; //
- rtl::OUString sName; ///< only used in ::GetName() !
+ OUString sName; ///< only used in ::GetName() !
String sColumn;
long nRefCnt;
@@ -43,7 +43,7 @@ public:
SwDBFieldType(SwDoc* pDocPtr, const String& rColumnName, const SwDBData& rDBData);
~SwDBFieldType();
- virtual const rtl::OUString& GetName() const;
+ virtual const OUString& GetName() const;
virtual SwFieldType* Copy() const;
inline void AddRef() { nRefCnt++; }
@@ -63,8 +63,8 @@ public:
class SW_DLLPUBLIC SwDBField : public SwValueField
{
- rtl::OUString aContent;
- rtl::OUString sFieldCode; ///< contains Word's field code
+ OUString aContent;
+ OUString sFieldCode; ///< contains Word's field code
sal_uInt16 nSubType;
bool bIsInBodyTxt : 1;
bool bValidValue : 1;
@@ -105,11 +105,11 @@ public:
inline void SetInitialized() { bInitialized = true; }
/// Get name.
- virtual const rtl::OUString& GetPar1() const;
+ virtual const OUString& GetPar1() const;
/// access to the command string
- const rtl::OUString& GetFieldCode() const { return sFieldCode;}
- void SetFieldCode(const rtl::OUString& rStr) { sFieldCode = rStr; }
+ const OUString& GetFieldCode() const { return sFieldCode;}
+ void SetFieldCode(const OUString& rStr) { sFieldCode = rStr; }
/// DBName
inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
@@ -172,7 +172,7 @@ public:
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
{
- rtl::OUString aCond;
+ OUString aCond;
bool bCondValid;
public:
@@ -187,8 +187,8 @@ public:
inline bool IsCondValid() const;
// Condition
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
@@ -218,7 +218,7 @@ public:
class SwDBNumSetField : public SwDBNameInfField
{
- rtl::OUString aCond;
+ OUString aCond;
String aPar2;
bool bCondValid;
@@ -233,12 +233,12 @@ public:
void Evaluate(SwDoc*);
// Condition
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
// Number of data record.
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
// Number of data record is in nFormat!!
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 44cc3051289b..7e41d6f26b26 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -55,7 +55,7 @@ extern bool bDbgOutPrintAttrSet;
SW_DLLPUBLIC const char * dbg_out(const void * pVoid);
SW_DLLPUBLIC const char * dbg_out(const String & aStr);
-SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr);
+SW_DLLPUBLIC const char * dbg_out(const OUString & aStr);
SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 33485a744032..978f779c248a 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -150,8 +150,8 @@ struct SwMergeDescriptor
String sAddressFromColumn;
String sMailBody;
String sAttachmentName;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aCopiesTo;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlindCopiesTo;
+ ::com::sun::star::uno::Sequence< OUString > aCopiesTo;
+ ::com::sun::star::uno::Sequence< OUString > aBlindCopiesTo;
::com::sun::star::uno::Reference< com::sun::star::mail::XSmtpService > xSmtpServer;
@@ -205,7 +205,7 @@ friend class SwConnectionDisposedListener_Impl;
const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send
SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
- SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, sal_Bool bCreate);
+ SW_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate);
SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
@@ -299,11 +299,11 @@ public:
sal_uInt32 GetSelectedRecordId(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
sal_Bool GetColumnCnt(const String& rSourceName, const String& rTableName,
const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
- rtl::OUString& rResult, double* pNumber);
+ OUString& rResult, double* pNumber);
/** create and store or find an already stored connection to a data source for use
in SwFldMgr and SwDBTreeList */
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
- RegisterConnection(::rtl::OUString& rSource);
+ RegisterConnection(OUString& rSource);
const SwDSParam* CreateDSData(const SwDBData& rData)
{return FindDSData(rData, sal_True);}
@@ -314,7 +314,7 @@ public:
void CloseAll(sal_Bool bIncludingMerge = sal_True);
sal_Bool GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage,
- rtl::OUString &rResult, double *pNumber, sal_uInt32 *pFormat);
+ OUString &rResult, double *pNumber, sal_uInt32 *pFormat);
sal_Bool ToNextMergeRecord();
sal_Bool ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
@@ -338,7 +338,7 @@ public:
const String& rTableOrQuery,
sal_uInt8 eTableOrQuery = SW_DB_SELECT_UNKNOWN);
- static ::com::sun::star::uno::Sequence<rtl::OUString> GetExistingDatabaseNames();
+ static ::com::sun::star::uno::Sequence<OUString> GetExistingDatabaseNames();
/**
Loads a data source from file and registers it. Returns the registered name.
@@ -359,7 +359,7 @@ public:
The data source.
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>
- getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName);
+ getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const OUString& _sDataSourceName);
/** creates a RowSet, which must be disposed after use.
@param _sDataSourceName
@@ -375,8 +375,8 @@ public:
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
- createCursor( const ::rtl::OUString& _sDataSourceName,
- const ::rtl::OUString& _sCommand,
+ createCursor( const OUString& _sDataSourceName,
+ const OUString& _sCommand,
sal_Int32 _nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
);
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index da239296a0f2..327766077f2b 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -31,7 +31,7 @@ class SwDoc;
class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType
{
- rtl::OUString aName;
+ OUString aName;
String aExpansion;
::sfx2::SvBaseLinkRef refLink;
@@ -53,7 +53,7 @@ public:
bCRLFFlag = sal_False; }
virtual SwFieldType* Copy() const;
- virtual const rtl::OUString& GetName() const;
+ virtual const OUString& GetName() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
@@ -99,11 +99,11 @@ public:
/** Get parameter via types.
Name cannot be changed. */
- virtual const rtl::OUString& GetPar1() const;
+ virtual const OUString& GetPar1() const;
// Command
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7c79c097b03e..5dfb6df53076 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -802,9 +802,9 @@ public:
virtual sfx2::LinkManager& GetLinkManager();
virtual const sfx2::LinkManager& GetLinkManager() const;
virtual void UpdateLinks(bool bUI);
- virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
- virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
- virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem);
+ virtual bool GetData(const OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
+ virtual bool SetData(const OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
+ virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem);
virtual bool EmbedAllLinks();
virtual void SetLinksUpdated(const bool bNewLinksUpdated);
virtual bool LinksUpdated() const;
@@ -1722,7 +1722,7 @@ public:
/** @return names of all references that are set in document.
If array pointer is 0 return only whether a RefMark is set in document. */
- sal_uInt16 GetRefMarks( std::vector<rtl::OUString>* = 0 ) const;
+ sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
/// Insert label. If a FlyFormat is created, return it.
SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 59e83a3ee04f..39bb3ceea796 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -142,7 +142,7 @@ public:
static SfxInterface *_GetInterface() { return GetStaticInterface(); }
- static rtl::OUString GetEventName( sal_Int32 nId );
+ static OUString GetEventName( sal_Int32 nId );
/// Doc is required for SO data exchange!
SwDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED );
@@ -277,7 +277,7 @@ public:
void InvalidateModel();
void ReactivateModel();
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
+ virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames();
/// #i20883# Digital Signatures and Encryption
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 7932edc63a61..72ea158d3172 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -172,7 +172,7 @@ public:
virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
virtual SfxStyleSheetBase* First();
virtual SfxStyleSheetBase* Next();
- virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
+ virtual SfxStyleSheetBase* Find(const OUString& rStr);
virtual void Notify( SfxBroadcaster&, const SfxHint& );
};
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 35ea4c156154..c5c1cfe1a45c 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -180,8 +180,8 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual sal_uInt16 GetSubType() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
@@ -352,11 +352,11 @@ public:
class SwHiddenTxtField : public SwField
{
- rtl::OUString aTRUETxt; ///< Text if condition sal_True.
- rtl::OUString aFALSETxt; ///< If condition false.
- rtl::OUString aContent; ///< Evaluated DB-text.
+ OUString aTRUETxt; ///< Text if condition sal_True.
+ OUString aFALSETxt; ///< If condition false.
+ OUString aContent; ///< Evaluated DB-text.
- rtl::OUString aCond; ///< Condition.
+ OUString aCond; ///< Condition.
sal_uInt16 nSubType;
sal_Bool bCanToggle : 1; ///< Can field be toggled alone?
@@ -389,12 +389,12 @@ public:
String GetDBName(const String& rName, SwDoc *pDoc);
/// Condition
- virtual void SetPar1(const rtl::OUString& rStr);
- virtual const rtl::OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
+ virtual const OUString& GetPar1() const;
/// True/False - String
- virtual void SetPar2(const rtl::OUString& rStr);
- virtual rtl::OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const;
virtual sal_uInt16 GetSubType() const;
@@ -421,7 +421,7 @@ public:
class SwHiddenParaField : public SwField
{
- rtl::OUString aCond;
+ OUString aCond;
sal_Bool bIsHidden:1;
public:
/// Direct input, delete old value.
@@ -434,8 +434,8 @@ public:
sal_Bool IsHidden() const { return bIsHidden; }
/// Query, set condition.
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
@@ -460,8 +460,8 @@ public:
class SW_DLLPUBLIC SwMacroField : public SwField
{
- rtl::OUString aMacro;
- rtl::OUString aText;
+ OUString aMacro;
+ OUString aText;
sal_Bool bIsScriptURL;
virtual String Expand() const;
@@ -472,7 +472,7 @@ public:
SwMacroField( SwMacroFieldType*, const String& rLibAndName,
const String& rTxt);
- inline const rtl::OUString& GetMacro() const { return aMacro; }
+ inline const OUString& GetMacro() const { return aMacro; }
String GetLibName() const;
String GetMacroName() const;
SvxMacro GetSvxMacro() const;
@@ -480,16 +480,16 @@ public:
virtual String GetFieldName() const;
/// Library and FileName
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
/// Macrotext
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- static void CreateMacroString( rtl::OUString& rMacro,
+ static void CreateMacroString( OUString& rMacro,
const String& rMacroName,
const String& rLibraryName );
@@ -518,10 +518,10 @@ public:
class SW_DLLPUBLIC SwPostItField : public SwField
{
- rtl::OUString sTxt;
- rtl::OUString sAuthor;
- rtl::OUString sInitials; ///< Initials of the author.
- rtl::OUString sName; ///< Name of the comment.
+ OUString sTxt;
+ OUString sAuthor;
+ OUString sInitials; ///< Initials of the author.
+ OUString sName; ///< Name of the comment.
DateTime aDateTime;
OutlinerParaObject* mpText;
SwTextAPIObject* m_pTextObject;
@@ -542,15 +542,15 @@ public:
inline const Time GetTime() const { return aDateTime.GetTime(); }
/// Author
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
/// Text
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
- const rtl::OUString& GetTxt() const { return sTxt; }
- const rtl::OUString& GetInitials() const;
- void SetName(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
+ const OUString& GetTxt() const { return sTxt; }
+ const OUString& GetInitials() const;
+ void SetName(const OUString& rStr);
const OUString& GetName() const;
const OutlinerParaObject* GetTextObject() const;
@@ -670,8 +670,8 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
sal_Bool IsOn() const { return bOn; }
@@ -739,7 +739,7 @@ public:
class SwJumpEditField : public SwField
{
- rtl::OUString sTxt, sHelp;
+ OUString sTxt, sHelp;
public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const String& sText, const String& sHelp );
@@ -748,12 +748,12 @@ public:
virtual SwField* Copy() const;
/// Placeholder-Text
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
/// Hint-Text
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
SwCharFmt* GetCharFmt() const
{ return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); }
@@ -780,8 +780,8 @@ public:
class SwScriptField : public SwField
{
- rtl::OUString sType; ///< Type of Code (Java/VBScript/...)
- rtl::OUString sCode; /**< Code as text.
+ OUString sType; ///< Type of Code (Java/VBScript/...)
+ OUString sCode; /**< Code as text.
Code as JavaCode ? */
sal_Bool bCodeURL; ///< Code contains URL of a script.
@@ -796,11 +796,11 @@ public:
virtual SwField* Copy() const;
/// Type
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
/// Text
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
sal_Bool IsCodeURL() const { return bCodeURL; }
void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; }
@@ -828,7 +828,7 @@ public:
class SW_DLLPUBLIC SwCombinedCharField : public SwField
{
- rtl::OUString sCharacters; ///< combine these characters
+ OUString sCharacters; ///< combine these characters
public:
SwCombinedCharField( SwCombinedCharFieldType*, const String& rChars );
@@ -837,8 +837,8 @@ public:
virtual SwField* Copy() const;
/// Characters
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 459b3976d8d0..f73611c4f06b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -559,10 +559,10 @@ public:
/// Closes parenthesis of nUndoId, not used by UI.
SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 );
- bool GetLastUndoInfo(::rtl::OUString *const o_pStr,
+ bool GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId) const;
- bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const;
- SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const;
+ bool GetFirstRedoInfo(OUString *const o_pStr) const;
+ SwUndoId GetRepeatInfo(OUString *const o_pStr) const;
/// is it forbidden to modify cursors via API calls?
bool CursorsLocked() const;
@@ -766,7 +766,7 @@ public:
bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult,
sal_Int32 /*out*/ &rErrorPosInText,
sal_Int32 /*out*/ &rErrorIndexInResult,
- ::com::sun::star::uno::Sequence< rtl::OUString > /*out*/ &rSuggestions,
+ ::com::sun::star::uno::Sequence< OUString > /*out*/ &rSuggestions,
const Point* pPt, SwRect& rSelectRect );
void IgnoreGrammarErrorAt( SwPaM& rErrorPosition );
@@ -777,7 +777,7 @@ public:
/** @return names of all references set in document.
If ArrayPointer == 0 then return only whether a RefMark is set in document. */
- sal_uInt16 GetRefMarks( std::vector<rtl::OUString>* = 0 ) const;
+ sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
/// Call AutoCorrect
void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True,
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 0b54faf6fd68..8ac6e48fa17c 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -116,8 +116,8 @@ public:
virtual String GetFieldName() const;
/// Change formula.
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual sal_uInt16 GetSubType() const;
virtual void SetSubType(sal_uInt16 nType);
@@ -147,7 +147,7 @@ class SwSetExpField;
class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
{
- rtl::OUString sName;
+ OUString sName;
const SwNode* pOutlChgNd;
String sDelim;
sal_uInt16 nType;
@@ -161,7 +161,7 @@ public:
SwSetExpFieldType( SwDoc* pDoc, const String& rName,
sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR );
virtual SwFieldType* Copy() const;
- virtual const rtl::OUString& GetName() const;
+ virtual const OUString& GetName() const;
inline void SetType(sal_uInt16 nTyp);
inline sal_uInt16 GetType() const;
@@ -173,7 +173,7 @@ public:
void SetDeleted( sal_Bool b ) { bDeleted = b; }
/// Overlay, because set-field takes care for its being updated by itself.
- inline const rtl::OUString& GetSetRefName() const;
+ inline const OUString& GetSetRefName() const;
sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
@@ -205,7 +205,7 @@ inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp )
inline sal_uInt16 SwSetExpFieldType::GetType() const
{ return nType; }
-inline const rtl::OUString& SwSetExpFieldType::GetSetRefName() const
+inline const OUString& SwSetExpFieldType::GetSetRefName() const
{ return sName; }
@@ -248,11 +248,11 @@ public:
inline sal_uInt16 GetSeqNumber() const { return nSeqNo; }
/// Query name only.
- virtual const rtl::OUString& GetPar1() const;
+ virtual const OUString& GetPar1() const;
/// Query formula.
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
@@ -293,7 +293,7 @@ public:
class SW_DLLPUBLIC SwInputField : public SwField
{
- rtl::OUString aContent;
+ OUString aContent;
String aPText;
String aHelp;
String aToolTip;
@@ -311,12 +311,12 @@ public:
virtual String GetFieldName() const;
/// Content
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
/// aPromptText
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual String GetHelp() const;
virtual void SetHelp(const String & rStr);
@@ -400,8 +400,8 @@ public:
virtual String GetFieldName() const;
/// The formula.
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 814ba38962a1..2c934321be8d 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -245,7 +245,7 @@ public:
static const String& GetTypeStr( sal_uInt16 nTypeId );
/// Only in derived classes.
- virtual const rtl::OUString& GetName() const;
+ virtual const OUString& GetName() const;
virtual SwFieldType* Copy() const = 0;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
@@ -323,14 +323,14 @@ public:
/// Query parameters for dialog and for BASIC.
inline sal_uInt32 GetFormat() const;
- virtual const rtl::OUString& GetPar1() const;
- virtual rtl::OUString GetPar2() const;
+ virtual const OUString& GetPar1() const;
+ virtual OUString GetPar2() const;
virtual String GetFormula() const;
virtual void ChangeFormat(sal_uInt32 n);
- virtual void SetPar1(const rtl::OUString& rStr);
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual void SetPar1(const OUString& rStr);
+ virtual void SetPar2(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index dad3266dec58..ccf8885a0f00 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -110,8 +110,8 @@ public:
virtual double GetValue() const;
- virtual void SetPar2(const rtl::OUString& rStr);
- virtual rtl::OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
+ virtual OUString GetPar2() const;
inline sal_Bool IsDate() const
{ return (nSubType & DATEFLD) != 0; }
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index f3ad2dce471b..57d4ee25d5e2 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -60,27 +60,27 @@ class SW_DLLPUBLIC SwDropDownField : public SwField
/**
the possible values (aka items) of the dropdown box
*/
- std::vector<rtl::OUString> aValues;
+ std::vector<OUString> aValues;
/**
the selected item
*/
- rtl::OUString aSelectedItem;
+ OUString aSelectedItem;
/**
the name of the field
*/
- rtl::OUString aName;
+ OUString aName;
/**
help text
*/
- rtl::OUString aHelp;
+ OUString aHelp;
/**
tool tip string
*/
- rtl::OUString aToolTip;
+ OUString aToolTip;
/**
Expands the field.
@@ -126,14 +126,14 @@ public:
@return the selected value
*/
- virtual const rtl::OUString & GetPar1() const;
+ virtual const OUString & GetPar1() const;
/**
Returns the name of the field.
@return the name of the field
*/
- virtual rtl::OUString GetPar2() const;
+ virtual OUString GetPar2() const;
/**
Sets the selected value.
@@ -142,14 +142,14 @@ public:
selected. Otherwise no item will be selected, i.e. the
resulting selection will be empty.
*/
- virtual void SetPar1(const rtl::OUString & rStr);
+ virtual void SetPar1(const OUString & rStr);
/**
Sets the name of the field.
@param rStr the new name of the field
*/
- virtual void SetPar2(const rtl::OUString & rStr);
+ virtual void SetPar2(const OUString & rStr);
/**
Sets the items of the dropdown box.
@@ -158,7 +158,7 @@ public:
@param rItems the new items
*/
- void SetItems(const std::vector<rtl::OUString> & rItems);
+ void SetItems(const std::vector<OUString> & rItems);
/**
Sets the items of the dropdown box.
@@ -167,42 +167,42 @@ public:
@param rItems the new items
*/
- void SetItems(const com::sun::star::uno::Sequence<rtl::OUString> & rItems);
+ void SetItems(const com::sun::star::uno::Sequence<OUString> & rItems);
/**
Returns the items of the dropdown box.
@return the items of the dropdown box
*/
- com::sun::star::uno::Sequence<rtl::OUString> GetItemSequence() const;
+ com::sun::star::uno::Sequence<OUString> GetItemSequence() const;
/**
Returns the selected item.
@return the selected item
*/
- const rtl::OUString & GetSelectedItem() const;
+ const OUString & GetSelectedItem() const;
/**
Returns the name of the field.
@return the name of the field
*/
- const rtl::OUString & GetName() const;
+ const OUString & GetName() const;
/**
Returns the help text of the field.
@return the help text of the field
*/
- const rtl::OUString & GetHelp() const;
+ const OUString & GetHelp() const;
/**
Returns the tool tip of the field.
@return the tool tip of the field
*/
- const rtl::OUString & GetToolTip() const;
+ const OUString & GetToolTip() const;
/**
Sets the selected item.
@@ -215,28 +215,28 @@ public:
@retval sal_True the selected item was successfully set
@retval sal_True failure (empty selection)
*/
- sal_Bool SetSelectedItem(const rtl::OUString & rItem);
+ sal_Bool SetSelectedItem(const OUString & rItem);
/**
Sets the name of the field.
@param rName the new name of the field
*/
- void SetName(const rtl::OUString & rName);
+ void SetName(const OUString & rName);
/**
Sets the help text of the field.
@param rHelp the help text
*/
- void SetHelp(const rtl::OUString & rHelp);
+ void SetHelp(const OUString & rHelp);
/**
Sets the tool tip of the field.
@param rToolTip the tool tip
*/
- void SetToolTip(const rtl::OUString & rToolTip);
+ void SetToolTip(const OUString & rToolTip);
/**
API: Gets a property value from the dropdown field.
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 6ae1e824d98d..11258afeeee4 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -37,8 +37,8 @@ enum SwFtnEndPosEnum
class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
{
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
+ OUString sPrefix;
+ OUString sSuffix;
SvxNumberType aFmt;
sal_uInt16 nOffset;
@@ -78,11 +78,11 @@ public:
sal_uInt16 GetOffset() const { return nOffset; }
void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; }
- const rtl::OUString& GetPrefix() const { return sPrefix; }
- void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet; }
+ const OUString& GetPrefix() const { return sPrefix; }
+ void SetPrefix(const OUString& rSet) { sPrefix = rSet; }
- const rtl::OUString& GetSuffix() const { return sSuffix; }
- void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet; }
+ const OUString& GetSuffix() const { return sSuffix; }
+ void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
};
class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index 98ab49822baa..0a1276d3bd07 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -180,7 +180,7 @@ private:
sal_uInt32 m_nNumberFormat;
bool m_bIsFixedLanguage;
- sal_uInt32 GetNumberFormat(::rtl::OUString const & rContent) const;
+ sal_uInt32 GetNumberFormat(OUString const & rContent) const;
void SetNumberFormat(sal_uInt32 nNumberFormat);
bool IsFixedLanguage() const { return m_bIsFixedLanguage; }
void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; }
@@ -192,7 +192,7 @@ private:
public:
/// get prefix/suffix from the RDF repository. @throws RuntimeException
void GetPrefixAndSuffix(
- ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix);
+ OUString *const o_pPrefix, OUString *const o_pSuffix);
};
/// knows all meta-fields in the document.
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 9565f47f37ee..3e7a0c81947a 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -34,7 +34,7 @@ class SwFmtRefMark : public SfxPoolItem
/// Protected CopyCtor.
SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark);
- rtl::OUString aRefName;
+ OUString aRefName;
public:
SwFmtRefMark( const String& rTxt );
@@ -48,8 +48,8 @@ public:
const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; }
SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; }
- inline rtl::OUString &GetRefName() { return aRefName; }
- inline const rtl::OUString &GetRefName() const { return aRefName; }
+ inline OUString &GetRefName() { return aRefName; }
+ inline const OUString &GetRefName() const { return aRefName; }
};
#endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 2a99ba268899..bf565f4dde6e 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -324,7 +324,7 @@ inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
inline void SwFmt::SetName( const sal_Char* pNewName,
sal_Bool bBroadcast )
{
- SetName(rtl::OUString::createFromAscii(pNewName), bBroadcast);
+ SetName(OUString::createFromAscii(pNewName), bBroadcast);
}
inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent,
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 095b09e57600..c88e0119b20d 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -33,8 +33,8 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
{
SwDepend aPageDescDep;
SwDepend aCharFmtDep, aAnchorCharFmtDep;
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
+ OUString sPrefix;
+ OUString sSuffix;
protected:
bool m_bEndNote;
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
@@ -65,11 +65,11 @@ public:
SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
SwEndNoteInfo(const SwEndNoteInfo&);
- const rtl::OUString& GetPrefix() const { return sPrefix; }
- const rtl::OUString& GetSuffix() const { return sSuffix; }
+ const OUString& GetPrefix() const { return sPrefix; }
+ const OUString& GetSuffix() const { return sSuffix; }
- void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet; }
- void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet; }
+ void SetPrefix(const OUString& rSet) { sPrefix = rSet; }
+ void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
};
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index cbd54511b127..7f9c7f22fefc 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -47,7 +47,7 @@ public:
/** It's slow to iterate through a stylepool looking for a special name, but if
the style has been inserted via "cacheAutomaticStyle" instead of "getAutomaticStyle",
it's faster */
- virtual StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName,
+ virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName,
SwAutoStyleFamily eFamily ) = 0;
/// insert the style to the pool and the cache (used during import)
virtual StylePool::SfxItemSet_Pointer_t cacheAutomaticStyle( const SfxItemSet& rSet,
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index c45244507015..f6616db05860 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -39,7 +39,7 @@ extern void SizeNotify(ViewShell* pVwSh, const Size &);
extern void PageNumNotify( ViewShell* pVwSh,
sal_uInt16 nPhyNum,
sal_uInt16 nVirtNum,
- const rtl::OUString& rPg );
+ const OUString& rPg );
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
@@ -63,7 +63,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc );
// Read ChgMode for tables from configuration.
TblChgMode GetTblChgDefaultMode();
-bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark );
+bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark );
#endif
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index b98bbf1e1d99..374d519766b0 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -58,13 +58,13 @@ class SwRevisionConfig : public utl::ConfigItem
sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark
Color aMarkColor; //Revision/LinesChanged/Color
- const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
public:
SwRevisionConfig();
~SwRevisionConfig();
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();}
};
@@ -78,13 +78,13 @@ class SwCompareConfig : public utl::ConfigItem
sal_Bool bIgnorePieces; //Compare/Settings/Ignore pieces of length
sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length
- const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
public:
SwCompareConfig();
~SwCompareConfig();
virtual void Commit();
- virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ){ };
+ virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ){ };
void Load();
void SetModified() {ConfigItem::SetModified(); }
};
@@ -104,13 +104,13 @@ class SwInsertConfig : public utl::ConfigItem
SwInsertTableOptions aInsTblOpts;
sal_Bool bIsWeb;
- const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
public:
SwInsertConfig(sal_Bool bWeb);
~SwInsertConfig();
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();}
};
@@ -129,13 +129,13 @@ class SwTableConfig : public utl::ConfigItem
sal_Bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats.
sal_Bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers.
- const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
public:
SwTableConfig(sal_Bool bWeb);
~SwTableConfig();
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();}
};
@@ -157,13 +157,13 @@ class SwMiscConfig : public utl::ConfigItem
String sMailingPath; // FormLetter/FileOutput/Path
String sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!)
- const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+ const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
public:
SwMiscConfig();
~SwMiscConfig();
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/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 835044d61e3e..a6a9d96c5976 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -79,7 +79,7 @@ class ModelToViewHelper
ConversionMap m_aMap;
- rtl::OUString m_aRetText;
+ OUString m_aRetText;
public:
@@ -133,7 +133,7 @@ public:
*/
ModelPosition ConvertToModelPosition( sal_uInt32 nViewPos ) const;
- rtl::OUString getViewText() const { return m_aRetText; }
+ OUString getViewText() const { return m_aRetText; }
};
#endif
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index e76eb69776e6..8e41570f6df2 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -117,7 +117,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
/// pointer to the list, to whose the text node is added to
SwList* mpList;
- ::std::auto_ptr< ::rtl::OUString > m_pNumStringCache;
+ ::std::auto_ptr< OUString > m_pNumStringCache;
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextContent> m_wXParagraph;
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index b6859a53e9b0..e92c164c7bf7 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -69,7 +69,7 @@ public:
bModified;
sal_Int16 nPrintPostIts;
- rtl::OUString sFaxName;
+ OUString sFaxName;
SwPrintData()
{
@@ -147,7 +147,7 @@ public:
sal_Bool IsPrintBlackFont() const { return bPrintBlackFont; }
sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
sal_Int16 GetPrintPostIts() const { return nPrintPostIts; }
- const rtl::OUString GetFaxName() const { return sFaxName; }
+ const OUString GetFaxName() const { return sFaxName; }
sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; }
sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
@@ -166,7 +166,7 @@ public:
void SetPrintPageBackground( sal_Bool b ) { doSetModified(); bPrintPageBackground = b; }
void SetPrintBlackFont( sal_Bool b ) { doSetModified(); bPrintBlackFont = b; }
void SetPrintSingleJobs( sal_Bool b ) { doSetModified(); bPrintSingleJobs = b; }
- void SetFaxName( const rtl::OUString& rSet ) { sFaxName = rSet; }
+ void SetFaxName( const OUString& rSet ) { sFaxName = rSet; }
void SetPrintHiddenText( sal_Bool b ) { doSetModified(); bPrintHiddenText = b; }
void SetPrintTextPlaceholder( sal_Bool b ) { doSetModified(); bPrintTextPlaceholder = b; }
@@ -231,7 +231,7 @@ class SwRenderData
-1 indicates a half page to be left empty. */
std::vector< std::pair< sal_Int32, sal_Int32 > > m_aPagePairs;
- rtl::OUString m_aPageRange;
+ OUString m_aPageRange;
/** temp print document -- must live longer than m_pViewOptionAdjust!
also this is a Lock and not a Ref because Ref does not delete the doc */
@@ -295,8 +295,8 @@ public:
PagePairsVec_t & GetPagePairsForProspectPrinting() { return m_aPagePairs; }
const PagePairsVec_t & GetPagePairsForProspectPrinting() const { return m_aPagePairs; }
- rtl::OUString GetPageRange() const { return m_aPageRange; }
- void SetPageRange( const rtl::OUString &rRange ) { m_aPageRange = rRange; }
+ OUString GetPageRange() const { return m_aPageRange; }
+ void SetPageRange( const OUString &rRange ) { m_aPageRange = rRange; }
};
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 4cad6c473f39..64dc9cd4c3c6 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -26,13 +26,13 @@ class SwPrintOptions : public SwPrintData, public utl::ConfigItem
{
sal_Bool bIsWeb;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
SwPrintOptions(sal_Bool bWeb);
virtual ~SwPrintOptions();
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 );
virtual void doSetModified( ) { bModified = sal_True; SetModified();}
SwPrintOptions& operator=(const SwPrintData& rData)
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 857c44c47fc1..9550de42539c 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -81,7 +81,7 @@ public:
class SW_DLLPUBLIC SwGetRefField : public SwField
{
private:
- rtl::OUString sSetRefName;
+ OUString sSetRefName;
String sTxt;
sal_uInt16 nSubType;
sal_uInt16 nSeqNo;
@@ -102,7 +102,7 @@ public:
virtual String GetFieldName() const;
- const rtl::OUString& GetSetRefName() const { return sSetRefName; }
+ const OUString& GetSetRefName() const { return sSetRefName; }
// #i81002#
/** The <SwTxtFld> instance, which represents the text attribute for the
@@ -132,10 +132,10 @@ public:
void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; }
// Name of reference.
- virtual const rtl::OUString& GetPar1() const;
- virtual void SetPar1(const rtl::OUString& rStr);
+ virtual const OUString& GetPar1() const;
+ virtual void SetPar1(const OUString& rStr);
- virtual rtl::OUString GetPar2() const;
+ virtual OUString GetPar2() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 255a5fec84ff..b9aae1ab8210 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -68,7 +68,7 @@ struct SwArgsBase // used for text conversion (Hangul/Hanja, ...)
struct SwConversionArgs : SwArgsBase
{
- rtl::OUString aConvText; // convertible text found
+ OUString aConvText; // convertible text found
LanguageType nConvSrcLang; // (source) language to look for
LanguageType nConvTextLang; // language of aConvText (if the latter one was found)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 51d28901ca4c..8992dce3d22c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -104,8 +104,8 @@ class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg
{
public:
//from class SalFrame
- virtual void SetWindowState( const rtl::OString & rStr ) = 0;
- virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
+ virtual void SetWindowState( const OString & rStr ) = 0;
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
};
class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg
@@ -115,7 +115,7 @@ public:
virtual sal_Bool IsEndNote() = 0;
virtual String GetStr() = 0;
//from class Window
- virtual void SetHelpId( const rtl::OString& sHelpId ) = 0;
+ virtual void SetHelpId( const OString& sHelpId ) = 0;
virtual void SetText( const OUString& rStr ) = 0;
};
@@ -141,7 +141,7 @@ class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
{
public:
virtual sal_uInt16 GetMergeType() = 0;
- virtual const ::rtl::OUString& GetSaveFilter() const = 0;
+ virtual const OUString& GetSaveFilter() const = 0;
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0;
virtual bool IsSaveIndividualDocs() const = 0;
@@ -240,8 +240,8 @@ public:
class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog
{
public:
- virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
- virtual void SetWindowState( const rtl::OString & rStr ) =0;//this method inherit from SystemWindow
+ virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
+ virtual void SetWindowState( const OString & rStr ) =0;//this method inherit from SystemWindow
};
class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 99e319653867..2c908461f7d2 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -25,8 +25,8 @@
// contains the description of a data source
struct SwDBData
{
- ::rtl::OUString sDataSource;
- ::rtl::OUString sCommand; //table, query or statement
+ OUString sDataSource;
+ OUString sCommand; //table, query or statement
sal_Int32 nCommandType; //com::sun::star::sdb::CommandType
SwDBData() :
nCommandType(0){}
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index 91216a2925d4..da84a9f39d41 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@ -46,7 +46,7 @@ public:
~SwDbtoolsClient();
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
- const ::rtl::OUString& _rsRegisteredName,
+ const OUString& _rsRegisteredName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
);
@@ -56,7 +56,7 @@ public:
const ::com::sun::star::lang::Locale& _rLocale
);
- ::rtl::OUString getFormattedValue(
+ OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
const ::com::sun::star::lang::Locale& _rLocale,
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 2dd07f8523ff..8a21083c1d63 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -30,7 +30,7 @@ public:
void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
sal_uInt32* pValues );
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/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index e326f91a7535..daff93c4e5ca 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -33,10 +33,10 @@ class SwTxtNode;
class SwScanner
{
- rtl::OUString aWord;
+ OUString aWord;
const SwTxtNode& rNode;
- const rtl::OUString aPreDashReplacementText;
- rtl::OUString aText;
+ const OUString aPreDashReplacementText;
+ OUString aText;
const LanguageType* pLanguage;
const ModelToViewHelper rConversionMap;
sal_Int32 nStartPos;
@@ -49,7 +49,7 @@ class SwScanner
sal_Bool bClip;
public:
- SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt,
+ SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
const LanguageType* pLang,
const ModelToViewHelper& rConvMap,
sal_uInt16 nWordType,
@@ -61,7 +61,7 @@ public:
// ! bReverse
sal_Bool NextWord();
- const rtl::OUString& GetWord() const { return aWord; }
+ const OUString& GetWord() const { return aWord; }
sal_Int32 GetBegin() const { return nBegin; }
sal_Int32 GetEnd() const { return nBegin + nLen; }
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 0d3bd7298836..1a19e4a4ba38 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -24,7 +24,7 @@
#include <rtl/ustring.hxx>
-typedef ::std::vector< ::rtl::OUString > SwUndoComments_t;
+typedef ::std::vector< OUString > SwUndoComments_t;
// The IDs for StdActions.
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 671540711e2f..6aab290a09c7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -26,8 +26,8 @@ class ViewShell;
#define URLLOAD_NOFILTER 0x0000
#define URLLOAD_NEWVIEW 0x8000
-void LoadURL( ViewShell& rSh, const rtl::OUString& rName,
- sal_uInt16 nFilter, const rtl::OUString& rTargetFrameName );
+void LoadURL( ViewShell& rSh, const OUString& rName,
+ sal_uInt16 nFilter, const OUString& rTargetFrameName );
#endif
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 362746849510..72deb8d869ff 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -53,7 +53,7 @@ public:
String GetFollowingText( sal_Bool bMorePages ) const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const;
sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 7f4a05f7ff38..3357401c1524 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -104,7 +104,7 @@ public:
@return textual comment for this undo object
*/
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
// UndoObject remembers which mode was turned on.
// In Undo/Redo/Repeat this remembered mode is switched on.
@@ -297,7 +297,7 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & );
virtual void RepeatImpl( ::sw::RepeatContext & );
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
};
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 444a87a6da90..3537cd2769cc 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -146,12 +146,12 @@ namespace sw {
return 0;
}
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
GetSupportedServiceNamesImpl(
size_t const nServices, char const*const pServices[]);
sal_Bool SupportsServiceImpl(
size_t const nServices, char const*const pServices[],
- ::rtl::OUString const & rServiceName);
+ OUString const & rServiceName);
} // namespace sw
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index eb480ecd3358..44229d823d8d 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -159,9 +159,9 @@ class SwChartDataProvider :
SwChartDataProvider & operator = ( const SwChartDataProvider & );
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const ::rtl::OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- rtl::OUString GetBrokenCellRangeForExport( const rtl::OUString &rCellRangeRepresentation );
+ OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation );
protected:
//SwClient
@@ -175,13 +175,13 @@ public:
virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException);
// XRangeXMLConversion
- virtual ::rtl::OUString SAL_CALL convertRangeToXML( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL convertRangeFromXML( const ::rtl::OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
@@ -189,9 +189,9 @@ 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);
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
@@ -235,9 +235,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) 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);
};
//////////////////////////////////////////////////////////////////////
@@ -301,12 +301,12 @@ public:
// XDataSequence
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSourceRangeRepresentation( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
// XTextualDataSequence
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException);
// XNumericalDataSequence
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData( ) throw (::com::sun::star::uno::RuntimeException);
@@ -316,17 +316,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( ) 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);
// XModifiable
virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException);
@@ -396,9 +396,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) 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);
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 0d0d5f4d0a7a..271491ec1061 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -254,10 +254,10 @@ class SwUnoCollection
class SwXServiceProvider
{
public:
- static rtl::OUString GetProviderName(sal_uInt16 nObjectType);
- static sal_uInt16 GetProviderType(const rtl::OUString& rServiceName);
+ static OUString GetProviderName(sal_uInt16 nObjectType);
+ static sal_uInt16 GetProviderType(const OUString& rServiceName);
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc);
- static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames();
+ static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames();
};
@@ -283,18 +283,18 @@ 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);
//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 ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt );
};
@@ -325,18 +325,18 @@ 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);
//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 );
FlyCntType GetType()const{return eType;}
static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType );
@@ -352,9 +352,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 );
};
@@ -366,9 +366,9 @@ public:
SwXTextGraphicObjects(SwDoc* pDoc);
//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 );
};
@@ -381,9 +381,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 );
};
@@ -401,18 +401,18 @@ 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);
//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 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
};
@@ -431,18 +431,18 @@ class SwXBookmarks : public SwCollectionBaseClass,
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 );
};
@@ -494,9 +494,9 @@ public:
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 );
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
};
@@ -515,18 +515,18 @@ 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);
//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 SwXReferenceMark* GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark );
};
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 251057e50c6e..b882582bf2af 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -119,7 +119,7 @@ namespace SwUnoCursorHelper
bool DocInsertStringSplitCR( SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints );
- void makeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType,
+ void makeRedline( SwPaM& rPaM, const OUString& RedlineType,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -131,11 +131,11 @@ namespace SwUnoCursorHelper
void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
const bool bOnlyTxtAttr = false,
const bool bGetFromChrFmt = true);
- void GetTextFromPam(SwPaM & rPam, ::rtl::OUString & rBuffer);
+ void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
void SelectPam(SwPaM & rPam, const bool bExpand);
- void SetString(SwCursor & rCursor, const ::rtl::OUString & rString);
+ void SetString(SwCursor & rCursor, const OUString & rString);
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
CreateSortDescriptor(const bool bFromTable);
@@ -148,7 +148,7 @@ namespace SwUnoCursorHelper
void SetPropertyValue(
SwPaM& rPaM,
const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName,
+ const OUString & rPropertyName,
const ::com::sun::star::uno::Any & rValue,
const SetAttrMode nAttrMode = nsSetAttrMode::SETATTR_DEFAULT,
const bool bTableMode = false)
@@ -173,7 +173,7 @@ namespace SwUnoCursorHelper
::com::sun::star::uno::Any GetPropertyValue(
SwPaM& rPaM,
const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
+ const OUString & rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -181,7 +181,7 @@ namespace SwUnoCursorHelper
::com::sun::star::beans::PropertyState > GetPropertyStates(
SwPaM & rPaM,
const SfxItemPropertySet & rPropSet,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames,
const SwGetPropertyStatesCaller eCaller =
SW_PROPERTY_STATE_CALLER_DEFAULT)
@@ -190,19 +190,19 @@ namespace SwUnoCursorHelper
::com::sun::star::beans::PropertyState GetPropertyState(
SwPaM & rPaM,
const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
+ const OUString & rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
void SetPropertyToDefault(
SwPaM & rPaM,
const SfxItemPropertySet & rPropSet,
- const ::rtl::OUString & rPropertyName)
+ const OUString & rPropertyName)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Any GetPropertyDefault(
SwPaM & rPaM,
const SfxItemPropertySet & rPropSet,
- 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/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 6680ae81e017..d285554f89d2 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -106,9 +106,9 @@ public:
virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) 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 );
SwFmDrawPage* GetSvxPage();
// renamed and outlined to detect where it's called
@@ -209,7 +209,7 @@ class SwXShape : public SwXShapeBaseClass,
@author OD
*/
- ::com::sun::star::uno::Any _getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
+ ::com::sun::star::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName )
throw( ::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -235,18 +235,18 @@ 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);
//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 );
@@ -258,15 +258,15 @@ 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 );
virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index fa089e2daa51..6030b7e9d340 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -46,12 +46,12 @@ public:
static sal_Bool getInstanceName(const SwFieldType& rFldType, String& rName);
// 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);
@@ -63,13 +63,13 @@ public:
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(
- const ::rtl::OUString& rName)
+ const OUString& rName)
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
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& rName)
+ virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
};
@@ -98,12 +98,12 @@ public:
virtual void Invalidate();
// 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/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 36309b86430e..fc34804ba469 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -94,23 +94,23 @@ public:
TYPEINFO();
//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 );
//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);
//XShape
virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException);
@@ -119,7 +119,7 @@ public:
virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
//XShapeDescriptor
- virtual rtl::OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException );
//Base implementation
//XComponent
@@ -130,9 +130,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) 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 );
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -210,9 +210,9 @@ 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 );
// XEventsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException);
@@ -221,7 +221,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
//XPropertySet
- 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 ::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);
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
@@ -261,9 +261,9 @@ 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 );
// XEventsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException);
@@ -315,9 +315,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() 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);
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index 765a307f89bf..0c9e885cf6df 100644
--- a/sw/inc/unoidxcoll.hxx
+++ b/sw/inc/unoidxcoll.hxx
@@ -35,12 +35,12 @@ public:
SwXDocumentIndexes(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& 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);
@@ -60,13 +60,13 @@ public:
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(
- const ::rtl::OUString& rName)
+ const OUString& rName)
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
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& rName)
+ virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 903fa432b736..e326ad3cc3ea 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -111,12 +111,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);
@@ -138,7 +138,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,
@@ -146,33 +146,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,
@@ -181,29 +181,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)
@@ -213,11 +213,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)
@@ -227,7 +227,7 @@ 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)
@@ -237,7 +237,7 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL
setPropertyValuesTolerant(
- 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)
@@ -246,13 +246,13 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL
getPropertyValuesTolerant(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
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 >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
throw (::com::sun::star::uno::RuntimeException);
@@ -271,9 +271,9 @@ public:
// XContentEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
- createContentEnumeration(const ::rtl::OUString& rServiceName)
+ createContentEnumeration(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
getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -297,9 +297,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);
};
@@ -328,12 +328,12 @@ public:
SwTable const*const pTable = 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/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index add008eb2bf6..25649b49ec44 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -91,12 +91,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);
//XEnumerationAccess
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index b4213efc5645..2eedea80611d 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -58,9 +58,9 @@ public:
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 );
static ::com::sun::star::beans::XPropertySet* GetObject( SwRedline& rRedline, SwDoc& rDoc );
};
@@ -82,9 +82,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 );
protected:
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index d156ec21f4c7..eede62f2e0db 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -55,17 +55,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 );
void Invalidate() {pDoc = 0;}
};
@@ -86,17 +86,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 );
void Invalidate() {pDoc = 0;}
};
@@ -117,17 +117,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 );
void Invalidate() {pDoc = 0;}
};
@@ -180,21 +180,21 @@ 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);
//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 );
//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 );
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue>
@@ -207,7 +207,7 @@ public:
const String* GetBulletFontNames() const {return sNewBulletFontNames;}
const SwNumRule* GetNumRule() {return pNumRule;}
- static bool isInvalidStyle(const rtl::OUString &rName);
+ static bool isInvalidStyle(const OUString &rName);
void Invalidate() {pDocShell = 0;}
const String& GetCreatedNumRuleName() const{return sCreatedNumRuleName; }
};
@@ -223,9 +223,9 @@ public:
void Invalidate() {SwXNumberingRules::Invalidate();}
//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 );
};
@@ -275,17 +275,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 );
sal_Int32 GetSepLineWidth() const {return nSepLineWidth;}
sal_Int32 GetSepLineColor() const {return nSepLineColor;}
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 372778a3b153..8b71eac57ebf 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -78,21 +78,21 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
//XSearchDescriptor
- virtual ::rtl::OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException);
//XReplaceDescriptor
- virtual ::rtl::OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setReplaceString(const ::rtl::OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) 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);
//XPropertyReplace
virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -103,9 +103,9 @@ public:
virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::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 );
void FillSearchItemSet(SfxItemSet& rSet) const;
void FillReplaceItemSet(SfxItemSet& rSet) const;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 76bbd5009776..26bfc4ea3a1c 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -73,9 +73,9 @@ public:
SwXStyleFamilies(SwDocShell& rDocShell);
//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 );
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -86,13 +86,13 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
//XStyleLoader
- virtual void SAL_CALL loadStylesFromURL(const rtl::OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) 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 );
};
class SwXStyleFamily : public cppu::WeakImplHelper4
@@ -122,31 +122,31 @@ public:
virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::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 );
//XNameContainer
- virtual void SAL_CALL insertByName(const rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) 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 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& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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);
//SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
//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 );
};
class SwXStyle : public cppu::WeakImplHelper7
@@ -185,8 +185,8 @@ protected:
com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
- void SAL_CALL SetPropertyValues_Impl( 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::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 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ void SAL_CALL SetPropertyValues_Impl( 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< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
@@ -205,46 +205,46 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::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 );
//XStyle
virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual rtl::OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setParentStyle(const rtl::OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::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);
//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);
//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);
//XMultiPropertyStates
virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) 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 );
//SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -289,8 +289,8 @@ public:
class SwXPageStyle : public SwXStyle
{
protected:
- void SAL_CALL SetPropertyValues_Impl( 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::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 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ void SAL_CALL SetPropertyValues_Impl( 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< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
public:
SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam,
@@ -298,11 +298,11 @@ public:
SwXPageStyle(SwDocShell* pDocSh);
~SwXPageStyle();
- 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 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 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 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);
};
@@ -330,9 +330,9 @@ public:
virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::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 );
};
@@ -389,7 +389,7 @@ class SwXAutoStyle : public cppu::WeakImplHelper3
SfxItemSet_Pointer_t pSet;
IStyleAccess::SwAutoStyleFamily eFamily;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::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< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
public:
@@ -398,30 +398,30 @@ 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);
//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);
//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);
//XMultiPropertyStates
virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// Special
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 9ba64146e357..a8cc7b952156 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -70,7 +70,7 @@ class SwXCell : public SwXCellBaseClass,
public SwXText,
public SwClient
{
- friend void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt,
+ friend void sw_setString( SwXCell &rCell, const OUString &rTxt,
sal_Bool bKeepNumberFmt = sal_False );
friend double sw_getValue( SwXCell &rCell );
friend void sw_setValue( SwXCell &rCell, double nVal );
@@ -120,8 +120,8 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
//XCell
- virtual ::rtl::OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException);
@@ -130,21 +130,21 @@ 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 setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setString(const OUString& aString) 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);
//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 );
//XEnumerationAccess - was: XParagraphEnumerationAccess
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::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 );
const SwTableLine* GetTblRow() const {return pLine;}
static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
@@ -223,8 +223,8 @@ public:
DECLARE_XINTERFACE()
//XTextTableCursor
- virtual ::rtl::OUString SAL_CALL getRangeName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL gotoCellByName( const ::rtl::OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getRangeName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException);
@@ -236,17 +236,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 );
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
@@ -322,9 +322,9 @@ public:
virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows( ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const ::rtl::OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const ::rtl::OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) 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 );
@@ -338,15 +338,15 @@ public:
//XCellRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException);
//XChartDataArray
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException);
//XChartData
virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -359,29 +359,29 @@ public:
virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw( ::com::sun::star::uno::RuntimeException );
//XAutoFormattable
- virtual void SAL_CALL autoFormat(const rtl::OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL autoFormat(const OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::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);
//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 );
//XCellRangeData
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) 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 );
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
@@ -436,16 +436,16 @@ public:
//XCellRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) 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);
//XChartData
virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -456,10 +456,10 @@ public:
//XChartDataArray
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException);
//XSortable
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -470,9 +470,9 @@ public:
virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) 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 );
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
@@ -486,7 +486,7 @@ public:
// for SwChartDataSequence
void GetDataSequence(
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > *pTxtSeq,
+ ::com::sun::star::uno::Sequence< OUString > *pTxtSeq,
::com::sun::star::uno::Sequence< double > *pDblSeq,
sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException);
@@ -522,9 +522,9 @@ public:
virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) 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 );
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
@@ -560,9 +560,9 @@ public:
virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) 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 );
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index 7c01aed506fa..bb43f1d30f0b 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -119,7 +119,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,
@@ -127,33 +127,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,
@@ -170,16 +170,16 @@ 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
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<
@@ -228,7 +228,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL
appendTextPortion(
- const ::rtl::OUString& rText,
+ const OUString& rText,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >&
rCharacterAndParagraphProperties)
@@ -238,7 +238,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL
insertTextPortion(
- const ::rtl::OUString& rText,
+ const OUString& rText,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >&
rCharacterAndParagraphProperties,
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 1090ff6de824..494aaff96535 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -75,12 +75,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);
@@ -160,12 +160,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);
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index 93c1bcf68c8a..6bb5bab8e9d6 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -96,7 +96,7 @@ public:
bool IsAtEndOfMeta() const;
- void DeleteAndInsert(::rtl::OUString const& rText,
+ void DeleteAndInsert(OUString const& rText,
const bool bForceExpandHints);
// OTextCursorHelper
@@ -115,12 +115,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,
@@ -173,29 +173,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 >& aPropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
throw (
css::beans::PropertyVetoException,
@@ -203,11 +203,11 @@ public:
css::lang::WrappedTargetException, css::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 )
+ getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw (css::uno::RuntimeException);
virtual void SAL_CALL addPropertiesChangeListener(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames,
const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
throw (css::uno::RuntimeException);
@@ -216,7 +216,7 @@ public:
throw (css::uno::RuntimeException);
virtual void SAL_CALL firePropertiesChangeEvent(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames,
const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
throw (css::uno::RuntimeException);
@@ -224,13 +224,13 @@ public:
virtual void SAL_CALL setAllPropertiesToDefault()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertiesToDefault(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL getPropertyDefaults(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ const ::com::sun::star::uno::Sequence< OUString >&
rPropertyNames)
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
@@ -251,9 +251,9 @@ public:
// XContentEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
- createContentEnumeration(const ::rtl::OUString& rServiceName)
+ createContentEnumeration(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
getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -269,7 +269,7 @@ public:
// XDocumentInsertable
virtual void SAL_CALL insertDocumentFromURL(
- const ::rtl::OUString& rURL,
+ const OUString& rURL,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rOptions)
throw (::com::sun::star::lang::IllegalArgumentException,
@@ -286,9 +286,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);
// XTextCursor
@@ -356,7 +356,7 @@ public:
// XRedline
virtual void SAL_CALL makeRedline(
- const ::rtl::OUString& rRedlineType,
+ const OUString& rRedlineType,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& RedlineProperties)
throw (::com::sun::star::lang::IllegalArgumentException,
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index cfd373766c38..6d0e8f0f5d0d 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -70,7 +70,7 @@ namespace sw {
CreateParentXText(SwDoc & rDoc, const SwPosition& rPos);
bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
- const ::rtl::OUString& rPropertyName, sal_uInt16 nWID = 0);
+ const OUString& rPropertyName, sal_uInt16 nWID = 0);
} // namespace sw
@@ -107,7 +107,7 @@ private:
void SetPositions(SwPaM const& rPam);
//TODO: new exception type for protected content
void DeleteAndInsert(
- const ::rtl::OUString& rText, const bool bForceExpandHints)
+ const OUString& rText, const bool bForceExpandHints)
throw (::com::sun::star::uno::RuntimeException);
void Invalidate();
@@ -139,12 +139,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);
@@ -154,7 +154,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,
@@ -162,33 +162,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,
@@ -197,22 +197,22 @@ 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);
@@ -232,9 +232,9 @@ public:
// XContentEnumerationAccess
virtual ::com::sun::star::uno::Reference<
::com::sun::star::container::XEnumeration > SAL_CALL
- createContentEnumeration(const ::rtl::OUString& rServiceName)
+ createContentEnumeration(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
getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -248,14 +248,14 @@ 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);
// XRedline
virtual void SAL_CALL makeRedline(
- const ::rtl::OUString& rRedlineType,
+ const OUString& rRedlineType,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& RedlineProperties)
throw (::com::sun::star::lang::IllegalArgumentException,
@@ -294,12 +294,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);
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index e3c6acd4ac5a..79d9f303ffb5 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -221,7 +221,7 @@ private:
SwDoc * GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport );
SfxViewShell * GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport );
- rtl::OUString maBuildId;
+ OUString maBuildId;
// boolean for XPagePrintable
// set in XPagePrintable::printPages(..) to indicate that the PagePrintSettings
@@ -257,8 +257,8 @@ public:
virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException );
//XModel
- virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException);
+ virtual OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException);
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw(css::uno::RuntimeException);
virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
@@ -341,18 +341,18 @@ public:
virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException);
//XMultiServiceFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier)
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier)
throw( css::uno::Exception, css::uno::RuntimeException );
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier,
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier,
const css::uno::Sequence< css::uno::Any >& Arguments)
throw( css::uno::Exception, css::uno::RuntimeException );
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void)
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void)
throw( css::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
// css::drawing::XDrawPageSupplier
virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException );
@@ -362,18 +362,18 @@ public:
//XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
//XPropertyState
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
- virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
//XLinkTargetSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException );
@@ -450,18 +450,18 @@ public:
~SwXLinkTargetSupplier();
//XNameAccess
- virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException );
+ virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException );
//XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
//
void Invalidate() {pxDoc = 0;}
@@ -491,9 +491,9 @@ public:
~SwXLinkNameAccessWrapper();
//XNameAccess
- virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException );
+ virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException );
//XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException);
@@ -501,20 +501,20 @@ public:
//XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
//XLinkTargetSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException );
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
};
@@ -533,17 +533,17 @@ public:
//XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
//XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( css::uno::RuntimeException );
};
class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 71c6f118e5ba..85fe469775a7 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -32,14 +32,14 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType
bool bValidValue : 1;
bool bDeleted : 1;
double nValue;
- rtl::OUString aName;
+ OUString aName;
String aContent;
sal_uInt16 nType;
public:
SwUserFieldType( SwDoc* pDocPtr, const String& );
- virtual const rtl::OUString& GetName() const;
+ virtual const OUString& GetName() const;
virtual SwFieldType* Copy() const;
String Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng);
@@ -108,11 +108,11 @@ public:
virtual String GetFieldName() const;
// Name cannot be changed.
- virtual const rtl::OUString& GetPar1() const;
+ virtual const OUString& GetPar1() const;
// Content.
- virtual rtl::OUString GetPar2() const;
- virtual void SetPar2(const rtl::OUString& rStr);
+ virtual OUString GetPar2() const;
+ virtual void SetPar2(const OUString& rStr);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
};
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 6e99bdd18258..f5c16e4de920 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -136,7 +136,7 @@ class SwViewOption
protected:
static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips
- rtl::OUString sSymbolFont; // Symbolfont.
+ OUString sSymbolFont; // Symbolfont.
sal_uInt32 nCoreOptions; // Bits for ViewShell.
sal_uInt32 nCore2Options; // Bits for ViewShell.
sal_uInt32 nUIOptions; // UI-Bits
@@ -489,8 +489,8 @@ public:
void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; }
void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; }
- const rtl::OUString& GetSymbolFont() const {return sSymbolFont;}
- void SetSymbolFont(const rtl::OUString& sSet) {sSymbolFont = sSet;}
+ const OUString& GetSymbolFont() const {return sSymbolFont;}
+ void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;}
const Color& GetRetoucheColor() const { return aRetoucheColor;}
void SetRetoucheColor(const Color&r) { aRetoucheColor = r; }
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index e434936def2e..2435092008ab 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -62,8 +62,8 @@ class SwFiltersTest
, public test::BootstrapFixture
{
public:
- virtual bool load( const rtl::OUString &rFilter, const rtl::OUString &rURL,
- const rtl::OUString &rUserData, unsigned int nFilterFlags,
+ virtual bool load( const OUString &rFilter, const OUString &rURL,
+ const OUString &rUserData, unsigned int nFilterFlags,
unsigned int nClipboardID, unsigned int nFilterVersion);
virtual void setUp();
@@ -78,14 +78,14 @@ private:
uno::Reference<uno::XInterface> m_xWriterComponent;
};
-bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
- const rtl::OUString &rUserData, unsigned int nFilterFlags,
+bool SwFiltersTest::load(const OUString &rFilter, const OUString &rURL,
+ const OUString &rUserData, unsigned int nFilterFlags,
unsigned int nClipboardID, unsigned int nFilterVersion)
{
SfxFilter* pFilter = new SfxFilter(
- rFilter, rtl::OUString(), nFilterFlags,
- nClipboardID, rtl::OUString(), 0, rtl::OUString(),
- rUserData, rtl::OUString());
+ rFilter, OUString(), nFilterFlags,
+ nClipboardID, OUString(), 0, OUString(),
+ rUserData, OUString());
pFilter->SetVersion(nFilterVersion);
SwDocShellRef xDocShRef = new SwDocShell;
@@ -95,7 +95,7 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL
if (rUserData == FILTER_TEXT_DLG)
{
pSrcMed->GetItemSet()->Put(
- SfxStringItem(SID_FILE_FILTEROPTIONS, rtl::OUString("UTF8,LF,Liberation Mono,en-US")));
+ SfxStringItem(SID_FILE_FILTEROPTIONS, OUString("UTF8,LF,Liberation Mono,en-US")));
}
bool bLoaded = xDocShRef->DoLoad(pSrcMed);
@@ -108,25 +108,25 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL
void SwFiltersTest::testCVEs()
{
- testDir(rtl::OUString("Staroffice XML (Writer)"),
+ testDir(OUString("Staroffice XML (Writer)"),
getURLFromSrc("/sw/qa/core/data/xml/"),
- rtl::OUString(FILTER_XML),
+ OUString(FILTER_XML),
SFX_FILTER_IMPORT | SFX_FILTER_OWN | SFX_FILTER_DEFAULT,
isstorage, SOFFICE_FILEFORMAT_CURRENT);
- testDir(rtl::OUString("writer8"),
+ testDir(OUString("writer8"),
getURLFromSrc("/sw/qa/core/data/odt/"),
- rtl::OUString(FILTER_XML),
+ OUString(FILTER_XML),
SFX_FILTER_IMPORT | SFX_FILTER_OWN | SFX_FILTER_DEFAULT,
isstorage, SOFFICE_FILEFORMAT_CURRENT);
- testDir(rtl::OUString("MS Word 97"),
+ testDir(OUString("MS Word 97"),
getURLFromSrc("/sw/qa/core/data/ww8/"),
- rtl::OUString(FILTER_WW8));
+ OUString(FILTER_WW8));
- testDir(rtl::OUString("Text (encoded)"),
+ testDir(OUString("Text (encoded)"),
getURLFromSrc("/sw/qa/core/data/txt/"),
- rtl::OUString(FILTER_TEXT_DLG));
+ OUString(FILTER_TEXT_DLG));
}
void SwFiltersTest::setUp()
@@ -136,7 +136,7 @@ void SwFiltersTest::setUp()
//This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
//which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(rtl::OUString(
+ getMultiServiceFactory()->createInstance(OUString(
"com.sun.star.comp.Writer.TextDocument"));
CPPUNIT_ASSERT_MESSAGE("no writer component!", m_xWriterComponent.is());
}
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
index cd56bfd6234f..f055bf6a6c3c 100644
--- a/sw/qa/core/layout-test.cxx
+++ b/sw/qa/core/layout-test.cxx
@@ -56,7 +56,7 @@ class SwLayoutTest : public test::BootstrapFixture, public unotest::MacrosTest
public:
SwLayoutTest();
- void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
+ void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath);
virtual void setUp();
virtual void tearDown();
@@ -71,13 +71,13 @@ public:
private:
uno::Reference<uno::XInterface> m_xWriterComponent;
- ::rtl::OUString m_aBaseString;
+ OUString m_aBaseString;
};
-void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
+void SwLayoutTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath)
{
- rtl::OUString aSep("/");
- rtl::OUStringBuffer aBuffer( getSrcRootURL() );
+ OUString aSep("/");
+ OUStringBuffer aBuffer( getSrcRootURL() );
aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
rFilePath = aBuffer.makeStringAndClear();
@@ -85,9 +85,9 @@ void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt
void SwLayoutTest::test()
{
- rtl::OUString aFilePath;
- rtl::OUString aFileBase("test.");
- rtl::OUString aExtension("odt");
+ OUString aFilePath;
+ OUString aFileBase("test.");
+ OUString aExtension("odt");
createFileURL(aFileBase, aExtension, aFilePath);
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFilePath, "com.sun.star.text.TextDocument");
CPPUNIT_ASSERT(xComponent.is());
@@ -106,7 +106,7 @@ void SwLayoutTest::setUp()
// This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
// which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(rtl::OUString(
+ getMultiServiceFactory()->createInstance(OUString(
"com.sun.star.comp.Writer.TextDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 70a431a4faa5..bb1b33540b4b 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -73,10 +73,10 @@ class SwMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest
public:
SwMacrosTest();
- SwDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
- const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0);
+ SwDocShellRef load(const OUString &rFilter, const OUString &rURL,
+ const OUString &rUserData, const OUString& rTypeName, sal_uLong nFormatType=0);
- void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
+ void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath);
virtual void setUp();
virtual void tearDown();
@@ -97,13 +97,13 @@ public:
private:
uno::Reference<uno::XInterface> m_xWriterComponent;
- ::rtl::OUString m_aBaseString;
+ OUString m_aBaseString;
};
-void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
+void SwMacrosTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath)
{
- rtl::OUString aSep("/");
- rtl::OUStringBuffer aBuffer( getSrcRootURL() );
+ OUString aSep("/");
+ OUStringBuffer aBuffer( getSrcRootURL() );
aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
rFilePath = aBuffer.makeStringAndClear();
@@ -113,15 +113,15 @@ void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt
void SwMacrosTest::testStarBasic()
{
- const rtl::OUString aFileNameBase("StarBasic.");
- rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
- rtl::OUString aFileName;
+ const OUString aFileNameBase("StarBasic.");
+ OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
+ OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
- rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
+ OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
String sUrl = aURL;
Any aRet;
Sequence< sal_Int16 > aOutParamIndex;
@@ -142,19 +142,19 @@ void SwMacrosTest::testVba()
{
TestMacroInfo testInfo[] = {
{
- rtl::OUString("testVba."),
- rtl::OUString("vnd.sun.Star.script:Project.NewMacros.Macro1?language=Basic&location=document")
+ OUString("testVba."),
+ OUString("vnd.sun.Star.script:Project.NewMacros.Macro1?language=Basic&location=document")
}
};
- rtl::OUString aFileExtension( "doc" );
+ OUString aFileExtension( "doc" );
for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i )
{
- rtl::OUString aFileName;
+ OUString aFileName;
createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.text.TextDocument");
- rtl::OUStringBuffer sMsg( rtl::OUString("Failed to load ") );
+ OUStringBuffer sMsg( OUString("Failed to load ") );
sMsg.append ( aFileName );
- CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
+ CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
String sUrl = testInfo[i].sMacroUrl;
Any aRet;
@@ -166,9 +166,9 @@ void SwMacrosTest::testVba()
CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
- rtl::OUString aStringRes;
+ OUString aStringRes;
aRet >>= aStringRes;
- std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
+ std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
//CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" );
pFoundShell->DoClose();
}
@@ -219,7 +219,7 @@ void SwMacrosTest::setUp()
// This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
// which is a private symbol to us, gets called
m_xWriterComponent =
- getMultiServiceFactory()->createInstance(rtl::OUString(
+ getMultiServiceFactory()->createInstance(OUString(
"com.sun.star.comp.Writer.TextDocument"));
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 7d590f5efe37..26dded0682a2 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -121,7 +121,7 @@ void SwDocTest::testPageDescName()
{
ShellResource aShellResources;
- std::vector<rtl::OUString> aResults;
+ std::vector<OUString> aResults;
//These names must be unique for each different combination, otherwise
//duplicate page description names may exist, which will causes lookup
@@ -141,7 +141,7 @@ void SwDocTest::testFileNameFields()
{
//Here's a file name with some chars in it that will be %% encoded, when expanding
//SwFileNameFields we want to restore the original readable filename
- utl::TempFile aTempFile(rtl::OUString("demo [name]"));
+ utl::TempFile aTempFile(OUString("demo [name]"));
aTempFile.EnableKillingFile();
INetURLObject aTempFileURL(aTempFile.GetURL());
@@ -149,9 +149,9 @@ void SwDocTest::testFileNameFields()
SfxMedium aDstMed(sFileURL, STREAM_STD_READWRITE);
SfxFilter aFilter(
- rtl::OUString("Text"),
- rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(),
- rtl::OUString("TEXT"), rtl::OUString() );
+ OUString("Text"),
+ OUString(), 0, 0, OUString(), 0, OUString(),
+ OUString("TEXT"), OUString() );
aDstMed.SetFilter(&aFilter);
m_xDocShRef->DoSaveAs(aDstMed);
@@ -162,29 +162,29 @@ void SwDocTest::testFileNameFields()
SwFileNameFieldType aNameField(m_pDoc);
{
- rtl::OUString sResult(aNameField.Expand(FF_NAME));
- rtl::OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT,
+ OUString sResult(aNameField.Expand(FF_NAME));
+ OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT,
true,INetURLObject::DECODE_WITH_CHARSET));
CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected);
}
{
- rtl::OUString sResult(aNameField.Expand(FF_PATHNAME));
- rtl::OUString sExpected(rUrlObj.GetFull());
+ OUString sResult(aNameField.Expand(FF_PATHNAME));
+ OUString sExpected(rUrlObj.GetFull());
CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected);
}
{
- rtl::OUString sResult(aNameField.Expand(FF_PATH));
+ OUString sResult(aNameField.Expand(FF_PATH));
INetURLObject aTemp(rUrlObj);
aTemp.removeSegment();
- rtl::OUString sExpected(aTemp.PathToFileName());
+ OUString sExpected(aTemp.PathToFileName());
CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected);
}
{
- rtl::OUString sResult(aNameField.Expand(FF_NAME_NOEXT));
- rtl::OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT,
+ OUString sResult(aNameField.Expand(FF_NAME_NOEXT));
+ OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT,
true,INetURLObject::DECODE_WITH_CHARSET));
//Chop off .tmp
sExpected = sExpected.copy(0, sExpected.getLength() - 4);
@@ -204,7 +204,7 @@ void SwDocTest::testDocStat()
SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- rtl::OUString sText("Hello World");
+ OUString sText("Hello World");
m_pDoc->InsertString(aPaM, sText);
CPPUNIT_ASSERT_MESSAGE("Should still be non-updated 0 count", m_pDoc->GetDocStat().nChar == 0);
@@ -227,14 +227,14 @@ void SwDocTest::testUserPerceivedCharCount()
//Grapheme example, two different unicode code-points perceived by the user as a single
//glyph
const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 };
- ::rtl::OUString sALEF_QAMATS(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
+ OUString sALEF_QAMATS(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
sal_Int32 nGraphemeCount = pBreakIter->getGraphemeCount(sALEF_QAMATS);
CPPUNIT_ASSERT_MESSAGE("Grapheme Count should be 1", nGraphemeCount == 1);
//Surrogate pair example, one single unicode code-point (U+1D11E)
//represented as two code units in UTF-16
const sal_Unicode GCLEF[] = { 0xD834, 0xDD1E };
- ::rtl::OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF));
+ OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF));
sal_Int32 nCount = pBreakIter->getGraphemeCount(sGCLEF);
CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1);
}
@@ -246,17 +246,17 @@ void SwDocTest::testModelToViewHelper()
{
SwFmtFtn aFtn;
- aFtn.SetNumStr(rtl::OUString("foo"));
+ aFtn.SetNumStr(OUString("foo"));
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString("AAAAA BBBBB "));
+ m_pDoc->InsertString(aPaM, OUString("AAAAA BBBBB "));
SwTxtNode* pTxtNode = aPaM.GetNode()->GetTxtNode();
xub_StrLen nPos = aPaM.GetPoint()->nContent.GetIndex();
pTxtNode->InsertItem(aFtn, nPos, nPos);
- m_pDoc->InsertString(aPaM, rtl::OUString(" CCCCC "));
+ m_pDoc->InsertString(aPaM, OUString(" CCCCC "));
nPos = aPaM.GetPoint()->nContent.GetIndex();
pTxtNode->InsertItem(aFtn, nPos, nPos);
- m_pDoc->InsertString(aPaM, rtl::OUString(" DDDDD"));
+ m_pDoc->InsertString(aPaM, OUString(" DDDDD"));
CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == (4*5) + 5 + 2);
//set start of selection to first B
@@ -282,21 +282,21 @@ void SwDocTest::testModelToViewHelper()
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, PASSTHROUGH);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
- rtl::OUString sModelText = pTxtNode->GetTxt();
+ OUString sViewText = aModelToViewHelper.getViewText();
+ OUString sModelText = pTxtNode->GetTxt();
CPPUNIT_ASSERT(sViewText == sModelText);
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
+ OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT(sViewText == "AAAAA BBBBB foo CCCCC foo DDDDD");
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
- rtl::OUStringBuffer aBuffer;
+ OUString sViewText = aModelToViewHelper.getViewText();
+ OUStringBuffer aBuffer;
aBuffer.append("AAAAA CCCCC ");
aBuffer.append(CH_TXTATR_BREAKWORD);
aBuffer.append(" DDDDD");
@@ -305,8 +305,8 @@ void SwDocTest::testModelToViewHelper()
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEREDLINED);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
- rtl::OUStringBuffer aBuffer;
+ OUString sViewText = aModelToViewHelper.getViewText();
+ OUStringBuffer aBuffer;
aBuffer.append("AAAABB ");
aBuffer.append(CH_TXTATR_BREAKWORD);
aBuffer.append(" CCCCC ");
@@ -317,20 +317,20 @@ void SwDocTest::testModelToViewHelper()
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
+ OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT(sViewText == "AAAAA CCCCC foo DDDDD");
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEREDLINED);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
+ OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT(sViewText == "AAAABB foo CCCCC foo DDDDD");
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE | HIDEREDLINED);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
- rtl::OUStringBuffer aBuffer;
+ OUString sViewText = aModelToViewHelper.getViewText();
+ OUStringBuffer aBuffer;
aBuffer.append("AAAACCCCC ");
aBuffer.append(CH_TXTATR_BREAKWORD);
aBuffer.append(" DDDDD");
@@ -339,7 +339,7 @@ void SwDocTest::testModelToViewHelper()
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED);
- rtl::OUString sViewText = aModelToViewHelper.getViewText();
+ OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT(sViewText == "AAAACCCCC foo DDDDD");
}
}
@@ -356,23 +356,23 @@ void SwDocTest::testSwScanner()
//See https://bugs.freedesktop.org/show_bug.cgi?id=40449
//See https://bugs.freedesktop.org/show_bug.cgi?id=39365
- //Use a temporary rtl::OUString as the arg, as that's the trouble behind
+ //Use a temporary OUString as the arg, as that's the trouble behind
//fdo#40449 and fdo#39365
{
SwScanner aScanner(*pTxtNode,
- rtl::OUString("Hello World"),
+ OUString("Hello World"),
0, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0,
RTL_CONSTASCII_LENGTH("Hello World"));
bool bFirstOk = aScanner.NextWord();
CPPUNIT_ASSERT_MESSAGE("First Token", bFirstOk);
- const rtl::OUString &rHello = aScanner.GetWord();
+ const OUString &rHello = aScanner.GetWord();
CPPUNIT_ASSERT_MESSAGE("Should be Hello",
rHello == "Hello");
bool bSecondOk = aScanner.NextWord();
CPPUNIT_ASSERT_MESSAGE("Second Token", bSecondOk);
- const rtl::OUString &rWorld = aScanner.GetWord();
+ const OUString &rWorld = aScanner.GetWord();
CPPUNIT_ASSERT_MESSAGE("Should be World",
rWorld == "World");
}
@@ -381,7 +381,7 @@ void SwDocTest::testSwScanner()
{
const sal_Unicode IDEOGRAPHICFULLSTOP_D[] = { 0x3002, 'D' };
- m_pDoc->InsertString(aPaM, rtl::OUString(IDEOGRAPHICFULLSTOP_D,
+ m_pDoc->InsertString(aPaM, OUString(IDEOGRAPHICFULLSTOP_D,
SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D)));
SvxLanguageItem aCJKLangItem( LANGUAGE_CHINESE_SIMPLIFIED, RES_CHRATR_CJK_LANGUAGE );
@@ -417,7 +417,7 @@ void SwDocTest::testSwScanner()
0x0069, 0x0073, 0x0020, 0x0064, 0x006F, 0x003F, 0x0020, 0x0020
};
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString(test,
+ m_pDoc->InsertString(aPaM, OUString(test,
SAL_N_ELEMENTS(test)));
SvxLanguageItem aCJKLangItem( LANGUAGE_JAPANESE, RES_CHRATR_CJK_LANGUAGE );
@@ -446,7 +446,7 @@ void SwDocTest::testSwScanner()
};
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree)));
+ m_pDoc->InsertString(aPaM, OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree)));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
@@ -463,7 +463,7 @@ void SwDocTest::testSwScanner()
};
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
+ m_pDoc->InsertString(aPaM, OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
pTxtNode = aPaM.GetNode()->GetTxtNode();
aDocStat.Reset();
pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
@@ -475,11 +475,11 @@ void SwDocTest::testSwScanner()
SwDocStat aDocStat;
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString("Apple"));
+ m_pDoc->InsertString(aPaM, OUString("Apple"));
pTxtNode = aPaM.GetNode()->GetTxtNode();
xub_StrLen nPos = aPaM.GetPoint()->nContent.GetIndex();
SwFmtFtn aFtn;
- aFtn.SetNumStr(rtl::OUString("banana"));
+ aFtn.SetNumStr(OUString("banana"));
SwTxtAttr* pTA = pTxtNode->InsertItem(aFtn, nPos, nPos);
CPPUNIT_ASSERT(pTA);
CPPUNIT_ASSERT(pTxtNode->Len() == 6); //Apple + 0x02
@@ -489,7 +489,7 @@ void SwDocTest::testSwScanner()
xub_StrLen nNextPos = aPaM.GetPoint()->nContent.GetIndex();
CPPUNIT_ASSERT(nNextPos == nPos+1);
- SwFmtRefMark aRef(rtl::OUString("refmark"));
+ SwFmtRefMark aRef(OUString("refmark"));
pTA = pTxtNode->InsertItem(aRef, nNextPos, nNextPos);
CPPUNIT_ASSERT(pTA);
@@ -500,15 +500,15 @@ void SwDocTest::testSwScanner()
CPPUNIT_ASSERT_MESSAGE("refmark anchor should not be counted", aDocStat.nChar == 11);
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString("Apple"));
+ m_pDoc->InsertString(aPaM, OUString("Apple"));
DateTime aDate(DateTime::SYSTEM);
SwPostItField aPostIt(
- (SwPostItFieldType*)m_pDoc->GetSysFldType(RES_POSTITFLD), rtl::OUString("An Author"),
- rtl::OUString("Some Text"), rtl::OUString("Initials"), OUString("Name"), aDate );
+ (SwPostItFieldType*)m_pDoc->GetSysFldType(RES_POSTITFLD), OUString("An Author"),
+ OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate );
m_pDoc->InsertPoolItem(aPaM, SwFmtFld(aPostIt), 0);
- m_pDoc->InsertString(aPaM, rtl::OUString("Apple"));
+ m_pDoc->InsertString(aPaM, OUString("Apple"));
pTxtNode = aPaM.GetNode()->GetTxtNode();
aDocStat.Reset();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
@@ -525,7 +525,7 @@ void SwDocTest::testSwScanner()
const char aString[] = "Lorem ipsum";
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString(aString));
+ m_pDoc->InsertString(aPaM, OUString(aString));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2));
@@ -558,7 +558,7 @@ void SwDocTest::testSwScanner()
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
- rtl::OUString sLorem = pTxtNode->GetTxt();
+ OUString sLorem = pTxtNode->GetTxt();
CPPUNIT_ASSERT(sLorem == "Lorem");
const SwRedlineTbl& rTbl = m_pDoc->GetRedlineTbl();
@@ -572,7 +572,7 @@ void SwDocTest::testSwScanner()
pTxtNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTxtNode(); //first deleted txtnode
CPPUNIT_ASSERT(pTxtNode);
- rtl::OUString sIpsum = pTxtNode->GetTxt();
+ OUString sIpsum = pTxtNode->GetTxt();
CPPUNIT_ASSERT(sIpsum == " ipsum");
aDocStat.Reset();
@@ -585,7 +585,7 @@ void SwDocTest::testSwScanner()
{
SwDocStat aDocStat;
- rtl::OUString sTemplate("ThisXis a test.");
+ OUString sTemplate("ThisXis a test.");
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
m_pDoc->InsertString(aPaM, sTemplate.replace('X', ' '));
@@ -597,7 +597,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" = ")));
+ m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = ")));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -606,7 +606,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" _ ")));
+ m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ ")));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -615,7 +615,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" -- ")));
+ m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- ")));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -680,9 +680,9 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
const sal_Unicode aChunk[] = {' ', 0x2013, ' '};
- rtl::OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
+ OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), sChunk));
+ m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk));
pTxtNode = aPaM.GetNode()->GetTxtNode();
pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
@@ -700,14 +700,14 @@ void SwDocTest::testGraphicAnchorDeletion()
SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- m_pDoc->InsertString(aPaM, rtl::OUString("Paragraph 1"));
+ m_pDoc->InsertString(aPaM, OUString("Paragraph 1"));
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString("graphic anchor>><<graphic anchor"));
+ m_pDoc->InsertString(aPaM, OUString("graphic anchor>><<graphic anchor"));
SwNodeIndex nPara2 = aPaM.GetPoint()->nNode;
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
- m_pDoc->InsertString(aPaM, rtl::OUString("Paragraph 3"));
+ m_pDoc->InsertString(aPaM, OUString("Paragraph 3"));
aPaM.GetPoint()->nNode = nPara2;
aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
@@ -717,7 +717,7 @@ void SwDocTest::testGraphicAnchorDeletion()
SwFmtAnchor aAnchor(FLY_AS_CHAR);
aAnchor.SetAnchor(aPaM.GetPoint());
aFlySet.Put(aAnchor);
- SwFlyFrmFmt *pFrame = m_pDoc->Insert(aPaM, rtl::OUString(), rtl::OUString(), NULL, &aFlySet, NULL, NULL);
+ SwFlyFrmFmt *pFrame = m_pDoc->Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
CPPUNIT_ASSERT_MESSAGE("Expected frame", pFrame != NULL);
CPPUNIT_ASSERT_MESSAGE("Should be 1 graphic", m_pDoc->GetFlyCount(FLYCNTTYPE_GRF) == 1);
@@ -733,7 +733,7 @@ void SwDocTest::testGraphicAnchorDeletion()
#ifdef DEBUG_AS_HTML
{
- SvFileStream aPasteDebug(rtl::OUString("cppunitDEBUG.html"), STREAM_WRITE|STREAM_TRUNC);
+ SvFileStream aPasteDebug(OUString("cppunitDEBUG.html"), STREAM_WRITE|STREAM_TRUNC);
WriterRef xWrt;
GetHTMLWriter( String(), String(), xWrt );
SwWriter aDbgWrt( aPasteDebug, *m_pDoc );
@@ -756,15 +756,15 @@ getRand(int modulus)
return rand() % modulus;
}
-static rtl::OUString
+static OUString
getRandString()
{
- rtl::OUString aText("AAAAA BBBB CCC DD E \n");
+ OUString aText("AAAAA BBBB CCC DD E \n");
int s = getRand(aText.getLength());
int j = getRand(aText.getLength() - s);
- rtl::OUString aRet(aText.copy(s, j));
+ OUString aRet(aText.copy(s, j));
if (!getRand(5))
- aRet += rtl::OUString(sal_Unicode('\n'));
+ aRet += OUString(sal_Unicode('\n'));
// fprintf (stderr, "rand string '%s'\n", OUStringToOString(aRet, RTL_TEXTENCODING_UTF8).getStr());
return aRet;
}
@@ -805,7 +805,7 @@ void SwDocTest::randomTest()
// setup redlining
m_pDoc->SetRedlineMode(modes[rlm]);
- SW_MOD()->SetRedlineAuthor(rtl::OUString::createFromAscii(authors[0]));
+ SW_MOD()->SetRedlineAuthor(OUString::createFromAscii(authors[0]));
for( int i = 0; i < 2000; i++ )
{
@@ -825,7 +825,7 @@ void SwDocTest::randomTest()
break;
case 2: { // switch author
int a = getRand(SAL_N_ELEMENTS(authors));
- SW_MOD()->SetRedlineAuthor(rtl::OUString::createFromAscii(authors[a]));
+ SW_MOD()->SetRedlineAuthor(OUString::createFromAscii(authors[a]));
break;
}
@@ -872,7 +872,7 @@ void SwDocTest::randomTest()
// Debug / verify the produced document has real content
#if 0
- rtl::OStringBuffer aBuffer("nodes-");
+ OStringBuffer aBuffer("nodes-");
aBuffer.append(sal_Int32(rlm));
aBuffer.append(".xml");
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index e265e125a703..86547b8848ad 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -141,7 +141,7 @@ protected:
*
* If the attribute is omitted, the text of the node is returned.
*/
- OUString parseDump(rtl::OString aXPath, rtl::OString aAttribute = OString())
+ OUString parseDump(OString aXPath, OString aAttribute = OString())
{
if (!mpXmlBuffer)
dumpLayout();
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