summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-06 10:51:51 +0200
committerNoel Grandin <noel@peralex.com>2015-11-06 11:55:09 +0200
commit2633976ef3406d48907bd922f067ea04e39c94f1 (patch)
treec29440a174d106805b686299fcaa4a3bacf23592
parent41d83eb8cd8e9544641182ff19a8c635760e75dc (diff)
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
-rw-r--r--sw/source/core/access/acccell.cxx8
-rw-r--r--sw/source/core/access/acccell.hxx83
-rw-r--r--sw/source/core/access/acccontext.hxx131
-rw-r--r--sw/source/core/access/accdoc.cxx26
-rw-r--r--sw/source/core/access/accdoc.hxx111
-rw-r--r--sw/source/core/access/accembedded.cxx16
-rw-r--r--sw/source/core/access/accembedded.hxx22
-rw-r--r--sw/source/core/access/accfootnote.hxx12
-rw-r--r--sw/source/core/access/accgraphic.cxx2
-rw-r--r--sw/source/core/access/accgraphic.hxx12
-rw-r--r--sw/source/core/access/accheaderfooter.cxx2
-rw-r--r--sw/source/core/access/accheaderfooter.hxx14
-rw-r--r--sw/source/core/access/acchyperlink.cxx8
-rw-r--r--sw/source/core/access/acchyperlink.hxx38
-rw-r--r--sw/source/core/access/accmap.cxx10
-rw-r--r--sw/source/core/access/accnotextframe.cxx42
-rw-r--r--sw/source/core/access/accnotextframe.hxx79
-rw-r--r--sw/source/core/access/accnotexthyperlink.cxx4
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx37
-rw-r--r--sw/source/core/access/accpage.cxx2
-rw-r--r--sw/source/core/access/accpage.hxx12
-rw-r--r--sw/source/core/access/accpara.cxx44
-rw-r--r--sw/source/core/access/accpara.hxx255
-rw-r--r--sw/source/core/access/accportions.cxx2
-rw-r--r--sw/source/core/access/accportions.hxx14
-rw-r--r--sw/source/core/access/accpreview.cxx6
-rw-r--r--sw/source/core/access/accpreview.hxx14
-rw-r--r--sw/source/core/access/accselectionhelper.hxx24
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/acctable.hxx176
-rw-r--r--sw/source/core/access/acctextframe.cxx12
-rw-r--r--sw/source/core/access/acctextframe.hxx54
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx34
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx20
-rw-r--r--sw/source/core/doc/DocumentDrawModelManager.cxx4
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentStatisticsManager.cxx2
-rw-r--r--sw/source/core/doc/number.cxx17
-rw-r--r--sw/source/core/doc/tblafmt.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.cxx4
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx6
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx12
-rw-r--r--sw/source/core/docnode/retrievedinputstreamdata.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstream.cxx6
-rw-r--r--sw/source/core/docnode/retrieveinputstreamconsumer.cxx2
-rw-r--r--sw/source/core/docnode/section.cxx2
-rw-r--r--sw/source/core/docnode/threadmanager.cxx4
-rw-r--r--sw/source/core/edit/edattr.cxx6
-rw-r--r--sw/source/core/edit/edundo.cxx6
-rw-r--r--sw/source/core/fields/authfld.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx2
-rw-r--r--sw/source/core/fields/textapi.cxx4
-rw-r--r--sw/source/core/frmedt/fefly1.cxx2
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
-rw-r--r--sw/source/core/inc/DocumentFieldsManager.hxx2
-rw-r--r--sw/source/core/inc/DocumentLayoutManager.hxx2
-rw-r--r--sw/source/core/inc/DocumentLinksAdministrationManager.hxx4
-rw-r--r--sw/source/core/inc/DocumentRedlineManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentSettingManager.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx8
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx6
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx8
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx54
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx2
-rw-r--r--sw/source/core/inc/bookmrk.hxx12
-rw-r--r--sw/source/core/inc/docsort.hxx2
-rw-r--r--sw/source/core/inc/dumpfilter.hxx32
-rw-r--r--sw/source/core/inc/frame.hxx4
-rw-r--r--sw/source/core/inc/pamtyp.hxx2
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx4
-rw-r--r--sw/source/core/inc/retrieveinputstreamconsumer.hxx2
-rw-r--r--sw/source/core/inc/swthreadjoiner.hxx2
-rw-r--r--sw/source/core/inc/threadmanager.hxx6
-rw-r--r--sw/source/core/inc/txmsrt.hxx26
-rw-r--r--sw/source/core/inc/txtfrm.hxx2
-rw-r--r--sw/source/core/inc/unobookmark.hxx199
-rw-r--r--sw/source/core/inc/unoevent.hxx9
-rw-r--r--sw/source/core/inc/unofield.hxx247
-rw-r--r--sw/source/core/inc/unoflatpara.hxx63
-rw-r--r--sw/source/core/inc/unofootnote.hxx157
-rw-r--r--sw/source/core/inc/unoidx.hxx250
-rw-r--r--sw/source/core/inc/unometa.hxx282
-rw-r--r--sw/source/core/inc/unoport.hxx198
-rw-r--r--sw/source/core/inc/unorefmark.hxx113
-rw-r--r--sw/source/core/inc/unosection.hxx203
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx38
-rw-r--r--sw/source/core/inc/wrong.hxx36
-rw-r--r--sw/source/core/layout/dumpfilter.cxx6
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx2
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx2
-rw-r--r--sw/source/core/text/frmform.cxx18
-rw-r--r--sw/source/core/text/guess.hxx4
-rw-r--r--sw/source/core/text/inftxt.hxx8
-rw-r--r--sw/source/core/text/porlay.cxx2
-rw-r--r--sw/source/core/text/wrong.cxx6
-rw-r--r--sw/source/core/tox/tox.cxx3
-rw-r--r--sw/source/core/tox/toxhlp.cxx11
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx3
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx3
-rw-r--r--sw/source/core/txtnode/txtedt.cxx8
-rw-r--r--sw/source/core/unocore/swunohelper.cxx61
-rw-r--r--sw/source/core/unocore/unocoll.cxx26
-rw-r--r--sw/source/core/unocore/unodraw.cxx10
-rw-r--r--sw/source/core/unocore/unoidx.cxx4
-rw-r--r--sw/source/core/unocore/unoobj2.cxx36
-rw-r--r--sw/source/core/view/viewsh.cxx7
-rw-r--r--sw/source/filter/basflt/fltini.cxx4
-rw-r--r--sw/source/filter/basflt/iodetect.cxx4
-rw-r--r--sw/source/filter/html/htmlbas.cxx4
-rw-r--r--sw/source/filter/html/htmlform.cxx6
-rw-r--r--sw/source/filter/html/swhtml.hxx10
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx26
-rw-r--r--sw/source/filter/ww8/docxexport.hxx6
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/escher.hxx10
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx12
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx10
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.hxx62
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx8
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx18
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx38
-rw-r--r--sw/source/filter/xml/swxml.cxx12
-rw-r--r--sw/source/filter/xml/wrtxml.cxx12
-rw-r--r--sw/source/filter/xml/wrtxml.hxx38
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx2
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx18
-rw-r--r--sw/source/filter/xml/xmlexp.cxx82
-rw-r--r--sw/source/filter/xml/xmlexp.hxx10
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx10
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx6
-rw-r--r--sw/source/filter/xml/xmlimp.cxx46
-rw-r--r--sw/source/filter/xml/xmlimp.hxx54
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx2
-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.cxx2
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx6
-rw-r--r--sw/source/filter/xml/xmltble.cxx10
-rw-r--r--sw/source/filter/xml/xmltbli.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.hxx20
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.cxx12
-rw-r--r--sw/source/filter/xml/xmltexte.hxx24
-rw-r--r--sw/source/filter/xml/xmltexti.cxx10
-rw-r--r--sw/source/filter/xml/xmltexti.hxx46
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx6
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx6
-rw-r--r--sw/source/ui/config/optcomp.cxx6
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx6
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx16
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx10
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx10
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx6
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx12
-rw-r--r--sw/source/ui/dialog/macassgn.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx12
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx30
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx4
-rw-r--r--sw/source/ui/envelp/envlop1.cxx6
-rw-r--r--sw/source/ui/envelp/label1.cxx2
-rw-r--r--sw/source/ui/envelp/labelexp.cxx6
-rw-r--r--sw/source/ui/envelp/labfmt.cxx4
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx24
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx2
-rw-r--r--sw/source/ui/fldui/changedb.cxx8
-rw-r--r--sw/source/ui/fldui/flddinf.hxx2
-rw-r--r--sw/source/ui/index/cntex.cxx14
-rw-r--r--sw/source/ui/index/cnttab.cxx6
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx6
-rw-r--r--sw/source/ui/misc/glossary.cxx10
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx4
-rw-r--r--sw/source/ui/uno/swdetect.cxx16
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx6
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx2
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx2
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx8
-rw-r--r--sw/source/ui/vba/vbaeventshelper.cxx4
-rw-r--r--sw/source/ui/vba/vbafont.cxx36
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx2
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx2
-rw-r--r--sw/source/ui/vba/vbavariables.cxx2
-rw-r--r--sw/source/uibase/app/appopt.cxx8
-rw-r--r--sw/source/uibase/app/docsh.cxx10
-rw-r--r--sw/source/uibase/app/docsh2.cxx12
-rw-r--r--sw/source/uibase/app/docshini.cxx12
-rw-r--r--sw/source/uibase/app/swmodul1.cxx10
-rw-r--r--sw/source/uibase/app/swmodule.cxx2
-rw-r--r--sw/source/uibase/config/barcfg.cxx4
-rw-r--r--sw/source/uibase/config/dbconfig.cxx4
-rw-r--r--sw/source/uibase/config/fontcfg.cxx28
-rw-r--r--sw/source/uibase/config/modcfg.cxx10
-rw-r--r--sw/source/uibase/config/prtopt.cxx4
-rw-r--r--sw/source/uibase/config/usrpref.cxx10
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx18
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx10
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx16
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx8
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx6
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx6
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.hxx2
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx20
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.hxx2
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.hxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx6
-rw-r--r--sw/source/uibase/envelp/envimg.cxx4
-rw-r--r--sw/source/uibase/envelp/labelcfg.cxx6
-rw-r--r--sw/source/uibase/envelp/labimg.cxx4
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx14
-rw-r--r--sw/source/uibase/fldui/xfldui.cxx14
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx64
-rw-r--r--sw/source/uibase/inc/barcfg.hxx4
-rw-r--r--sw/source/uibase/inc/conttree.hxx2
-rw-r--r--sw/source/uibase/inc/cption.hxx4
-rw-r--r--sw/source/uibase/inc/dbconfig.hxx4
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx14
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/inc/envimg.hxx8
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx12
-rw-r--r--sw/source/uibase/inc/fontcfg.hxx4
-rw-r--r--sw/source/uibase/inc/glosdoc.hxx4
-rw-r--r--sw/source/uibase/inc/glossary.hxx2
-rw-r--r--sw/source/uibase/inc/hyp.hxx8
-rw-r--r--sw/source/uibase/inc/imaildsplistener.hxx4
-rw-r--r--sw/source/uibase/inc/label.hxx2
-rw-r--r--sw/source/uibase/inc/labelcfg.hxx2
-rw-r--r--sw/source/uibase/inc/labimg.hxx4
-rw-r--r--sw/source/uibase/inc/maildispatcher.hxx14
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx12
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx26
-rw-r--r--sw/source/uibase/inc/navicfg.hxx4
-rw-r--r--sw/source/uibase/inc/olmenu.hxx22
-rw-r--r--sw/source/uibase/inc/regionsw.hxx2
-rw-r--r--sw/source/uibase/inc/sharedconnection.hxx2
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx2
-rw-r--r--sw/source/uibase/inc/stmenu.hxx16
-rw-r--r--sw/source/uibase/inc/swrenamexnameddlg.hxx16
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx4
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx4
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx4
-rw-r--r--sw/source/uibase/inc/uiitems.hxx8
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx26
-rw-r--r--sw/source/uibase/inc/unoatxt.hxx158
-rw-r--r--sw/source/uibase/inc/unodispatch.hxx52
-rw-r--r--sw/source/uibase/inc/unomailmerge.hxx78
-rw-r--r--sw/source/uibase/inc/unomod.hxx58
-rw-r--r--sw/source/uibase/inc/unotools.hxx14
-rw-r--r--sw/source/uibase/inc/unotxvw.hxx262
-rw-r--r--sw/source/uibase/inc/usrpref.hxx20
-rw-r--r--sw/source/uibase/inc/workctrl.hxx2
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx4
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx8
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx10
-rw-r--r--sw/source/uibase/misc/glosdoc.cxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx6
-rw-r--r--sw/source/uibase/shells/annotsh.cxx8
-rw-r--r--sw/source/uibase/shells/basesh.cxx10
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx6
-rw-r--r--sw/source/uibase/shells/frmsh.cxx2
-rw-r--r--sw/source/uibase/shells/grfshex.cxx4
-rw-r--r--sw/source/uibase/shells/textsh.cxx2
-rw-r--r--sw/source/uibase/shells/textsh1.cxx4
-rw-r--r--sw/source/uibase/shells/textsh2.cxx16
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx12
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx10
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.cxx10
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx6
-rw-r--r--sw/source/uibase/smartmenu/stmenu.cxx2
-rw-r--r--sw/source/uibase/table/chartins.cxx2
-rw-r--r--sw/source/uibase/table/tablemgr.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx6
-rw-r--r--sw/source/uibase/uiview/srcview.cxx10
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx10
-rw-r--r--sw/source/uibase/uiview/view.cxx6
-rw-r--r--sw/source/uibase/uiview/view2.cxx18
-rw-r--r--sw/source/uibase/uiview/viewling.cxx10
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx4
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx6
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.cxx8
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.hxx34
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx12
-rw-r--r--sw/source/uibase/uno/dlelstnr.cxx10
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx6
-rw-r--r--sw/source/uibase/uno/unodoc.cxx12
-rw-r--r--sw/source/uibase/uno/unofreg.cxx8
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx12
-rw-r--r--sw/source/uibase/uno/unomod.cxx12
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx26
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx16
-rw-r--r--sw/source/uibase/utlui/condedit.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx6
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/navicfg.cxx4
-rw-r--r--sw/source/uibase/utlui/navipi.cxx4
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx4
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx2
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx4
-rw-r--r--sw/source/uibase/wrtsh/select.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx4
322 files changed, 3043 insertions, 3227 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f2f02bcf3c69..8faf03b222ff 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -412,12 +412,12 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
return aRet;
}
-::com::sun::star::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
- ::com::sun::star::uno::Any strRet;
+ css::uno::Any strRet;
SwFrameFormat *pFrameFormat = GetTableBoxFormat();
assert(pFrameFormat);
@@ -433,7 +433,7 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
}
sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 03d70950a552..6814270b172b 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -29,9 +29,9 @@ class SwAccessibleTable;
class SwFrameFormat;
class SwAccessibleCell : public SwAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleValue,
- ::com::sun::star::accessibility::XAccessibleSelection,
- public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
+ css::accessibility::XAccessibleValue,
+ css::accessibility::XAccessibleSelection,
+ public css::accessibility::XAccessibleExtendedAttributes
{
// Implementation for XAccessibleSelection interface
SwAccessibleSelectionHelper aSelectionHelper;
@@ -63,25 +63,25 @@ public:
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void Dispose( bool bRecursive = false ) override;
@@ -93,9 +93,8 @@ public:
// between those inherited through SwAcessibleContext and
// XAccessibleValue).
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -104,59 +103,55 @@ public:
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleValue
// XAccessibleExtendedAttributes
- ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ css::uno::Any SAL_CALL getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
private:
SwFrameFormat* GetTableBoxFormat() const;
public:
- virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getCurrentValue( )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setCurrentValue(
- const ::com::sun::star::uno::Any& aNumber )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getMaximumValue( )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getMinimumValue( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild(
- sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
- virtual sal_Bool SAL_CALL isAccessibleChildSelected(
- sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
+
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+ throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deselectAccessibleChild(
- sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
};
#endif
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 9a5e5fe4bea8..e895bf346930 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -45,11 +45,11 @@ const sal_Char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible
class SwAccessibleContext :
public ::cppu::WeakImplHelper<
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::lang::XServiceInfo
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleEventBroadcaster,
+ css::lang::XServiceInfo
>,
public SwAccessibleFrame
{
@@ -67,8 +67,8 @@ private:
// The parent if it has been retrieved. This is always an
// SwAccessibleContext. (protected by Mutex)
- ::com::sun::star::uno::WeakReference <
- ::com::sun::star::accessibility::XAccessible > m_xWeakParent;
+ css::uno::WeakReference <
+ css::accessibility::XAccessible > m_xWeakParent;
SwAccessibleMap *m_pMap; // must be protected by solar mutex
@@ -99,7 +99,7 @@ protected:
//This flag is used to mark the object's selected state.
bool m_isSelectedInDoc;
void SetParent( SwAccessibleContext *pParent );
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetWeakParent() const;
+ css::uno::Reference< css::accessibility::XAccessible> GetWeakParent() const;
bool IsDisposing() const { return m_isDisposing; }
@@ -163,7 +163,7 @@ protected:
public:
void SetMap(SwAccessibleMap *const pMap) { m_pMap = pMap; }
- void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent );
+ void FireAccessibleEvent( css::accessibility::AccessibleEventObject& rEvent );
protected:
// broadcast visual data event
@@ -179,7 +179,7 @@ protected:
bool IsEditableState();
- ::com::sun::star::awt::Rectangle SAL_CALL
+ css::awt::Rectangle SAL_CALL
getBoundsImpl(bool bRelative)
throw (css::uno::RuntimeException, std::exception);
@@ -199,122 +199,119 @@ public:
// XAccessible
// Return the XAccessibleContext.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
- getAccessibleContext() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
+ getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return the specified child or NULL if index is invalid.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException, std::exception) override;
// Return a reference to the parent.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return NULL to indicate that an empty relation set.
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return the set of current states.
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return the parents locale or throw exception if this object has no
parent yet/anymore. */
- virtual ::com::sun::star::lang::Locale SAL_CALL
+ virtual css::lang::Locale SAL_CALL
getLocale()
- throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
virtual void SAL_CALL addAccessibleEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeAccessibleEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
- const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::awt::Point& aPoint )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
- const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
+ const css::awt::Point& aPoint )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize()
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL grabFocus()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// thread safe C++ interface
@@ -382,20 +379,20 @@ public:
};
// some heavily used exception support
-#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \
- ::com::sun::star::uno::Reference < ifc > xThis( this ); \
- ::com::sun::star::uno::RuntimeException aExcept( \
+#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \
+ css::uno::Reference < ifc > xThis( this ); \
+ css::uno::RuntimeException aExcept( \
OUString( msg ), xThis ); \
throw aExcept;
-#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
- if( !(GetFrm() && GetMap()) ) \
- { \
- ::com::sun::star::uno::Reference < ifc > xThis( ths ); \
- ::com::sun::star::lang::DisposedException aExcept( \
+#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
+ if( !(GetFrm() && GetMap()) ) \
+ { \
+ css::uno::Reference < ifc > xThis( ths ); \
+ css::lang::DisposedException aExcept( \
OUString( "object is defunctional" ), \
- xThis ); \
- throw aExcept; \
+ xThis ); \
+ throw aExcept; \
}
#define CHECK_FOR_DEFUNC( ifc ) \
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index d771d27be569..07265493a0eb 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent()
if( xAcc->getAccessibleChild( i ) == xThis )
return i;
}
- catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
+ catch(const css::lang::IndexOutOfBoundsException &)
{
return -1L;
}
@@ -203,7 +203,7 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription()
}
OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -252,7 +252,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
return aBox;
}
- catch(const ::com::sun::star::lang::IndexOutOfBoundsException &)
+ catch(const css::lang::IndexOutOfBoundsException &)
{
return awt::Rectangle();
}
@@ -273,7 +273,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
return aLoc;
}
-::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
+css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -288,7 +288,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
return aLoc;
}
-::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
+css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -548,8 +548,8 @@ void SwAccessibleDocument::deselectAccessibleChild(
}
uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard g;
@@ -781,15 +781,15 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
}
sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL SwAccessibleDocument::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
- throw (::com::sun::star::uno::RuntimeException,
+css::uno::Sequence< css::uno::Any >
+ SAL_CALL SwAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
+ throw (css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard g;
@@ -804,7 +804,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
if ( nType == FORSPELLCHECKFLOWTO )
{
- uno::Reference< ::com::sun::star::drawing::XShape > xShape;
+ uno::Reference< css::drawing::XShape > xShape;
rAny >>= xShape;
if( xShape.is() )
{
@@ -836,7 +836,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
}
}
}
- catch ( const com::sun::star::lang::IndexOutOfBoundsException& )
+ catch ( const css::lang::IndexOutOfBoundsException& )
{
return uno::Sequence< uno::Any >();
}
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index d39f3c7f78ab..5fdb656b7772 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -33,8 +33,7 @@ class VclSimpleEvent;
// SwAccessiblePreview
class SwAccessibleDocumentBase : public SwAccessibleContext
{
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible> mxParent;
+ css::uno::Reference< css::accessibility::XAccessible> mxParent;
VclPtr<vcl::Window> mpChildWin; // protected by solar mutext
@@ -55,60 +54,60 @@ public:
// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return the specified child or NULL if index is invalid.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException, std::exception) override;
// Return a reference to the parent.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return this object's description.
virtual OUString SAL_CALL
- getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
- const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::awt::Point& aPoint )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
- const ::com::sun::star::awt::Point& aPoint )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
+ const css::awt::Point& aPoint )
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen()
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize()
+ throw (css::uno::RuntimeException, std::exception) override;
};
/**
* access to an accessible Writer document
*/
class SwAccessibleDocument : public SwAccessibleDocumentBase,
- public com::sun::star::accessibility::XAccessibleSelection,
- public com::sun::star::accessibility::XAccessibleExtendedAttributes,
- public com::sun::star::accessibility::XAccessibleGetAccFlowTo
+ public css::accessibility::XAccessibleSelection,
+ public css::accessibility::XAccessibleExtendedAttributes,
+ public css::accessibility::XAccessibleGetAccFlowTo
{
// Implementation for XAccessibleSelection interface
SwAccessibleSelectionHelper maSelectionHelper;
@@ -130,18 +129,18 @@ public:
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XInterface
@@ -149,9 +148,9 @@ public:
// XAccessibleSelection. These methods are needed to avoid
// ambiguities.
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -160,40 +159,40 @@ public:
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+ throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Any SAL_CALL getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
// thread safe C++ interface
@@ -203,12 +202,12 @@ public:
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleGetAccFlowTo
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
- SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
- throw (::com::sun::star::uno::RuntimeException,
+ css::uno::Sequence< css::uno::Any >
+ SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
+ throw (css::uno::RuntimeException,
std::exception) override;
};
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 57684d5e55d3..fda48d759d1f 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -47,14 +47,14 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject()
}
// XInterface
-com::sun::star::uno::Any SAL_CALL
- SwAccessibleEmbeddedObject::queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL
+ SwAccessibleEmbeddedObject::queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType);
+ css::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType);
if ( ! aReturn.hasValue())
aReturn = ::cppu::queryInterface (rType,
- static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this) );
+ static_cast< css::accessibility::XAccessibleExtendedAttributes* >(this) );
return aReturn;
}
@@ -101,12 +101,12 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation
}
// XAccessibleExtendedAttributes
-::com::sun::star::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
- ::com::sun::star::uno::Any strRet;
+ css::uno::Any strRet;
OUString style;
SwFlyFrm* pFFrm = getFlyFrm();
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index b3b7f6b5ef82..c349edc09de4 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
class SwAccessibleEmbeddedObject : public SwAccessibleNoTextFrame
- , public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
+ , public css::accessibility::XAccessibleExtendedAttributes
{
protected:
@@ -37,9 +37,9 @@ public:
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
acquire()
@@ -54,25 +54,25 @@ public:
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleExtendedAttributes
- virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Any SAL_CALL getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
};
#endif
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index dd789dbfb49e..cc48ec61488b 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -41,28 +41,28 @@ public:
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
static bool IsEndnote( const SwFootnoteFrm *pFrm );
};
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index ed4138e4c1d4..c29ca478c9ca 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -72,7 +72,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId()
// Return this object's role.
sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 4cfc258892b4..35c50b29ddd0 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -36,23 +36,23 @@ public:
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
/// Return this object's role.
- virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 3e89f6eb81b8..aa594c5fe908 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -113,7 +113,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId()
}
sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
Reference< XAccessible > xParent = getAccessibleParent();
if (xParent.is())
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index fbaf7a64ec17..7f91d40eca7a 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -41,31 +41,31 @@ public:
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service. */
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index cd1430802256..8ccd616bbe66 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -212,7 +212,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
if( ! xFactory.is() )
return sal_False;
- uno::Reference< com::sun::star::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ),
+ uno::Reference< css::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ),
uno::UNO_QUERY );
if( !xDesktop.is() )
return sal_False;
@@ -220,12 +220,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
xComp = xDesktop->getCurrentComponent();
if( !xComp.is() )
return sal_False;
- uno::Reference< com::sun::star::document::XLinkTargetSupplier > xLTS(xComp, uno::UNO_QUERY);
+ uno::Reference< css::document::XLinkTargetSupplier > xLTS(xComp, uno::UNO_QUERY);
if ( !xLTS.is())
return sal_False;
- uno::Reference< ::com::sun::star::container::XNameAccess > xLinks = xLTS->getLinks();
- uno::Reference< ::com::sun::star::container::XNameAccess > xSubLinks;
+ uno::Reference< css::container::XNameAccess > xLinks = xLTS->getLinks();
+ uno::Reference< css::container::XNameAccess > xSubLinks;
const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
const sal_uLong nLinks = aNames.getLength();
const OUString* pNames = aNames.getConstArray();
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index dd6146f29aee..060be01b617d 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -30,7 +30,7 @@ class SwTextAttr;
class SwAccessibleHyperlink :
public ::cppu::WeakImplHelper<
- ::com::sun::star::accessibility::XAccessibleHyperlink >
+ css::accessibility::XAccessibleHyperlink >
{
friend class SwAccessibleParagraph;
friend class SwAccessibleHyperTextData;
@@ -49,35 +49,35 @@ class SwAccessibleHyperlink :
public:
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleKeyBinding > SAL_CALL
getAccessibleActionKeyBinding( sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// XAccessibleHyperlink
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor(
+ virtual css::uno::Any SAL_CALL getAccessibleActionAnchor(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject(
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getAccessibleActionObject(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getStartIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getEndIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isValid( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 13a2c8bb2019..87f9dbd5e2ec 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2097,7 +2097,7 @@ void SwAccessibleMap::AddShapeContext(const SdrObject *pObj, uno::Reference < XA
}
//Added by yanjun for sym2_6407
-void SwAccessibleMap::RemoveGroupContext(const SdrObject *pParentObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent)
+void SwAccessibleMap::RemoveGroupContext(const SdrObject *pParentObj, css::uno::Reference < css::accessibility::XAccessible > xAccParent)
{
osl::MutexGuard aGuard( maMutex );
if (mpShapeMap && pParentObj && pParentObj->IsGroupObject() && xAccParent.is())
@@ -3236,7 +3236,7 @@ bool SwAccessibleMap::ReplaceChild (
}
//Get the accessible control shape from the model object, here model object is with XPropertySet type
-::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
+::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException)
{
if( mpShapeMap )
{
@@ -3259,9 +3259,9 @@ bool SwAccessibleMap::ReplaceChild (
return NULL;
}
-::com::sun::star::uno::Reference< XAccessible >
- SwAccessibleMap::GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&)
- throw (::com::sun::star::uno::RuntimeException)
+css::uno::Reference< XAccessible >
+ SwAccessibleMap::GetAccessibleCaption (const css::uno::Reference< css::drawing::XShape >&)
+ throw (css::uno::RuntimeException)
{
return NULL;
}
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 5a5ec6031830..b0199a102c27 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -263,43 +263,43 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth( )
}
// XAccesibleText
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
+sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
+css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
uno::Sequence<beans::PropertyValue> aValues(0);
return aValues;
}
-::com::sun::star::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
- return com::sun::star::awt::Rectangle(0, 0, 0, 0 );
+ return css::awt::Rectangle(0, 0, 0, 0 );
}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;}
-OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;}
+OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
+OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
+OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();}
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
// XAccessibleHyperText
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index d77f116bb297..17c7d5216a85 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -34,14 +34,13 @@ class SwNoTextNode;
class SwAccessibleNoTextHyperlink;
class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
- public ::com::sun::star::accessibility::XAccessibleImage,
- public ::com::sun::star::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink
+ public css::accessibility::XAccessibleImage,
+ public css::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink
{
friend class SwAccessibleNoTextHyperlink;
- //HyperLinksMap alinksMap;
- com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > alink;
+ css::uno::Reference< css::accessibility::XAccessibleHyperlink > alink;
SwDepend aDepend;
- OUString msTitle; // #i73249#
+ OUString msTitle;
OUString msDesc;
protected:
@@ -61,20 +60,20 @@ public:
// #i73249# - Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XInterface methods need to be implemented to disambiguate
// between those inherited through SwAcessibleContext and
// XAccessibleImage.
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -83,61 +82,59 @@ public:
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleImage
virtual OUString SAL_CALL
getAccessibleImageDescription( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
getAccessibleImageHeight( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
getAccessibleImageWidth( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
// The object is not visible an longer and should be destroyed
virtual void Dispose( bool bRecursive = false ) override;
- virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32
- 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, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XAccessibleHypertext
virtual sal_Int32 SAL_CALL getHyperLinkCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleHyperlink >
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink >
SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
SwAccessibleMap *GetAccessibleMap(){ return GetMap();}
public:
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 24eb0d2c626c..e6c149e1ae6c 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -158,7 +158,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL
new ::comphelper::OAccessibleKeyBindingHelper();
xKeyBinding = pKeyBindingHelper;
- ::com::sun::star::awt::KeyStroke aKeyStroke;
+ css::awt::KeyStroke aKeyStroke;
aKeyStroke.Modifiers = 0;
aKeyStroke.KeyCode = KEY_RETURN;
aKeyStroke.KeyChar = 0;
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getEndIndex()
}
sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 84bdabf2da52..bd1c881338b8 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -30,7 +30,7 @@
class SwAccessibleNoTextHyperlink :
public ::cppu::WeakImplHelper<
- ::com::sun::star::accessibility::XAccessibleHyperlink >
+ css::accessibility::XAccessibleHyperlink >
{
friend class SwAccessibleNoTextFrame;
@@ -47,35 +47,34 @@ public:
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL
getAccessibleActionKeyBinding( sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// XAccessibleHyperlink
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor(
+ virtual css::uno::Any SAL_CALL getAccessibleActionAnchor(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject(
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getAccessibleActionObject(
sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getStartIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getEndIndex()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isValid( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 46d6e0d69dea..55752ae89031 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -167,7 +167,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId()
OUString SwAccessiblePage::getAccessibleDescription( )
throw( RuntimeException, std::exception )
{
- CHECK_FOR_DEFUNC( ::com::sun::star::accessibility::XAccessibleContext );
+ CHECK_FOR_DEFUNC( css::accessibility::XAccessibleContext );
OUString sArg( GetFormattedPageNumber() );
return GetResource( STR_ACCESS_PAGE_DESC, &sArg );
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 54d4f2858be8..03e4ac8baede 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -56,21 +56,21 @@ public:
// XAccessibleContext methods that need to be overridden
virtual OUString SAL_CALL getAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService (
const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
virtual bool HasCursor() override; // required by map to remember that object
};
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 0a1a5bf08321..dce86d889887 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1230,7 +1230,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
}
else if ( rType == cppu::UnoType<XAccessibleTextSelection>::get())
{
- uno::Reference< com::sun::star::accessibility::XAccessibleTextSelection > aTextExtension = this;
+ uno::Reference< css::accessibility::XAccessibleTextSelection > aTextExtension = this;
aRet <<= aTextExtension;
}
else if ( rType == cppu::UnoType<XAccessibleExtendedAttributes>::get())
@@ -1349,7 +1349,7 @@ sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex )
throw lang::IndexOutOfBoundsException();
}
-com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessibleParagraph::GetCurrentTabStop( sal_Int32 nIndex )
+css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabStop( sal_Int32 nIndex )
{
SolarMutexGuard aGuard;
@@ -1389,7 +1389,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState );
// already get the caret position
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs;
+ css::uno::Sequence< css::style::TabStop > tabs;
const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
if( nStrLen > 0 )
{
@@ -2342,20 +2342,20 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
//tab stop
if (rValue.Name == UNO_NAME_TABSTOPS)
{
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs = GetCurrentTabStop( nIndex );
+ css::uno::Sequence< css::style::TabStop > tabs = GetCurrentTabStop( nIndex );
if( !tabs.hasElements() )
{
tabs.realloc(1);
- ::com::sun::star::style::TabStop ts;
- com::sun::star::awt::Rectangle rc0 = getCharacterBounds(0);
- com::sun::star::awt::Rectangle rc1 = getCharacterBounds(nIndex);
+ css::style::TabStop ts;
+ css::awt::Rectangle rc0 = getCharacterBounds(0);
+ css::awt::Rectangle rc1 = getCharacterBounds(nIndex);
if( rc1.X - rc0.X >= 48 )
ts.Position = (rc1.X - rc0.X) - (rc1.X - rc0.X - 48)% 47 + 47;
else
ts.Position = 48;
ts.DecimalChar = ' ';
ts.FillChar = ' ';
- ts.Alignment = ::com::sun::star::style::TabAlign_LEFT;
+ ts.Alignment = css::style::TabAlign_LEFT;
tabs[0] = ts;
}
rValue.Value <<= tabs;
@@ -3304,14 +3304,14 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
}
//MSAA Extension Implementation in app module
-sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const ::com::sun::star::awt::Point&, sal_Bool )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const css::awt::Point&, sal_Bool )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
return sal_False;
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard g;
@@ -3350,8 +3350,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( )
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
@@ -3364,8 +3364,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSe
}
sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
@@ -3378,8 +3378,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSele
}
sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard g;
@@ -3436,8 +3436,8 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
}
sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 startOffset, sal_Int32 endOffset)
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception)
{
SolarMutexGuard aGuard;
@@ -3823,7 +3823,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
return bRet;
}
-sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -3841,7 +3841,7 @@ sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (::com::sun:
//Get the real heading level, Heading1 ~ Heading10
sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel()
{
- uno::Reference< ::com::sun::star::beans::XPropertySet > xPortion = CreateUnoPortion( 0, 0 );
+ uno::Reference< css::beans::XPropertySet > xPortion = CreateUnoPortion( 0, 0 );
OUString pString = "ParaStyleName";
uno::Any styleAny = xPortion->getPropertyValue( pString );
OUString sValue;
@@ -3863,7 +3863,7 @@ sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel()
}
uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 0f684883349e..d9831f320fc2 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -50,21 +50,21 @@ namespace com { namespace sun { namespace star {
} } }
typedef std::unordered_map< OUString,
- ::com::sun::star::beans::PropertyValue,
+ css::beans::PropertyValue,
OUStringHash,
::std::equal_to< OUString > > tAccParaPropValMap;
class SwAccessibleParagraph :
public SwClient, // #i108125#
public SwAccessibleContext,
- public ::com::sun::star::accessibility::XAccessibleEditableText,
- public com::sun::star::accessibility::XAccessibleSelection,
- public com::sun::star::accessibility::XAccessibleHypertext,
- public com::sun::star::accessibility::XAccessibleTextMarkup,
- public com::sun::star::accessibility::XAccessibleMultiLineText,
- public ::com::sun::star::accessibility::XAccessibleTextAttributes,
- public com::sun::star::accessibility::XAccessibleTextSelection,
- public com::sun::star::accessibility::XAccessibleExtendedAttributes
+ public css::accessibility::XAccessibleEditableText,
+ public css::accessibility::XAccessibleSelection,
+ public css::accessibility::XAccessibleHypertext,
+ public css::accessibility::XAccessibleTextMarkup,
+ public css::accessibility::XAccessibleMultiLineText,
+ public css::accessibility::XAccessibleTextAttributes,
+ public css::accessibility::XAccessibleTextSelection,
+ public css::accessibility::XAccessibleExtendedAttributes
{
friend class SwAccessibleHyperlink;
@@ -143,22 +143,22 @@ class SwAccessibleParagraph :
// #i63870#
void _getDefaultAttributesImpl(
- const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes,
+ const css::uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rDefAttrSeq,
const bool bOnlyCharAttrs = false );
void _getRunAttributesImpl(
const sal_Int32 nIndex,
- const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes,
+ const css::uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rRunAttrSeq );
void _getSupplementalAttributesImpl(
const sal_Int32 nIndex,
- const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes,
+ const css::uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rSupplementalAttrSeq );
void _correctValues(
const sal_Int32 nIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
+ css::uno::Sequence< css::beans::PropertyValue >& rValues );
public:
SwTOXSortTabBase* GetTOXSortTabBase();
@@ -183,14 +183,14 @@ protected:
// force update of new portion data
void UpdatePortionData()
- throw( com::sun::star::uno::RuntimeException );
+ throw( css::uno::RuntimeException );
// remove the current portion data
void ClearPortionData();
// get portion data; update if necessary
SwAccessiblePortionData& GetPortionData()
- throw( com::sun::star::uno::RuntimeException )
+ throw( css::uno::RuntimeException )
{
if( pPortionData == NULL )
UpdatePortionData();
@@ -199,38 +199,38 @@ protected:
//helpers for word boundaries
- bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetCharBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetWordBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetSentenceBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetLineBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- static bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
+ static bool GetParagraphBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetAttributeBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos );
- bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetGlyphBoundary( css::i18n::Boundary& rBound,
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.
- bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound,
+ bool GetTextBoundary( css::i18n::Boundary& rBound,
const OUString& rText,
sal_Int32 nPos,
sal_Int16 aTextType )
throw (
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
std::exception);
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) override;
@@ -240,59 +240,59 @@ public:
SwAccessibleParagraph( SwAccessibleMap& rInitMap,
const SwTextFrm& rTextFrm );
- inline operator ::com::sun::star::accessibility::XAccessibleText *();
+ inline operator css::accessibility::XAccessibleText *();
virtual bool HasCursor() override; // required by map to remember that object
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex );
- virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex );
+ virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return the parents locale or throw exception if this object has no
// parent yet/anymore.
- virtual ::com::sun::star::lang::Locale SAL_CALL
+ virtual css::lang::Locale SAL_CALL
getLocale()
- throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
virtual void SAL_CALL grabFocus()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// #i71385#
virtual sal_Int32 SAL_CALL getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
// Returns an identifier for the implementation of this object.
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// Returns a list of all supported services. In this case that is just
// the AccessibleContext service.
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XInterface
@@ -300,9 +300,9 @@ public:
// between those inherited through SwAcessibleContext and
// XAccessibleEditableText).
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -311,131 +311,131 @@ public:
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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 sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getSelectedText( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getSelectionStart()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Int32 SAL_CALL getSelectionEnd()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XAccessibleEditableText
- virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+ throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
// XAccessibleHypertext
virtual sal_Int32 SAL_CALL getHyperLinkCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleHyperlink >
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleHyperlink >
SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// #i71360#
// XAccesibleTextMarkup
virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
+ virtual css::accessibility::TextSegment SAL_CALL
getTextMarkup( sal_Int32 nTextMarkupIndex,
sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > SAL_CALL
+ virtual css::uno::Sequence< css::accessibility::TextSegment > SAL_CALL
getTextMarkupAtIndex( sal_Int32 nCharIndex,
sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
// XAccessibleTextSelection
- virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getSelectedPortionCount( )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset)
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
// XAccessibleExtendedAttributes
- virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ virtual css::uno::Any SAL_CALL getExtendedAttributes()
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
sal_Int32 GetRealHeadingLevel();
// XAccessibleComponent
@@ -444,31 +444,30 @@ public:
// #i89175#
// XAccessibleMultiLineText
virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
+ virtual css::accessibility::TextSegment SAL_CALL
getTextAtLineNumber( sal_Int32 nLineNo )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL
+ virtual css::accessibility::TextSegment SAL_CALL
getTextAtLineWithCaret()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// #i63870#
// XAccesibleTextAttributes
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
};
-inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *()
+inline SwAccessibleParagraph::operator css::accessibility::XAccessibleText *()
{
- return static_cast<
- ::com::sun::star::accessibility::XAccessibleEditableText * >( this );
+ return static_cast< css::accessibility::XAccessibleEditableText * >( this );
}
#endif
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index e100e16b802b..8f55cb079b52 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -667,7 +667,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
return nModelPos;
}
-bool SwAccessiblePortionData::FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos )
+bool SwAccessiblePortionData::FillBoundaryIFDateField( css::i18n::Boundary& rBound, const sal_Int32 nPos )
{
if( aFieldPosition.size() < 2 )
return false;
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index a23f8b1f76b5..8a48c4d77cd4 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -77,7 +77,7 @@ class SwAccessiblePortionData : public SwPortionHandler
static size_t FindLastBreak( const Positions_t& rPositions, sal_Int32 nValue );
/// fill the boundary with the values from rPositions[nPos]
- static void FillBoundary(com::sun::star::i18n::Boundary& rBound,
+ static void FillBoundary(css::i18n::Boundary& rBound,
const Positions_t& rPositions,
size_t nPos );
@@ -104,7 +104,7 @@ public:
virtual void Finish() override;
virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) override;
- bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
+ bool FillBoundaryIFDateField( css::i18n::Boundary& rBound, const sal_Int32 nPos );
bool IsIndexInFootnode(sal_Int32 nIndex);
bool IsInGrayPortion( sal_Int32 nPos );
sal_Int32 GetFieldIndex(sal_Int32 nPos);
@@ -117,11 +117,11 @@ public:
const OUString& GetAccessibleString() const;
/// get the start & end positions of the sentence
- void GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
+ void GetLineBoundary( css::i18n::Boundary& rBound,
sal_Int32 nPos ) const;
// get start and end position of the last line
- void GetLastLineBoundary( com::sun::star::i18n::Boundary& rBound ) const;
+ void GetLastLineBoundary( css::i18n::Boundary& rBound ) const;
/// Determine whether this core position is valid for these portions.
/// (A paragraph may be split into several frames, e.g. at page
@@ -139,7 +139,7 @@ public:
sal_Int32 GetLineCount() const;
sal_Int32 GetLineNo( const sal_Int32 nPos ) const;
void GetBoundaryOfLine( const sal_Int32 nLineNo,
- com::sun::star::i18n::Boundary& rLineBound );
+ css::i18n::Boundary& rLineBound );
/// get the position in the model string for a given
/// (accessibility) position
@@ -155,11 +155,11 @@ public:
// get boundaries of words/sentences. The data structures are
// created on-demand.
- void GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
+ void GetSentenceBoundary( css::i18n::Boundary& rBound,
sal_Int32 nPos );
// get (a) boundary for attribute change
- void GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
+ void GetAttributeBoundary( css::i18n::Boundary& rBound,
sal_Int32 nPos ) const;
/// Convert start and end positions into core positions.
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 7c645f6eeeec..774aa3ecdbcc 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -67,12 +67,12 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception)
{
return GetResource( STR_ACCESS_PREVIEW_DOC_NAME );
}
-OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (css::uno::RuntimeException, std::exception)
{
OUString sLclName = SwAccessibleDocumentBase::getAccessibleName();
sLclName += " ";
@@ -82,7 +82,7 @@ OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (::com::sun::st
void SwAccessiblePreview::_InvalidateFocus()
{
- FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, true );
+ FireStateChangedEvent( css::accessibility::AccessibleStateType::FOCUSED, true );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index 46d8e96afb98..7387a2e0820b 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -43,26 +43,26 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override;
- OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
virtual void _InvalidateFocus() override;
};
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 5c189ff425c7..2dc163dbd87b 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -34,7 +34,7 @@ class SwAccessibleSelectionHelper
SwFEShell* GetFEShell();
void throwIndexOutOfBoundsException()
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+ throw ( css::lang::IndexOutOfBoundsException );
public:
SwAccessibleSelectionHelper( SwAccessibleContext& rContext );
@@ -44,26 +44,26 @@ public:
void selectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException );
bool isAccessibleChildSelected(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException );
void selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
sal_Int32 getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException );
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getSelectedAccessibleChild(
+ throw ( css::uno::RuntimeException );
+ css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException);
// index has to be treated as global child index.
void deselectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException );
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException );
};
#endif
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index fdf2bfd6250f..0c7adac6518c 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1700,7 +1700,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
}
sal_Int32 SAL_CALL SwAccessibleTable::getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
const SvxBrushItem &rBack = GetFrm()->GetAttrSet()->GetBackground();
sal_uInt32 crBack = rBack.GetColor().GetColor();
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index b05d714b17ed..4da22af9a5a8 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -38,9 +38,9 @@ namespace sw { namespace access {
class SwAccessibleTable :
public SwAccessibleContext,
- public ::com::sun::star::accessibility::XAccessibleTable,
- public ::com::sun::star::accessibility::XAccessibleSelection,
- public ::com::sun::star::accessibility::XAccessibleTableSelection,
+ public css::accessibility::XAccessibleTable,
+ public css::accessibility::XAccessibleSelection,
+ public css::accessibility::XAccessibleTableSelection,
public SwClient
{
SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex
@@ -94,9 +94,9 @@ public:
// between those inherited through SwAcessibleContext and
// XAccessibleTable).
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -105,97 +105,97 @@ public:
{ SwAccessibleContext::release(); };
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleTable
virtual sal_Int32 SAL_CALL getAccessibleRowCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleColumnCount( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getAccessibleRowDescription(
sal_Int32 nRow )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getAccessibleColumnDescription(
sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt(
sal_Int32 nRow, sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt(
sal_Int32 nRow, sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleTable >
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleTable >
SAL_CALL getAccessibleRowHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleTable >
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleTable >
SAL_CALL getAccessibleColumnHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL
getSelectedAccessibleRows( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL
getSelectedAccessibleColumns( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible > SAL_CALL
getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible > SAL_CALL
getAccessibleCaption( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible > SAL_CALL
getAccessibleSummary( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isAccessibleSelected(
sal_Int32 nRow, sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleIndex(
sal_Int32 nRow, sal_Int32 nColumn )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// XAccessibleTableSelection
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException,
std::exception) override;
// XServiceInfo
@@ -203,20 +203,20 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// C++ interface
@@ -235,37 +235,37 @@ public:
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
// index has to be treated as global child index.
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
typedef std::vector< ::std::pair<SwAccessibleContext*,
css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t;
Cells_t m_vecCellAdd;
@@ -296,9 +296,9 @@ public:
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override
{ SwAccessibleContext::acquire(); };
@@ -310,24 +310,24 @@ public:
/// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/// Return the specified child or NULL if index is invalid.
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException, std::exception) override;
// XAccessibleTable
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleTable >
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleTable >
SAL_CALL getAccessibleRowHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleTable >
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::accessibility::XAccessibleTable >
SAL_CALL getAccessibleColumnHeaders( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
@@ -335,7 +335,7 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index fb3e0391cc85..d5026b986858 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -141,14 +141,14 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
// XInterface
-com::sun::star::uno::Any SAL_CALL
- SwAccessibleTextFrame::queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL
+ SwAccessibleTextFrame::queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aReturn = SwAccessibleContext::queryInterface (rType);
+ css::uno::Any aReturn = SwAccessibleContext::queryInterface (rType);
if ( ! aReturn.hasValue())
aReturn = ::cppu::queryInterface (rType,
- static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this)
+ static_cast< css::accessibility::XAccessibleSelection* >(this)
);
return aReturn;
}
@@ -189,7 +189,7 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC
{
if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
- uno::Reference< ::com::sun::star::accessibility::XAccessibleText >
+ uno::Reference< css::accessibility::XAccessibleText >
xText(xAcc, uno::UNO_QUERY);
if( xText.is() )
{
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index f16d1a19e826..d276c65656e2 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -31,7 +31,7 @@ namespace com { namespace star {
} }
class SwAccessibleTextFrame : public SwAccessibleFrameBase,
- public ::com::sun::star::accessibility::XAccessibleSelection
+ public css::accessibility::XAccessibleSelection
{
private:
// #i73249#
@@ -45,51 +45,51 @@ protected:
public:
SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm );
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- ::com::sun::star::uno::Type const & rType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ css::uno::Type const & rType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected(
sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL clearAccessibleSelection( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL selectAllAccessibleChildren( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL deselectAccessibleChild(
sal_Int32 nSelectedChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception ) override;
// XAccessibleContext
// #i73249# - Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/// Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
@@ -97,23 +97,23 @@ public:
*/
virtual OUString SAL_CALL
getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService (const OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
/** Returns a list of all supported services. In this case that is just
the AccessibleContext service.
*/
- virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL
+ virtual css::uno::Sequence< OUString> SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleContext::getAccessibleRelationSet
@@ -124,14 +124,12 @@ private:
// helper methods for getAccessibleRelationSet:
SwFlyFrm* getFlyFrm() const;
- com::sun::star::accessibility::AccessibleRelation makeRelation(
+ css::accessibility::AccessibleRelation makeRelation(
sal_Int16 nType, const SwFlyFrm* pFrm );
public:
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
- getAccessibleRelationSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet()
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index d316b21ba9c2..750be3b52341 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -35,8 +35,8 @@ using namespace com::sun::star;
namespace {
const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode,
const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException)
{
const SwWrongList* pTextMarkupList( 0 );
switch ( nTextMarkupType )
@@ -88,8 +88,8 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD
}
sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException)
{
sal_Int32 nTextMarkupCount( 0 );
@@ -106,12 +106,12 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
return nTextMarkupCount;
}
-::com::sun::star::accessibility::TextSegment
+css::accessibility::TextSegment
SwTextMarkupHelper::getTextMarkup( const sal_Int32 nTextMarkupIndex,
const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException)
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException)
{
if ( nTextMarkupIndex >= getTextMarkupCount( nTextMarkupType ) ||
nTextMarkupIndex < 0 )
@@ -119,7 +119,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
throw lang::IndexOutOfBoundsException();
}
- ::com::sun::star::accessibility::TextSegment aTextMarkupSegment;
+ css::accessibility::TextSegment aTextMarkupSegment;
aTextMarkupSegment.SegmentStart = -1;
aTextMarkupSegment.SegmentEnd = -1;
@@ -152,12 +152,12 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
return aTextMarkupSegment;
}
-::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment >
+css::uno::Sequence< css::accessibility::TextSegment >
SwTextMarkupHelper::getTextMarkupAtIndex( const sal_Int32 nCharIndex,
const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException)
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException)
{
// assumption:
// value of <nCharIndex> is in range [0..length of accessible text)
@@ -167,7 +167,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
// paragraph - e.g. numbering portion.
if ( mrPortionData.GetAccessiblePosition( nCoreCharIndex ) > nCharIndex )
{
- return uno::Sequence< ::com::sun::star::accessibility::TextSegment >();
+ return uno::Sequence< css::accessibility::TextSegment >();
}
// #i108125#
@@ -175,7 +175,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
mpTextMarkupList
? mpTextMarkupList
: getTextMarkupList( *mpTextNode, nTextMarkupType );
- ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups;
+ ::std::vector< css::accessibility::TextSegment > aTmpTextMarkups;
if ( pTextMarkupList )
{
const OUString rText = mrPortionData.GetAccessibleString();
@@ -194,7 +194,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos );
const sal_Int32 nEndPos =
mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos + pTextMarkup->mnLen );
- ::com::sun::star::accessibility::TextSegment aTextMarkupSegment;
+ css::accessibility::TextSegment aTextMarkupSegment;
aTextMarkupSegment.SegmentText = rText.copy( nStartPos, nEndPos - nStartPos );
aTextMarkupSegment.SegmentStart = nStartPos;
aTextMarkupSegment.SegmentEnd = nEndPos;
@@ -203,7 +203,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
}
}
- uno::Sequence< ::com::sun::star::accessibility::TextSegment > aTextMarkups(
+ uno::Sequence< css::accessibility::TextSegment > aTextMarkups(
aTmpTextMarkups.size() );
::std::copy( aTmpTextMarkups.begin(), aTmpTextMarkups.end(), aTextMarkups.begin() );
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index c0ae39448bc2..08491b05d707 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -42,22 +42,22 @@ class SwTextMarkupHelper
~SwTextMarkupHelper() {}
sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
- ::com::sun::star::accessibility::TextSegment getTextMarkup(
+ css::accessibility::TextSegment getTextMarkup(
const sal_Int32 nTextMarkupIndex,
const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
- ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment >
+ css::uno::Sequence< css::accessibility::TextSegment >
getTextMarkupAtIndex( const sal_Int32 nCharIndex,
const sal_Int32 nTextMarkupType )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IndexOutOfBoundsException,
+ css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
private:
SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete;
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index d4be33664b5b..2fd18842489d 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -141,9 +141,9 @@ void DocumentDrawModelManager::InitDrawModel()
if (!utl::ConfigManager::IsAvoidConfig())
{
SAL_INFO( "sw.doc", "before create Spellchecker/Hyphenator" );
- ::com::sun::star::uno::Reference< com::sun::star::linguistic2::XSpellChecker1 > xSpell = ::GetSpellChecker();
+ css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell = ::GetSpellChecker();
rOutliner.SetSpeller( xSpell );
- ::com::sun::star::uno::Reference< com::sun::star::linguistic2::XHyphenator > xHyphenator( ::GetHyphenator() );
+ css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator( ::GetHyphenator() );
rOutliner.SetHyphenator( xHyphenator );
SAL_INFO( "sw.doc", "after create Spellchecker/Hyphenator" );
}
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index e9cb58a73f0a..d2db518c3f5a 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -414,7 +414,7 @@ const css::i18n::ForbiddenCharacters*
}
void sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
- /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars )
+ /*[in]*/ const css::i18n::ForbiddenCharacters& rFChars )
{
if( !mxForbiddenCharsTable.is() )
{
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 8525ab117881..6318c03d832c 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -175,7 +175,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
mpDocStat->nPage = m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ? m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum() : 0;
mpDocStat->bModified = false;
- com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
+ css::uno::Sequence < css::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
sal_Int32 n=0;
aStat[n].Name = "TableCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index d1a2a2f39fe1..b3aef6952bdb 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1318,13 +1318,13 @@ namespace numfunc
void SetToDefault();
/** returns sequence of configuration property names */
- static com::sun::star::uno::Sequence<OUString> GetPropNames();
+ static css::uno::Sequence<OUString> GetPropNames();
/** loads configuration properties and applies values to internal data */
void LoadConfig();
/** catches notification about changed configuration data */
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override;
virtual void ImplCommit() override;
// configuration data
@@ -1357,9 +1357,9 @@ namespace numfunc
mbChangeIndentOnTabAtFirstPosOfFirstListItem = true;
}
- com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames()
+ css::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames()
{
- com::sun::star::uno::Sequence<OUString> aPropNames(1);
+ css::uno::Sequence<OUString> aPropNames(1);
OUString* pNames = aPropNames.getArray();
pNames[0] = "ChangeIndentOnTabAtFirstPosOfFirstListItem";
@@ -1370,10 +1370,9 @@ namespace numfunc
void SwNumberingUIBehaviorConfig::LoadConfig()
{
- com::sun::star::uno::Sequence<OUString> aPropNames = GetPropNames();
- com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues =
- GetProperties( aPropNames );
- const com::sun::star::uno::Any* pValues = aValues.getConstArray();
+ css::uno::Sequence<OUString> aPropNames = GetPropNames();
+ css::uno::Sequence<css::uno::Any> aValues = GetProperties( aPropNames );
+ const css::uno::Any* pValues = aValues.getConstArray();
OSL_ENSURE( aValues.getLength() == aPropNames.getLength(),
"<SwNumberingUIBehaviorConfig::LoadConfig()> - GetProperties failed");
if ( aValues.getLength() == aPropNames.getLength() )
@@ -1399,7 +1398,7 @@ namespace numfunc
}
}
- void SwNumberingUIBehaviorConfig::Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames )
+ void SwNumberingUIBehaviorConfig::Notify( const css::uno::Sequence<OUString>& aPropertyNames )
{
(void) aPropertyNames;
SetToDefault();
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index fb67e0e9b30e..c910dc6d20a1 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -289,7 +289,7 @@ SwBoxAutoFormat::SwBoxAutoFormat()
aBackground( RES_BACKGROUND ),
aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
m_aTextOrientation(FRMDIR_ENVIRONMENT, RES_FRAMEDIR),
- m_aVerticalAlignment(0, com::sun::star::text::VertOrientation::NONE, com::sun::star::text::RelOrientation::FRAME),
+ m_aVerticalAlignment(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME),
aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
aStacked( 0 ),
diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx
index ef965e4ab29d..9704824e10ce 100644
--- a/sw/source/core/docnode/cancellablejob.cxx
+++ b/sw/source/core/docnode/cancellablejob.cxx
@@ -24,8 +24,8 @@ CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThrea
{
}
-// ::com::sun::star::util::XCancellable:
-void SAL_CALL CancellableJob::cancel() throw (com::sun::star::uno::RuntimeException, std::exception)
+// css::util::XCancellable:
+void SAL_CALL CancellableJob::cancel() throw (css::uno::RuntimeException, std::exception)
{
mrThread->join();
}
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 4a7596e0dda1..dabde55257e3 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -28,14 +28,14 @@
class ObservableThread;
-class CancellableJob : public ::cppu::WeakImplHelper<com::sun::star::util::XCancellable>
+class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable>
{
public:
explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread );
virtual ~CancellableJob() {}
- // ::com::sun::star::util::XCancellable:
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::util::XCancellable:
+ virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
private:
CancellableJob( CancellableJob& ) = delete;
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 86dc48d07e71..93e2d8a14fcd 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -299,7 +299,7 @@ css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceN
return s;
}
-// ::com::sun::star::util::XJobManager:
+// css::util::XJobManager:
void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(maMutex);
@@ -353,7 +353,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept
}
}
-// ::com::sun::star::frame::XTerminateListener
+// css::frame::XTerminateListener
void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(maMutex);
@@ -438,15 +438,15 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec
SwThreadJoiner::ReleaseThreadJoiner();
}
-// ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener)
+// ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener)
void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
{
// nothing to do, because instance doesn't hold any references of observed objects
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_util_comp_FinalThreadManager_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_util_comp_FinalThreadManager_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new FinalThreadManager(context));
}
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 4631ef8866a1..0838761767fb 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -63,7 +63,7 @@ SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::R
void SwRetrievedInputStreamDataManager::PushData(
const tDataKey nDataKey,
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
+ css::uno::Reference<css::io::XInputStream> xInputStream,
const bool bIsStreamReadOnly )
{
osl::MutexGuard aGuard(maMutex);
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index ad70921e2902..030dcfbbbf16 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -53,7 +53,7 @@ void SwAsyncRetrieveInputStreamThread::threadFunction()
{
osl_setThreadName("SwAsyncRetrieveInputStreamThread");
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 2 );
+ css::uno::Sequence < css::beans::PropertyValue > xProps( 2 );
xProps[0].Name = "URL";
xProps[0].Value <<= mrLinkedURL;
xProps[1].Name = "Referer";
@@ -62,11 +62,11 @@ void SwAsyncRetrieveInputStreamThread::threadFunction()
aMedium.addInputStream();
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream;
+ css::uno::Reference<css::io::XInputStream> xInputStream;
aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
if ( !xInputStream.is() )
{
- com::sun::star::uno::Reference<com::sun::star::io::XStream> xStream;
+ css::uno::Reference<css::io::XStream> xStream;
aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= xStream;
if ( xStream.is() )
{
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index 6bfa562c2aa2..258768f34e2f 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -54,7 +54,7 @@ void SwAsyncRetrieveInputStreamThreadConsumer::CreateThread( const OUString& rUR
}
void SwAsyncRetrieveInputStreamThreadConsumer::ApplyInputStream(
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
+ css::uno::Reference<css::io::XInputStream> xInputStream,
const bool bIsStreamReadOnly )
{
mrGrfNode.ApplyInputStream( xInputStream, bIsStreamReadOnly );
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 0571943a5150..c3ee22c092bd 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -79,7 +79,7 @@ public:
virtual void Closed() override;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+ const OUString& rMimeType, const css::uno::Any & rValue ) override;
virtual const SwNode* GetAnchor() const override;
virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 786dd763b9f3..cb1e380faeab 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -130,7 +130,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID,
if ( bThreadFinished )
{
// release thread as job from thread joiner instance
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner );
+ css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner );
if ( rThreadJoiner.is() )
{
rThreadJoiner->releaseJob( aTmpThreadData.aJob );
@@ -183,7 +183,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData )
maStartedThreads.push_back( rThreadData );
// register thread as job at thread joiner instance
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner );
+ css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner );
if ( rThreadJoiner.is() )
{
rThreadJoiner->registerJob( rThreadData.aJob );
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index b8d64ff7d650..8b624ffba171 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -544,11 +544,11 @@ static inline SvtScriptType lcl_SetScriptFlags( sal_uInt16 nType )
{
switch( nType )
{
- case ::com::sun::star::i18n::ScriptType::LATIN:
+ case css::i18n::ScriptType::LATIN:
return SvtScriptType::LATIN;
- case ::com::sun::star::i18n::ScriptType::ASIAN:
+ case css::i18n::ScriptType::ASIAN:
return SvtScriptType::ASIAN;
- case ::com::sun::star::i18n::ScriptType::COMPLEX:
+ case css::i18n::ScriptType::COMPLEX:
return SvtScriptType::COMPLEX;
default:
return SvtScriptType::NONE;
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 473fd5a47397..5603cb9ae62b 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -131,7 +131,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
bRet = GetDoc()->GetIDocumentUndoRedo().Undo()
|| bRet;
}
- } catch (const ::com::sun::star::uno::Exception & e) {
+ } catch (const css::uno::Exception & e) {
SAL_WARN("sw.core",
"SwEditShell::Undo(): exception caught: " << e.Message);
}
@@ -187,7 +187,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount)
bRet = GetDoc()->GetIDocumentUndoRedo().Redo()
|| bRet;
}
- } catch (const ::com::sun::star::uno::Exception & e) {
+ } catch (const css::uno::Exception & e) {
SAL_WARN("sw.core",
"SwEditShell::Redo(): exception caught: " << e.Message);
}
@@ -217,7 +217,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount)
::sw::RepeatContext context(*GetDoc(), *GetCrsr());
bRet = GetDoc()->GetIDocumentUndoRedo().Repeat( context, nCount )
|| bRet;
- } catch (const ::com::sun::star::uno::Exception & e) {
+ } catch (const css::uno::Exception & e) {
SAL_WARN("sw.core",
"SwEditShell::Repeat(): exception caught: " << e.Message);
}
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index c7df4937877e..7f0d6127e899 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -420,7 +420,7 @@ bool SwAuthorityFieldType::PutValue( const Any& rAny, sal_uInt16 nWhichId )
case FIELD_PROP_LOCALE:
{
- com::sun::star::lang::Locale aLocale;
+ css::lang::Locale aLocale;
if( (bRet = rAny >>= aLocale ))
SetLanguage( LanguageTag::convertToLanguageType( aLocale ));
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index cb4dadd8c371..5a1b89dee044 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -50,7 +50,7 @@ public:
virtual void Closed() override;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+ const OUString& rMimeType, const css::uno::Any & rValue ) override;
virtual const SwNode* GetAnchor() const override;
virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index c9a38206a615..8c563a857fe5 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -43,9 +43,9 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
{OUString("TextPortionType"), WID_PORTIONTYPE,
::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
{OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS,
- cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS,
- cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0},
+ cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 8d4d2695b973..b800d0aa5833 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -2053,7 +2053,7 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
const SwFormatVertOrient &rVert = pFrameFormat->GetVertOrient();
SwFormatVertOrient aVert( rVert );
aVert.SetPos( -nBaseline );
- aVert.SetVertOrient( com::sun::star::text::VertOrientation::NONE );
+ aVert.SetVertOrient( css::text::VertOrientation::NONE );
pFrameFormat->LockModify();
pFrameFormat->SetFormatAttr( aVert );
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 7f098a1f4759..8327c64fbc81 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -1108,7 +1108,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
void SwGrfNode::ApplyInputStream(
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
+ css::uno::Reference<css::io::XInputStream> xInputStream,
const bool bIsStreamReadOnly )
{
if ( IsLinkedFile() )
diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx
index 78a7c85713d4..4c05c29cbf81 100644
--- a/sw/source/core/inc/DocumentFieldsManager.hxx
+++ b/sw/source/core/inc/DocumentFieldsManager.hxx
@@ -43,7 +43,7 @@ public:
virtual void RemoveFieldType(size_t nField) override;
virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) override;
virtual void InsDeletedFieldType(SwFieldType &) override;
- virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) override;
+ virtual bool PutValueToField(const SwPosition & rPos, const css::uno::Any& rVal, sal_uInt16 nWhich) override;
virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) override;
virtual void UpdateRefFields(SfxPoolItem* pHt) override;
virtual void UpdateTableFields(SfxPoolItem* pHt) override;
diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx
index c15b9ec2dcd2..026e3c0dc9ed 100644
--- a/sw/source/core/inc/DocumentLayoutManager.hxx
+++ b/sw/source/core/inc/DocumentLayoutManager.hxx
@@ -63,7 +63,7 @@ private:
SwDoc& m_rDoc;
SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView
- SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting
+ SwLayouter *mpLayouter; /**< css::frame::Controller for complex layout formatting
like footnote/endnote in sections */
};
diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
index cac16e282e04..dcd329978cb8 100644
--- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
+++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
@@ -49,9 +49,9 @@ public:
void UpdateLinks(bool bUI) override;
- bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const override;
+ bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const override;
- bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) override;
+ bool SetData(const OUString& rItem, const OUString& rMimeType, const css::uno::Any& rValue) override;
::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) override;
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 30d04f6f2cb9..89bca6123a45 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -105,10 +105,10 @@ public:
/*[in]*/const SwPaM& rPam,
/*[in]*/const OUString& rComment) override;
- virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const override;
+ virtual const css::uno::Sequence <sal_Int8>& GetRedlinePassword() const override;
virtual void SetRedlinePassword(
- /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) override;
+ /*[in]*/const css::uno::Sequence <sal_Int8>& rNewPassword) override;
//Non Interface methods;
@@ -134,7 +134,7 @@ private:
bool mbReadlineChecked; //< true: if the query was already shown
sal_uInt16 mnAutoFormatRedlnCommentNo; /**< SeqNo for conjoining of AutoFormat-Redlines.
by the UI. Managed by SwAutoFormat! */
- ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
+ css::uno::Sequence <sal_Int8 > maRedlinePasswd;
};
}
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx
index 8a0f12db218e..db0af2fcf38f 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -161,8 +161,8 @@ public:
// IDocumentSettingAccess
virtual bool get(/*[in]*/ DocumentSettingId id) const override;
virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) override;
- virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override;
- virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) override;
+ virtual const css::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override;
+ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) override;
virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() override;
virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const override;
virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const override;
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index bb1d0232c4bd..53509ab8c53e 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -31,10 +31,10 @@ private:
public:
SwXMLBlockListExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
SwXMLTextBlocks & rBlocks,
const OUString &rFileName,
- com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
+ css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLBlockListExport() {}
sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) override;
@@ -50,10 +50,10 @@ private:
public:
SwXMLTextBlockExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
SwXMLTextBlocks & rBlocks,
const OUString &rFileName,
- com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
+ css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
virtual ~SwXMLTextBlockExport() {}
sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;}
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 31c28c15b4e6..f15e8393803d 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -45,7 +45,7 @@ protected:
public:
SwXMLBlockListImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
SwXMLTextBlocks &rBlocks );
SwXMLTextBlocks& getBlockList()
@@ -68,13 +68,13 @@ public:
bool bTextOnly;
OUString &m_rText;
SwXMLTextBlockImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString &rNewText, bool bNewTextOnly );
virtual ~SwXMLTextBlockImport()
throw();
virtual void SAL_CALL endDocument()
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
};
enum SwXMLTextBlockToken : sal_Int32
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 9c7bc8639813..8f96c6d7f1d7 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -43,15 +43,15 @@ protected:
void ReadInfo();
void WriteInfo();
- void InitBlockMode ( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStorage );
+ void InitBlockMode ( const css::uno::Reference < css::embed::XStorage >& rStorage );
void ResetBlockMode();
public:
- com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xBlkRoot;
- com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xRoot;
+ css::uno::Reference < css::embed::XStorage > xBlkRoot;
+ css::uno::Reference < css::embed::XStorage > xRoot;
short nCurBlk;
SwXMLTextBlocks( const OUString& rFile );
- SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile );
+ SwXMLTextBlocks( const css::uno::Reference < css::embed::XStorage >&, const OUString& rFile );
void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false );
virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) override;
static OUString GeneratePackageName ( const OUString& rShort );
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 42eb62a61b2d..4e6d768f895c 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -29,9 +29,9 @@ class SwDoc;
class SwXTextDefaults : public cppu::WeakImplHelper
<
- com::sun::star::beans::XPropertyState,
- com::sun::star::beans::XPropertySet,
- com::sun::star::lang::XServiceInfo
+ css::beans::XPropertyState,
+ css::beans::XPropertySet,
+ css::lang::XServiceInfo
>
{
const SfxItemPropertySet* m_pPropSet;
@@ -42,35 +42,35 @@ public:
virtual ~SwXTextDefaults ();
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue )
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName )
+ throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames )
+ throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 60c2eb67fad0..5bf395c15c91 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -84,7 +84,7 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
void AddChanges( SwTextNode& rTNd, sal_Int32 nStart, sal_Int32 nLen,
- ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
+ css::uno::Sequence <sal_Int32>& rOffsets );
bool HasData() const { return aChanges.size() > 0; }
};
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 8a960a5c1bd8..633dffbab771 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -102,11 +102,9 @@ namespace sw {
virtual ~MarkBase();
- const ::com::sun::star::uno::WeakReference<
- ::com::sun::star::text::XTextContent> & GetXBookmark() const
+ const css::uno::WeakReference< css::text::XTextContent> & GetXBookmark() const
{ return m_wXBookmark; }
- void SetXBookmark(::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent> const& xBkmk)
+ void SetXBookmark(css::uno::Reference< css::text::XTextContent> const& xBkmk)
{ m_wXBookmark = xBkmk; }
protected:
@@ -119,8 +117,7 @@ namespace sw {
OUString m_aName;
static OUString GenerateNewName(const OUString& rPrefix);
- ::com::sun::star::uno::WeakReference<
- ::com::sun::star::text::XTextContent> m_wXBookmark;
+ css::uno::WeakReference< css::text::XTextContent> m_wXBookmark;
};
class NavigatorReminder
@@ -188,8 +185,7 @@ namespace sw {
virtual bool IsInClipboard() const override;
virtual bool IsInUndo() const override;
virtual bool IsInContent() const override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override;
+ virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override;
private:
vcl::KeyCode m_aCode;
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 8a9c48e0e1a5..0dac71b4d0f4 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -70,7 +70,7 @@ struct SwSortElement
static SwDoc* pDoc;
static const FlatFndBox* pBox;
static CollatorWrapper* pSortCollator;
- static ::com::sun::star::lang::Locale* pLocale;
+ static css::lang::Locale* pLocale;
static OUString* pLastAlgorithm;
static LocaleDataWrapper* pLclData;
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index 06cbff670c79..7b0acb1ba17b 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -24,40 +24,40 @@ namespace sw {
*/
class LayoutDumpFilter : public cppu::WeakImplHelper
<
- com::sun::star::document::XFilter,
- com::sun::star::document::XExporter,
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo
+ css::document::XFilter,
+ css::document::XExporter,
+ css::lang::XInitialization,
+ css::lang::XServiceInfo
>
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc;
+ css::uno::Reference< css::lang::XComponent > m_xSrcDoc;
public:
LayoutDumpFilter();
virtual ~LayoutDumpFilter();
// XFilter
- virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL cancel( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XExporter
- virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw (css::uno::RuntimeException, std::exception) override;
};
}
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5acb1f086394..251bc15e9d82 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -484,8 +484,8 @@ public:
const bool bLowerBorder = false,
const bool bOnlyTextBackground = false ) const;
void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
- const Color *pColor, const editeng::SvxBorderStyle =
- ::com::sun::star::table::BorderLineStyle::SOLID ) const;
+ const Color *pColor,
+ const editeng::SvxBorderStyle = css::table::BorderLineStyle::SOLID ) const;
drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const;
void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const;
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 784b4284281c..6a6ffbddfe28 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -65,7 +65,7 @@ typedef void (*GoSection)( SwPosition* );
typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
typedef const SwTextAttr* (*GetHint)( const SwpHints&, sal_uInt16&, sal_Int32 );
typedef bool (utl::TextSearch:: *SearchText)( const OUString&, sal_Int32*,
- sal_Int32*, ::com::sun::star::util::SearchResult* );
+ sal_Int32*, css::util::SearchResult* );
typedef void (*MvSection)( SwNodeIndex * );
struct SwMoveFnCollection
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 111e2a3247d9..209a2470402d 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -49,7 +49,7 @@ class SwRetrievedInputStreamDataManager
struct tData
{
std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
+ css::uno::Reference<css::io::XInputStream> mxInputStream;
bool mbIsStreamReadOnly;
tData()
@@ -68,7 +68,7 @@ class SwRetrievedInputStreamDataManager
tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer );
void PushData( const tDataKey nDataKey,
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
+ css::uno::Reference<css::io::XInputStream> xInputStream,
const bool bIsStreamReadOnly );
bool PopData( const tDataKey nDataKey,
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index fc9f2cc52208..b6bda40be546 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -45,7 +45,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer
/** method called to provide the retrieved input stream to the thread Consumer
*/
void ApplyInputStream(
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
+ css::uno::Reference<css::io::XInputStream> xInputStream,
const bool bIsStreamReadOnly );
private:
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index a6b329895918..1bab117fb024 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -24,7 +24,7 @@
/** Testing */
namespace SwThreadJoiner
{
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner();
+ css::uno::Reference< css::util::XJobManager >& GetThreadJoiner();
void ReleaseThreadJoiner();
}
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 67e4dc4441b5..0cab5022dfc8 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -48,7 +48,7 @@ class ThreadManager
{
public:
- explicit ThreadManager( ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& rThreadJoiner );
+ explicit ThreadManager( css::uno::Reference< css::util::XJobManager >& rThreadJoiner );
virtual ~ThreadManager();
std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
@@ -99,7 +99,7 @@ class ThreadManager
{
oslInterlockedCount nThreadID;
::rtl::Reference< ObservableThread > pThread;
- com::sun::star::uno::Reference< com::sun::star::util::XCancellable > aJob;
+ css::uno::Reference< css::util::XCancellable > aJob;
tThreadData()
: nThreadID( 0 ),
@@ -114,7 +114,7 @@ class ThreadManager
osl::Mutex maMutex;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XJobManager > mrThreadJoiner;
+ css::uno::WeakReference< css::util::XJobManager > mrThreadJoiner;
std::shared_ptr< ThreadListener > mpThreadListener;
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index c0235ad5a1fd..bcb30b78a82f 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -84,28 +84,28 @@ public:
~SwTOXInternational();
sal_Int32 Compare( const TextAndReading& rTaR1,
- const ::com::sun::star::lang::Locale& rLocale1,
+ const css::lang::Locale& rLocale1,
const TextAndReading& rTaR2,
- const ::com::sun::star::lang::Locale& rLocale2 ) const;
+ const css::lang::Locale& rLocale2 ) const;
inline bool IsEqual( const TextAndReading& rTaR1,
- const ::com::sun::star::lang::Locale& rLocale1,
+ const css::lang::Locale& rLocale1,
const TextAndReading& rTaR2,
- const ::com::sun::star::lang::Locale& rLocale2 ) const
+ const css::lang::Locale& rLocale2 ) const
{
return 0 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 );
}
inline bool IsLess( const TextAndReading& rTaR1,
- const ::com::sun::star::lang::Locale& rLocale1,
+ const css::lang::Locale& rLocale1,
const TextAndReading& rTaR2,
- const ::com::sun::star::lang::Locale& rLocale2 ) const
+ const css::lang::Locale& rLocale2 ) const
{
return -1 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 );
}
OUString GetIndexKey( const TextAndReading& rTaR,
- const ::com::sun::star::lang::Locale& rLcl ) const;
+ const css::lang::Locale& rLcl ) const;
OUString GetFollowingText( bool bMorePages ) const;
@@ -119,7 +119,7 @@ public:
struct SwTOXSortTabBase
{
std::vector<SwTOXSource> aTOXSources;
- ::com::sun::star::lang::Locale aLocale;
+ css::lang::Locale aLocale;
const SwTextNode* pTOXNd;
const SwTextTOXMark* pTextMark;
const SwTOXInternational* pTOXIntl;
@@ -132,7 +132,7 @@ struct SwTOXSortTabBase
const SwContentNode* pTOXSrc,
const SwTextTOXMark* pTextMark,
const SwTOXInternational* pIntl,
- const ::com::sun::star::lang::Locale* pLocale = NULL );
+ const css::lang::Locale* pLocale = NULL );
virtual ~SwTOXSortTabBase() {}
sal_uInt16 GetType() const { return nType; }
@@ -146,7 +146,7 @@ struct SwTOXSortTabBase
virtual OUString GetURL() const;
inline TextAndReading GetText() const;
- inline const ::com::sun::star::lang::Locale& GetLocale() const;
+ inline const css::lang::Locale& GetLocale() const;
private:
mutable bool bValidText;
@@ -167,7 +167,7 @@ inline TextAndReading SwTOXSortTabBase::GetText() const
return m_aSort;
}
-inline const ::com::sun::star::lang::Locale& SwTOXSortTabBase::GetLocale() const
+inline const css::lang::Locale& SwTOXSortTabBase::GetLocale() const
{
return aLocale;
}
@@ -179,7 +179,7 @@ struct SwTOXIndex : public SwTOXSortTabBase
{
SwTOXIndex( const SwTextNode&, const SwTextTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel,
const SwTOXInternational& rIntl,
- const ::com::sun::star::lang::Locale& rLocale );
+ const css::lang::Locale& rLocale );
virtual ~SwTOXIndex() {}
virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override;
@@ -197,7 +197,7 @@ struct SwTOXCustom : public SwTOXSortTabBase
{
SwTOXCustom( const TextAndReading& rKey, sal_uInt16 nLevel,
const SwTOXInternational& rIntl,
- const ::com::sun::star::lang::Locale& rLocale );
+ const css::lang::Locale& rLocale );
virtual ~SwTOXCustom() {}
virtual sal_uInt16 GetLevel() const override;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 978ba81f944c..286902d638f3 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -204,7 +204,7 @@ protected:
public:
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override;
+ css::uno::Sequence< css::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override;
/**
* This is public, as it needs to be called by some methods in order to save the Prepare
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index 612cacb898a4..01e88465599d 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -38,11 +38,11 @@ class SwDoc;
typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::container::XNamed
-, ::com::sun::star::text::XTextContent
+, css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::container::XNamed
+, css::text::XTextContent
> SwXBookmark_Base;
class SwXBookmark
@@ -57,16 +57,14 @@ private:
protected:
void attachToRangeEx(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xTextRange,
+ const css::uno::Reference< css::text::XTextRange > & xTextRange,
IDocumentMarkAccess::MarkType eType)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException );
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException );
virtual 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);
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
const ::sw::mark::IMark* GetBookmark() const;
@@ -82,116 +80,105 @@ protected:
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent>
+ static css::uno::Reference< css::text::XTextContent>
CreateXBookmark(SwDoc & rDoc, ::sw::mark::IMark * pBookmark);
/// @return IMark for this, but only if it lives in pDoc
static ::sw::mark::IMark const* GetBookmarkInDoc(SwDoc const*const pDoc,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XUnoTunnel> & xUT);
+ const css::uno::Reference<css::lang::XUnoTunnel> & xUT);
// MetadatableMixin
virtual ::sfx2::Metadatable* GetCoreObject() override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel > GetModel() override;
+ virtual css::uno::Reference< css::frame::XModel > GetModel() override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference<
+ css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
};
class SwXFieldmarkParameters
- : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer>
+ : public ::cppu::WeakImplHelper< css::container::XNameContainer>
, private SwClient
{
public:
@@ -201,26 +188,26 @@ class SwXFieldmarkParameters
}
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override;
protected:
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
private:
- ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException);
+ ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (css::uno::RuntimeException);
};
typedef cppu::ImplInheritanceHelper< SwXBookmark,
- ::com::sun::star::text::XFormField > SwXFieldmark_Base;
+ css::text::XFormField > SwXFieldmark_Base;
class SwXFieldmark
: public SwXFieldmark_Base
@@ -237,36 +224,34 @@ protected:
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent>
+ static css::uno::Reference<css::text::XTextContent>
CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark * pMark,
bool isReplacementObject = false);
virtual 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) override;
+ const css::uno::Reference<css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException) override;
virtual OUString SAL_CALL getFieldType()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setFieldType(const OUString& description )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters( )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
-
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
};
class SwXODFCheckboxField : public SwXFieldmark
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index db01ae888c96..46c752fb2208 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
protected:
virtual ~SwHyperlinkEventDescriptor();
public:
@@ -48,8 +48,7 @@ public:
void copyMacrosIntoINetFormat(SwFormatINetFormat& aFormat);
void copyMacrosFromNameReplace(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameReplace> & xReplace);
+ css::uno::Reference<css::container::XNameReplace> & xReplace);
};
// SwEventDescriptor for
@@ -71,7 +70,7 @@ public:
virtual ~SwFrameEventDescriptor();
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
protected:
virtual void setMacroItem(const SvxMacroItem& rItem) override;
@@ -91,7 +90,7 @@ public:
virtual ~SwFrameStyleEventDescriptor();
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
protected:
virtual void setMacroItem(const SvxMacroItem& rItem) override;
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 7669abd6f018..549ab3021c22 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -38,10 +38,10 @@ class SwSetExpField;
class SwTextAPIObject;
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XComponent
+< css::beans::XPropertySet
+, css::lang::XServiceInfo
+, css::lang::XUnoTunnel
+, css::lang::XComponent
> SwXFieldMaster_Base;
class SwXFieldMaster
@@ -61,8 +61,7 @@ private:
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ static css::uno::Reference<css::beans::XPropertySet>
CreateXFieldMaster(SwDoc * pDoc, SwFieldType * pType,
sal_uInt16 nResId = 0xFFFF);
@@ -71,90 +70,83 @@ public:
SwFieldType* GetFieldType(bool bDontCreate = false) const;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
};
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::text::XDependentTextField
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::util::XUpdatable
+< css::text::XDependentTextField
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::lang::XUnoTunnel
+, css::util::XUpdatable
> SwXTextField_Base;
class SwXTextField
@@ -176,119 +168,108 @@ public:
sal_uInt16 GetServiceId() const;
/// @return an SwXTextField, either an already existing one or a new one
- static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField>
+ static css::uno::Reference< css::text::XTextField>
CreateXTextField(SwDoc * pDoc, SwFormatField const* pFormat,
sal_uInt16 nServiceId = 0xFFFF);
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XUpdatable
virtual void SAL_CALL update()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XTextField
virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XDependentTextField
virtual void SAL_CALL attachTextFieldMaster(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & xFieldMaster)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster()
+ throw (css::uno::RuntimeException, std::exception) override;
};
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::container::XEnumeration
-, ::com::sun::star::lang::XServiceInfo
+< css::container::XEnumeration
+, css::lang::XServiceInfo
> SwXFieldEnumeration_Base;
class SwXFieldEnumeration
@@ -306,21 +287,21 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL nextElement()
+ throw (css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index b173d03bc930..b7f6dddf467c 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -58,51 +58,46 @@ public:
virtual ~SwXFlatParagraph();
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// text::XTextMarkup:
virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override;
@@ -110,7 +105,7 @@ public:
virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange,
+ virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange,
const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
// text::XFlatParagraph:
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index d687dbb644b2..4313a3128577 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -36,11 +36,11 @@ class SwModify;
class SwFormatFootnote;
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::container::XEnumerationAccess
-, ::com::sun::star::text::XFootnote
+< css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::container::XEnumerationAccess
+, css::text::XFootnote
> SwXFootnote_Base;
class SwXFootnote
@@ -59,10 +59,8 @@ protected:
virtual const SwStartNode *GetStartNode() const override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor >
- CreateCursor()
- throw (::com::sun::star::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::text::XTextCursor > CreateCursor()
+ throw (css::uno::RuntimeException) override;
virtual ~SwXFootnote();
@@ -76,135 +74,122 @@ public:
bool isEndnote = false);
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& rType)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+ virtual css::uno::Sequence< css::uno::Type >
SAL_CALL getTypes()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType()
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XEnumerationAccess
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XEnumeration > SAL_CALL
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XFootnote
virtual OUString SAL_CALL getLabel()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setLabel(const OUString& rLabel)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XSimpleText
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor > SAL_CALL
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
createTextCursor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
createTextCursorByRange(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xTextPosition)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextPosition)
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index 8d662c25988b..9b9eb4d252ee 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -41,12 +41,12 @@ class SwTOXType;
typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::container::XNamed
-, ::com::sun::star::util::XRefreshable
-, ::com::sun::star::text::XDocumentIndex
+, css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::container::XNamed
+, css::util::XRefreshable
+, css::text::XDocumentIndex
> SwXDocumentIndex_Base;
class SwXDocumentIndex
@@ -70,133 +70,121 @@ private:
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XDocumentIndex>
+ static css::uno::Reference< css::text::XDocumentIndex>
CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection * pSection,
TOXTypes eTypes = TOX_INDEX);
// MetadatableMixin
virtual ::sfx2::Metadatable* GetCoreObject() override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ virtual css::uno::Reference< css::frame::XModel >
GetModel() override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XRefreshable
virtual void SAL_CALL refresh()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addRefreshListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XRefreshListener>& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XRefreshListener>& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeRefreshListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::util::XRefreshListener>& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XRefreshListener>& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XDocumentIndex
virtual OUString SAL_CALL getServiceName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL update()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::text::XDocumentIndexMark
+< css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::text::XDocumentIndexMark
> SwXDocumentIndexMark_Base;
class SwXDocumentIndexMark
@@ -218,102 +206,92 @@ private:
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XDocumentIndexMark>
+ static css::uno::Reference< css::text::XDocumentIndexMark>
CreateXDocumentIndexMark(SwDoc & rDoc,
SwTOXMark * pMark, TOXTypes eType = TOX_INDEX);
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XDocumentIndexMark
virtual OUString SAL_CALL getMarkEntry()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index c80ea70f7e03..2c6f4b2794f4 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -38,7 +38,7 @@
#include <unobaseclass.hxx>
typedef ::std::deque<
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
+ css::uno::Reference< css::text::XTextRange > >
TextRangeList_t;
class SwPaM;
@@ -50,12 +50,12 @@ namespace sw {
typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::container::XChild
-, ::com::sun::star::container::XEnumerationAccess
-, ::com::sun::star::text::XTextContent
-, ::com::sun::star::text::XText
+, css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::container::XChild
+, css::container::XEnumerationAccess
+, css::text::XTextContent
+, css::text::XText
> SwXMeta_Base;
class SwXMeta
@@ -72,171 +72,149 @@ protected:
::sw::UnoImplPtr<Impl> m_pImpl;
void SAL_CALL AttachImpl(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xTextRange,
+ const css::uno::Reference< css::text::XTextRange > & xTextRange,
const sal_uInt16 nWhich)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
virtual ~SwXMeta();
/// @param pDoc and pMeta != 0, but not & because of ImplInheritanceHelper
SwXMeta(SwDoc *const pDoc, ::sw::Meta *const pMeta,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const&
- xParentText,
+ css::uno::Reference< css::text::XText> const& xParentText,
TextRangeList_t const*const pPortions);
SwXMeta(SwDoc *const pDoc);
public:
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable >
+ static css::uno::Reference< css::rdf::XMetadatable >
CreateXMeta(
::sw::Meta & rMeta,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
- const& xParentText = 0,
- ::std::unique_ptr<TextRangeList_t const> && pPortions =
- ::std::unique_ptr<TextRangeList_t const>());
+ css::uno::Reference< css::text::XText> const& xParentText = 0,
+ ::std::unique_ptr<TextRangeList_t const> && pPortions = ::std::unique_ptr<TextRangeList_t const>());
static css::uno::Reference<css::rdf::XMetadatable>
CreateXMeta(SwDoc & rDoc, bool isField);
/// init params with position of the attribute content (w/out CH_TXTATR)
- bool SetContentRange(
- SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- GetParentText() const;
+ bool SetContentRange( SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const;
+ css::uno::Reference< css::text::XText > GetParentText() const;
bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
// MetadatableMixin
virtual ::sfx2::Metadatable * GetCoreObject() override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ virtual css::uno::Reference< css::frame::XModel >
GetModel() override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& Identifier )
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XChild
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface > SAL_CALL
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
getParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setParent(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface> const& xParent)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::NoSupportException, std::exception) override;
+ css::uno::Reference< css::uno::XInterface> const& xParent)
+ throw (css::uno::RuntimeException,
+ css::lang::NoSupportException, std::exception) override;
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType()
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XEnumerationAccess
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XEnumeration > SAL_CALL
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getStart()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getEnd()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XText >
+ SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::text::XTextRange > SAL_CALL getStart()
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<
+ css::text::XTextRange > SAL_CALL getEnd()
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getString()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setString(const OUString& rString)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XSimpleText
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor > SAL_CALL
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
createTextCursor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
createTextCursorByRange(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xTextPosition)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextPosition)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL insertString(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xRange,
+ const css::uno::Reference< css::text::XTextRange > & xRange,
const OUString& aString, sal_Bool bAbsorb)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL insertControlCharacter(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xRange,
+ const css::uno::Reference< css::text::XTextRange > & xRange,
sal_Int16 nControlCharacter, sal_Bool bAbsorb)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
// XText
virtual void SAL_CALL insertTextContent(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & xRange,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > & xContent,
+ const css::uno::Reference< css::text::XTextRange > & xRange,
+ const css::uno::Reference< css::text::XTextContent > & xContent,
sal_Bool bAbsorb)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeTextContent(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > & xContent)
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextContent > & xContent)
+ throw (css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) override;
};
typedef ::cppu::ImplInheritanceHelper
< SwXMeta
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::text::XTextField
+, css::beans::XPropertySet
+, css::text::XTextField
> SwXMetaField_Base;
class SwXMetaField
@@ -247,16 +225,13 @@ private:
virtual ~SwXMetaField();
- friend ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable >
+ friend css::uno::Reference< css::rdf::XMetadatable >
SwXMeta::CreateXMeta(::sw::Meta &,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
- const&,
+ css::uno::Reference< css::text::XText> const&,
::std::unique_ptr<TextRangeList_t const> && pPortions);
SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const&
- xParentText,
+ css::uno::Reference< css::text::XText> const& xParentText,
TextRangeList_t const*const pPortions);
friend css::uno::Reference<css::rdf::XMetadatable>
@@ -268,95 +243,84 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& ServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL
getPropertyValue(const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// 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, std::exception ) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw ( css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XTextField
virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
/// get prefix/suffix from the RDF repository. @throws RuntimeException
void getPrefixAndSuffix(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel>& xModel,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable>& xMetaField,
+ const css::uno::Reference< css::frame::XModel>& xModel,
+ const css::uno::Reference< css::rdf::XMetadatable>& xMetaField,
OUString *const o_pPrefix, OUString *const o_pSuffix);
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index ac180a65433e..cb8e364f87c6 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -49,7 +49,7 @@ class SwRangeRedline;
class SwTextRuby;
typedef ::std::deque<
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
+ css::uno::Reference< css::text::XTextRange > >
TextRangeList_t;
enum SwTextPortionType
@@ -79,14 +79,14 @@ enum SwTextPortionType
class SwXTextPortion : public cppu::WeakImplHelper
<
- ::com::sun::star::beans::XTolerantMultiPropertySet,
- ::com::sun::star::beans::XMultiPropertySet,
- ::com::sun::star::beans::XPropertySet,
- ::com::sun::star::text::XTextRange,
- ::com::sun::star::beans::XPropertyState,
- ::com::sun::star::container::XContentEnumerationAccess,
- ::com::sun::star::lang::XUnoTunnel,
- ::com::sun::star::lang::XServiceInfo
+ css::beans::XTolerantMultiPropertySet,
+ css::beans::XMultiPropertySet,
+ css::beans::XPropertySet,
+ css::text::XTextRange,
+ css::beans::XPropertyState,
+ css::container::XContentEnumerationAccess,
+ css::lang::XUnoTunnel,
+ css::lang::XServiceInfo
>,
public SwClient
{
@@ -96,24 +96,24 @@ private:
::sw::UnoImplPtr<Impl> m_pImpl;
const SfxItemPropertySet * m_pPropSet;
- const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+ const css::uno::Reference< css::text::XText >
m_xParentText;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+ css::uno::Reference< css::text::XTextContent >
m_xRefMark;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+ css::uno::Reference< css::text::XTextContent >
m_xTOXMark;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+ css::uno::Reference< css::text::XTextContent >
m_xBookmark;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote >
+ css::uno::Reference< css::text::XFootnote >
m_xFootnote;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField >
+ css::uno::Reference< css::text::XTextField >
m_xTextField;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+ css::uno::Reference< css::text::XTextContent >
m_xMeta;
- ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyText;
- ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyStyle;
- ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyAdjust;
- ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyIsAbove;
+ ::std::unique_ptr< css::uno::Any > m_pRubyText;
+ ::std::unique_ptr< css::uno::Any > m_pRubyStyle;
+ ::std::unique_ptr< css::uno::Any > m_pRubyAdjust;
+ ::std::unique_ptr< css::uno::Any > m_pRubyIsAbove;
sw::UnoCursorPointer m_pUnoCursor;
const SwDepend m_FrameDepend;
@@ -127,14 +127,14 @@ private:
protected:
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);
-
- void GetPropertyValue( ::com::sun::star::uno::Any &rVal,
+ const css::uno::Sequence< OUString >& aPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& aValues )
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl(
+ const css::uno::Sequence< OUString >& aPropertyNames )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+ void GetPropertyValue( css::uno::Any &rVal,
const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet );
css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl(
@@ -147,85 +147,78 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
- SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType );
- SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwFrameFormat& rFormat );
+ SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwTextPortionType eType );
+ SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwFrameFormat& rFormat );
// for Ruby
SwXTextPortion(const SwUnoCrsr* pPortionCrsr,
SwTextRuby const& rAttr,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- const& xParent,
+ css::uno::Reference< css::text::XText > const& xParent,
bool bIsEnd );
//XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getString() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
//XTolerantMultiPropertySet
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
//XMultiPropertySet
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
//XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
//XUnoTunnel
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
//XContentEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
- void SetRefMark( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > xMark)
+ void SetRefMark( css::uno::Reference< css::text::XTextContent > xMark)
{ m_xRefMark = xMark; }
- void SetTOXMark( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > xMark)
+ void SetTOXMark( css::uno::Reference< css::text::XTextContent > xMark)
{ m_xTOXMark = xMark; }
- void SetBookmark( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > xMark)
+ void SetBookmark( css::uno::Reference< css::text::XTextContent > xMark)
{ m_xBookmark = xMark; }
- void SetFootnote( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XFootnote > xNote)
+ void SetFootnote( css::uno::Reference< css::text::XFootnote > xNote)
{ m_xFootnote = xNote; }
- void SetTextField( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextField> xField)
+ void SetTextField( css::uno::Reference< css::text::XTextField> xField)
{ m_xTextField = xField; }
- void SetMeta( ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent > xMeta)
+ void SetMeta( css::uno::Reference< css::text::XTextContent > xMeta)
{ m_xMeta = xMeta; }
void SetCollapsed(bool bSet) { m_bIsCollapsed = bSet;}
@@ -238,9 +231,9 @@ public:
class SwXTextPortionEnumeration
: public ::cppu::WeakImplHelper
- < ::com::sun::star::container::XEnumeration
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::lang::XUnoTunnel
+ < css::container::XEnumeration
+ , css::lang::XServiceInfo
+ , css::lang::XUnoTunnel
>
{
TextRangeList_t m_Portions; // contains all portions, filled by ctor
@@ -254,36 +247,35 @@ protected:
public:
SwXTextPortionEnumeration(SwPaM& rParaCrsr,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- const & xParent,
+ css::uno::Reference< css::text::XText > const & xParent,
const sal_Int32 nStart, const sal_Int32 nEnd );
SwXTextPortionEnumeration(SwPaM& rParaCrsr,
TextRangeList_t const & rPortions );
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& aIdentifier )
+ throw(css::uno::RuntimeException, std::exception) override;
//XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
- throw( ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL nextElement()
+ throw( css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
class SwXRedlinePortion : public SwXTextPortion
@@ -291,7 +283,7 @@ class SwXRedlinePortion : public SwXTextPortion
private:
SwRangeRedline const& m_rRedline;
- void Validate() throw (::com::sun::star::uno::RuntimeException);
+ void Validate() throw (css::uno::RuntimeException);
using SwXTextPortion::GetPropertyValue;
@@ -301,25 +293,23 @@ public:
SwXRedlinePortion(
SwRangeRedline const& rRedline,
SwUnoCrsr const* pPortionCrsr,
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- const& xParent,
+ css::uno::Reference< css::text::XText > const& xParent,
bool const bIsStart);
- static ::com::sun::star::uno::Any GetPropertyValue(
+ static css::uno::Any GetPropertyValue(
OUString const& PropertyName, SwRangeRedline const& rRedline) throw();
- static ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > CreateRedlineProperties(
+ static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties(
SwRangeRedline const& rRedline, bool const bIsStart) throw();
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index cac6f29d3dae..724a6644f3c6 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -35,11 +35,11 @@ class SwModify;
class SwFormatRefMark;
typedef ::cppu::WeakImplHelper
-< ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::container::XNamed
-, ::com::sun::star::text::XTextContent
+< css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::container::XNamed
+, css::text::XTextContent
> SwXReferenceMark_Base;
class SwXReferenceMark
@@ -60,97 +60,88 @@ public:
static css::uno::Reference<css::text::XTextContent>
CreateXReferenceMark(SwDoc & rDoc, SwFormatRefMark * pMarkFormat);
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index 31fa12473e0e..0c6ee44fb8c7 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -41,13 +41,13 @@ struct SwTextSectionProperties_Impl;
typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::beans::XPropertyState
-, ::com::sun::star::beans::XMultiPropertySet
-, ::com::sun::star::container::XNamed
-, ::com::sun::star::text::XTextSection
+, css::lang::XUnoTunnel
+, css::lang::XServiceInfo
+, css::beans::XPropertySet
+, css::beans::XPropertyState
+, css::beans::XMultiPropertySet
+, css::container::XNamed
+, css::text::XTextSection
> SwXTextSection_Base;
class SwXTextSection
@@ -67,172 +67,149 @@ public:
SwSectionFormat* GetFormat() const;
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextSection >
+ static css::uno::Reference< css::text::XTextSection >
CreateXTextSection(SwSectionFormat *const pFormat = 0,
const bool bIndexHeader = false);
// MetadatableMixin
virtual ::sfx2::Metadatable* GetCoreObject() override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ virtual css::uno::Reference< css::frame::XModel >
GetModel() override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething(
- const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int8 >& rIdentifier)
+ throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL dispose()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XEventListener > & xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::lang::XEventListener > & xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Any& rValue)
- 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, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+ const css::uno::Any& rValue)
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString& rPropertyName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertyChangeListener >& xListener)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener(
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, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL
+ virtual css::beans::PropertyState SAL_CALL
getPropertyState(const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyState > SAL_CALL
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
getPropertyStates(
- const ::com::sun::star::uno::Sequence<
- OUString >& rPropertyNames)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& rPropertyNames)
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyToDefault(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault(
const OUString& rPropertyName)
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XMultiPropertySet
virtual void SAL_CALL setPropertyValues(
- const ::com::sun::star::uno::Sequence< OUString >&
- rPropertyNames,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any >& rValues)
- throw (::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+ const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& rValues)
+ throw (css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any >
SAL_CALL getPropertyValues(
- const ::com::sun::star::uno::Sequence< OUString >&
- rPropertyNames)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& rPropertyNames)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertiesChangeListener(
- const ::com::sun::star::uno::Sequence< OUString >&
- rPropertyNames,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertiesChangeListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL firePropertiesChangeEvent(
- const ::com::sun::star::uno::Sequence< OUString >&
- rPropertyNames,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
// XNamed
virtual OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setName(const OUString& rName)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// 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, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::text::XTextRange > & xTextRange)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
+ throw (css::uno::RuntimeException, std::exception) override;
// XTextSection
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextSection > SAL_CALL
+ virtual css::uno::Reference< css::text::XTextSection > SAL_CALL
getParentSection()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextSection > > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::text::XTextSection > > SAL_CALL
getChildSections()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 55ecb9036f55..2f94f8d13ebe 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -45,8 +45,8 @@ class SfxPoolItem;
*/
class SwXTextMarkup
: public ::cppu::WeakImplHelper
- < ::com::sun::star::text::XTextMarkup
- , ::com::sun::star::text::XMultiTextMarkup
+ < css::text::XTextMarkup
+ , css::text::XMultiTextMarkup
>
{
public:
@@ -54,17 +54,17 @@ public:
const ModelToViewHelper& rConversionMap);
virtual ~SwXTextMarkup();
- // ::com::sun::star::text::XTextMarkup:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::text::XTextMarkup:
+ virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange,
+ const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::text::XMultiTextMarkup:
- virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::text::XMultiTextMarkup:
+ virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
private:
SwXTextMarkup( const SwXTextMarkup & ) = delete;
@@ -79,22 +79,22 @@ protected:
const ModelToViewHelper& GetConversionMap();
};
-/** Implementation of the ::com::sun::star::container::XStringKeyMap interface
+/** Implementation of the css::container::XStringKeyMap interface
*/
class SwXStringKeyMap:
public ::cppu::WeakImplHelper<
- ::com::sun::star::container::XStringKeyMap>
+ css::container::XStringKeyMap>
{
public:
SwXStringKeyMap();
- // ::com::sun::star::container::XStringKeyMap:
- virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) override;
- virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override;
+ // css::container::XStringKeyMap:
+ virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
private:
SwXStringKeyMap(SwXStringKeyMap &) = delete;
@@ -102,7 +102,7 @@ private:
virtual ~SwXStringKeyMap() {}
- std::map< OUString, ::com::sun::star::uno::Any > maMap;
+ std::map< OUString, css::uno::Any > maMap;
};
#endif
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index bd33e0f9850c..3aefb95c6abc 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -54,7 +54,7 @@ class SwWrongArea
{
public:
OUString maType;
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxPropertyBag;
+ css::uno::Reference< css::container::XStringKeyMap > mxPropertyBag;
sal_Int32 mnPos;
sal_Int32 mnLen;
SwWrongList* mpSubList;
@@ -64,12 +64,12 @@ public:
SwWrongArea( const OUString& rType,
WrongListType listType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen);
SwWrongArea( const OUString& rType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen,
SwWrongList* pSubList);
@@ -77,15 +77,15 @@ private:
SwWrongArea() : mnPos(0), mnLen(0), mpSubList(NULL), mColor(0,0,0), mLineType(WRONGAREA_WAVE) {}
- static Color getSmartColor ( com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag)
+ static Color getSmartColor ( css::uno::Reference< css::container::XStringKeyMap > xPropertyBag)
{
try
{
if (xPropertyBag.is())
{
const OUString colorKey("LineColor");
- com::sun::star::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< com::sun::star::uno::Any>();
- com::sun::star::util::Color lineColor = 0;
+ css::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< css::uno::Any>();
+ css::util::Color lineColor = 0;
if (aLineColor >>= lineColor)
{
@@ -93,44 +93,44 @@ private:
}
}
}
- catch(const ::com::sun::star::container::NoSuchElementException&)
+ catch(const css::container::NoSuchElementException&)
{
}
- catch(const ::com::sun::star::uno::RuntimeException&)
+ catch(const css::uno::RuntimeException&)
{
}
return SwViewOption::GetSmarttagColor( );
}
- static WrongAreaLineType getSmartLineType( com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag )
+ static WrongAreaLineType getSmartLineType( css::uno::Reference< css::container::XStringKeyMap > xPropertyBag )
{
try
{
if (xPropertyBag.is())
{
const OUString typeKey("LineType");
- com::sun::star::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< com::sun::star::uno::Any>();
+ css::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< css::uno::Any>();
::sal_Int16 lineType = 0;
if (!(aLineType >>= lineType))
{
return WRONGAREA_DASHED;
}
- if (::com::sun::star::awt::FontUnderline::WAVE == lineType)
+ if (css::awt::FontUnderline::WAVE == lineType)
{
return WRONGAREA_WAVE;
}
- if (::com::sun::star::awt::FontUnderline::SMALLWAVE == lineType)
+ if (css::awt::FontUnderline::SMALLWAVE == lineType)
{
return WRONGAREA_WAVE; //Code draws wave height based on space that fits.
}
}
}
- catch(const ::com::sun::star::container::NoSuchElementException&)
+ catch(const css::container::NoSuchElementException&)
{
}
- catch(const ::com::sun::star::uno::RuntimeException&)
+ catch(const css::uno::RuntimeException&)
{
}
@@ -138,7 +138,7 @@ private:
}
static Color getWrongAreaColor(WrongListType listType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag )
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag )
{
if (WRONGLIST_SPELL == listType)
{
@@ -157,7 +157,7 @@ private:
}
static WrongAreaLineType getWrongAreaLineType(WrongListType listType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag )
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag )
{
if (WRONGLIST_SPELL == listType)
{
@@ -241,7 +241,7 @@ public:
inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); }
inline void Insert( const OUString& rType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere )
{
std::vector<SwWrongArea>::iterator i = maList.begin();
@@ -254,7 +254,7 @@ public:
}
void Insert( const OUString& rType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nNewPos, sal_Int32 nNewLen );
inline SwWrongList* SubList( sal_uInt16 nIdx ) const
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 244dac889d09..fe315d3bf7a8 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -163,9 +163,9 @@ namespace sw
} // Namespace sw
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_LayoutDump_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_LayoutDump_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new sw::LayoutDumpFilter());
}
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 205f01a763cd..989ec2f29257 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1953,7 +1953,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob )
bAllValid = false;
if ( aRepaint.HasArea() )
pImp->GetShell()->InvalidateWindows( aRepaint );
- } catch( const ::com::sun::star::uno::RuntimeException& e) {
+ } catch( const css::uno::RuntimeException& e) {
// #i122885# handle smarttag problems gracefully and provide diagnostics
SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message);
}
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 96b513e320f4..679f43e9e4bb 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -152,7 +152,7 @@ public:
virtual void Closed() override;
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+ const OUString& rMimeType, const css::uno::Any & rValue ) override;
bool Connect() { return GetRealObject() != NULL; }
};
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index da59db9f6b88..4a4b99e58078 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1540,7 +1540,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
// set the document locale
- com::sun::star::lang::Locale aDocLocale( LanguageTag( SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() );
+ css::lang::Locale aDocLocale( LanguageTag( SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() );
pPDFExtOutDevData->SetDocumentLocale( aDocLocale );
// Prepare the output device:
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index a767b3c40d51..3312d9a16bed 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -490,10 +490,10 @@ void SwTextFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
Shrink( -nChgHght );
}
-com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::GetTabStopInfo( SwTwips CurrentPos )
+css::uno::Sequence< css::style::TabStop > SwTextFrm::GetTabStopInfo( SwTwips CurrentPos )
{
- com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1);
- ::com::sun::star::style::TabStop ts;
+ css::uno::Sequence< css::style::TabStop > tabs(1);
+ css::style::TabStop ts;
SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this );
SwTextFormatter aLine( this, &aInf );
@@ -508,7 +508,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::Get
if( !pTS )
{
- return com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >();
+ return css::uno::Sequence< css::style::TabStop >();
}
// copy tab stop information into a Sequence, which only contains one element.
@@ -517,11 +517,11 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::Get
ts.FillChar = pTS->GetFill();
switch( pTS->GetAdjustment() )
{
- case SVX_TAB_ADJUST_LEFT : ts.Alignment = ::com::sun::star::style::TabAlign_LEFT; break;
- case SVX_TAB_ADJUST_CENTER : ts.Alignment = ::com::sun::star::style::TabAlign_CENTER; break;
- case SVX_TAB_ADJUST_RIGHT : ts.Alignment = ::com::sun::star::style::TabAlign_RIGHT; break;
- case SVX_TAB_ADJUST_DECIMAL: ts.Alignment = ::com::sun::star::style::TabAlign_DECIMAL; break;
- case SVX_TAB_ADJUST_DEFAULT: ts.Alignment = ::com::sun::star::style::TabAlign_DEFAULT; break;
+ case SVX_TAB_ADJUST_LEFT : ts.Alignment = css::style::TabAlign_LEFT; break;
+ case SVX_TAB_ADJUST_CENTER : ts.Alignment = css::style::TabAlign_CENTER; break;
+ case SVX_TAB_ADJUST_RIGHT : ts.Alignment = css::style::TabAlign_RIGHT; break;
+ case SVX_TAB_ADJUST_DECIMAL: ts.Alignment = css::style::TabAlign_DECIMAL; break;
+ case SVX_TAB_ADJUST_DEFAULT: ts.Alignment = css::style::TabAlign_DEFAULT; break;
default: break; // prevent warning
}
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 267c7c468636..1ee872ecc5fb 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -28,7 +28,7 @@ class SwTextFormatInfo;
class SwTextGuess
{
- ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord;
+ css::uno::Reference< css::linguistic2::XHyphenatedWord > xHyphWord;
SwHangingPortion *pHanging; // for hanging punctuation
sal_Int32 nCutPos; // this character doesn't fit
sal_Int32 nBreakStart; // start index of word containing line break
@@ -54,7 +54,7 @@ public:
inline sal_Int32 BreakStart() const { return nBreakStart; }
inline sal_Int32 BreakPos() const {return nBreakPos; }
inline sal_Int32 FieldDiff() const {return nFieldDiff; }
- inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > HyphWord() const
+ inline css::uno::Reference< css::linguistic2::XHyphenatedWord > HyphWord() const
{ return xHyphWord; }
};
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 7637c42473c0..1eec0f6f5c8c 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -486,7 +486,7 @@ public:
class SwTextFormatInfo : public SwTextPaintInfo
{
// temporary arguments for hyphenation
- com::sun::star::beans::PropertyValues m_aHyphVals;
+ css::beans::PropertyValues m_aHyphVals;
SwLineLayout *m_pRoot; // The Root of the current line (pCurr)
SwLinePortion *m_pLast; // The last Portion
@@ -663,11 +663,9 @@ public:
inline void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; }
// Calls HyphenateWord() of Hyphenator
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenatedWord >
+ css::uno::Reference< css::linguistic2::XHyphenatedWord >
HyphWord( const OUString &rText, const sal_Int32 nMinTrail );
- const com::sun::star::beans::PropertyValues &
- GetHyphValues() const;
+ const css::beans::PropertyValues & GetHyphValues() const;
bool CheckFootnotePortion( SwLineLayout* pCurr )
{ return IsFootnoteInside() && _CheckFootnotePortion( pCurr ); }
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index c5952abf2b65..cb25bfa36f96 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -819,7 +819,7 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL )
const short nScriptType = ScriptTypeDetector::getCTLScriptType( rText, nSearchStt );
sal_Int32 nNextCTLScriptStart = nSearchStt;
short nCurrentScriptType = nScriptType;
- while( com::sun::star::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType )
+ while( css::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType )
{
nNextCTLScriptStart = ScriptTypeDetector::endOfCTLScriptType( rText, nNextCTLScriptStart );
if( nNextCTLScriptStart >= rText.getLength() || nNextCTLScriptStart >= nChg )
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index cde5b7e2e874..b0a9ffe25b6a 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -23,7 +23,7 @@
#include <osl/diagnose.h>
SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen)
: maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen), mpSubList(0)
@@ -33,7 +33,7 @@ SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
}
SwWrongArea::SwWrongArea( const OUString& rType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen,
SwWrongList* pSubList)
@@ -629,7 +629,7 @@ bool SwWrongList::LookForEntry( sal_Int32 nBegin, sal_Int32 nEnd ) {
}
void SwWrongList::Insert( const OUString& rType,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
+ css::uno::Reference< css::container::XStringKeyMap > xPropertyBag,
sal_Int32 nNewPos, sal_Int32 nNewLen )
{
std::vector<SwWrongArea>::iterator aIter = maList.begin();
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index ddb94bd6f449..a0b93093f701 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -155,8 +155,7 @@ void SwTOXMark::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew)
NotifyClients(pOld, pNew);
if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
{ // invalidate cached uno object
- SetXTOXMark(::com::sun::star::uno::Reference<
- ::com::sun::star::text::XDocumentIndexMark>(0));
+ SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark>(0));
}
}
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 9bb56ead2954..6aaa7f673661 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -44,7 +44,7 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper()
OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rText,
const OUString& rTextReading,
- const ::com::sun::star::lang::Locale& rLocale ) const
+ const css::lang::Locale& rLocale ) const
{
OUString sRet;
try {
@@ -70,8 +70,7 @@ OUString IndexEntrySupplierWrapper::GetFollowingText( bool bMorePages ) const
return sRet;
}
-::com::sun::star::uno::Sequence< OUString >
-IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const
+css::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( const css::lang::Locale& rLcl ) const
{
uno::Sequence< OUString > sRet;
@@ -86,7 +85,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
}
bool IndexEntrySupplierWrapper::LoadAlgorithm(
- const ::com::sun::star::lang::Locale& rLcl,
+ const css::lang::Locale& rLcl,
const OUString& sSortAlgorithm, long nOptions ) const
{
bool bRet = false;
@@ -102,9 +101,9 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm(
sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
const OUString& rText1, const OUString& rTextReading1,
- const ::com::sun::star::lang::Locale& rLocale1,
+ const css::lang::Locale& rLocale1,
const OUString& rText2, const OUString& rTextReading2,
- const ::com::sun::star::lang::Locale& rLocale2 ) const
+ const css::lang::Locale& rLocale2 ) const
{
sal_Int16 nRet = 0;
try {
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 26d212917b68..d3b4528b4f02 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -714,8 +714,7 @@ bool Meta::IsInContent() const
return pTextNode == nullptr || pTextNode->IsInContent();
}
-::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable >
-Meta::MakeUnoObject()
+css::uno::Reference< css::rdf::XMetadatable > Meta::MakeUnoObject()
{
return SwXMeta::CreateXMeta(*this);
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 633e638633b2..8cda73e9cdec 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3592,8 +3592,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa
if (pOldValue && (RES_REMOVE_UNO_OBJECT == pOldValue->Which()))
{ // invalidate cached uno object
- SetXParagraph(::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent>(0));
+ SetXParagraph(css::uno::Reference<css::text::XTextContent>(0));
}
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index c858d7a7bb2e..5a60a8de4c86 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1462,7 +1462,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos
if ( nBegin < nEnd )
{
const LanguageType aCurrLang = pNode->GetLang( nBegin );
- const com::sun::star::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang );
+ const css::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang );
nBegin = g_pBreakIt->GetBreakIter()->beginOfSentence( rText, nBegin, aCurrLocale );
nEnd = g_pBreakIt->GetBreakIter()->endOfSentence(rText, nEnd, aCurrLocale);
if (nEnd > rText.getLength() || nEnd < 0)
@@ -1495,11 +1495,11 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos
uno::Reference<text::XTextMarkup> const xTextMarkup =
new SwXTextMarkup(pNode, aConversionMap);
- com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController();
+ css::uno::Reference< css::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController();
SwPosition start(*pNode, nBegin);
SwPosition end (*pNode, nEnd);
- Reference< ::com::sun::star::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end);
+ Reference< css::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end);
rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController);
@@ -1512,7 +1512,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos
do
{
const LanguageType nLang = aIter.GetLanguage();
- const com::sun::star::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang );
+ const css::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang );
nLangEnd = std::min<sal_Int32>( nEnd, aIter.GetChgPos() );
const sal_Int32 nExpandBegin = aConversionMap.ConvertToViewPosition( nLangBegin );
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index b4a8a4fd9488..1a7e50bcdd09 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -47,14 +47,14 @@ using namespace com::sun::star;
namespace SWUnoHelper
{
-sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal )
+sal_Int32 GetEnumAsInt32( const css::uno::Any& rVal )
{
sal_Int32 eVal;
try
{
eVal = comphelper::getEnumAsINT32( rVal );
}
- catch( ::com::sun::star::uno::Exception & )
+ catch( css::uno::Exception & )
{
eVal = 0;
OSL_FAIL( "can't get EnumAsInt32" );
@@ -69,13 +69,12 @@ bool UCB_DeleteFile( const OUString& rURL )
try
{
ucbhelper::Content aTempContent( rURL,
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+ css::uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aTempContent.executeCommand("delete",
- ::com::sun::star::uno::makeAny( true ) );
+ aTempContent.executeCommand("delete", css::uno::makeAny( true ) );
bRemoved = true;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
bRemoved = false;
OSL_FAIL( "Exeception from executeCommand( delete )" );
@@ -94,19 +93,19 @@ bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, bool bCopyIsMo
const OUString sMainURL( aURL.GetMainURL(INetURLObject::NO_DECODE) );
ucbhelper::Content aTempContent( sMainURL,
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+ css::uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- ::com::sun::star::uno::Any aAny;
- ::com::sun::star::ucb::TransferInfo aInfo;
- aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR;
+ css::uno::Any aAny;
+ css::ucb::TransferInfo aInfo;
+ aInfo.NameClash = css::ucb::NameClash::ERROR;
aInfo.NewTitle = sName;
aInfo.SourceURL = rURL;
aInfo.MoveData = bCopyIsMove;
aAny <<= aInfo;
aTempContent.executeCommand( "transfer", aAny );
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL( "Exeception from executeCommand( transfer )" );
bCopyCompleted = false;
@@ -121,20 +120,20 @@ bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
{
INetURLObject aTempObj( rURL );
aTempObj.SetBase( aTempObj.GetBase().toAsciiLowerCase() );
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef1 = new
+ css::uno::Reference< css::ucb::XContentIdentifier > xRef1 = new
ucbhelper::ContentIdentifier( aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
aTempObj.SetBase(aTempObj.GetBase().toAsciiUpperCase());
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef2 = new
+ css::uno::Reference< css::ucb::XContentIdentifier > xRef2 = new
ucbhelper::ContentIdentifier( aTempObj.GetMainURL( INetURLObject::NO_DECODE ));
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XUniversalContentBroker > xUcb =
- com::sun::star::ucb::UniversalContentBroker::create(comphelper::getProcessComponentContext());
+ css::uno::Reference< css::ucb::XUniversalContentBroker > xUcb =
+ css::ucb::UniversalContentBroker::create(comphelper::getProcessComponentContext());
sal_Int32 nCompare = xUcb->compareContentIds( xRef1, xRef2 );
bCaseSensitive = 0 != nCompare;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
bCaseSensitive = false;
OSL_FAIL( "Exeception from compareContentIds()" );
@@ -147,12 +146,12 @@ bool UCB_IsReadOnlyFileName( const OUString& rURL )
bool bIsReadOnly = false;
try
{
- ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue("IsReadOnly");
+ ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ css::uno::Any aAny = aCnt.getPropertyValue("IsReadOnly");
if(aAny.hasValue())
bIsReadOnly = *static_cast<sal_Bool const *>(aAny.getValue());
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
bIsReadOnly = false;
}
@@ -164,10 +163,10 @@ bool UCB_IsFile( const OUString& rURL )
bool bExists = false;
try
{
- ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ ::ucbhelper::Content aContent( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
bExists = aContent.isDocument();
}
- catch (::com::sun::star::uno::Exception &)
+ catch (css::uno::Exception &)
{
}
return bExists;
@@ -178,10 +177,10 @@ bool UCB_IsDirectory( const OUString& rURL )
bool bExists = false;
try
{
- ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ ::ucbhelper::Content aContent( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
bExists = aContent.isFolder();
}
- catch (::com::sun::star::uno::Exception &)
+ catch (css::uno::Exception &)
{
}
return bExists;
@@ -200,11 +199,11 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
bool bOk = false;
try
{
- ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
+ ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ css::uno::Reference< css::sdbc::XResultSet > xResultSet;
const sal_Int32 nSeqSize = pDateTimeList ? 2 : 1;
- ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize );
+ css::uno::Sequence < OUString > aProps( nSeqSize );
OUString* pProps = aProps.getArray();
pProps[ 0 ] = "Title";
if( pDateTimeList )
@@ -214,14 +213,14 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
{
xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL( "create cursor failed!" );
}
if( xResultSet.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::sdbc::XRow > xRow( xResultSet, css::uno::UNO_QUERY );
const sal_Int32 nExtLen = pExtension ? pExtension->getLength() : 0;
try
{
@@ -237,7 +236,7 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
if( pDateTimeList )
{
- ::com::sun::star::util::DateTime aStamp = xRow->getTimestamp(2);
+ css::util::DateTime aStamp = xRow->getTimestamp(2);
::DateTime* pDateTime = new ::DateTime(
::Date( aStamp.Day,
aStamp.Month,
@@ -254,13 +253,13 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
}
bOk = true;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL( "Exception caught!" );
}
}
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( css::uno::Exception& )
{
OSL_FAIL( "Exception caught!" );
bOk = false;
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 9fc0b2eb132f..5c264916331f 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -182,17 +182,17 @@ public:
SwVbaProjectNameProvider()
{
}
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override
{
return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
}
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
return uno::makeAny( mTemplateToProject.find( aName )->second );
}
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override
{
uno::Sequence< OUString > aElements( mTemplateToProject.size() );
StringHashMap::iterator it_end = mTemplateToProject.end();
@@ -202,7 +202,7 @@ public:
return aElements;
}
- virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) override
+ virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception ) override
{
OUString sProjectName;
@@ -212,24 +212,24 @@ public:
mTemplateToProject[ aName ] = sProjectName;
}
- virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override
{
if ( !hasByName( Name ) )
throw container::NoSuchElementException();
mTemplateToProject.erase( Name );
}
- virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override
+ virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
insertByName( aName, aElement ); // insert will overwrite
}
// XElemenAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override
{
return ::cppu::UnoType<OUString>::get();
}
- virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override
+ virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override
{
return ( !mTemplateToProject.empty() );
@@ -246,7 +246,7 @@ public:
// #FIXME #TODO is the code name for ThisDocument read anywhere?
}
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override
{
// #FIXME #TODO we really need to be checking against the codename for
// ThisDocument
@@ -255,7 +255,7 @@ public:
return sal_False;
}
- ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override
+ css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
{
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
@@ -267,14 +267,14 @@ public:
"Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get());
return uno::makeAny( xDocObj );
}
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override
{
uno::Sequence< OUString > aNames;
return aNames;
}
// XElemenAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return uno::Type(); }
- virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return sal_True; }
+ virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); }
+ virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return sal_True; }
};
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 7e351a7f591f..1062514a90de 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -376,7 +376,7 @@ namespace
: public SwSimpleEnumeration_Base
{
private:
- typedef ::std::list< ::com::sun::star::uno::Any > shapescontainer_t;
+ typedef ::std::list< css::uno::Any > shapescontainer_t;
shapescontainer_t m_aShapes;
protected:
virtual ~SwXShapesEnumeration() {};
@@ -2688,8 +2688,8 @@ void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition )
Writer specific position, which is the attribute position in layout direction
#i59051#
*/
-::com::sun::star::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir(
- const ::com::sun::star::awt::Point& aStartOrEndPos )
+css::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir(
+ const css::awt::Point& aStartOrEndPos )
{
awt::Point aConvertedPos( aStartOrEndPos );
@@ -2726,8 +2726,8 @@ void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition )
return aConvertedPos;
}
-::com::sun::star::drawing::PolyPolygonBezierCoords SwXShape::_ConvertPolyPolygonBezierToLayoutDir(
- const ::com::sun::star::drawing::PolyPolygonBezierCoords& aPath )
+css::drawing::PolyPolygonBezierCoords SwXShape::_ConvertPolyPolygonBezierToLayoutDir(
+ const css::drawing::PolyPolygonBezierCoords& aPath )
{
drawing::PolyPolygonBezierCoords aConvertedPath( aPath );
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index de13f04cca58..a3ba68e2e36f 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2263,8 +2263,8 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
break;
case PROPERTY_MAP_INDEX_OBJECTS:
{
- uno::Sequence<com::sun::star::beans::PropertyValue> aValues(1);
- com::sun::star::beans::PropertyValue propertyVal;
+ uno::Sequence<css::beans::PropertyValue> aValues(1);
+ css::beans::PropertyValue propertyVal;
rValue >>= aValues;
propertyVal = aValues[0];
m_pImpl->m_sCitaitonText = lcl_AnyToString(propertyVal.Value);
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 8ad2a9507112..cd7b2d7f63d5 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -497,16 +497,16 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
{ return OUString("SwXParagraphEnumeration"); }
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
{ return cppu::supportsService(this, rServiceName); };
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
{ return {"com.sun.star.text.ParagraphEnumeration"}; };
// XEnumeration
- virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
SwUnoCrsr& GetCursor()
{ return *m_pCrsr; }
@@ -1476,24 +1476,24 @@ struct SwXTextRangesImpl final : public SwXTextRanges
{
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
{ return OUString("SwXTextRanges"); };
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
{ return cppu::supportsService(this, rServiceName); };
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
{ return { "com.sun.star.text.TextRanges" }; };
// XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
{ return cppu::UnoType<text::XTextRange>::get(); };
- virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override
{ return getCount() > 0; };
// XIndexAccess
- virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
explicit SwXTextRangesImpl(SwPaM *const pPaM)
{
@@ -1600,16 +1600,16 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration
{
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
{ return OUString("SwXParaFrameEnumeration"); };
- virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
{ return cppu::supportsService(this, rServiceName); };
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
{ return {"com.sun.star.util.ContentEnumeration"}; };
// XEnumeration
- virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat = nullptr);
virtual void SAL_CALL release() throw () override
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index d424ebf43ae6..ea989c0c92da 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2309,9 +2309,9 @@ bool SwViewShell::IsNewLayout() const
return GetLayout()->IsNewLayout();
}
-uno::Reference< ::com::sun::star::accessibility::XAccessible > SwViewShell::CreateAccessible()
+uno::Reference< css::accessibility::XAccessible > SwViewShell::CreateAccessible()
{
- uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc;
+ uno::Reference< css::accessibility::XAccessible > xAcc;
// We require a layout and an XModel to be accessible.
OSL_ENSURE( mpLayout, "no layout, no access" );
@@ -2323,8 +2323,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > SwViewShell::Crea
return xAcc;
}
-uno::Reference< ::com::sun::star::accessibility::XAccessible >
-SwViewShell::CreateAccessiblePreview()
+uno::Reference< css::accessibility::XAccessible > SwViewShell::CreateAccessiblePreview()
{
OSL_ENSURE( IsPreview(),
"Can't create accessible preview for non-preview SwViewShell" );
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index ae2693af88a4..9db885407650 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -58,7 +58,7 @@
#include <rtl/bootstrap.hxx>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
using namespace com::sun::star;
SwRead ReadAscii = 0, ReadHTML = 0, ReadXML = 0;
@@ -267,7 +267,7 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
}
void SwFilterOptions::ImplCommit() {}
-void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwFilterOptions::Notify( const css::uno::Sequence< OUString >& ) {}
void StgReader::SetFltName( const OUString& rFltNm )
{
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 8421dedac9a2..6b9819ef7a2b 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -87,7 +87,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFormatNm,
return 0;
}
-bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter)
+bool SwIoSystem::IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter)
{
bool bRet = false;
try
@@ -97,7 +97,7 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
if ( bRet )
bRet = ( nStgFormatId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFormatId ) );
}
- catch (const com::sun::star::uno::Exception& )
+ catch (const css::uno::Exception& )
{
}
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 303d8e1e22d3..2305a92aac0b 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -46,8 +46,8 @@
#include "swhtml.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
+using namespace css::uno;
+using namespace css::container;
static HTMLOutEvent aBodyEventTable[] =
{
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index f9c5ded4e078..984dcc94604b 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -77,9 +77,9 @@
#include "htmlform.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::form;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::form;
const sal_uInt16 TABINDEX_MIN = 0;
const sal_uInt16 TABINDEX_MAX = 32767;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 4f18d04b6c38..613b94e75537 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -772,8 +772,8 @@ private:
SfxItemSet& rCSS1ItemSet,
SvxCSS1PropertyInfo& rCSS1PropInfo,
bool bHidden=false );
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > InsertControl( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & rFormComp,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rFCompPropSet,
+ css::uno::Reference< css::drawing::XShape > InsertControl( const css::uno::Reference< css::form::XFormComponent > & rFormComp,
+ const css::uno::Reference< css::beans::XPropertySet > & rFCompPropSet,
const Size& rSize,
sal_Int16 eVertOri,
sal_Int16 eHoriOri,
@@ -784,7 +784,7 @@ private:
const std::vector<OUString>& rUnoMacroParamTable,
bool bSetPropSet = true,
bool bHidden = false );
- void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
+ void SetControlSize( const css::uno::Reference< css::drawing::XShape > & rShape, const Size& rTextSz,
bool bMinWidth, bool bMinHeight );
public:
@@ -899,8 +899,8 @@ public:
// for reading asynchronously from SvStream
virtual void Continue( int nToken ) override;
- virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties>&,
+ virtual bool ParseMetaOptions( const css::uno::Reference<
+ css::document::XDocumentProperties>&,
SvKeyValueIterator* ) override;
};
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index fe4e5e9de740..990f2d47e10c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -138,7 +138,7 @@ using namespace nsSwDocInfoSubType;
using namespace nsFieldFlags;
using namespace sw::util;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::drawing;
+using namespace css::drawing;
static const sal_Int32 Tag_StartParagraph_1 = 1;
static const sal_Int32 Tag_StartParagraph_2 = 2;
@@ -304,7 +304,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
if (const SfxPoolItem* pItem = pSet->GetItem(RES_PARATR_GRABBAG))
{
const SfxGrabBagItem& rParaGrabBag = static_cast<const SfxGrabBagItem&>(*pItem);
- const std::map<OUString, com::sun::star::uno::Any>& rMap = rParaGrabBag.GetGrabBag();
+ const std::map<OUString, css::uno::Any>& rMap = rParaGrabBag.GetGrabBag();
bEndParaSdt = m_bStartedParaSdt && rMap.find("ParaSdtEndBefore") != rMap.end();
}
}
@@ -3240,7 +3240,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
FSEND );
// Look for the table style property in the table grab bag
- std::map<OUString, com::sun::star::uno::Any> aGrabBag =
+ std::map<OUString, css::uno::Any> aGrabBag =
pTableFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)->GetGrabBag();
// We should clear the TableStyle map. In case of Table inside multiple tables it contains the
@@ -3249,7 +3249,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
m_aTableStyleConf.clear();
// Extract properties from grab bag
- std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement;
+ std::map<OUString, css::uno::Any>::iterator aGrabBagElement;
for( aGrabBagElement = aGrabBag.begin(); aGrabBagElement != aGrabBag.end(); ++aGrabBagElement )
{
if( aGrabBagElement->first == "TableStyleName")
@@ -3467,11 +3467,11 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_
Color aColor = pColorProp ? pColorProp->GetColor() : COL_AUTO;
OString sColor = msfilter::util::ConvertColor( aColor );
- std::map<OUString, com::sun::star::uno::Any> aGrabBag =
+ std::map<OUString, css::uno::Any> aGrabBag =
pFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)->GetGrabBag();
OString sOriginalColor;
- std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement = aGrabBag.find("originalColor");
+ std::map<OUString, css::uno::Any>::iterator aGrabBagElement = aGrabBag.find("originalColor");
if( aGrabBagElement != aGrabBag.end() )
sOriginalColor = OUStringToOString( aGrabBagElement->second.get<OUString>(), RTL_TEXTENCODING_UTF8 );
@@ -4108,7 +4108,7 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj )
xPropSet->getPropertyValue("GraphicURL") >>= sUrl;
Size aOriginalSize( GraphicObject::CreateGraphicObjectFromURL( sUrl ).GetPrefSize() );
- ::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+ css::text::GraphicCrop aGraphicCropStruct;
xPropSet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropStruct;
const MapMode aMap100mm( MAP_100TH_MM );
@@ -5885,7 +5885,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, FontFam
osl::File file( fontUrl );
if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None )
return;
- uno::Reference< com::sun::star::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream(
+ uno::Reference< css::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream(
"word/fonts/font" + OUString::number(m_nextFontId) + ".odttf",
"application/vnd.openxmlformats-officedocument.obfuscatedFont" );
// Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway,
@@ -8069,8 +8069,8 @@ void DocxAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDi
void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
{
- const std::map<OUString, com::sun::star::uno::Any>& rMap = rItem.GetGrabBag();
- for (std::map<OUString, com::sun::star::uno::Any>::const_iterator i = rMap.begin(); i != rMap.end(); ++i)
+ const std::map<OUString, css::uno::Any>& rMap = rItem.GetGrabBag();
+ for (std::map<OUString, css::uno::Any>::const_iterator i = rMap.begin(); i != rMap.end(); ++i)
{
if (i->first == "MirrorIndents")
m_pSerializer->singleElementNS(XML_w, XML_mirrorIndents, FSEND);
@@ -8264,7 +8264,7 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
{
- const std::map< OUString, com::sun::star::uno::Any >& rMap = rItem.GetGrabBag();
+ const std::map< OUString, css::uno::Any >& rMap = rItem.GetGrabBag();
// get original values of theme-derived properties to check if they have changed during the edition
bool bWriteCSTheme = true;
@@ -8272,7 +8272,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
bool bWriteEastAsiaTheme = true;
bool bWriteThemeFontColor = true;
OUString sOriginalValue;
- for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
+ for ( std::map< OUString, css::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
{
if ( m_pFontsAttrList.is() && i->first == "CharThemeFontNameCs" )
{
@@ -8302,7 +8302,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
// save theme attributes back to the run properties
OUString str;
- for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
+ for ( std::map< OUString, css::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
{
if ( i->first == "CharThemeNameAscii" && bWriteAsciiTheme )
{
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 8ce9c1857078..3643a6569ada 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -162,19 +162,19 @@ public:
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems) override;
+ css::uno::Sequence<OUString> &rListItems) override;
virtual void DoFormText(const SwInputField * pField) override;
virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
/// Returns the relationd id
- OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer );
+ OString OutputChart( css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer );
OString WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType, const OUString& sFileExtension );
static bool lcl_CopyStream( css::uno::Reference< css::io::XInputStream> xIn, css::uno::Reference< css::io::XOutputStream > xOut );
/// Writes the shape using drawingML syntax.
- void OutputDML( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
+ void OutputDML( css::uno::Reference< css::drawing::XShape >& xShape );
void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp);
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 425d2461a93a..b5ed18d3bbd9 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -30,7 +30,7 @@
class DocxExportFilter : public oox::core::XmlFilterBase
{
public:
- explicit DocxExportFilter( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
+ explicit DocxExportFilter( const css::uno::Reference< css::uno::XComponentContext >& xContext );
// FIXME these should not even exist for the export-only filter!
// For now, let's just do empty implementations of those.
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 88c08beb789a..4e5fa49eb662 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -102,7 +102,7 @@ protected:
EscherPropertyContainer& rPropOpt);
void WriteOLEPicture(EscherPropertyContainer &rPropOpt,
sal_uInt32 nShapeFlags, const Graphic &rGraphic, const SdrObject &rObj,
- sal_uInt32 nShapeId, const com::sun::star::awt::Rectangle* pVisArea );
+ sal_uInt32 nShapeId, const css::awt::Rectangle* pVisArea );
static void WriteGrfAttr(const SwNoTextNode& rNd,EscherPropertyContainer& rPropOpt);
sal_Int32 DrawModelToEmu(sal_Int32 nVal) const
@@ -157,8 +157,8 @@ private:
EscherPropertyContainer& rPropOpt) override;
virtual sal_uInt32 QueryTextID(
- const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &,sal_uInt32) override;
+ const css::uno::Reference<
+ css::drawing::XShape > &,sal_uInt32) override;
virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId,
EscherPropertyContainer &rPropOpt) override;
public:
@@ -169,8 +169,8 @@ public:
virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override;
- EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
+ EscherExHostAppData* StartShape(const css::uno::Reference<
+ css::drawing::XShape > &, const Rectangle*) override {return &aHostData;}
private:
SwEscherEx(const SwEscherEx&) = delete;
SwEscherEx &operator=(const SwEscherEx&) = delete;
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 7186b924be36..d537e2d084de 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -334,11 +334,11 @@ namespace sw
OSL_ENSURE( !mrPers.GetEmbeddedObjectContainer().HasEmbeddedObject( mxIPRef ), "Object in adaptor is inserted?!" );
try
{
- uno::Reference < com::sun::star::util::XCloseable > xClose( mxIPRef, uno::UNO_QUERY );
+ uno::Reference < css::util::XCloseable > xClose( mxIPRef, uno::UNO_QUERY );
if ( xClose.is() )
xClose->close(sal_True);
}
- catch ( const com::sun::star::util::CloseVetoException& )
+ catch ( const css::util::CloseVetoException& )
{
}
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 0f5f52879f34..0d115bb90451 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -809,7 +809,7 @@ namespace sw
class DrawingOLEAdaptor
{
private:
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef;
+ css::uno::Reference < css::embed::XEmbeddedObject > mxIPRef;
SfxObjectShell& mrPers;
const Graphic* mpGraphic;
public:
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index f9d3fc94146f..d468e39f4556 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -533,7 +533,7 @@ namespace sw
}
}
- using namespace ::com::sun::star::i18n;
+ using namespace css::i18n;
sal_uInt16 nScript = i18n::ScriptType::LATIN;
if (!rText.isEmpty() && g_pBreakIt && g_pBreakIt->GetBreakIter().is())
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index c0558940a2b4..a9da2b338571 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -108,10 +108,10 @@ using namespace com::sun::star;
using namespace sw::util;
using namespace sw::types;
using namespace nsFieldFlags;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::beans::XPropertySet;
-using ::com::sun::star::drawing::XShape;
+using css::uno::Reference;
+using css::uno::UNO_QUERY;
+using css::beans::XPropertySet;
+using css::drawing::XShape;
bool SwBasicEscherEx::IsRelUrl()
{
@@ -3162,14 +3162,14 @@ SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox
// in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in
// filter/source/msocximex.cxx, so.. we need an implementation here
bool SwMSConvertControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
- com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef,
+ css::uno::Reference< css::drawing::XShape > *pShapeRef,
bool bFloatingCtrl )
{
uno::Reference< form::XFormComponent > xFComp;
bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp );
if ( bRes && xFComp.is() )
{
- com::sun::star::awt::Size aSz; // not used in import
+ css::awt::Size aSz; // not used in import
bRes = InsertControl( xFComp, aSz,pShapeRef,bFloatingCtrl);
}
return bRes;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d948f8c51d77..d059403f9cef 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -100,7 +100,7 @@
#include <cstdio>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::i18n;
+using namespace css::i18n;
using namespace sw::util;
using namespace sw::types;
using namespace sw::mark;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index e05c50e9b676..aaadd8e08c0d 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -120,7 +120,7 @@ class WW8_WrPc;
namespace com { namespace sun { namespace star { namespace embed {
class XEmbeddedObject;
} } } }
-typedef std::map<const com::sun::star::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
+typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
struct WW8_PdAttrDesc;
class SvxBrushItem;
@@ -765,7 +765,7 @@ public:
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems) = 0;
+ css::uno::Sequence<OUString> &rListItems) = 0;
virtual void DoFormText(const SwInputField * pField) = 0;
@@ -992,8 +992,8 @@ private:
void RestoreMacroCmds();
- void DoComboBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet);
- void DoCheckBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet);
+ void DoComboBox(css::uno::Reference<css::beans::XPropertySet> xPropSet);
+ void DoCheckBox(css::uno::Reference<css::beans::XPropertySet> xPropSet);
public:
@@ -1113,7 +1113,7 @@ public:
const OUString &rHelp,
const OUString &ToolTip,
const OUString &rSelected,
- com::sun::star::uno::Sequence<OUString> &rListItems) override;
+ css::uno::Sequence<OUString> &rListItems) override;
virtual void DoFormText(const SwInputField * pField) override;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a7b7f9f57909..22249f1c17ea 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -766,7 +766,7 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b
ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
aSet.Put( aLR );
OutputItemSet( aSet, bPapFormat, bChpFormat,
- com::sun::star::i18n::ScriptType::LATIN, m_bExportModeRTF);
+ css::i18n::ScriptType::LATIN, m_bExportModeRTF);
bCallOutSet = false;
}
}
@@ -5173,7 +5173,7 @@ void AttributeOutputBase::CharBackgroundBase( const SvxBrushItem& rBrush )
// Check shading marker
{
const SfxGrabBagItem& aGrabBag = static_cast< const SfxGrabBagItem& >( GetExport().GetItem( RES_CHRATR_GRABBAG ) );
- const std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ const std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fbf205375768..0886debc7155 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -579,7 +579,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
{
tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName );
OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!");
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
+ css::uno::Reference< css::drawing::XShape > xShape;
if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) &&
rReader.m_pFormImpl->ReadOCXStream(xSrc,&xShape,true))
{
@@ -995,7 +995,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
fExtraTextRotation /= 100.0;
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
const OUString sTextRotateAngle( "TextRotateAngle" );
- com::sun::star::beans::PropertyValue aPropVal;
+ css::beans::PropertyValue aPropVal;
aPropVal.Name = sTextRotateAngle;
aPropVal.Value <<= fExtraTextRotation;
aGeometryItem.SetPropertyValue( aPropVal );
@@ -2755,7 +2755,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCharSetFromLanguage()
*/
const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_LANGUAGE));
LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM;
- ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
+ css::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
return msfilter::util::getBestTextEncodingFromLocale(aLocale);
}
@@ -2773,7 +2773,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCJKCharSetFromLanguage()
*/
const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_CJK_LANGUAGE));
LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM;
- ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
+ css::lang::Locale aLocale(LanguageTag::convertToLocale(eLang));
return msfilter::util::getBestTextEncodingFromLocale(aLocale);
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 6c6b3613368e..8406e64d6a75 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -687,11 +687,11 @@ public:
std::vector<OUString> maListEntries;
virtual ~WW8FormulaControl() {}
void FormulaRead(SwWw8ControlType nWhich,SvStream *pD);
- virtual bool Import(const com::sun::star::uno::Reference <
- com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
- com::sun::star::uno::Reference <
- com::sun::star::form::XFormComponent> &rFComp,
- com::sun::star::awt::Size &rSz) = 0;
+ virtual bool Import(const css::uno::Reference <
+ css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference <
+ css::form::XFormComponent> &rFComp,
+ css::awt::Size &rSz) = 0;
OUString msName;
};
@@ -704,11 +704,11 @@ private:
public:
explicit WW8FormulaCheckBox(SwWW8ImplReader &rR);
- virtual bool Import(const com::sun::star::uno::Reference <
- com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
- com::sun::star::uno::Reference <
- com::sun::star::form::XFormComponent> &rFComp,
- com::sun::star::awt::Size &rSz) override;
+ virtual bool Import(const css::uno::Reference <
+ css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference <
+ css::form::XFormComponent> &rFComp,
+ css::awt::Size &rSz) override;
};
class WW8FormulaListBox : public WW8FormulaControl
@@ -720,11 +720,11 @@ private:
public:
explicit WW8FormulaListBox(SwWW8ImplReader &rR);
- virtual bool Import(const com::sun::star::uno::Reference <
- com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
- com::sun::star::uno::Reference <
- com::sun::star::form::XFormComponent> &rFComp,
- com::sun::star::awt::Size &rSz) override;
+ virtual bool Import(const css::uno::Reference <
+ css::lang::XMultiServiceFactory> &rServiceFactory,
+ css::uno::Reference <
+ css::form::XFormComponent> &rFComp,
+ css::awt::Size &rSz) override;
};
class WW8FormulaEditBox : public WW8FormulaControl
@@ -735,11 +735,11 @@ private:
public:
explicit WW8FormulaEditBox(SwWW8ImplReader &rR);
//no real implementation, return false
- virtual bool Import(const com::sun::star::uno::Reference <
- com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */,
- com::sun::star::uno::Reference <
- com::sun::star::form::XFormComponent> & /* rFComp */,
- com::sun::star::awt::Size & /* rSz */) override { return false; }
+ virtual bool Import(const css::uno::Reference <
+ css::lang::XMultiServiceFactory> & /* rServiceFactory */,
+ css::uno::Reference <
+ css::form::XFormComponent> & /* rFComp */,
+ css::awt::Size & /* rSz */) override { return false; }
};
class SwMSConvertControls: public oox::ole::MSConvertOCXControls
@@ -747,15 +747,15 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls
public:
SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
bool InsertFormula( WW8FormulaControl &rFormula);
- virtual bool InsertControl(const com::sun::star::uno::Reference<
- com::sun::star::form::XFormComponent >& rFComp,
- const ::com::sun::star::awt::Size& rSize,
- com::sun::star::uno::Reference <
- com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) override;
+ virtual bool InsertControl(const css::uno::Reference<
+ css::form::XFormComponent >& rFComp,
+ const css::awt::Size& rSize,
+ css::uno::Reference <
+ css::drawing::XShape > *pShape, bool bFloatingCtrl) override;
bool ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj);
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
- com::sun::star::uno::Reference<
- com::sun::star::drawing::XShape > *pShapeRef=0,
+ css::uno::Reference<
+ css::drawing::XShape > *pShapeRef=0,
bool bFloatingCtrl=false );
private:
sal_uInt32 GenerateObjectID() { return ++mnObjectId; }
@@ -771,7 +771,7 @@ private:
std::map<sal_uInt32,OString> aOldEscherBlipCache;
virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
- tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const override;
+ tools::SvRef<SotStorage>& rSrcStorage, css::uno::Reference < css::embed::XStorage >& rDestStorage ) const override;
virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const override;
// #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object
@@ -1692,7 +1692,7 @@ private:
// #i84783#
// determine object attribute "Layout in Table Cell"
bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const;
- bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
+ bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const css::uno::Reference< css::container::XNameContainer >& xPrjNameMap );
SwWW8ImplReader(const SwWW8ImplReader &) = delete;
SwWW8ImplReader& operator=(const SwWW8ImplReader&) = delete;
public: // really private, but can only be done public
@@ -1852,8 +1852,8 @@ public: // really private, but can only be done public
eF_ResT Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr);
eF_ResT Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr );
eF_ResT Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr);
- com::sun::star::awt::Size MiserableDropDownFormHack(const OUString &rString,
- com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>&
+ css::awt::Size MiserableDropDownFormHack(const OUString &rString,
+ css::uno::Reference<css::beans::XPropertySet>&
rPropSet);
eF_ResT Read_F_Macro( WW8FieldDesc*, OUString& rStr);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 85b2fc614cdd..958f50680d6f 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3851,8 +3851,8 @@ void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, shor
// Add a marker to the grabbag indicating that character background was imported from MSO shading
SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG)));
- std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
- rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true)));
+ std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true)));
NewAttr(aGrabBag);
}
}
@@ -3873,8 +3873,8 @@ void SwWW8ImplReader::Read_TextBackColor(sal_uInt16, const sal_uInt8* pData, sho
// Add a marker to the grabbag indicating that character background was imported from MSO shading
SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG)));
- std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
- rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true)));
+ std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true)));
NewAttr(aGrabBag);
}
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 8f9cc49fbbc5..1ed3dab3924f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -49,7 +49,7 @@
#include <stdio.h>
#endif
-using namespace ::com::sun::star::lang;
+using namespace css::lang;
//-begin
namespace SL
@@ -6103,7 +6103,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, sal_uInt16 nLidLocale)
value was the nLocale. If value is < 999, then it is the nLocale,
otherwise it is the lid.
*/
- ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(nLidLocale));
+ css::lang::Locale aLocale(LanguageTag::convertToLocale(nLidLocale));
return msfilter::util::getBestTextEncodingFromLocale(aLocale);
}
return rtl_getTextEncodingFromWindowsCharset(static_cast<sal_uInt8>(chs));
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 099d0c6e8318..ad6855c2b27f 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -33,17 +33,17 @@
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
using namespace ::xmloff::token;
-using ::com::sun::star::frame::XModel;
-using ::com::sun::star::text::XTextCursor;
-using ::com::sun::star::text::XTextRange;
-using ::com::sun::star::text::XText;
-using ::com::sun::star::text::XWordCursor;
-using ::com::sun::star::lang::XUnoTunnel;
-using ::com::sun::star::beans::XPropertySet;
-using ::com::sun::star::beans::XPropertySetInfo;
+using css::frame::XModel;
+using css::text::XTextCursor;
+using css::text::XTextRange;
+using css::text::XText;
+using css::text::XWordCursor;
+using css::lang::XUnoTunnel;
+using css::beans::XPropertySet;
+using css::beans::XPropertySetInfo;
// collision with tools/DateTime: use UNO DateTime as util::DateTime
// using util::DateTime;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 277de4699579..40c1e612600f 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -54,13 +54,13 @@ class XMLRedlineImportHelper
bool bIgnoreRedlines;
// save information for saving and reconstruction of the redline mode
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> xModelPropertySet;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> xImportInfoPropertySet;
+ css::uno::Reference<
+ css::beans::XPropertySet> xModelPropertySet;
+ css::uno::Reference<
+ css::beans::XPropertySet> xImportInfoPropertySet;
bool bShowChanges;
bool bRecordChanges;
- ::com::sun::star::uno::Sequence<sal_Int8> aProtectionKey;
+ css::uno::Sequence<sal_Int8> aProtectionKey;
public:
@@ -69,10 +69,10 @@ public:
// property sets of model + import info for saving + restoring the
// redline mode
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> & rModel,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> & rImportInfoSet );
+ const css::uno::Reference<
+ css::beans::XPropertySet> & rModel,
+ const css::uno::Reference<
+ css::beans::XPropertySet> & rImportInfoSet );
virtual ~XMLRedlineImportHelper();
// create a redline object
@@ -83,15 +83,15 @@ public:
const OUString& rId, // use to identify this redline
const OUString& rAuthor, // name of the author
const OUString& rComment, // redline comment
- const ::com::sun::star::util::DateTime& rDateTime, // date+time
+ const css::util::DateTime& rDateTime, // date+time
bool bMergeLastParagraph); // merge last paragraph?
// create a text section for the redline, and return an
// XText/XTextCursor that may be used to write into it.
- ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor> CreateRedlineTextSection(
- ::com::sun::star::uno::Reference< // needed to get the document
- ::com::sun::star::text::XTextCursor> xOldCursor,
+ css::uno::Reference<
+ css::text::XTextCursor> CreateRedlineTextSection(
+ css::uno::Reference< // needed to get the document
+ css::text::XTextCursor> xOldCursor,
const OUString& rId); // ID used to RedlineAdd() call
// Set start or end position for a redline in the text body.
@@ -99,8 +99,8 @@ public:
void SetCursor(
const OUString& rId, // ID used in RedlineAdd() call
bool bStart, // start or end Range
- ::com::sun::star::uno::Reference< // the actual XTextRange
- ::com::sun::star::text::XTextRange> & rRange,
+ css::uno::Reference< // the actual XTextRange
+ css::text::XTextRange> & rRange,
// text range is (from an XML view) outside of a paragraph
// (i.e. before a table)
bool bIsOusideOfParagraph);
@@ -117,8 +117,8 @@ public:
const OUString& rId, // ID used in RedlineAdd() call
bool bStart,
// XTextRange _inside_ a table/section
- ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange> & rRange);
+ css::uno::Reference<
+ css::text::XTextRange> & rRange);
// set redline mode: show changes
void SetShowChanges( bool bShowChanges );
@@ -128,7 +128,7 @@ public:
// set redline protection key
void SetProtectionKey(
- const ::com::sun::star::uno::Sequence<sal_Int8> & rKey );
+ const css::uno::Sequence<sal_Int8> & rKey );
private:
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index b32c7317bff5..bccfbdd5fbb8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -77,11 +77,11 @@
#include <sfx2/DocumentMetadataAccess.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::container;
+using namespace css::document;
+using namespace css::lang;
static void lcl_EnsureValidPam( SwPaM& rPam )
{
@@ -616,7 +616,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
- ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+ css::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet(
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 853942a17f0a..bddc90b9974b 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -54,11 +54,11 @@
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::document;
+using namespace css::beans;
+using namespace css::lang;
SwXMLWriter::SwXMLWriter( const OUString& rBaseURL )
{
@@ -151,7 +151,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("TargetStorage"),0, cppu::UnoType<embed::XStorage>::get(),
- ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+ css::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet(
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index eedd9d83ff76..6e6c56b51c89 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
class SwXMLWriter : public StgWriter
{
- sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& );
+ sal_uInt32 _Write( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& );
using StgWriter::Write;
@@ -60,34 +60,34 @@ private:
// write a single XML stream into the package
bool WriteThroughComponent(
// the component we export
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent> & xComponent,
+ const css::uno::Reference<
+ css::lang::XComponent> & xComponent,
const sal_Char* pStreamName, // the stream name
// service factory for pServiceName
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext> & rFactory,
+ const css::uno::Reference<
+ css::uno::XComponentContext> & rFactory,
const sal_Char* pServiceName, // service name of the component
// the argument (XInitialization)
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any> & rArguments,
+ const css::uno::Sequence<
+ css::uno::Any> & rArguments,
// output descriptor
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue> & rMediaDesc );
+ const css::uno::Sequence<
+ css::beans::PropertyValue> & rMediaDesc );
// write a single output stream
// (to be called either directly or by WriteThroughComponent(...))
static bool WriteThroughComponent(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XOutputStream> & xOutputStream,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent> & xComponent,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext> & rFactory,
+ const css::uno::Reference<
+ css::io::XOutputStream> & xOutputStream,
+ const css::uno::Reference<
+ css::lang::XComponent> & xComponent,
+ const css::uno::Reference<
+ css::uno::XComponentContext> & rFactory,
const sal_Char* pServiceName,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any> & rArguments,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue> & rMediaDesc );
+ const css::uno::Sequence<
+ css::uno::Any> & rArguments,
+ const css::uno::Sequence<
+ css::beans::PropertyValue> & rMediaDesc );
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 4e07c24a1fe2..8f9abcfe18fd 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -38,7 +38,7 @@
#include "xmlexpit.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
using namespace ::xmloff::token;
enum SvXMLTokenMapAttrs
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index 3edbb4fe07e6..6b2ab2ea0147 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star {
class SwXMLBrushItemImportContext : public SvXMLImportContext
{
private:
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream;
+ css::uno::Reference < css::io::XOutputStream > xBase64Stream;
SvxBrushItem *pItem;
void ProcessAttrs(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv );
public:
@@ -50,8 +50,8 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
const SvxBrushItem& rItem );
@@ -59,8 +59,8 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
const SvXMLUnitConverter& rUnitConv,
sal_uInt16 nWhich );
@@ -68,8 +68,8 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override;
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 0c7ffd555b4c..2d0b37057ca5 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -69,17 +69,17 @@
#include <pausethreadstarting.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::xforms;
+using namespace css::frame;
+using namespace css::lang;
+using namespace css::xml::sax;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::container;
+using namespace css::document;
+using namespace css::drawing;
+using namespace css::beans;
+using namespace css::i18n;
+using namespace css::xforms;
using namespace ::xmloff::token;
SwXMLExport::SwXMLExport(
@@ -542,85 +542,85 @@ const SwDoc* SwXMLExport::getDoc() const
return const_cast< SwXMLExport* >( this )->getDoc();
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLExporter"),
SvXMLExportFlags::ALL));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLStylesExporter"),
SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES |
SvXMLExportFlags::FONTDECLS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLContentExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLContentExporter"),
SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES |
SvXMLExportFlags::FONTDECLS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLMetaExporter"),
SvXMLExportFlags::META));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLSettingsExporter"),
SvXMLExportFlags::SETTINGS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisExporter"),
SvXMLExportFlags::ALL | SvXMLExportFlags::OASIS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesExporter"),
SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES |
SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentExporter"),
SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS |
SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaExporter"),
SvXMLExportFlags::META | SvXMLExportFlags::OASIS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsExporter"),
SvXMLExportFlags::SETTINGS | SvXMLExportFlags::OASIS));
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 165aa1e55f87..c7450aefce4f 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -94,8 +94,8 @@ class SwXMLExport : public SvXMLExport
virtual void _ExportMasterStyles() override;
virtual void SetBodyAttributes() override;
virtual void _ExportContent() override;
- virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
- virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
+ virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override;
// string constants for table cell export
@@ -116,7 +116,7 @@ protected:
public:
SwXMLExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlags);
virtual ~SwXMLExport();
@@ -135,8 +135,8 @@ public:
bool IsBlockMode() const { return bBlock; }
// XUnoTunnel
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index b5df169bdfef..978d22990847 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -39,11 +39,11 @@
#include "xmlexp.hxx"
#include <SwStyleNameMapper.hxx>
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::lang;
+using namespace css::beans;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::drawing;
+using namespace css::lang;
using namespace ::xmloff::token;
void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFamily )
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index a59ae3a3aa15..228a0fffadf0 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -27,9 +27,9 @@
#include <xmlimp.hxx>
#include <IDocumentSettingAccess.hxx>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::text;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::text;
class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
{
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 3307cd560004..7677cf684de0 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -76,14 +76,14 @@
#include <unordered_set>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::xforms;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::container;
+using namespace css::i18n;
+using namespace css::drawing;
+using namespace css::xforms;
using namespace ::xmloff::token;
using namespace ::std;
@@ -1564,18 +1564,18 @@ const SwDoc* SwXMLImport::getDoc() const
return const_cast< SwXMLImport* >( this )->getDoc();
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisImporter"),
SvXMLImportFlags::ALL));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesImporter"),
SvXMLImportFlags::STYLES | SvXMLImportFlags::MASTERSTYLES | SvXMLImportFlags::AUTOSTYLES |
@@ -1583,27 +1583,27 @@ com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(::com::sun::s
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentImporter"),
SvXMLImportFlags::CONTENT | SvXMLImportFlags::SCRIPTS | SvXMLImportFlags::AUTOSTYLES |
SvXMLImportFlags::FONTDECLS));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaImporter"),
SvXMLImportFlags::META));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(::com::sun::star::uno::XComponentContext* context,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::XComponentContext* context,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"),
SvXMLImportFlags::SETTINGS));
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 1309e1f3fc46..62d9773f181a 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -64,7 +64,7 @@ class SwXMLImport: public SvXMLImport
SvXMLItemMapEntriesRef xTableRowItemMap;
SvXMLItemMapEntriesRef xTableCellItemMap;
tools::SvRef<SotStorage> xPackage;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+ css::uno::Reference< css::container::XNameContainer >
xLateInitSettings;
sal_uInt16 nStyleFamilyMask;// Mask of styles to load
@@ -86,8 +86,8 @@ class SwXMLImport: public SvXMLImport
void UpdateTextCollConditions( SwDoc *pDoc );
void setTextInsertMode(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & rInsertPos );
+ const css::uno::Reference<
+ css::text::XTextRange > & rInsertPos );
void setStyleInsertMode( sal_uInt16 nFamilies,
bool bOverwrite );
void setBlockMode();
@@ -99,8 +99,8 @@ protected:
// before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList ) override;
virtual XMLTextImportHelper* CreateTextImport() override;
@@ -108,25 +108,25 @@ protected:
public:
SwXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags);
virtual ~SwXMLImport() throw();
- // ::com::sun::star::xml::sax::XDocumentHandler
+ // css::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument()
- throw (::com::sun::star::xml::sax::SAXException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::xml::sax::SAXException,
+ css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL endDocument()
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
// XUnoTunnel
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
void InsertStyles( bool bAuto );
void FinishStyles();
@@ -139,17 +139,17 @@ public:
SvXMLImportContext *CreateScriptContext( const OUString& rLocalName );
SvXMLImportContext *CreateStylesContext(
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
bool bAuto );
SvXMLImportContext *CreateMasterStylesContext(
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateFontDeclsContext(
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName );
sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
bool IsInsertMode() const { return bInsert; }
@@ -162,8 +162,8 @@ public:
inline SvXMLImportItemMapper& GetTableItemMapper();
SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nSubFamily, SfxItemSet& rItemSet );
const SvXMLTokenMap& GetDocElemTokenMap();
@@ -176,18 +176,18 @@ public:
OUString *pParent=0 ) const;
virtual void SetStatistics(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override;
- virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
- virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override;
+ const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override;
+ virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
+ virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override;
virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) override;
+ const css::uno::Sequence<css::beans::PropertyValue>& _rSettings) override;
// initialize XForms
virtual void initXForms() override;
// get the document properties, but only if they actually need importing
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties>
+ css::uno::Reference<
+ css::document::XDocumentProperties>
GetDocumentProperties() const;
virtual void NotifyEmbeddedFontRead() override;
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index d93026aa1867..0a959a757e83 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -44,7 +44,7 @@ public:
/** fills the given itemset with the attributes in the given list */
void importXML( SfxItemSet& rSet,
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList,
+ css::uno::Reference< css::xml::sax::XAttributeList > xAttrList,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap );
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 8984fe6184e6..b927d0427235 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -41,7 +41,7 @@ public:
SvXMLItemSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
SvXMLImportItemMapper& rIMap,
const SvXMLUnitConverter& rUnitConv );
@@ -50,14 +50,14 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
// SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT_ITEM_IMPORT
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
const SvXMLUnitConverter& rUnitConv );
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 2b28b352f7df..2183c9673352 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -42,7 +42,7 @@
#include <comphelper/processfactory.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
using namespace ::xmloff::token;
extern SvXMLItemMapEntry aXMLTableItemMap[];
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index ddecdccc0c35..0c4789a32d24 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -50,7 +50,7 @@
#include "xmlitem.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
extern SvXMLItemMapEntry aXMLTableItemMap[];
extern SvXMLItemMapEntry aXMLTableColItemMap[];
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 9a201702688f..b81a84f654c2 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -35,9 +35,9 @@
#include "xmlexp.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::text;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::text;
using namespace ::xmloff::token;
uno::Reference<document::XDocumentProperties>
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 66b1388b377c..af816d0cf1b5 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -52,11 +52,11 @@
#include <textboxhelper.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::container;
using namespace ::xmloff::token;
using table::XCell;
using ::std::vector;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 386326a22f88..1b49a0878fe9 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -65,12 +65,12 @@
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::xml::sax;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::text;
+using namespace css::frame;
+using namespace css::table;
+using namespace css::xml::sax;
using namespace ::xmloff::token;
enum SwXMLTableElemTokens
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index f9c781f3d885..d19cea868a50 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -59,10 +59,10 @@ class SwXMLTableContext : public XMLTextTableContext
std::vector<ColumnWidthInfo> aColumnWidths;
std::vector<OUString> *pColumnDefaultCellStyleNames;
- ::com::sun::star::uno::Reference <
- ::com::sun::star::text::XTextCursor > xOldCursor;
- ::com::sun::star::uno::Reference <
- ::com::sun::star::text::XTextContent > xTextContent;
+ css::uno::Reference <
+ css::text::XTextCursor > xOldCursor;
+ css::uno::Reference <
+ css::text::XTextContent > xTextContent;
SwXMLTableRows_Impl * m_pRows;
@@ -133,20 +133,20 @@ public:
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList );
SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable );
virtual ~SwXMLTableContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index debc85c5fd6e..07b18b817658 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -21,8 +21,8 @@
#include "xmlimp.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
+using namespace css::uno;
+using namespace css::text;
class SwXMLBodyContentContext_Impl : public SvXMLImportContext
{
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index fe2a0730b91d..d760bfbd9c31 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -48,12 +48,12 @@
#include <SwStyleNameMapper.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::io;
+using namespace css::uno;
+using namespace css::style;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::document;
+using namespace css::io;
using namespace ::xmloff::token;
enum SvEmbeddedObjectTypes
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index d64d7b14f72a..cc2fcdaadc5a 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -42,26 +42,26 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
const SvGlobalName aOutplaceClassId;
static SwNoTextNode *GetNoTextNode(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet >& rPropSet );
+ const css::uno::Reference <
+ css::beans::XPropertySet >& rPropSet );
protected:
virtual void exportStyleContent(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::style::XStyle > & rStyle ) override;
+ const css::uno::Reference<
+ css::style::XStyle > & rStyle ) override;
virtual void _collectTextEmbeddedAutoStyles(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
+ const css::uno::Reference <
+ css::beans::XPropertySet > & rPropSet ) override;
virtual void _exportTextEmbedded(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet > & rPropSet,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) override;
+ const css::uno::Reference <
+ css::beans::XPropertySet > & rPropSet,
+ const css::uno::Reference <
+ css::beans::XPropertySetInfo > & rPropSetInfo ) override;
virtual void exportTable(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::text::XTextContent > & rTextContent,
+ const css::uno::Reference <
+ css::text::XTextContent > & rTextContent,
bool bAutoStyles, bool bProgress ) override;
public:
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index deaf437e6ca9..4f914a9fcac1 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -62,11 +62,11 @@
#include <svl/urihelper.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::text;
+using namespace css::frame;
+using namespace css::beans;
using namespace xml::sax;
struct XMLServiceMapEntry_Impl
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index f753c44f33d8..685a0e2c73c1 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -32,37 +32,37 @@ protected:
virtual SvXMLImportContext *CreateTableChildContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+ const css::uno::Reference<
+ css::xml::sax::XAttributeList > & xAttrList ) override;
public:
SwXMLTextImportHelper(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::frame::XModel>& rModel,
+ const css::uno::Reference <
+ css::frame::XModel>& rModel,
SvXMLImport& rImport,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet>& rInfoSet,
+ const css::uno::Reference <
+ css::beans::XPropertySet>& rInfoSet,
bool bInsertM, bool bStylesOnlyM, bool bProgress,
bool bBlockM, bool bOrganizerM,
bool bPreserveRedlineMode );
virtual ~SwXMLTextImportHelper();
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ virtual css::uno::Reference<
+ css::beans::XPropertySet>
createAndInsertOLEObject( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ virtual css::uno::Reference<
+ css::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ virtual css::uno::Reference<
+ css::beans::XPropertySet>
createAndInsertApplet(
const OUString &rName,
const OUString &rCode,
@@ -70,15 +70,15 @@ public:
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ virtual css::uno::Reference<
+ css::beans::XPropertySet>
createAndInsertPlugin(
const OUString &rMimeType,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight ) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet>
+ virtual css::uno::Reference<
+ css::beans::XPropertySet>
createAndInsertFloatingFrame(
const OUString &rName,
const OUString &rHRef,
@@ -86,7 +86,7 @@ public:
sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual void endAppletOrPlugin(
- const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
+ const css::uno::Reference < css::beans::XPropertySet > &rPropSet,
::std::map < const OUString, OUString > &rParamMap) override;
virtual bool IsInHeaderFooter() const override;
@@ -98,12 +98,12 @@ public:
const OUString& rId, /// use to identify this redline
const OUString& rAuthor, /// name of the author
const OUString& rComment, /// redline comment
- const ::com::sun::star::util::DateTime& rDateTime, /// date+time
+ const css::util::DateTime& rDateTime, /// date+time
bool bMergeLastPara) override; /// merge last paragraph
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextCursor> RedlineCreateText(
- ::com::sun::star::uno::Reference< /// needed to get the document
- ::com::sun::star::text::XTextCursor> & rOldCursor,
+ virtual css::uno::Reference<
+ css::text::XTextCursor> RedlineCreateText(
+ css::uno::Reference< /// needed to get the document
+ css::text::XTextCursor> & rOldCursor,
const OUString& rId) override; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call
@@ -113,7 +113,7 @@ public:
virtual void SetShowChanges( bool bShowChanges ) override;
virtual void SetRecordChanges( bool bRecordChanges ) override;
virtual void SetChangesProtectionKey(
- const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override;
+ const css::uno::Sequence<sal_Int8> & rKey ) override;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 81be5088c0f0..9ad2a358c977 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -54,9 +54,9 @@
#include <svx/flagsdef.hxx>
#include <svx/dialogs.hrc>
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::ui::dialogs;
+using namespace css::lang;
+using namespace css::uno;
using namespace ::sfx2;
SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet,
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index a0edd7784b21..6baadf341abf 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -39,9 +39,9 @@
#include <helpid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::mail;
-using namespace ::com::sun::star::beans;
+using namespace css::lang;
+using namespace css::mail;
+using namespace css::beans;
class SwTestAccountSettingsDialog : public SfxModalDialog
{
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 4cf969f803f3..1f9be8bb1014 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -35,9 +35,9 @@
#include <svtools/treelistentry.hxx>
#include <IDocumentSettingAccess.hxx>
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::uno;
+using namespace css::beans;
+using namespace css::document;
+using namespace css::uno;
using namespace ::std;
struct CompatibilityItem
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index cd44b5614d03..267fba8f086b 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -62,15 +62,15 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::task;
+using namespace css::beans;
+using namespace css::ui::dialogs;
#define ITEMID_NAME 1
#define ITEMID_TABLE 2
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 5e74b4ebd5d1..325fbf0f18ae 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -68,7 +68,7 @@ class SwAddressListDialog : public SfxModalDialog
VclPtr<SwMailMergeAddressBlockPage> m_pAddressPage;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext> m_xDBContext;
+ css::uno::Reference< css::sdb::XDatabaseContext> m_xDBContext;
SwDBData m_aDBData;
@@ -89,12 +89,12 @@ public:
virtual ~SwAddressListDialog();
virtual void dispose() override;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>
+ css::uno::Reference< css::sdbc::XDataSource>
GetSource();
SharedConnection GetConnection();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>
+ css::uno::Reference< css::sdbcx::XColumnsSupplier>
GetColumnsSupplier();
const SwDBData& GetDBData() const {return m_aDBData;}
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 9f9fb7fbce30..0fc2e80943bf 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -42,7 +42,7 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::ui::dialogs;
class SwAddressControl_Impl : public Control
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 64bbe8e655ab..1913e5310a03 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -98,13 +98,13 @@
using namespace ::dbtools;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::uno;
+using namespace css::beans;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::uno;
const char cDBFieldStart = '<';
const char cDBFieldEnd = '>';
@@ -1520,7 +1520,7 @@ static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames)
}
}
-void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwInsertDBColAutoPilot::Notify( const css::uno::Sequence< OUString >& ) {}
void SwInsertDBColAutoPilot::ImplCommit()
{
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index fd9e2eb34f5c..004fef5014cd 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -26,11 +26,11 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
+using namespace css::uno;
+using namespace css::frame;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::util;
SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) :
SfxModalDialog(pParent, "TablePreviewDialog", "modules/swriter/ui/tablepreviewdialog.ui")
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index edaa78497d6c..166b0cacb1cc 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -34,10 +34,10 @@ class SwDBTablePreviewDialog : public SfxModalDialog
VclPtr<FixedText> m_pDescriptionFI;
VclPtr<vcl::Window> m_pBeamerWIN;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame;
+ css::uno::Reference< css::frame::XFrame2 > m_xFrame;
public:
SwDBTablePreviewDialog(vcl::Window* pParent,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues );
+ css::uno::Sequence< css::beans::PropertyValue>& rValues );
virtual ~SwDBTablePreviewDialog();
virtual void dispose() override;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index fe8c59a3543b..c328dfa29905 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -39,10 +39,10 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
static void lcl_Move(Control* pCtrl, long nYOffset)
{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index b046df8130e8..b1df29cc0a46 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -96,7 +96,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog
VclPtr<RadioButton> m_pDependentRB;
VclPtr<Edit> m_pCountryED;
- com::sun::star::uno::Sequence< OUString> m_aAddressBlocks;
+ css::uno::Sequence< OUString> m_aAddressBlocks;
SwMailMergeConfigItem& m_rConfig;
DECL_LINK_TYPED(NewCustomizeHdl_Impl, Button*, void);
@@ -257,7 +257,7 @@ class SwAssignFieldsDialog : public SfxModalDialog
SwMailMergeConfigItem& m_rConfigItem;
- ::com::sun::star::uno::Sequence< OUString > CreateAssignments();
+ css::uno::Sequence< OUString > CreateAssignments();
DECL_LINK_TYPED(OkHdl_Impl, Button*, void);
DECL_LINK_TYPED(AssignmentModifyHdl_Impl, LinkParamNone*, void);
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 2617a0cf61ee..b0637f42ba3d 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -38,9 +38,9 @@
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::ui::dialogs;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
using namespace svt;
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent)
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 87cbd05e3038..5af6bb8b2054 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -31,7 +31,7 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
static void lcl_FillGreetingsBox(ListBox& rBox,
SwMailMergeConfigItem& rConfig,
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index b0438805205b..0328aad6f0e3 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -61,11 +61,11 @@
using namespace osl;
using namespace svt;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::view;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::frame;
+using namespace css::lang;
+using namespace css::view;
#define DEFAULT_LEFT_DISTANCE (MM50*5) // 2,5 cm
#define DEFAULT_TOP_DISTANCE (MM50*11) // 5,5 cm
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 83007a94623a..3c113d570730 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -63,7 +63,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
VclPtr<SwMailMergeWizard> m_pWizard;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xViewProperties;
+ css::uno::Reference< css::beans::XPropertySet > m_xViewProperties;
DECL_LINK_TYPED(PreviewLoadedHdl_Impl, SwOneExampleFrame&, void);
DECL_LINK_TYPED(ZoomHdl_Impl, ListBox&, void);
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 11b7e5321a79..e70fce6b76cd 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -75,7 +75,7 @@
using namespace svt;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
#define MM_DOCTYPE_OOO 1
#define MM_DOCTYPE_PDF 2
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index de3dfff36b4a..5657543e431d 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -200,7 +200,7 @@ public:
void EnableDesctruction() {m_bDesctructionEnabled = true;}
void ShowDialog();
- void DocumentSent( ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage>,
+ void DocumentSent( css::uno::Reference< css::mail::XMailMessage>,
bool bResult,
const OUString* pError );
void AllMailsSent();
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 7b8d649fc7f5..361f5cea96fc 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -33,9 +33,9 @@
#include <unomid.h>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbc;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::sdbc;
SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent)
: svt::OWizardPage(_pParent, "MMPreparePage", "modules/swriter/ui/mmpreparepage.ui")
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 706bf0549637..c4b00c3658ca 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -35,12 +35,12 @@
#include <helpid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
+using namespace css::sdbcx;
+using namespace css::sdbc;
+using namespace css::sdb;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::beans;
class SwAddressTable : public SvSimpleTable
{
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 5eadf9a3f2e8..3dfe225521d6 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -38,8 +38,8 @@
#include <doc.hxx>
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::frame::XFrame;
+using css::uno::Reference;
+using css::frame::XFrame;
SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
{
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 46c970b81147..615ecee68950 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -383,8 +383,8 @@ void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const OUString& rSet )
}
void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
+ css::uno::Reference< css::container::XNameAccess > & xSecond,
+ css::uno::Reference< css::container::XNameAccess > & xThird )
{
pDlg->SetAlternativeAccess( xSecond, xThird);
}
@@ -486,7 +486,7 @@ const OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const
return pDlg->GetSaveFilter();
}
-const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > AbstractMailMergeDlg_Impl::GetSelection() const
+const css::uno::Sequence< css::uno::Any > AbstractMailMergeDlg_Impl::GetSelection() const
{
return pDlg->GetSelection();
}
@@ -636,7 +636,7 @@ AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstra
SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&,
+ const css::uno::Reference< css::frame::XFrame >&,
sal_uInt32 nResId
)
{
@@ -905,8 +905,8 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg ( SwView
}
AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(vcl::Window* pParent,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess)
+ css::uno::Reference< css::container::XNamed > & xNamed,
+ css::uno::Reference< css::container::XNameAccess > & xNameAccess)
{
VclPtr<SwRenameXNamedDlg> pDlg = VclPtr<SwRenameXNamedDlg>::Create( pParent,xNamed, xNameAccess);
return new AbstractSwRenameXNamedDlg_Impl( pDlg );
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 37dd753bb816..dbd78f5be072 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -147,10 +147,10 @@ class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg
class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot
{
DECL_ABSTDLG_BASE( AbstractSwInsertDBColAutoPilot_Impl,SwInsertDBColAutoPilot)
- virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) override;
+ virtual void DataToDoc( const css::uno::Sequence< css::uno::Any >& rSelection,
+ css::uno::Reference< css::sdbc::XDataSource> rxSource,
+ css::uno::Reference< css::sdbc::XConnection> xConnection,
+ css::uno::Reference< css::sdbc::XResultSet > xResultSet) override;
};
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
@@ -213,8 +213,8 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
virtual void SetForbiddenChars( const OUString& rSet ) override;
virtual void SetAlternativeAccess(
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) override;
+ css::uno::Reference< css::container::XNameAccess > & xSecond,
+ css::uno::Reference< css::container::XNameAccess > & xThird ) override;
};
class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
@@ -279,8 +279,8 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg)
virtual DBManagerOptions GetMergeType() override ;
virtual const OUString& GetSaveFilter() const override;
- virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const override ;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const override;
+ virtual const css::uno::Sequence< css::uno::Any > GetSelection() const override ;
+ virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const override;
virtual bool IsSaveSingleDoc() const override;
virtual bool IsGenerateFromDataBase() const override;
virtual OUString GetColumnName() const override;
@@ -370,7 +370,7 @@ public:
virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
+ const css::uno::Reference< css::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
) override;
virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings,
@@ -387,8 +387,8 @@ public:
virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) override;
virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
- com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
+ css::uno::Reference< css::sdbc::XDataSource> rxSource,
+ css::uno::Reference<css::sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData) override;
virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) override;
@@ -423,8 +423,8 @@ public:
virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) override;
virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) override;
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) override;
+ css::uno::Reference< css::container::XNamed > & xNamed,
+ css::uno::Reference< css::container::XNameAccess > & xNameAccess) override;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) override;
virtual VclAbstractDialog* CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) override;
@@ -459,8 +459,8 @@ public:
const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) override;
+ const css::uno::Reference< css::sdbc::XConnection>& xConnection,
+ css::uno::Sequence< css::uno::Any >* pSelection = 0 ) override;
virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) override;
virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override;
virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 19f4763050ab..a057cf513c1b 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -404,7 +404,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
if (aPasswdDlg->Execute())
{
const OUString sNewPasswd( aPasswdDlg->GetPassword() );
- ::com::sun::star::uno::Sequence <sal_Int8 > aNewPasswd;
+ css::uno::Sequence <sal_Int8 > aNewPasswd;
SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd );
if (SvPasswordHelper::CompareHashPassword(
pRepr->GetSectionData().GetPassword(), sNewPasswd))
@@ -579,7 +579,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void
m_pProtectCB->Enable();
m_pFileCB->Enable();
- ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd;
+ css::uno::Sequence <sal_Int8> aCurPasswd;
if( 1 < pBox->GetSelectionCount() )
{
m_pHideCB->EnableTriState();
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 89d7f9d749da..e9bd44250dbe 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -41,9 +41,9 @@
#include <unomid.h>
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::uno;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::uno;
using namespace ::com::sun::star;
SwEnvPreview::SwEnvPreview(vcl::Window* pParent, WinBits nStyle)
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index f63b3651cca5..0b5711bf367d 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -461,7 +461,7 @@ void SwLabPage::InitDatabaseBox()
if( GetDBManager() )
{
m_pDatabaseLB->Clear();
- ::com::sun::star::uno::Sequence<OUString> aDataNames = SwDBManager::GetExistingDatabaseNames();
+ css::uno::Sequence<OUString> aDataNames = SwDBManager::GetExistingDatabaseNames();
const OUString* pDataNames = aDataNames.getConstArray();
for (long i = 0; i < aDataNames.getLength(); i++)
m_pDatabaseLB->InsertEntry(pDataNames[i]);
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 2834e504ac85..96a00b8019c7 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -31,9 +31,9 @@
#include <unoprnms.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::uno;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::uno;
using namespace ::comphelper;
void SwVisitingCardPage::InitFrameControl()
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index dab095f3b155..df278562547f 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -37,8 +37,8 @@
#include <unomid.h>
using namespace utl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::beans;
#define ROUND(x) static_cast<long>((x) + .5)
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index fe75d2fd1820..b94dc89484e7 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -63,18 +63,18 @@
#include <algorithm>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::form;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::beans;
+using namespace css::util;
+using namespace css::uno;
+using namespace css::frame;
+using namespace css::form;
+using namespace css::view;
+using namespace css::ui::dialogs;
struct SwMailMergeDlg_Impl {
uno::Reference<runtime::XFormController> xFController;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index e2e8c11a82c3..aa83f306507e 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -95,7 +95,7 @@ class SwVisitingCardPage : public SfxTabPage
SwLabItem aLabItem;
SwOneExampleFrame* pExampleFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText;
+ css::uno::Reference< css::text::XAutoTextContainer2 > m_xAutoText;
DECL_LINK_TYPED( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( AutoTextSelectHdl, ListBox&, void );
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 3911cd579a5c..3b61e87a2a5e 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -45,10 +45,10 @@
#include <unomid.h>
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::uno;
// edit insert-field
SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index c1fab4302503..b086921c66c9 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -44,7 +44,7 @@ class SwFieldDokInfPage : public SwFieldPage
VclPtr<CheckBox> m_pFixedCB;
SvTreeListEntry* pSelEntry;
- com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet;
+ css::uno::Reference < css::beans::XPropertySet > xCustomPropertySet;
sal_Int32 nOldSel;
sal_uLong nOldFormat;
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 16ae310b60ae..a73441282771 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -53,13 +53,13 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace com::sun::star::ui::dialogs;
+using namespace css::text;
+using namespace css::beans;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::ucb;
+using namespace css::uno;
+using namespace css::ui::dialogs;
static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index b77979663e4f..cf2f40f2fc95 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -85,9 +85,9 @@
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace com::sun::star::ui::dialogs;
+using namespace css::lang;
+using namespace css::uno;
+using namespace css::ui::dialogs;
using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index c2f4fa4aca09..348471114d77 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -69,9 +69,9 @@ static sal_uInt16 nKey1Pos = USHRT_MAX;
static sal_uInt16 nKey2Pos = USHRT_MAX;
using namespace com::sun::star;
-using namespace com::sun::star::i18n;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::util;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::util;
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 6f94e2c7c6a0..ce9726e8a744 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -73,11 +73,11 @@
#include "access.hrc"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::lang;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::ucb;
+using namespace css::ui::dialogs;
using namespace ::ucbhelper;
using namespace ::sfx2;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 5c235f9fea9b..325fb6682afe 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -165,7 +165,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
{
PushButton* pUserButton = GetUserButton();
pUserButton->SetClickHdl(LINK(this, SwOutlineTabDialog, FormHdl));
- pUserButton->SetAccessibleRole( com::sun::star::accessibility::AccessibleRole::BUTTON_MENU );
+ pUserButton->SetAccessibleRole( css::accessibility::AccessibleRole::BUTTON_MENU );
pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() );
GetCancelButton().SetClickHdl(LINK(this, SwOutlineTabDialog, CancelHdl));
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index a75f46504e51..955553bc9932 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -66,8 +66,8 @@ static bool bCsSens= false;
static sal_Unicode cDeli = '\t';
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::lang;
+using namespace css::uno;
using namespace ::com::sun::star;
static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 7d48ea5b0dde..e5393bec7bed 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -27,11 +27,11 @@
#include <unotools/mediadescriptor.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::io;
+using namespace css::task;
+using namespace css::beans;
+using namespace css::lang;
using utl::MediaDescriptor;
SwFilterDetect::SwFilterDetect()
@@ -132,9 +132,9 @@ Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw(
return seqServiceNames ;
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_writer_FormatDetector_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_writer_FormatDetector_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwFilterDetect());
}
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 2c23b717a878..a641a87e1ea0 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -38,9 +38,9 @@ using namespace ::ooo;
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_QUERY;
+using css::uno::Reference;
+using css::uno::UNO_QUERY_THROW;
+using css::uno::UNO_QUERY;
SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
{
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index 4bf5b59e4340..538492195d6b 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -93,7 +93,7 @@ SwVbaAutoTextEntry::getServiceNames()
return aServiceNames;
}
-SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess )
+SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess )
{
}
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 9af6c7c17f73..5a295b99c285 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -105,7 +105,7 @@ public:
}
};
-SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel )
+SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BookmarkCollectionHelper( xBookmarks ) ) ), mxModel( xModel )
{
mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 4629ceb9a615..a44c14702421 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -631,14 +631,14 @@ SwVbaBuiltInDocumentProperty::getServiceNames()
}
return aServiceNames;
}
-typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess
- ,com::sun::star::container::XNameAccess
- ,com::sun::star::container::XEnumerationAccess
+typedef ::cppu::WeakImplHelper< css::container::XIndexAccess
+ ,css::container::XNameAccess
+ ,css::container::XEnumerationAccess
> PropertiesImpl_BASE;
typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
-class DocPropEnumeration : public ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration >
+class DocPropEnumeration : public ::cppu::WeakImplHelper< css::container::XEnumeration >
{
DocProps mDocProps;
DocProps::iterator mIt;
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 71e2f99c8a31..f26e8d945b4d 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -23,13 +23,13 @@
#include <vbahelper/helperdecl.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::script::vba::VBAEventId;
+using namespace css::script::vba::VBAEventId;
using namespace ::ooo::vba;
SwVbaEventsHelper::SwVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext ) :
VbaEventsHelperBase( aArgs, xContext )
{
- using namespace ::com::sun::star::script::ModuleType;
+ using namespace css::script::ModuleType;
registerEventHandler( DOCUMENT_NEW, DOCUMENT, "Document_New" );
registerEventHandler( AUTO_NEW, NORMAL, "AutoNew" );
registerEventHandler( DOCUMENT_OPEN, DOCUMENT, "Document_Open" );
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index b9b75ab9dd9f..82988820e2b5 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -37,24 +37,24 @@ struct MapPair
};
static MapPair UnderLineTable[] = {
- { word::WdUnderline::wdUnderlineNone, com::sun::star::awt::FontUnderline::NONE },
- { word::WdUnderline::wdUnderlineSingle, com::sun::star::awt::FontUnderline::SINGLE },
- { word::WdUnderline::wdUnderlineWords, com::sun::star::awt::FontUnderline::SINGLE },
- { word::WdUnderline::wdUnderlineDouble, com::sun::star::awt::FontUnderline::DOUBLE },
- { word::WdUnderline::wdUnderlineDotted, com::sun::star::awt::FontUnderline::DOTTED },
- { word::WdUnderline::wdUnderlineThick, com::sun::star::awt::FontUnderline::BOLDDASH },
- { word::WdUnderline::wdUnderlineDash, com::sun::star::awt::FontUnderline::DASH },
- { word::WdUnderline::wdUnderlineDotDash, com::sun::star::awt::FontUnderline::DASHDOT },
- { word::WdUnderline::wdUnderlineDotDotDash, com::sun::star::awt::FontUnderline::DASHDOTDOT },
- { word::WdUnderline::wdUnderlineWavy, com::sun::star::awt::FontUnderline::WAVE },
- { word::WdUnderline::wdUnderlineDottedHeavy, com::sun::star::awt::FontUnderline::BOLDDOTTED },
- { word::WdUnderline::wdUnderlineDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASH },
- { word::WdUnderline::wdUnderlineDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOT },
- { word::WdUnderline::wdUnderlineDotDotDashHeavy, com::sun::star::awt::FontUnderline::BOLDDASHDOTDOT },
- { word::WdUnderline::wdUnderlineWavyHeavy, com::sun::star::awt::FontUnderline::BOLDWAVE },
- { word::WdUnderline::wdUnderlineDashLong, com::sun::star::awt::FontUnderline::LONGDASH },
- { word::WdUnderline::wdUnderlineWavyDouble, com::sun::star::awt::FontUnderline::DOUBLEWAVE },
- { word::WdUnderline::wdUnderlineDashLongHeavy, com::sun::star::awt::FontUnderline::BOLDLONGDASH },
+ { word::WdUnderline::wdUnderlineNone, css::awt::FontUnderline::NONE },
+ { word::WdUnderline::wdUnderlineSingle, css::awt::FontUnderline::SINGLE },
+ { word::WdUnderline::wdUnderlineWords, css::awt::FontUnderline::SINGLE },
+ { word::WdUnderline::wdUnderlineDouble, css::awt::FontUnderline::DOUBLE },
+ { word::WdUnderline::wdUnderlineDotted, css::awt::FontUnderline::DOTTED },
+ { word::WdUnderline::wdUnderlineThick, css::awt::FontUnderline::BOLDDASH },
+ { word::WdUnderline::wdUnderlineDash, css::awt::FontUnderline::DASH },
+ { word::WdUnderline::wdUnderlineDotDash, css::awt::FontUnderline::DASHDOT },
+ { word::WdUnderline::wdUnderlineDotDotDash, css::awt::FontUnderline::DASHDOTDOT },
+ { word::WdUnderline::wdUnderlineWavy, css::awt::FontUnderline::WAVE },
+ { word::WdUnderline::wdUnderlineDottedHeavy, css::awt::FontUnderline::BOLDDOTTED },
+ { word::WdUnderline::wdUnderlineDashHeavy, css::awt::FontUnderline::BOLDDASH },
+ { word::WdUnderline::wdUnderlineDotDashHeavy, css::awt::FontUnderline::BOLDDASHDOT },
+ { word::WdUnderline::wdUnderlineDotDotDashHeavy, css::awt::FontUnderline::BOLDDASHDOTDOT },
+ { word::WdUnderline::wdUnderlineWavyHeavy, css::awt::FontUnderline::BOLDWAVE },
+ { word::WdUnderline::wdUnderlineDashLong, css::awt::FontUnderline::LONGDASH },
+ { word::WdUnderline::wdUnderlineWavyDouble, css::awt::FontUnderline::DOUBLEWAVE },
+ { word::WdUnderline::wdUnderlineDashLongHeavy, css::awt::FontUnderline::BOLDLONGDASH },
};
typedef std::unordered_map< sal_Int32, sal_Int32 > ConstToConst;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index bb2859f7d259..127d84e6fdb7 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -27,7 +27,7 @@
#include <cppuhelper/bootstrap.hxx>
#include "vbaapplication.hxx"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
using namespace ::ooo::vba;
SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" )
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 3ebca1b28d50..bb7967061145 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -133,7 +133,7 @@ public:
}
};
-SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
+SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
{
}
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index fa8204d36ec0..d77ce2a19d49 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -38,7 +38,7 @@ uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Refe
return xVariables;
}
-SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ), mxUserDefined( rUserDefined )
+SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ), mxUserDefined( rUserDefined )
{
}
// XEnumerationAccess
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index b6747379c4bb..1a1123dcb458 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -68,8 +68,8 @@
#include <unomid.h>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
{
@@ -148,10 +148,10 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
else
{
SvtLinguConfig aLinguCfg;
- com::sun::star::lang::Locale aLocale;
+ css::lang::Locale aLocale;
LanguageType nLang;
- using namespace ::com::sun::star::i18n::ScriptType;
+ using namespace css::i18n::ScriptType;
Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale"));
aLang >>= aLocale;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 37304d230101..5f2ccf464157 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -129,9 +129,9 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::container;
+using namespace css::uno;
+using namespace css::script;
+using namespace css::container;
SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell)
@@ -1217,7 +1217,7 @@ void SwDocShell::UpdateLinks()
uno::Reference< frame::XController >
SwDocShell::GetController()
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > aRet;
+ css::uno::Reference< css::frame::XController > aRet;
// #i82346# No view in page preview
if ( GetView() )
aRet = GetView()->GetController();
@@ -1319,7 +1319,7 @@ bool SwDocShell::SetProtectionPassword( const OUString &rNewPassword )
return bRes;
}
-bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash )
+bool SwDocShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash )
{
bool bRes = false;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index dbe1d4f5df34..2b5bc210bf57 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -127,9 +127,9 @@
#include <memory>
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::ui::dialogs;
+using namespace css::lang;
+using namespace css::uno;
using namespace ::com::sun::star;
using namespace ::sfx2;
@@ -216,7 +216,7 @@ void SwDocShell::DoFlushDocInfo()
static void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint )
{
- using namespace com::sun::star::script::vba::VBAEventId;
+ using namespace css::script::vba::VBAEventId;
if ( dynamic_cast<const SfxEventHint*>(&rHint) )
{
uno::Sequence< uno::Any > aArgs;
@@ -327,7 +327,7 @@ bool SwDocShell::PrepareClose( bool bUI )
m_pDoc->GetVbaEventProcessor();
if( xVbaEvents.is() )
{
- using namespace com::sun::star::script::vba::VBAEventId;
+ using namespace css::script::vba::VBAEventId;
uno::Sequence< uno::Any > aArgs;
xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
}
@@ -810,7 +810,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
TransferDataContainer* pClipCntnr =
new TransferDataContainer;
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
+ css::uno::Reference< css::datatransfer::XTransferable >
xRef( pClipCntnr );
pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, static_cast<sal_Char const *>(
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4fb66e70cc49..677389288535 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -93,9 +93,9 @@
#include <tgrditem.hxx>
#include <memory>
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::uno;
using namespace ::com::sun::star;
// Load Document
@@ -658,9 +658,9 @@ void SwDocShell::SubInitNew()
if (!utl::ConfigManager::IsAvoidConfig())
SvtLinguConfig().GetOptions(aLinguOpt);
- sal_Int16 nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ sal_Int16 nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+ eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+ eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
aDfltSet.Put( SvxLanguageItem( nVal, RES_CHRATR_LANGUAGE ) );
aDfltSet.Put( SvxLanguageItem( eCJK, RES_CHRATR_CJK_LANGUAGE ) );
aDfltSet.Put( SvxLanguageItem( eCTL, RES_CHRATR_CTL_LANGUAGE ) );
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 7427473aa21d..88312cb6e270 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -62,11 +62,11 @@
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::frame;
+using namespace css::view;
+using namespace css::lang;
static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh )
{
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index d2d99939dd50..3f91a1dbcd32 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -140,7 +140,7 @@ using namespace com::sun::star;
TYPEINIT1( SwModule, SfxModule );
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact,
diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx
index 35342855b683..d5e33f2294f1 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
#define SEL_TYPE_TABLE_TEXT 0
#define SEL_TYPE_LIST_TEXT 1
@@ -122,6 +122,6 @@ void SwToolbarConfigItem::ImplCommit()
PutProperties(aNames, aValues);
}
-void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwToolbarConfigItem::Notify( const css::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx
index 054c06c9a564..29f0eeb9a290 100644
--- a/sw/source/uibase/config/dbconfig.cxx
+++ b/sw/source/uibase/config/dbconfig.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
const Sequence<OUString>& SwDBConfig::GetPropertyNames()
{
@@ -111,6 +111,6 @@ const SwDBData& SwDBConfig::GetBibliographySource()
}
void SwDBConfig::ImplCommit() {}
-void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwDBConfig::Notify( const css::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index dbf7478a74db..8e1b52a8d2e3 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -30,7 +30,7 @@
#include <unomid.h>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL)
{
@@ -96,9 +96,9 @@ SwStdFontConfig::SwStdFontConfig() :
if (!utl::ConfigManager::IsAvoidConfig())
SvtLinguConfig().GetOptions( aLinguOpt );
- sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+ eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+ eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
for(sal_Int16 i = 0; i < DEF_FONT_COUNT; i++)
{
@@ -142,9 +142,9 @@ void SwStdFontConfig::ImplCommit()
SvtLinguConfig().GetOptions( aLinguOpt );
- sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+ eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+ eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
for(sal_uInt16 nProp = 0;
nProp < sal::static_int_cast< sal_uInt16, sal_Int32 >( aNames.getLength() );
@@ -176,9 +176,9 @@ bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
if (!utl::ConfigManager::IsAvoidConfig())
SvtLinguConfig().GetOptions(aLinguOpt);
- sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+ eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+ eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
OUString sDefFont(GetDefaultFor(FONT_STANDARD, eWestern));
OUString sDefFontCJK(GetDefaultFor(FONT_STANDARD_CJK, eCJK));
@@ -290,9 +290,9 @@ void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
if (!utl::ConfigManager::IsAvoidConfig())
SvtLinguConfig().GetOptions( aLinguOpt );
- sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN),
- eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN),
- eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
+ sal_Int16 eWestern = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, css::i18n::ScriptType::LATIN),
+ eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, css::i18n::ScriptType::ASIAN),
+ eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, css::i18n::ScriptType::COMPLEX);
// #i92090# default height value sets back to -1
const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType, lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
@@ -319,6 +319,6 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType
return nRet;
}
-void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwStdFontConfig::Notify( const css::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index eb03eaeddaf8..8d51c185891f 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -39,7 +39,7 @@
#include <unomid.h>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
#define GLOB_NAME_CALC 0
#define GLOB_NAME_IMPRESS 1
@@ -290,7 +290,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
return nRet;
}
-void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwRevisionConfig::Notify( const css::uno::Sequence< OUString >& ) {}
void SwRevisionConfig::ImplCommit()
{
@@ -629,7 +629,7 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro
}
}
-void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwInsertConfig::Notify( const css::uno::Sequence< OUString >& ) {}
void SwInsertConfig::ImplCommit()
{
@@ -1130,7 +1130,7 @@ SwTableConfig::~SwTableConfig()
{
}
-void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwTableConfig::Notify( const css::uno::Sequence< OUString >& ) {}
void SwTableConfig::ImplCommit()
{
@@ -1229,7 +1229,7 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
return aNames;
}
-void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwMiscConfig::Notify( const css::uno::Sequence< OUString >& ) {}
void SwMiscConfig::ImplCommit()
{
diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx
index d772d5eeaaa8..e59d0ae56a1d 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -26,7 +26,7 @@
#include <unomid.h>
using namespace utl;
-using namespace com::sun::star::uno;
+using namespace css::uno;
// Ctor
Sequence<OUString> SwPrintOptions::GetPropertyNames()
@@ -125,7 +125,7 @@ SwPrintOptions::~SwPrintOptions()
{
}
-void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwPrintOptions::Notify( const css::uno::Sequence< OUString >& ) {}
void SwPrintOptions::ImplCommit()
{
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 6ac62c6fc528..46ade91ccc99 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -36,7 +36,7 @@
using namespace utl;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
{
@@ -365,7 +365,7 @@ void SwLayoutViewConfig::Load()
}
}
-void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLayoutViewConfig::Notify( const css::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwGridConfig::GetPropertyNames()
{
@@ -456,7 +456,7 @@ void SwGridConfig::Load()
}
}
-void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwGridConfig::Notify( const css::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwCursorConfig::GetPropertyNames()
{
@@ -538,7 +538,7 @@ void SwCursorConfig::Load()
}
}
-void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwCursorConfig::Notify( const css::uno::Sequence< OUString >& ) {}
SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) :
ConfigItem("Office.WriterWeb/Background",
@@ -567,7 +567,7 @@ void SwWebColorConfig::ImplCommit()
PutProperties(aPropNames, aValues);
}
-void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwWebColorConfig::Notify( const css::uno::Sequence< OUString >& ) {}
void SwWebColorConfig::Load()
{
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 36c7a362c4c9..868bf061e7ba 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1703,7 +1703,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> xSour
uno::Reference< util::XNumberFormats > xDocNumberFormats = xDocNumFormatsSupplier->getNumberFormats();
uno::Reference< util::XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, uno::UNO_QUERY);
- com::sun::star::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
+ css::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
//get the number formatter of the data source
uno::Reference<beans::XPropertySet> xSourceProps(xSource, uno::UNO_QUERY);
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 48f2ff993b28..fc62336780c3 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -52,14 +52,14 @@
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::task;
+using namespace css::beans;
struct SwConnectionData
{
@@ -467,7 +467,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
if (!sDBName.isEmpty())
{
TransferDataContainer* pContainer = new TransferDataContainer;
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
+ css::uno::Reference< css::datatransfer::XTransferable > xRef( pContainer );
if( !sColumnName.isEmpty() )
{
// drag database field
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 1b49433d0f4d..25fd69742397 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -43,11 +43,11 @@
#include <dbui.hrc>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
namespace SwMailMergeHelper
{
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index eec12006e970..8efa47795e6d 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -50,12 +50,12 @@
using namespace utl;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
const char* cAddressDataAssignments = "AddressDataAssignments";
const char* cDBColumnAssignments = "DBColumnAssignments";
@@ -160,7 +160,7 @@ public:
SwMailMergeConfigItem_Impl();
virtual ~SwMailMergeConfigItem_Impl();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
const Sequence< OUString>
GetAddressBlocks(bool bConvertToConfig = false) const;
void SetAddressBlocks(
@@ -492,7 +492,7 @@ const Sequence<OUString>& SwMailMergeConfigItem_Impl::GetPropertyNames()
return aNames;
}
-void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwMailMergeConfigItem_Impl::Notify( const css::uno::Sequence< OUString >& ) {}
void SwMailMergeConfigItem_Impl::ImplCommit()
{
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 230202341a86..c4cbb3c99e61 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -52,10 +52,10 @@
#include <cmdid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::text;
+using namespace css::linguistic2;
+using namespace css::beans;
SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 43043942e6ab..c69c6b3fd067 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -145,8 +145,8 @@ extern bool g_bExecuteDrag;
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::datatransfer;
+using namespace css::uno;
+using namespace css::datatransfer;
using namespace nsTransferBufferType;
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
@@ -172,7 +172,7 @@ public:
SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh );
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
- const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override;
+ const OUString& rMimeType, const css::uno::Any & rValue ) override;
virtual void Closed() override;
bool WriteData( SvStream& rStrm );
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 74a65c66f9a1..d2d021420763 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1978,7 +1978,7 @@ sal_uInt16 SwPostItMgr::Replace(SvxSearchItem* pItem)
return aResult;
}
-sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
+sal_uInt16 SwPostItMgr::FinishSearchReplace(const css::util::SearchOptions& rSearchOptions, bool bSrchForward)
{
SwSidebarWin* pWin = GetActiveSidebarWin();
SvxSearchItem aItem(SID_SEARCH_ITEM );
@@ -1990,7 +1990,7 @@ sal_uInt16 SwPostItMgr::FinishSearchReplace(const ::com::sun::star::util::Search
return aResult;
}
-sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bSrchForward)
+sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const css::util::SearchOptions& rSearchOptions, bool bSrchForward)
{
sal_uInt16 aResult = 0;
SwSidebarWin* pWin = GetSidebarWin(&pField);
@@ -2158,6 +2158,6 @@ void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm,
}
void SwNoteProps::ImplCommit() {}
-void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwNoteProps::Notify( const css::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index d7a0130dfc50..3897182edebe 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -66,7 +66,7 @@ class SidebarTextControl : public Control
DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override;
void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 87d29901c130..f75dafd17025 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -132,21 +132,21 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
virtual sal_Int32 SAL_CALL
getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int32 i )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
addAccessibleEventListener (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference<
+ css::accessibility::XAccessibleEventListener >& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
removeAccessibleEventListener (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference<
+ css::accessibility::XAccessibleEventListener >& xListener)
+ throw (css::uno::RuntimeException, std::exception) override;
protected:
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
@@ -182,7 +182,7 @@ void SidebarTextControlAccessibleContext::defunc()
}
sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( maMutex );
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index 2c80887eaff6..e48caecc4591 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -32,7 +32,7 @@ class SidebarTextControlAccessible : public VCLXWindow
explicit SidebarTextControlAccessible( SidebarTextControl& rSidebarTextControl );
virtual ~SidebarTextControlAccessible();
- virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
CreateAccessibleContext() override;
private:
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 321a9a14f63a..ed0a55402fff 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -38,7 +38,7 @@ class SidebarWinAccessible : public VCLXWindow
const SwSidebarItem& rSidebarItem );
virtual ~SidebarWinAccessible();
- virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext >
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext >
CreateAccessibleContext() override;
void ChangeSidebarItem( const SwSidebarItem& rSidebarItem );
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index d1c9c6bc6bd1..83e022479370 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5831,13 +5831,13 @@ void SwEditWin::SetChainMode( bool bOn )
m_rView.GetViewFrame()->GetBindings().Invalidate(aInva);
}
-uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::CreateAccessible()
+uno::Reference< css::accessibility::XAccessible > SwEditWin::CreateAccessible()
{
SolarMutexGuard aGuard; // this should have happened already!!!
SwWrtShell *pSh = m_rView.GetWrtShellPtr();
OSL_ENSURE( pSh, "no writer shell, no accessible object" );
uno::Reference<
- ::com::sun::star::accessibility::XAccessible > xAcc;
+ css::accessibility::XAccessible > xAcc;
if( pSh )
xAcc = pSh->CreateAccessible();
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 0bdf4e47d2ad..20873b4d0400 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -46,8 +46,8 @@
#include <helpid.h>
#include <docvw.hrc>
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
+using namespace css::lang;
+using namespace css::uno;
using namespace ::com::sun::star;
using namespace ::sfx2;
@@ -339,7 +339,7 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId )
if( pClipCntnr )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pClipCntnr );
+ css::uno::Reference< css::datatransfer::XTransferable > xRef( pClipCntnr );
if( pClipCntnr->HasAnyData() )
pClipCntnr->CopyToClipboard( pWin );
}
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 766c1556dbf0..d1ed4a6a9bdb 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -41,7 +41,7 @@
#endif
using namespace utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
@@ -264,7 +264,7 @@ void SwEnvCfgItem::ImplCommit()
PutProperties(aNames, aValues);
}
-void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwEnvCfgItem::Notify( const css::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwEnvCfgItem::GetPropertyNames()
{
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index a29ee6c4ce34..dcd1a4ac0532 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -30,8 +30,8 @@
#include <unomid.h>
using namespace utl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::beans;
static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
{
@@ -171,7 +171,7 @@ SwLabelConfig::~SwLabelConfig()
// the config item is not writable ?:
void SwLabelConfig::ImplCommit() {}
-void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLabelConfig::Notify( const css::uno::Sequence< OUString >& ) {}
static std::unique_ptr<SwLabRec> lcl_CreateSwLabRec(const OUString& rType, const OUString& rMeasure, const OUString& rManufacturer)
{
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index 1d8681966212..d893eb93f429 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -29,7 +29,7 @@
#include <unomid.h>
using namespace utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
SwLabItem::SwLabItem() :
@@ -394,7 +394,7 @@ SwLabCfgItem::SwLabCfgItem(bool bLabel) :
}
}
-void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwLabCfgItem::Notify( const css::uno::Sequence< OUString >& ) {}
void SwLabCfgItem::ImplCommit()
{
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index fa6ecca7d6d8..230ea4eeabb4 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -80,13 +80,13 @@
#include <cnttab.hxx>
#include <unotools/useroptions.hxx>
-using namespace com::sun::star::uno;
-using namespace com::sun::star::container;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::text;
-using namespace com::sun::star::style;
-using namespace com::sun::star::sdbc;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
+using namespace css::style;
+using namespace css::sdbc;
using namespace ::com::sun::star;
using namespace nsSwDocInfoSubType;
diff --git a/sw/source/uibase/fldui/xfldui.cxx b/sw/source/uibase/fldui/xfldui.cxx
index c7164e5e771d..95d6ec51cbc5 100644
--- a/sw/source/uibase/fldui/xfldui.cxx
+++ b/sw/source/uibase/fldui/xfldui.cxx
@@ -33,13 +33,13 @@
#include <view.hxx>
#include <swmodule.hxx>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::beans;
// This file contains all routines of the fldui directory, which must compile
// with exceptions. So we can reduce the code of the other files, which don't
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 1e15c274b8dc..b76ecf5078b6 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -32,19 +32,19 @@ namespace com { namespace sun { namespace star { namespace io {
} } } }
class SwXFilterOptions : public ::cppu::WeakImplHelper<
- ::com::sun::star::beans::XPropertyAccess,
- ::com::sun::star::ui::dialogs::XExecutableDialog,
- ::com::sun::star::document::XImporter,
- ::com::sun::star::document::XExporter,
- ::com::sun::star::lang::XServiceInfo >
+ css::beans::XPropertyAccess,
+ css::ui::dialogs::XExecutableDialog,
+ css::document::XImporter,
+ css::document::XExporter,
+ css::lang::XServiceInfo >
{
OUString sFilterName;
OUString sFilterOptions;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream > xInputStream;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent > xModel;
+ css::uno::Reference<
+ css::io::XInputStream > xInputStream;
+ css::uno::Reference<
+ css::lang::XComponent > xModel;
bool bExport;
public:
@@ -52,40 +52,40 @@ public:
virtual ~SwXFilterOptions();
// XPropertyAccess
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
- SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue >& aProps )
- 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, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue >
+ SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence<
+ css::beans::PropertyValue >& aProps )
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
// XExecutableDialog
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
// XImporter
- virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTargetDocument( const css::uno::Reference<
+ css::lang::XComponent >& xDoc )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
// XExporter
- virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSourceDocument( const css::uno::Reference<
+ css::lang::XComponent >& xDoc )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw(css::uno::RuntimeException, std::exception) override;
};
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index db8bb316cfd6..aaca51cbf44b 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.hxx
@@ -24,7 +24,7 @@ class SwToolbarConfigItem : public utl::ConfigItem
{
sal_Int32 aTbxIdArray[5];
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -32,7 +32,7 @@ public:
SwToolbarConfigItem( bool bWeb );
virtual ~SwToolbarConfigItem();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId );
};
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 7b9a2afdad98..0f6085c4d701 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -248,7 +248,7 @@ private:
static const SfxObjectShell* pShowShell;
void InsertRegion( const SwGlblDocContent* _pContent,
- const com::sun::star::uno::Sequence< OUString >& _rFiles );
+ const css::uno::Sequence< OUString >& _rFiles );
DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void );
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 53848f34cedb..7e9617c574c3 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -91,8 +91,8 @@ class SwCaptionDialog : public SvxStandardDialog
bool bCopyAttributes;
bool bOrderNumberingFirst; //#i61007# order of captions
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xNameAccess;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed;
+ css::uno::Reference< css::container::XNameAccess > xNameAccess;
+ css::uno::Reference< css::container::XNamed > xNamed;
DECL_LINK_TYPED(SelectHdl, ComboBox&, void);
DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void);
diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx
index e67382dbf38f..c4c4c6e5e3f5 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.hxx
@@ -27,7 +27,7 @@ struct SwDBData;
class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem
{
private:
- SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
+ SAL_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
virtual void ImplCommit() override;
SwDBData* pAdrImpl;
@@ -40,7 +40,7 @@ public:
void Load();
const SwDBData& GetAddressSource();
const SwDBData& GetBibliographySource();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
};
#endif
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 2bf535ef4dc1..59c1b5fd1561 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -147,7 +147,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField );
using SfxModalDialog::Notify;
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
virtual void ImplCommit() override;
void Load();
@@ -156,17 +156,17 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
public:
SwInsertDBColAutoPilot( SwView& rView,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
- com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier>,
+ css::uno::Reference< css::sdbc::XDataSource> rxSource,
+ css::uno::Reference<css::sdbcx::XColumnsSupplier>,
const SwDBData& rData );
virtual ~SwInsertDBColAutoPilot();
virtual void dispose() override;
- void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet);
+ void DataToDoc( const css::uno::Sequence< css::uno::Any >& rSelection,
+ css::uno::Reference< css::sdbc::XDataSource> rxSource,
+ css::uno::Reference< css::sdbc::XConnection> xConnection,
+ css::uno::Reference< css::sdbc::XResultSet > xResultSet);
};
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index fda3911a3c96..5e8f7571e06e 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -263,7 +263,7 @@ public:
const SwView &GetView() const { return m_rView; }
SwView &GetView() { return m_rView; }
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
static inline long GetDDStartPosX() { return m_nDDStartPosX; }
static inline long GetDDStartPosY() { return m_nDDStartPosY; }
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 9fea992adb2d..66fd1438e9fc 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -63,8 +63,8 @@ public:
virtual bool operator ==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
class SwEnvCfgItem : public utl::ConfigItem
@@ -72,7 +72,7 @@ class SwEnvCfgItem : public utl::ConfigItem
private:
SwEnvItem aEnvItem;
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -82,7 +82,7 @@ public:
SwEnvItem& GetItem() {return aEnvItem;}
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
};
#endif
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index fe4f06c90cb1..5beab7aac8cf 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -73,9 +73,9 @@ struct SwInsertField_Data
SwWrtShell* m_pSh;
sal_Unicode m_cSeparator;
bool m_bIsAutomaticLanguage;
- ::com::sun::star::uno::Any m_aDBDataSource;
- ::com::sun::star::uno::Any m_aDBConnection;
- ::com::sun::star::uno::Any m_aDBColumn;
+ css::uno::Any m_aDBDataSource;
+ css::uno::Any m_aDBConnection;
+ css::uno::Any m_aDBColumn;
VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFieldDlg()
SwInsertField_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
@@ -115,9 +115,9 @@ private:
SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const;
- com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
- com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
- SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
+ css::uno::Reference<css::container::XNameAccess> xDBContext;
+ css::uno::Reference<css::text::XNumberingTypeInfo> xNumberingInfo;
+ SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const;
public:
explicit SwFieldMgr(SwWrtShell* pSh = 0);
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index e9f47ebfd31f..cee5e671914f 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -58,7 +58,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
OUString sDefaultFonts[DEF_FONT_COUNT];
sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT];
- SAL_DLLPRIVATE com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ SAL_DLLPRIVATE css::uno::Sequence<OUString> GetPropertyNames();
void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
{
@@ -77,7 +77,7 @@ public:
SwStdFontConfig();
virtual ~SwStdFontConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index a9cddb26d986..e460e81bb1d3 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.hxx
@@ -72,7 +72,7 @@ public:
@param _bCreate
if <TRUE/>, the group is created if it does not yet exist
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup >
+ css::uno::Reference< css::text::XAutoTextGroup >
GetAutoTextGroup(
const OUString& _rGroupName,
bool _bCreate = false
@@ -92,7 +92,7 @@ public:
@param _bCreate
if <TRUE/>, the entry is created if it does not yet exist
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry >
+ css::uno::Reference< css::text::XAutoTextEntry >
GetAutoTextEntry(
const OUString& _rCompleteGroupName,
const OUString& _rGroupName,
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index b41ae52c9be2..ccc9759274c7 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -104,7 +104,7 @@ class SwGlossaryDlg : public SvxStandardDialog
OUString sReadonlyPath;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText;
+ css::uno::Reference< css::text::XAutoTextContainer2 > m_xAutoText;
SwOneExampleFrame* pExampleFrame;
SwGlossaryHdl* pGlossaryHdl;
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 5af24755d0d8..8031e2203137 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -29,8 +29,8 @@ class SwView;
class SwHyphWrapper : public SvxSpellWrapper {
private:
SwView* pView;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenator > xHyph;
+ css::uno::Reference<
+ css::linguistic2::XHyphenator > xHyph;
sal_uInt16 nPageCount; // page count for progress view
sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text
@@ -46,8 +46,8 @@ protected:
public:
SwHyphWrapper( SwView* pVw,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XHyphenator > &rxHyph,
+ css::uno::Reference<
+ css::linguistic2::XHyphenator > &rxHyph,
bool bStart, bool bOther, bool bSelect );
virtual ~SwHyphWrapper();
};
diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx
index 8c7f04c7c219..82bd2ddfaa7b 100644
--- a/sw/source/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/uibase/inc/imaildsplistener.hxx
@@ -56,13 +56,13 @@ public:
Called for every mail message that has been
successfully delivered.
*/
- virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage) = 0;
+ virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, css::uno::Reference< css::mail::XMailMessage> xMailMessage) = 0;
/**
Called for every mail message whose delivery
failed.
*/
- virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0;
+ virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, css::uno::Reference< css::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0;
};
#endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index f8102bb3b9f8..193b8c89a077 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -73,7 +73,7 @@ public:
Printer *GetPrt();
inline void ReplaceGroup( const OUString &rMake );
void UpdateGroup( const OUString &rMake ) {_ReplaceGroup( rMake );}
- static void UpdateFieldInformation(::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
+ static void UpdateFieldInformation(css::uno::Reference< css::frame::XModel>& xModel,
const SwLabItem& rItem);
const OUString& GetBusinessCardStr() const {return m_sBusinessCardDlg;}
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 783a9b105a33..504b15c24e12 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.hxx
@@ -44,7 +44,7 @@ public:
SwLabelConfig();
virtual ~SwLabelConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr);
const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;}
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 43b6690d6169..4207c38b8b8e 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -109,7 +109,7 @@ private:
SwLabItem aItem;
bool bIsLabel;
- com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -118,7 +118,7 @@ public:
SwLabItem& GetItem() {return aItem;}
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
};
#endif
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 4a33570314ed..c0a6dec4f498 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -58,10 +58,10 @@ public:
connected to the mail server otherwise errors occur
during the delivery of mail messages.
- @throws ::com::sun::star::uno::RuntimeException
+ @throws css::uno::RuntimeException
on errors during construction of an instance of this class.
*/
- MailDispatcher(::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> xMailService);
+ MailDispatcher(css::uno::Reference< css::mail::XSmtpService> xMailService);
/**
Shutdown the mail dispatcher. Every mail messages
@@ -77,12 +77,12 @@ public:
@param xMailMessage
[in] a mail message that should be send.
*/
- void enqueueMailMessage(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage);
+ void enqueueMailMessage(css::uno::Reference< css::mail::XMailMessage> xMailMessage);
/**
Dequeues a mail message.
This enables the caller to remove attachments when sending mails is to be cancelled.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> dequeueMailMessage();
+ css::uno::Reference< css::mail::XMailMessage> dequeueMailMessage();
/**
Start sending mail messages asynchronously. A client may register
@@ -138,11 +138,11 @@ protected:
private:
std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener();
- void sendMailMessageNotifyListener(::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> message);
+ void sendMailMessageNotifyListener(css::uno::Reference< css::mail::XMailMessage> message);
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::mail::XSmtpService> mailserver_;
- ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage > > messages_;
+ css::uno::Reference< css::mail::XSmtpService> mailserver_;
+ ::std::list< css::uno::Reference< css::mail::XMailMessage > > messages_;
::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_;
::osl::Mutex message_container_mutex_;
::osl::Mutex listener_container_mutex_;
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index fd5777a1a496..9132a282ca26 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -98,8 +98,8 @@ class SwMailMergeDlg : public SvxStandardDialog
SwModuleOptions* pModOpt;
DBManagerOptions nMergeType;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame;
+ css::uno::Sequence< css::uno::Any > m_aSelection;
+ css::uno::Reference< css::frame::XFrame2 > m_xFrame;
Size m_aDialogSize;
OUString m_sSaveFilter;
@@ -119,8 +119,8 @@ public:
const OUString& rSourceName,
const OUString& rTableName,
sal_Int32 nCommandType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0);
+ const css::uno::Reference< css::sdbc::XConnection>& xConnection,
+ css::uno::Sequence< css::uno::Any >* pSelection = 0);
virtual ~SwMailMergeDlg();
virtual void dispose() override;
@@ -132,8 +132,8 @@ public:
OUString GetPath() const { return m_pPathED->GetText();}
const OUString& GetSaveFilter() const {return m_sSaveFilter;}
- inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
+ inline const css::uno::Sequence< css::uno::Any > GetSelection() const { return m_aSelection; }
+ css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const;
};
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 1f7207cdcca1..4eb41f011511 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -49,7 +49,7 @@ struct SwDocMergeInfo
class SW_DLLPUBLIC SwMailMergeConfigItem
{
-// com::sun::star::uno::Sequence< OUString> m_aSavedDocuments;
+// css::uno::Sequence< OUString> m_aSavedDocuments;
SwMailMergeConfigItem_Impl* m_pImpl;
//session information - not stored in configuration
bool m_bAddressInserted;
@@ -82,18 +82,18 @@ public:
const ResStringArray& GetDefaultAddressHeaders() const;
void SetCurrentConnection(
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+ css::uno::Reference< css::sdbc::XDataSource> xSource,
const SharedConnection& rConnection,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xColumnsSupplier,
+ css::uno::Reference< css::sdbcx::XColumnsSupplier> xColumnsSupplier,
const SwDBData& rDBData);
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> GetSource();
+ css::uno::Reference< css::sdbc::XDataSource> GetSource();
SharedConnection GetConnection();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> GetColumnsSupplier();
+ css::uno::Reference< css::sdbcx::XColumnsSupplier> GetColumnsSupplier();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
+ css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const;
void DisposeResultSet();
@@ -112,7 +112,7 @@ public:
void ExcludeRecord(sal_Int32 nRecord, bool bExclude);
css::uno::Sequence< css::uno::Any> GetSelection() const;
- const com::sun::star::uno::Sequence<OUString>& GetSavedDocuments() const;
+ const css::uno::Sequence<OUString>& GetSavedDocuments() const;
void AddSavedDocument(const OUString& rName);
bool IsOutputToLetter()const;
@@ -124,8 +124,8 @@ public:
bool IsHideEmptyParagraphs() const;
void SetHideEmptyParagraphs(bool bSet);
- const com::sun::star::uno::Sequence<OUString> GetAddressBlocks() const;
- void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks);
+ const css::uno::Sequence<OUString> GetAddressBlocks() const;
+ void SetAddressBlocks(const css::uno::Sequence< OUString>& rBlocks);
void SetCurrentAddressBlockIndex( sal_Int32 nSet );
sal_Int32 GetCurrentAddressBlockIndex() const;
@@ -140,8 +140,8 @@ public:
bool IsGreetingLine(bool bInEMail) const;
void SetGreetingLine(bool bSet, bool bInEMail);
- const com::sun::star::uno::Sequence<OUString> GetGreetings(Gender eType) const;
- void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< OUString>& rBlocks);
+ const css::uno::Sequence<OUString> GetGreetings(Gender eType) const;
+ void SetGreetings(Gender eType, const css::uno::Sequence< OUString>& rBlocks);
sal_Int32 GetCurrentGreeting(Gender eType) const;
void SetCurrentGreeting(Gender eType, sal_Int32 nIndex);
@@ -151,10 +151,10 @@ public:
void SetFemaleGenderValue(const OUString& rValue);
//returns the assignment in the order of the default headers (GetDefaultAddressHeaders())
- com::sun::star::uno::Sequence<OUString> GetColumnAssignment( const SwDBData& rDBData ) const;
+ css::uno::Sequence<OUString> GetColumnAssignment( const SwDBData& rDBData ) const;
void SetColumnAssignment(
const SwDBData& rDBData,
- const com::sun::star::uno::Sequence< OUString>& );
+ const css::uno::Sequence< OUString>& );
bool IsAddressFieldsAssigned() const;
bool IsGreetingFieldsAssigned() const;
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 90fe6d348d6a..e0f77646b6be 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -34,7 +34,7 @@ class SwNavigationConfig : public utl::ConfigItem
bool bIsSmall; //ShowListBox
bool bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -42,7 +42,7 @@ public:
SwNavigationConfig();
virtual ~SwNavigationConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
ContentTypeId GetRootType()const {return nRootType;}
void SetRootType(ContentTypeId nSet){
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index d68e22140b1d..3e1324bb1bea 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -36,15 +36,15 @@ class SwWrtShell;
class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
{
SwWrtShell* m_pSh;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary > > m_aDics;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellAlternatives > m_xSpellAlt;
+ css::uno::Sequence< css::uno::Reference<
+ css::linguistic2::XDictionary > > m_aDics;
+ css::uno::Reference<
+ css::linguistic2::XSpellAlternatives > m_xSpellAlt;
- ::com::sun::star::linguistic2::ProofreadingResult m_xGrammarResult;
+ css::linguistic2::ProofreadingResult m_xGrammarResult;
sal_Int32 m_nGrammarError;
- ::com::sun::star::uno::Sequence< OUString > m_aSuggestions;
+ css::uno::Sequence< OUString > m_aSuggestions;
OUString m_sExplanationLink;
LanguageType m_nCheckedLanguage;
@@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
Image m_aInfo16;
static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
- const ::com::sun::star::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
+ const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
std::map< sal_Int16, OUString > &rLangTable );
using PopupMenu::Execute;
@@ -71,14 +71,14 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
public:
SwSpellPopup( SwWrtShell *pWrtSh,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellAlternatives > &xAlt,
+ const css::uno::Reference<
+ css::linguistic2::XSpellAlternatives > &xAlt,
const OUString & rParaText );
SwSpellPopup( SwWrtShell *pWrtSh,
- const ::com::sun::star::linguistic2::ProofreadingResult &rResult,
+ const css::linguistic2::ProofreadingResult &rResult,
sal_Int32 nErrorInResult,
- const ::com::sun::star::uno::Sequence< OUString > &rSuggestions,
+ const css::uno::Sequence< OUString > &rSuggestions,
const OUString & rParaText );
sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin );
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index ab1cd78378b6..f615299e7285 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -166,7 +166,7 @@ class SwInsertSectionTabPage : public SfxTabPage
OUString m_sFilterName;
OUString m_sFilePasswd;
- ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd;
+ css::uno::Sequence <sal_Int8 > m_aNewPasswd;
SwWrtShell* m_pWrtSh;
sfx2::DocumentInserter* m_pDocInserter;
VclPtr<vcl::Window> m_pOldDefDlgParent;
diff --git a/sw/source/uibase/inc/sharedconnection.hxx b/sw/source/uibase/inc/sharedconnection.hxx
index 48b23e4f7673..138cbf51e107 100644
--- a/sw/source/uibase/inc/sharedconnection.hxx
+++ b/sw/source/uibase/inc/sharedconnection.hxx
@@ -23,7 +23,7 @@
#include <unotools/sharedunocomponent.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
-typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
+typedef ::utl::SharedUNOComponent< css::sdbc::XConnection > SharedConnection;
#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index e7cea26f9e10..d8d6d34be93a 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -77,7 +77,7 @@ private:
rtl::Reference< ChangesListener > listener_;
osl::Mutex mutex_;
- com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet >
+ css::uno::Reference< css::beans::XMultiPropertySet >
notifier_;
long nCurTextWidth;
diff --git a/sw/source/uibase/inc/stmenu.hxx b/sw/source/uibase/inc/stmenu.hxx
index 90876aa03a21..6c6073895ee0 100644
--- a/sw/source/uibase/inc/stmenu.hxx
+++ b/sw/source/uibase/inc/stmenu.hxx
@@ -42,15 +42,15 @@ class SwView;
class SwSmartTagPopup : public PopupMenu
{
SwView* mpSwView;
- com::sun::star::uno::Reference< com::sun::star::text::XTextRange > mxTextRange;
+ css::uno::Reference< css::text::XTextRange > mxTextRange;
struct InvokeAction
{
- com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > mxAction;
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxSmartTagProperties;
+ css::uno::Reference< css::smarttags::XSmartTagAction > mxAction;
+ css::uno::Reference< css::container::XStringKeyMap > mxSmartTagProperties;
sal_uInt32 mnActionID;
- InvokeAction( com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > xAction,
- com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xSmartTagProperties,
+ InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction,
+ css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties,
sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {}
};
@@ -60,9 +60,9 @@ class SwSmartTagPopup : public PopupMenu
public:
SwSmartTagPopup( SwView* _pSwView,
- ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
- ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange );
+ css::uno::Sequence< OUString >& rSmartTagTypes,
+ css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps,
+ css::uno::Reference< css::text::XTextRange > xTextRange );
sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin );
};
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index 87f3085043d5..88c9bce213e4 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -36,18 +36,18 @@ class SwRenameXNamedDlg : public ModalDialog
TextFilter m_aTextFilter;
VclPtr<OKButton> m_pOk;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xSecondAccess;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xThirdAccess;
+ css::uno::Reference< css::container::XNamed > & xNamed;
+ css::uno::Reference< css::container::XNameAccess > & xNameAccess;
+ css::uno::Reference< css::container::XNameAccess > xSecondAccess;
+ css::uno::Reference< css::container::XNameAccess > xThirdAccess;
DECL_LINK_TYPED(OkHdl, Button*, void);
DECL_LINK_TYPED(ModifyHdl, Edit&, void);
public:
SwRenameXNamedDlg( vcl::Window* pParent,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess );
+ css::uno::Reference< css::container::XNamed > & xNamed,
+ css::uno::Reference< css::container::XNameAccess > & xNameAccess );
virtual ~SwRenameXNamedDlg();
virtual void dispose() override;
@@ -57,8 +57,8 @@ public:
}
void SetAlternativeAccess(
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird )
+ css::uno::Reference< css::container::XNameAccess > & xSecond,
+ css::uno::Reference< css::container::XNameAccess > & xThird )
{
xSecondAccess = xSecond;
xThirdAccess = xThird;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 0a81436deeef..50847c0889ba 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -51,8 +51,8 @@ namespace com{namespace sun{namespace star{
struct SwIndexSections_Impl
{
- com::sun::star::uno::Reference< com::sun::star::text::XTextSection > xContainerSection;
- com::sun::star::uno::Reference< com::sun::star::text::XDocumentIndex > xDocumentIndex;
+ css::uno::Reference< css::text::XTextSection > xContainerSection;
+ css::uno::Reference< css::text::XDocumentIndex > xDocumentIndex;
};
class SwOneExampleFrame;
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 41ab57482e67..86bc063acd57 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -96,7 +96,7 @@ class SwIndexMarkPane
bool bPhoneticED2_ChangedByUser;
LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
bool bIsPhoneticReadingEnabled; //this value states whether phonetic reading is enabled in principle dependent of global cjk settings and language of current entry
- com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier >
+ css::uno::Reference< css::i18n::XExtendedIndexEntrySupplier >
xExtendedIndexEntrySupplier;
SwTOXMgr* pTOXMgr;
@@ -206,7 +206,7 @@ class SwAuthorMarkPane
OUString m_sCreatedEntry[AUTH_FIELD_END];
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess;
+ css::uno::Reference< css::container::XNameAccess > xBibAccess;
DECL_LINK_TYPED(InsertHdl, Button*, void);
DECL_LINK_TYPED(CloseHdl, Button*, void);
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index bfb09c38d7b6..796b5c0dce5b 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -68,8 +68,8 @@ public:
void UpdateChart();
/// @return the XModel of the newly inserted chart if successful
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
- InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
+ css::uno::Reference< css::frame::XModel >
+ InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
};
inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) :
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 3b23ac631bf1..1e573e915344 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -47,8 +47,8 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; }
const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; }
@@ -80,8 +80,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
const SwNumRule* GetNumRule() const { return pRule; }
SwNumRule* GetNumRule() { return pRule; }
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 94c1401a44e2..b95cb12f6d80 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -46,7 +46,7 @@ namespace com{ namespace sun{ namespace star {
}}}
class SwScannerEventListener : public ::cppu::WeakImplHelper<
- ::com::sun::star::lang::XEventListener >
+ css::lang::XEventListener >
{
SwView* pView;
@@ -57,24 +57,24 @@ public:
// XEventListener
virtual void SAL_CALL disposing(
- const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& rEventObject ) throw(css::uno::RuntimeException, std::exception) override;
void ViewDestroyed() { pView = 0; }
};
// Clipboard EventListener
class SwClipboardChangeListener : public ::cppu::WeakImplHelper<
- ::com::sun::star::datatransfer::clipboard::XClipboardListener >
+ css::datatransfer::clipboard::XClipboardListener >
{
SwView* pView;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject )
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XClipboardListener
- virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
- throw (com::sun::star::uno::RuntimeException,
+ virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
+ throw (css::uno::RuntimeException,
std::exception) override;
public:
@@ -90,11 +90,11 @@ class SwMailMergeConfigItem;
class SwView_Impl
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xScanEvtLstnr;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xClipEvtLstnr;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xDisProvInterceptor;
- ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier > mxXTextView; // UNO object
- com::sun::star::uno::WeakReference< com::sun::star::lang::XUnoTunnel > xTransferable;
+ css::uno::Reference< css::lang::XEventListener > xScanEvtLstnr;
+ css::uno::Reference< css::lang::XEventListener > xClipEvtLstnr;
+ css::uno::Reference< css::frame::XDispatchProviderInterceptor > xDisProvInterceptor;
+ css::uno::Reference< css::view::XSelectionSupplier > mxXTextView; // UNO object
+ css::uno::WeakReference< css::lang::XUnoTunnel > xTransferable;
// temporary document for printing text of selection / multi selection
// in PDF export.
@@ -125,7 +125,7 @@ public:
void SetShellMode(ShellModes eSet);
- ::com::sun::star::view::XSelectionSupplier* GetUNOObject();
+ css::view::XSelectionSupplier* GetUNOObject();
SwXTextView* GetUNOObject_Impl();
void Invalidate();
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index acaa4033b36a..b8c57ad10c9a 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -45,14 +45,14 @@ class SwXBodyText;
typedef tools::SvRef<SwDocShell> SwDocShellRef;
#endif
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+css::uno::Reference< css::uno::XInterface >
SAL_CALL SwXAutoTextContainer_createInstance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw ( ::com::sun::star::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & ) throw ( css::uno::Exception );
class SwXAutoTextContainer : public cppu::WeakImplHelper
<
- ::com::sun::star::text::XAutoTextContainer2,
- ::com::sun::star::lang::XServiceInfo
+ css::text::XAutoTextContainer2,
+ css::lang::XServiceInfo
>
{
SwGlossaries *pGlossaries;
@@ -64,37 +64,37 @@ public:
SwXAutoTextContainer();
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception ) override;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
//XNameAccess
- 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, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
//XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override;
//XAutoTextContainer
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
};
class SwXAutoTextGroup : public cppu::WeakImplHelper
<
- ::com::sun::star::text::XAutoTextGroup,
- ::com::sun::star::beans::XPropertySet,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::container::XIndexAccess,
- ::com::sun::star::container::XNamed,
- ::com::sun::star::lang::XUnoTunnel
+ css::text::XAutoTextGroup,
+ css::beans::XPropertySet,
+ css::lang::XServiceInfo,
+ css::container::XIndexAccess,
+ css::container::XNamed,
+ css::lang::XUnoTunnel
>
{
const SfxItemPropertySet* pPropSet;
@@ -108,47 +108,47 @@ protected:
public:
SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss);
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
//XAutoTextGroup
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getTitles() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
//XNamed
- virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
//XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception ) override;
+ virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
//XNameAccess
- 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, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
//XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
//XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
void Invalidate();
};
@@ -157,11 +157,11 @@ class SwXAutoTextEntry
:public SfxListener
,public cppu::WeakImplHelper
<
- ::com::sun::star::text::XAutoTextEntry,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XUnoTunnel,
- ::com::sun::star::text::XText,
- ::com::sun::star::document::XEventsSupplier
+ css::text::XAutoTextEntry,
+ css::lang::XServiceInfo,
+ css::lang::XUnoTunnel,
+ css::text::XText,
+ css::document::XEventsSupplier
>
{
SwGlossaries* pGlossaries;
@@ -169,7 +169,7 @@ class SwXAutoTextEntry
OUString sEntryName;
SwDocShellRef xDocSh;
SwXBodyText* pBodyText;
- com::sun::star::uno::Reference < com::sun::star::lang::XServiceInfo> xBodyText;
+ css::uno::Reference < css::lang::XServiceInfo> xBodyText;
void EnsureBodyText ()
{
@@ -201,36 +201,36 @@ protected:
public:
SwXAutoTextEntry(SwGlossaries* , const OUString& rGroupName, const OUString& rEntryName);
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
//XText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- 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, std::exception ) override;
- virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
//XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getString() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
//XAutoTextEntry
- virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange)throw( css::uno::RuntimeException, std::exception ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
// XEventsSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw( css::uno::RuntimeException, std::exception ) override;
void Invalidate() {pGlossaries = 0;}
const SwGlossaries* GetGlossaries() { return pGlossaries; }
@@ -254,7 +254,7 @@ public:
virtual ~SwAutoTextEventDescriptor();
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
protected:
@@ -262,18 +262,18 @@ protected:
const sal_uInt16 nEvent, /// item ID of event
const SvxMacro& rMacro) /// event (will be copied)
throw(
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException) override;
+ css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException) override;
virtual void getByName(
SvxMacro& rMacro, /// macro to be filled
const sal_uInt16 nEvent ) /// item ID of event
throw(
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException) override;
+ css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException) override;
};
#endif
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 51088a65c8c5..2889116c0200 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -33,9 +33,9 @@ class SwView;
class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
<
- ::com::sun::star::frame::XDispatchProviderInterceptor,
- ::com::sun::star::lang::XEventListener,
- ::com::sun::star::lang::XUnoTunnel
+ css::frame::XDispatchProviderInterceptor,
+ css::lang::XEventListener,
+ css::lang::XUnoTunnel
>
{
class DispatchMutexLock_Impl
@@ -52,13 +52,13 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
// ::osl::Mutex m_aMutex;#102295# solar mutex has to be used currently
// the component which's dispatches we're intercepting
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> m_xIntercepted;
+ css::uno::Reference< css::frame::XDispatchProviderInterception> m_xIntercepted;
// chaining
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher;
+ css::uno::Reference< css::frame::XDispatchProvider> m_xSlaveDispatcher;
+ css::uno::Reference< css::frame::XDispatchProvider> m_xMasterDispatcher;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> m_xDispatch;
+ css::uno::Reference< css::frame::XDispatch> m_xDispatch;
SwView* m_pView;
@@ -67,21 +67,21 @@ public:
virtual ~SwXDispatchProviderInterceptor();
//XDispatchProvider
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override;
//XDispatchProviderInterceptor
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) throw(css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
//XUnoTunnel
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
// view destroyed
void Invalidate();
@@ -89,14 +89,14 @@ public:
struct StatusStruct_Impl
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> xListener;
- ::com::sun::star::util::URL aURL;
+ css::uno::Reference< css::frame::XStatusListener> xListener;
+ css::util::URL aURL;
};
typedef std::list< StatusStruct_Impl > StatusListenerList;
class SwXDispatch : public cppu::WeakImplHelper
<
- ::com::sun::star::frame::XDispatch,
- ::com::sun::star::view::XSelectionChangeListener
+ css::frame::XDispatch,
+ css::view::XSelectionChangeListener
>
{
SwView* m_pView;
@@ -107,17 +107,17 @@ public:
SwXDispatch(SwView& rView);
virtual ~SwXDispatch();
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
- throw (::com::sun::star::uno::RuntimeException,
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
//XSelectionChangeListener
- virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
//XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
static const sal_Char* GetDBChangeURL();
};
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 6aa7e6786330..59bceace1160 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -65,12 +65,12 @@ class MailMergeExecuteFinalizer;
class SwXMailMerge :
public cppu::WeakImplHelper
<
- com::sun::star::task::XJob,
- com::sun::star::util::XCancellable,
- com::sun::star::beans::XPropertySet,
- com::sun::star::text::XMailMergeBroadcaster,
- com::sun::star::lang::XComponent,
- com::sun::star::lang::XServiceInfo
+ css::task::XJob,
+ css::util::XCancellable,
+ css::beans::XPropertySet,
+ css::text::XMailMergeBroadcaster,
+ css::lang::XComponent,
+ css::lang::XServiceInfo
>
{
friend class MailMergeExecuteFinalizer;
@@ -86,10 +86,10 @@ class SwXMailMerge :
OUString m_aTmpFileName;
// properties of mail merge service
- com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_aSelection;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > m_xResultSet;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_xConnection;
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > m_xModel;
+ css::uno::Sequence< css::uno::Any > m_aSelection;
+ css::uno::Reference< css::sdbc::XResultSet > m_xResultSet;
+ css::uno::Reference< css::sdbc::XConnection > m_xConnection;
+ css::uno::Reference< css::frame::XModel > m_xModel;
OUString m_aDataSourceName;
OUString m_aDataCommand;
OUString m_aFilter;
@@ -109,22 +109,22 @@ class SwXMailMerge :
OUString m_sMailBody;
OUString m_sAttachmentName;
OUString m_sAttachmentFilter;
- com::sun::star::uno::Sequence< OUString > m_aCopiesTo;
- com::sun::star::uno::Sequence< OUString > m_aBlindCopiesTo;
- bool m_bSendAsHTML;
- bool m_bSendAsAttachment;
+ css::uno::Sequence< OUString > m_aCopiesTo;
+ css::uno::Sequence< OUString > m_aBlindCopiesTo;
+ bool m_bSendAsHTML;
+ bool m_bSendAsAttachment;
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrintSettings;
+ css::uno::Sequence< css::beans::PropertyValue > m_aPrintSettings;
- bool m_bSaveAsSingleFile;
+ bool m_bSaveAsSingleFile;
OUString m_sSaveFilter;
OUString m_sSaveFilterOptions;
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aSaveFilterData;
+ css::uno::Sequence< css::beans::PropertyValue > m_aSaveFilterData;
bool m_bDisposing;
SwDBManager *m_pMgr;
- void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
+ void launchEvent( const css::beans::PropertyChangeEvent &rEvt ) const;
SwXMailMerge( const SwXMailMerge & ) = delete;
SwXMailMerge & operator = ( const SwXMailMerge & ) = delete;
@@ -133,40 +133,40 @@ protected:
public:
SwXMailMerge();
- void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const;
+ void LaunchMailMergeEvent( const css::text::MailMergeEvent &rData ) const;
// XJob
- virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::Exception,
+ css::uno::RuntimeException,
std::exception) override;
// XCancellable
- virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
// XMailMergeBroadcaster
- virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 70877da36abb..630f40c463b9 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -34,18 +34,18 @@ class SwViewOption;
class SwPrintData;
class SwDoc;
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & );
class SwXModule : public cppu::WeakImplHelper
<
- ::com::sun::star::view::XViewSettingsSupplier,
- ::com::sun::star::view::XPrintSettingsSupplier,
- ::com::sun::star::lang::XServiceInfo
+ css::view::XViewSettingsSupplier,
+ css::view::XPrintSettingsSupplier,
+ css::lang::XServiceInfo
>
{
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxViewSettings;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxPrintSettings;
+ css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
+ css::uno::Reference< css::beans::XPropertySet > mxPrintSettings;
protected:
virtual ~SwXModule();
@@ -53,20 +53,20 @@ public:
SwXModule();
//XViewSettings
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings()
+ throw( css::uno::RuntimeException, std::exception ) override;
//XPrintSettings
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getPrintSettings()
+ throw( css::uno::RuntimeException, std::exception ) override;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) override;
};
enum SwXPrintSettingsType
@@ -90,8 +90,8 @@ protected:
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
- virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+ virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
virtual void _postSetValues ()
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
@@ -106,10 +106,10 @@ protected:
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
- virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override;
+ virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
+ throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
virtual void _postGetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
virtual ~SwXPrintSettings()
throw();
@@ -118,11 +118,11 @@ public:
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) override;
};
class SwXViewSettings : public comphelper::ChainableHelperNoState
@@ -146,7 +146,7 @@ protected:
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
- virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+ virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
@@ -166,12 +166,12 @@ protected:
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
- virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+ virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
virtual void _postGetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
virtual ~SwXViewSettings()
throw();
@@ -179,9 +179,9 @@ public:
SwXViewSettings(bool bWeb, SwView* pView);
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
bool IsValid() const {return bObjectValid;}
void Invalidate() {bObjectValid = false;}
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index fbb9fabf9f05..5e37a4ce2f96 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -68,10 +68,10 @@ class SwView;
class SW_DLLPUBLIC SwOneExampleFrame
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > _xControl;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > _xModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > _xController;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > _xCursor;
+ css::uno::Reference< css::awt::XControl > _xControl;
+ css::uno::Reference< css::frame::XModel > _xModel;
+ css::uno::Reference< css::frame::XController > _xController;
+ css::uno::Reference< css::text::XTextCursor > _xCursor;
VclPtr<SwFrmCtrlWindow> aTopWindow;
Idle aLoadedIdle;
@@ -102,9 +102,9 @@ public:
const OUString* pURL = 0);
~SwOneExampleFrame();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & GetModel() {return _xModel;}
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & GetController() {return _xController;}
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & GetTextCursor() {return _xCursor;}
+ css::uno::Reference< css::frame::XModel > & GetModel() {return _xModel;}
+ css::uno::Reference< css::frame::XController > & GetController() {return _xController;}
+ css::uno::Reference< css::text::XTextCursor > & GetTextCursor() {return _xCursor;}
void ClearDocument( bool bStartTimer = false );
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index dfa6721a7796..e6d9b4b51e04 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -48,14 +48,14 @@ class SdrObject;
class SwView;
class SwXTextView :
- public ::com::sun::star::view::XSelectionSupplier,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::view::XFormLayerAccess,
- public ::com::sun::star::text::XTextViewCursorSupplier,
- public ::com::sun::star::text::XRubySelection,
- public ::com::sun::star::view::XViewSettingsSupplier,
- public ::com::sun::star::beans::XPropertySet,
- public ::com::sun::star::datatransfer::XTransferableSupplier,
+ public css::view::XSelectionSupplier,
+ public css::lang::XServiceInfo,
+ public css::view::XFormLayerAccess,
+ public css::text::XTextViewCursorSupplier,
+ public css::text::XRubySelection,
+ public css::view::XViewSettingsSupplier,
+ public css::beans::XPropertySet,
+ public css::datatransfer::XTransferableSupplier,
public SfxBaseController
{
::cppu::OInterfaceContainerHelper m_SelChangedListeners;
@@ -64,88 +64,88 @@ class SwXTextView :
const SfxItemPropertySet* m_pPropSet; // property map for SwXTextView properties
// (not related to mxViewSettings!)
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxViewSettings;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > mxTextViewCursor;
+ css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
+ css::uno::Reference< css::text::XTextViewCursor > mxTextViewCursor;
SdrObject* GetControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model,
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xToFill );
+ const css::uno::Reference< css::awt::XControlModel > & Model,
+ css::uno::Reference< css::awt::XControl >& xToFill );
protected:
virtual ~SwXTextView();
public:
SwXTextView(SwView* pSwView);
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw() override;
virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
//XSelectionSupplier
- virtual ::com::sun::star::uno::Any SAL_CALL getSelection()
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Any SAL_CALL getSelection()
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface)
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException,
+ virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
// XFormLayerAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override;
// XControlAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
//XTextViewCursorSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::text::XTextViewCursor > SAL_CALL getViewCursor() throw( css::uno::RuntimeException, std::exception ) override;
//XViewSettings
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings() throw( css::uno::RuntimeException, std::exception ) override;
//XRubySelection
- virtual ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Sequence<
+ css::uno::Sequence<
+ css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setRubyList(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
- throw (::com::sun::star::uno::RuntimeException,
+ const css::uno::Sequence<
+ css::uno::Sequence<
+ css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
+ throw (css::uno::RuntimeException,
std::exception) override;
//XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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,
- std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
+ 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, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
+ std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
//XTransferableSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( )
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable( )
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw (css::datatransfer::UnsupportedFlavorException, css::uno::RuntimeException, std::exception) override;
void NotifySelChanged();
void NotifyDBChanged();
@@ -158,14 +158,14 @@ public:
};
typedef cppu::WeakImplHelper<
- ::com::sun::star::text::XTextViewCursor,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::text::XPageCursor,
- ::com::sun::star::view::XScreenCursor,
- ::com::sun::star::view::XViewCursor,
- ::com::sun::star::view::XLineCursor,
- ::com::sun::star::beans::XPropertySet,
- ::com::sun::star::beans::XPropertyState
+ css::text::XTextViewCursor,
+ css::lang::XServiceInfo,
+ css::text::XPageCursor,
+ css::view::XScreenCursor,
+ css::view::XViewCursor,
+ css::view::XLineCursor,
+ css::beans::XPropertySet,
+ css::beans::XPropertyState
> SwXTextViewCursor_Base;
class SwXTextViewCursor : public SwXTextViewCursor_Base,
@@ -183,146 +183,146 @@ public:
DECLARE_XINTERFACE()
//XTextViewCursor
- virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Point SAL_CALL getPosition() throw( css::uno::RuntimeException, std::exception ) override;
//XTextCursor - neu
virtual void SAL_CALL collapseToStart()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL collapseToEnd()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL isCollapsed()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL gotoStart( sal_Bool bExpand )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
- throw (::com::sun::star::uno::RuntimeException,
+ virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand )
+ throw (css::uno::RuntimeException,
std::exception) override;
//XPageCursor
virtual sal_Bool SAL_CALL jumpToFirstPage()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL jumpToLastPage()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL jumpToNextPage() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Int16 SAL_CALL getPage()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
//XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText()
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Reference< css::text::XText > SAL_CALL getText()
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart()
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart()
+ throw (css::uno::RuntimeException,
std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd()
- throw (::com::sun::star::uno::RuntimeException,
+ virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd()
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual OUString SAL_CALL getString()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setString(const OUString& aString)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
//XScreenCursor
virtual sal_Bool SAL_CALL screenDown()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL screenUp()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
//XViewCursor
virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
//XLineCursor
virtual sal_Bool SAL_CALL isAtStartOfLine()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL isAtEndOfLine()
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception) override;
//XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- 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,
- std::exception) override;
- 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,
- std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
+ 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,
+ std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
+ std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
+ 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, std::exception) override;
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException,
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException,
std::exception) override;
- 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 css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException,
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException,
std::exception) override;
- 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,
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
std::exception) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
void Invalidate(){m_pView = 0;}
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 865aadf7daec..299dbb0777f9 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -32,7 +32,7 @@ private:
SwMasterUsrPref& rParent;
bool bWeb;
- com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -41,7 +41,7 @@ public:
virtual ~SwContentViewConfig();
// utl::ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
@@ -53,7 +53,7 @@ private:
SwMasterUsrPref& rParent;
bool bWeb;
- com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -61,7 +61,7 @@ public:
SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent);
virtual ~SwLayoutViewConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -71,7 +71,7 @@ class SwGridConfig : public utl::ConfigItem
private:
SwMasterUsrPref& rParent;
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -79,7 +79,7 @@ public:
SwGridConfig(bool bWeb, SwMasterUsrPref& rParent);
virtual ~SwGridConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -89,7 +89,7 @@ class SwCursorConfig : public utl::ConfigItem
private:
SwMasterUsrPref& rParent;
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() override;
@@ -97,7 +97,7 @@ public:
SwCursorConfig(SwMasterUsrPref& rParent);
virtual ~SwCursorConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
@@ -106,7 +106,7 @@ class SwWebColorConfig : public utl::ConfigItem
{
private:
SwMasterUsrPref& rParent;
- com::sun::star::uno::Sequence<OUString> aPropNames;
+ css::uno::Sequence<OUString> aPropNames;
virtual void ImplCommit() override;
@@ -114,7 +114,7 @@ public:
SwWebColorConfig(SwMasterUsrPref& rParent);
virtual ~SwWebColorConfig();
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void Load();
void SetModified(){ConfigItem::SetModified();}
};
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 9a13873c0e7d..b2e220eabf26 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -121,7 +121,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
public:
- SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent );
+ SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent );
virtual ~SwScrollNaviPopup();
virtual void dispose() override;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index b640061efdc4..ef2f1c934be2 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -362,7 +362,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
// search and replace
- sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
+ sal_uLong SearchPattern(const css::util::SearchOptions& rSearchOpt,
bool bSearchInNotes,
SwDocPositions eStart, SwDocPositions eEnd,
FindRanges eFlags = FND_IN_BODY,
@@ -377,7 +377,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
bool bNoColls,
SwDocPositions eStart, SwDocPositions eEnd,
FindRanges eFlags = FND_IN_BODY,
- const com::sun::star::util::SearchOptions* pSearchOpt = 0,
+ const css::util::SearchOptions* pSearchOpt = 0,
const SfxItemSet* pReplaceSet = 0);
void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar );
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index d4c2479c564b..889541a777ab 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -50,10 +50,10 @@
#include <unomid.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::i18n;
+using namespace css::text;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::i18n;
// Description: Turn off frame/object shell if applicable
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 46f0039016f2..aa95a1763234 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -165,8 +165,8 @@ void SwSpellPopup::fillLangPopupMenu(
}
//6--all languages used in current document
- uno::Reference< com::sun::star::frame::XModel > xModel;
- uno::Reference< com::sun::star::frame::XController > xController( pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface()->getController(), uno::UNO_QUERY );
+ uno::Reference< css::frame::XModel > xModel;
+ uno::Reference< css::frame::XController > xController( pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface()->getController(), uno::UNO_QUERY );
if ( xController.is() )
xModel = xController->getModel();
uno::Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, uno::UNO_QUERY );
@@ -798,10 +798,10 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
{
try
{
- uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
- com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
+ uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+ css::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute( m_sExplanationLink, OUString(),
- com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ css::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch (const uno::Exception&)
{
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 6b147080a178..e3a485794b67 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -44,7 +44,7 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
namespace
{
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 9b8276d6bd2c..10a2e227455d 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -60,9 +60,9 @@
#define ZOOM_ENTRIES 9
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::frame;
SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 5f68f0c57b73..d3ebe91d5e56 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -126,9 +126,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::i18n;
#define SwAnnotationShell
@@ -1401,7 +1401,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq)
if (!pOLV)
return;
- using namespace ::com::sun::star::i18n;
+ using namespace css::i18n;
sal_uInt32 nMode = 0;
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 58921faec742..3aa8c419d035 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -149,9 +149,9 @@ namespace
}
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::frame;
+using namespace css::lang;
SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell)
@@ -716,7 +716,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
sal_Int8 nGalleryItemType( pGalleryItem->GetType() );
if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF) &&
- nGalleryItemType == com::sun::star::gallery::GalleryItemType::GRAPHIC )
+ nGalleryItemType == css::gallery::GalleryItemType::GRAPHIC )
{
SwWait aWait( *rView.GetDocShell(), true );
@@ -731,7 +731,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
GetView().GetEditWin().GrabFocus();
}
else if(!rSh.IsSelFrmMode() &&
- nGalleryItemType == com::sun::star::gallery::GalleryItemType::MEDIA )
+ nGalleryItemType == css::gallery::GalleryItemType::MEDIA )
{
const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() );
GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L );
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 86df26664185..21440386efdc 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -67,7 +67,7 @@
#include "misc.hrc"
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index ff2c67e550c7..98b77ecb8e55 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -77,9 +77,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::i18n;
SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell)
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 0872981aa2be..1e065af9f124 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -85,7 +85,7 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
// Prototypes
static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index 69a18da6a07b..4910b7a5f13b 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -57,8 +57,8 @@
// <- #111827#
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::uno;
+using namespace css::ui::dialogs;
using namespace ::sfx2;
bool SwTextShell::InsertMediaDlg( SfxRequest& rReq )
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 8c65f71359fd..807db4339bbd 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -876,7 +876,7 @@ void SwTextShell::ExecDelete(SfxRequest &rReq)
void SwTextShell::ExecTransliteration( SfxRequest & rReq )
{
- using namespace ::com::sun::star::i18n;
+ using namespace css::i18n;
sal_uInt32 nMode = 0;
switch( rReq.GetSlot() )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c57ede29641b..94f95fe0bd53 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1229,7 +1229,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if( SfxItemState::SET == aCoreSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
{
SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
- std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
@@ -1283,7 +1283,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if( SfxItemState::SET == aCoreSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
{
SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
- std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index fddb21522455..19a578974e8b 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -66,14 +66,14 @@
using namespace ::svx;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::sdb;
+using namespace css::sdbc;
+using namespace css::sdbcx;
+using namespace css::beans;
+using namespace css::frame;
struct DBTextStruct_Impl
{
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 069f3cf1ed72..6f4b82e18467 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -434,7 +434,7 @@ bool PageMarginControl::GetUserCustomValues()
SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
if ( aWinOpt.Exists() )
{
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt.GetUserData();
OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
@@ -446,7 +446,7 @@ bool PageMarginControl::GetUserCustomValues()
SvtViewOptions aWinOpt2( E_WINDOW, SWPAGE_RIGHT_GVALUE );
if ( aWinOpt2.Exists() )
{
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt2.GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt2.GetUserData();
OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
@@ -458,7 +458,7 @@ bool PageMarginControl::GetUserCustomValues()
SvtViewOptions aWinOpt3( E_WINDOW, SWPAGE_TOP_GVALUE );
if ( aWinOpt3.Exists() )
{
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt3.GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt3.GetUserData();
OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
@@ -470,7 +470,7 @@ bool PageMarginControl::GetUserCustomValues()
SvtViewOptions aWinOpt4( E_WINDOW, SWPAGE_DOWN_GVALUE );
if ( aWinOpt4.Exists() )
{
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt4.GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt4.GetUserData();
OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
@@ -482,7 +482,7 @@ bool PageMarginControl::GetUserCustomValues()
SvtViewOptions aWinOpt5( E_WINDOW, SWPAGE_MIRROR_GVALUE );
if ( aWinOpt5.Exists() )
{
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt5.GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt5.GetUserData();
OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
@@ -501,7 +501,7 @@ void PageMarginControl::StoreUserCustomValues()
return;
}
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
+ css::uno::Sequence < css::beans::NamedValue > aSeq(1);
SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
aSeq[0].Name = "mnPageLeftMargin";
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index a869b44e3f49..8ac1f6939617 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -83,15 +83,15 @@ namespace sw { namespace sidebar {
VclPtr<vcl::Window> PagePropertyPanel::Create (
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+ const css::uno::Reference< css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
- throw ::com::sun::star::lang::IllegalArgumentException("no parent Window given to PagePropertyPanel::Create", NULL, 0);
+ throw css::lang::IllegalArgumentException("no parent Window given to PagePropertyPanel::Create", NULL, 0);
if ( ! rxFrame.is())
- throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PagePropertyPanel::Create", NULL, 1);
+ throw css::lang::IllegalArgumentException("no XFrame given to PagePropertyPanel::Create", NULL, 1);
if (pBindings == NULL)
- throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", NULL, 2);
+ throw css::lang::IllegalArgumentException("no SfxBindings given to PagePropertyPanel::Create", NULL, 2);
return VclPtr<PagePropertyPanel>::Create( pParent,
rxFrame,
@@ -100,7 +100,7 @@ VclPtr<vcl::Window> PagePropertyPanel::Create (
PagePropertyPanel::PagePropertyPanel(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+ const css::uno::Reference< css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame)
, mpBindings(pBindings)
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index a575e8eb3840..b1456a9540fa 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -56,7 +56,7 @@ namespace sw { namespace sidebar {
public:
static VclPtr<vcl::Window> Create(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+ const css::uno::Reference< css::frame::XFrame>& rxFrame,
SfxBindings* pBindings );
// interface of ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -98,7 +98,7 @@ namespace sw { namespace sidebar {
PagePropertyPanel(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+ const css::uno::Reference< css::frame::XFrame>& rxFrame,
SfxBindings* pBindings );
private:
virtual ~PagePropertyPanel();
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index d341db8649b9..1e6708bf4ec4 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -47,15 +47,15 @@ namespace sw { namespace sidebar {
VclPtr<vcl::Window> WrapPropertyPanel::Create (
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+ const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings)
{
if (pParent == NULL)
- throw ::com::sun::star::lang::IllegalArgumentException("no parent Window given to WrapPropertyPanel::Create", NULL, 0);
+ throw css::lang::IllegalArgumentException("no parent Window given to WrapPropertyPanel::Create", NULL, 0);
if ( ! rxFrame.is())
- throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to WrapPropertyPanel::Create", NULL, 1);
+ throw css::lang::IllegalArgumentException("no XFrame given to WrapPropertyPanel::Create", NULL, 1);
if (pBindings == NULL)
- throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
+ throw css::lang::IllegalArgumentException("no SfxBindings given to WrapPropertyPanel::Create", NULL, 2);
return VclPtr<WrapPropertyPanel>::Create(
pParent,
@@ -65,7 +65,7 @@ VclPtr<vcl::Window> WrapPropertyPanel::Create (
WrapPropertyPanel::WrapPropertyPanel(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+ const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings )
: PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame)
, mxFrame( rxFrame )
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 38230b51fac9..5dd4caa5ff09 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -36,7 +36,7 @@ namespace sw { namespace sidebar {
public:
static VclPtr<vcl::Window> Create(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
+ const css::uno::Reference< css::frame::XFrame>& rxFrame,
SfxBindings* pBindings );
// interface of ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
@@ -51,10 +51,10 @@ namespace sw { namespace sidebar {
WrapPropertyPanel(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
+ const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings );
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
SfxBindings* mpBindings;
VclPtr<RadioButton> mpRBNoWrap;
diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx
index 42751cfc507d..9d45454ab0d0 100644
--- a/sw/source/uibase/smartmenu/stmenu.cxx
+++ b/sw/source/uibase/smartmenu/stmenu.cxx
@@ -29,7 +29,7 @@
#include <breakit.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
Sequence< OUString >& rSmartTagTypes,
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index c28c18675c45..7f54cf505442 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -59,7 +59,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart )
{
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 90b707c1a369..e0a9894b7d51 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -225,7 +225,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
uno::Reference < embed::XEmbeddedObject > xObj =
aCnt.CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aObjName );
- ::svt::EmbeddedObjectRef aEmbObjRef( xObj, ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
+ ::svt::EmbeddedObjectRef aEmbObjRef( xObj, css::embed::Aspects::MSOLE_CONTENT );
if ( xObj.is() )
{
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 7535940181ea..3efbd57b9b7e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1844,20 +1844,20 @@ bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
return bOk;
}
-uno::Reference< ::com::sun::star::accessibility::XAccessible >
+uno::Reference< css::accessibility::XAccessible >
SwPagePreviewWin::CreateAccessible()
{
SolarMutexGuard aGuard; // this should have happened already!!!
OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" );
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( false );
+ css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible( false );
if (xAcc.is())
{
return xAcc;
}
if (mpViewShell)
{
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccPreview = mpViewShell->CreateAccessiblePreview();
+ css::uno::Reference< css::accessibility::XAccessible > xAccPreview = mpViewShell->CreateAccessiblePreview();
SetAccessible(xAccPreview);
}
return GetAccessible( false );
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index eb66d8ac5fa5..80a6c849ce61 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -91,12 +91,12 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::uno;
+using namespace css::ui::dialogs;
using namespace ::sfx2;
-using ::com::sun::star::util::SearchOptions;
+using css::util::SearchOptions;
#define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW )
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 23ec3205ab97..b1f792bff4c3 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -49,10 +49,10 @@
#include <view.hrc>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::scanner;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::datatransfer::clipboard;
+using namespace css::uno;
+using namespace css::scanner;
+using namespace css::lang;
+using namespace css::datatransfer::clipboard;
SwView_Impl::SwView_Impl(SwView* pShell)
: mxXTextView()
@@ -278,7 +278,7 @@ void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventO
{
}
-void SAL_CALL SwClipboardChangeListener::changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject )
+void SAL_CALL SwClipboardChangeListener::changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
throw (RuntimeException, std::exception)
{
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 7dd9064caad0..4cb1d172d216 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -114,9 +114,9 @@
#include <svl/cjkoptions.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::scanner;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::scanner;
extern bool g_bNoInterrupt; // in swmodule.cxx
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 7c528dc42a31..b506d5505c9f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -153,15 +153,15 @@ const char sStatusComma[] = " , ";
using namespace sfx2;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::scanner;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::ui::dialogs;
+using namespace css::i18n;
+using namespace css::util;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::scanner;
+using namespace css::beans;
+using namespace css::container;
+using namespace css::sdb;
+using namespace css::ui::dialogs;
static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16 nWhichId )
{
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 25a626d99c38..7e83a86dd620 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -90,10 +90,10 @@
using namespace sw::mark;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::smarttags;
+using namespace css::beans;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::smarttags;
// Lingu-Dispatcher
@@ -741,7 +741,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
uno::Reference< frame::XFrame > xFrame;
if ( pSfxViewFrame )
xFrame = pSfxViewFrame->GetFrame().GetFrameInterface();
- com::sun::star::util::URL aURL;
+ css::util::URL aURL;
uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY );
try
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index a722622493fd..58fc72667fd1 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -56,8 +56,8 @@
sal_uInt16 SwView::m_nMoveType = NID_PGE;
sal_Int32 SwView::m_nActMark = 0;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::frame;
void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly )
{
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 92d907694970..f37acaeda850 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -69,9 +69,9 @@
#include "PostItMgr.hxx"
using namespace com::sun::star;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
+using namespace css::i18n;
+using namespace css::lang;
+using namespace css::util;
//Search Parameter
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index a48e970561ed..3aefd4f83588 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -50,10 +50,10 @@
using namespace comphelper;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::i18n;
enum SwDocumentSettingsPropertyHandles
{
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index edd0c703ca81..131991312fec 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -33,12 +33,12 @@ class SfxPrinter;
class SwXDocumentSettings :
public comphelper::MasterPropertySet,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::lang::XTypeProvider,
public cppu::OWeakObject
{
protected:
- com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel;
+ css::uno::Reference< css::text::XTextDocument > mxModel;
SwXTextDocument* mpModel;
SwDocShell* mpDocSh;
SwDoc* mpDoc;
@@ -49,22 +49,22 @@ protected:
VclPtr<SfxPrinter> mpPrinter;
virtual void _preSetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
- virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+ virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
virtual void _postSetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
virtual void _preGetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
- virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+ virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) override;
virtual void _postGetValues ()
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override;
+ throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
protected:
virtual ~SwXDocumentSettings()
throw();
@@ -72,8 +72,8 @@ public:
SwXDocumentSettings( SwXTextDocument* pModel );
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( )
throw () override;
virtual void SAL_CALL release( )
@@ -81,15 +81,15 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw(com::sun::star::uno::RuntimeException, std::exception) override;
+ throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ throw(css::uno::RuntimeException, std::exception) override;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override;
};
#endif
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 74de4115911f..003cc4bac491 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -35,9 +35,9 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::lang;
+using namespace css::ui::dialogs;
+using namespace css::document;
+using namespace css::lang;
#define FILTER_OPTIONS_NAME "FilterOptions"
@@ -155,9 +155,9 @@ uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames()
return uno::Sequence< OUString> (&sService, 1);
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index b3c7ba28cd02..98c5f8bb1038 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -37,11 +37,11 @@
#include <view.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags;
+using namespace css::lang;
+using namespace css::frame;
+using namespace css::uno;
+using namespace css::linguistic2;
+using namespace css::linguistic2::LinguServiceEventFlags;
SwLinguServiceEventListener::SwLinguServiceEventListener()
{
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 428b6c92f109..f42b4b5ba50e 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -1091,9 +1091,9 @@ void SwAutoTextEventDescriptor::getByName(
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXAutoTextContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXAutoTextContainer_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
//the module may not be loaded
SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index bfa5ce5b4c6e..80f3ca86e80a 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -57,9 +57,9 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance(
return uno::Reference< uno::XInterface >( pShell->GetModel() );
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_WebDocument_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_WebDocument_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
SwGlobals::ensure();
@@ -70,9 +70,9 @@ com_sun_star_comp_Writer_WebDocument_get_implementation(::com::sun::star::uno::X
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_Writer_GlobalDocument_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_GlobalDocument_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
SwGlobals::ensure();
diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx
index 9b455f335fcf..a3671cf390ab 100644
--- a/sw/source/uibase/uno/unofreg.cxx
+++ b/sw/source/uibase/uno/unofreg.cxx
@@ -32,7 +32,7 @@
#include <string.h>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
+using namespace css::lang;
// #i73788#
#include <cppuhelper/implementationentry.hxx>
@@ -83,9 +83,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sw_component_getFactory(
} // extern "C"
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXMailMerge_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXMailMerge_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
#if HAVE_FEATURE_DBCONNECTIVITY
SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 2dde9d41362b..5d83796a5208 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -74,11 +74,11 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
+using namespace css::frame;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
using namespace SWUnoHelper;
typedef ::utl::SharedUNOComponent< XInterface > SharedComponent;
@@ -832,7 +832,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
return makeAny( true );
}
-void SAL_CALL SwXMailMerge::cancel() throw (com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL SwXMailMerge::cancel() throw (css::uno::RuntimeException, std::exception)
{
// Cancel may be called from a second thread, so this protects from m_pMgr
/// cleanup in the execute function.
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 2971c05d25c4..a87741b45302 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -42,9 +42,9 @@
#include <rtl/ustrbuf.hxx>
#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
using namespace ::comphelper;
enum SwViewSettingsPropertyHandles
@@ -1005,9 +1005,9 @@ Sequence< OUString > SwXViewSettings::getSupportedServiceNames() throw( RuntimeE
return aRet;
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-SwXModule_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+SwXModule_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new SwXModule());
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 4c54dc9fb4f5..5244f007b166 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -152,13 +152,13 @@
#include <memory>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::i18n;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::document;
+using namespace css::text;
+using namespace css::i18n;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::container;
+using namespace css::document;
using ::osl::FileBase;
#define SW_CREATE_DASH_TABLE 0x01
@@ -301,12 +301,12 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(Run
}
if ( !aRet.hasValue()
- && rType != cppu::UnoType<com::sun::star::document::XDocumentEventBroadcaster>::get()
- && rType != cppu::UnoType<com::sun::star::frame::XController>::get()
- && rType != cppu::UnoType<com::sun::star::frame::XFrame>::get()
- && rType != cppu::UnoType<com::sun::star::script::XInvocation>::get()
- && rType != cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get()
- && rType != cppu::UnoType<com::sun::star::awt::XWindow>::get())
+ && rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get()
+ && rType != cppu::UnoType<css::frame::XController>::get()
+ && rType != cppu::UnoType<css::frame::XFrame>::get()
+ && rType != cppu::UnoType<css::script::XInvocation>::get()
+ && rType != cppu::UnoType<css::beans::XFastPropertySet>::get()
+ && rType != cppu::UnoType<css::awt::XWindow>::get())
{
GetNumberFormatter();
if(xNumFormatAgg.is())
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index dc012f1a0183..fce18a5a9620 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -77,14 +77,14 @@
#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::frame;
-
-using ::com::sun::star::util::URL;
+using namespace css::uno;
+using namespace css::lang;
+using namespace css::beans;
+using namespace css::text;
+using namespace css::view;
+using namespace css::frame;
+
+using css::util::URL;
using comphelper::HelperBaseNoState;
SwXTextView::SwXTextView(SwView* pSwView) :
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index fd11e8a5b8a0..b67e203fb607 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -24,7 +24,7 @@
#include <vcl/builderfactory.hxx>
using namespace ::svx;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle)
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 338198eb9e5b..822284f74f3e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -101,9 +101,9 @@
using namespace ::std;
using namespace ::com::sun::star;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
+using namespace css::text;
+using namespace css::uno;
+using namespace css::container;
#define NAVI_BOOKMARK_DELIM (sal_Unicode)1
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 1c43dd420de4..5882387ef719 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -60,7 +60,7 @@
#include "swabstdlg.hxx"
#include <memory>
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
// Context menu for GlobalTree
#define CTX_INSERT_ANY_INDEX 10
diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx
index 4c60c27d4b46..0732fed68add 100644
--- a/sw/source/uibase/utlui/navicfg.cxx
+++ b/sw/source/uibase/utlui/navicfg.cxx
@@ -27,7 +27,7 @@
#include <unomid.h>
using namespace ::utl;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
Sequence<OUString> SwNavigationConfig::GetPropertyNames()
{
@@ -124,6 +124,6 @@ void SwNavigationConfig::ImplCommit()
PutProperties(aNames, aValues);
}
-void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SwNavigationConfig::Notify( const css::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index b4997d00096a..fd048d49073b 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -57,8 +57,8 @@
#include <unomid.h>
#include <memory>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
+using namespace css::uno;
+using namespace css::frame;
SFX_IMPL_CHILDWINDOW_CONTEXT( SwNavigationChild, SID_NAVIGATOR, SwView )
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 90a8154c82fe..ddeb44c6188b 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -44,8 +44,8 @@
#include <sfx2/viewfrm.hxx>
#include <memory>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::lang;
// STATIC DATA
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 16823c94e688..dee8d90482ee 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -30,7 +30,7 @@
#include <numrule.hxx>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css::uno;
SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) :
SfxPoolItem( nId ),
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 6ed9aea5d9e0..c2165ccc2674 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -178,7 +178,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
if( SfxItemState::SET == rOrigSet.GetItemState( RES_CHRATR_GRABBAG, false, &pTmpItem ) )
{
SfxGrabBagItem aGrabBag(*static_cast<const SfxGrabBagItem*>(pTmpItem));
- std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag();
+ std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index 22b3f48fb180..8e4b24e04a62 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -178,10 +178,10 @@ bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
// commit state change
SvxViewLayoutItem aViewLayout( nColumns, bBookMode );
- ::com::sun::star::uno::Any a;
+ css::uno::Any a;
aViewLayout.QueryValue( a );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "ViewLayout";
aArgs[0].Value = a;
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index e7a3806b95e2..342123150f12 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace util {
struct SearchOptions;
} } } }
-using namespace ::com::sun::star::util;
+using namespace css::util;
static long nStartDragX = 0, nStartDragY = 0;
static bool bStartDrag = false;
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index de8d83e695e2..922b06b7404d 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -594,8 +594,8 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point&
try
{
sal_Int32 nState = xObj->getCurrentState();
- if ( nState == ::com::sun::star::embed::EmbedStates::INPLACE_ACTIVE
- || nState == ::com::sun::star::embed::EmbedStates::UI_ACTIVE )
+ if ( nState == css::embed::EmbedStates::INPLACE_ACTIVE
+ || nState == css::embed::EmbedStates::UI_ACTIVE )
{
SfxInPlaceClient* pCli =
GetView().FindIPClient( xObj.GetObject(), &(GetView().GetEditWin()) );