[Libreoffice-commits] core.git: sw/source
Noel Grandin
noel at peralex.com
Fri Nov 6 02:16:10 PST 2015
sw/source/core/access/acccell.cxx | 8
sw/source/core/access/acccell.hxx | 83 +---
sw/source/core/access/acccontext.hxx | 131 +++---
sw/source/core/access/accdoc.cxx | 26 -
sw/source/core/access/accdoc.hxx | 111 ++---
sw/source/core/access/accembedded.cxx | 16
sw/source/core/access/accembedded.hxx | 22 -
sw/source/core/access/accfootnote.hxx | 12
sw/source/core/access/accgraphic.cxx | 2
sw/source/core/access/accgraphic.hxx | 12
sw/source/core/access/accheaderfooter.cxx | 2
sw/source/core/access/accheaderfooter.hxx | 14
sw/source/core/access/acchyperlink.cxx | 8
sw/source/core/access/acchyperlink.hxx | 38 -
sw/source/core/access/accmap.cxx | 10
sw/source/core/access/accnotextframe.cxx | 42 +-
sw/source/core/access/accnotextframe.hxx | 79 +--
sw/source/core/access/accnotexthyperlink.cxx | 4
sw/source/core/access/accnotexthyperlink.hxx | 37 -
sw/source/core/access/accpage.cxx | 2
sw/source/core/access/accpage.hxx | 12
sw/source/core/access/accpara.cxx | 44 +-
sw/source/core/access/accpara.hxx | 255 ++++++------
sw/source/core/access/accportions.cxx | 2
sw/source/core/access/accportions.hxx | 14
sw/source/core/access/accpreview.cxx | 6
sw/source/core/access/accpreview.hxx | 14
sw/source/core/access/accselectionhelper.hxx | 24 -
sw/source/core/access/acctable.cxx | 2
sw/source/core/access/acctable.hxx | 176 ++++----
sw/source/core/access/acctextframe.cxx | 12
sw/source/core/access/acctextframe.hxx | 54 +-
sw/source/core/access/textmarkuphelper.cxx | 34 -
sw/source/core/access/textmarkuphelper.hxx | 20
sw/source/core/doc/DocumentDrawModelManager.cxx | 4
sw/source/core/doc/DocumentSettingManager.cxx | 2
sw/source/core/doc/DocumentStatisticsManager.cxx | 2
sw/source/core/doc/number.cxx | 17
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/cancellablejob.cxx | 4
sw/source/core/docnode/cancellablejob.hxx | 6
sw/source/core/docnode/finalthreadmanager.cxx | 12
sw/source/core/docnode/retrievedinputstreamdata.cxx | 2
sw/source/core/docnode/retrieveinputstream.cxx | 6
sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 2
sw/source/core/docnode/section.cxx | 2
sw/source/core/docnode/threadmanager.cxx | 4
sw/source/core/edit/edattr.cxx | 6
sw/source/core/edit/edundo.cxx | 6
sw/source/core/fields/authfld.cxx | 2
sw/source/core/fields/ddefld.cxx | 2
sw/source/core/fields/textapi.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/inc/DocumentFieldsManager.hxx | 2
sw/source/core/inc/DocumentLayoutManager.hxx | 2
sw/source/core/inc/DocumentLinksAdministrationManager.hxx | 4
sw/source/core/inc/DocumentRedlineManager.hxx | 6
sw/source/core/inc/DocumentSettingManager.hxx | 4
sw/source/core/inc/SwXMLBlockExport.hxx | 8
sw/source/core/inc/SwXMLBlockImport.hxx | 6
sw/source/core/inc/SwXMLTextBlocks.hxx | 8
sw/source/core/inc/SwXTextDefaults.hxx | 54 +-
sw/source/core/inc/UndoOverwrite.hxx | 2
sw/source/core/inc/bookmrk.hxx | 12
sw/source/core/inc/docsort.hxx | 2
sw/source/core/inc/dumpfilter.hxx | 32 -
sw/source/core/inc/frame.hxx | 4
sw/source/core/inc/pamtyp.hxx | 2
sw/source/core/inc/retrievedinputstreamdata.hxx | 4
sw/source/core/inc/retrieveinputstreamconsumer.hxx | 2
sw/source/core/inc/swthreadjoiner.hxx | 2
sw/source/core/inc/threadmanager.hxx | 6
sw/source/core/inc/txmsrt.hxx | 26 -
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/inc/unobookmark.hxx | 199 ++++-----
sw/source/core/inc/unoevent.hxx | 9
sw/source/core/inc/unofield.hxx | 247 +++++-------
sw/source/core/inc/unoflatpara.hxx | 63 +--
sw/source/core/inc/unofootnote.hxx | 157 +++----
sw/source/core/inc/unoidx.hxx | 250 +++++-------
sw/source/core/inc/unometa.hxx | 282 ++++++--------
sw/source/core/inc/unoport.hxx | 198 ++++-----
sw/source/core/inc/unorefmark.hxx | 113 ++---
sw/source/core/inc/unosection.hxx | 203 ++++------
sw/source/core/inc/unotextmarkup.hxx | 38 -
sw/source/core/inc/wrong.hxx | 36 -
sw/source/core/layout/dumpfilter.cxx | 6
sw/source/core/layout/layact.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/frmform.cxx | 18
sw/source/core/text/guess.hxx | 4
sw/source/core/text/inftxt.hxx | 8
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/wrong.cxx | 6
sw/source/core/tox/tox.cxx | 3
sw/source/core/tox/toxhlp.cxx | 11
sw/source/core/txtnode/fmtatr2.cxx | 3
sw/source/core/txtnode/ndtxt.cxx | 3
sw/source/core/txtnode/txtedt.cxx | 8
sw/source/core/unocore/swunohelper.cxx | 61 +--
sw/source/core/unocore/unocoll.cxx | 26 -
sw/source/core/unocore/unodraw.cxx | 10
sw/source/core/unocore/unoidx.cxx | 4
sw/source/core/unocore/unoobj2.cxx | 36 -
sw/source/core/view/viewsh.cxx | 7
sw/source/filter/basflt/fltini.cxx | 4
sw/source/filter/basflt/iodetect.cxx | 4
sw/source/filter/html/htmlbas.cxx | 4
sw/source/filter/html/htmlform.cxx | 6
sw/source/filter/html/swhtml.hxx | 10
sw/source/filter/ww8/docxattributeoutput.cxx | 26 -
sw/source/filter/ww8/docxexport.hxx | 6
sw/source/filter/ww8/docxexportfilter.hxx | 2
sw/source/filter/ww8/escher.hxx | 10
sw/source/filter/ww8/writerhelper.cxx | 4
sw/source/filter/ww8/writerhelper.hxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 12
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 10
sw/source/filter/ww8/ww8atr.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 8
sw/source/filter/ww8/ww8par.hxx | 62 +--
sw/source/filter/ww8/ww8par6.cxx | 8
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 18
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 38 -
sw/source/filter/xml/swxml.cxx | 12
sw/source/filter/xml/wrtxml.cxx | 12
sw/source/filter/xml/wrtxml.hxx | 38 -
sw/source/filter/xml/xmlbrsh.cxx | 2
sw/source/filter/xml/xmlbrshi.hxx | 18
sw/source/filter/xml/xmlexp.cxx | 82 ++--
sw/source/filter/xml/xmlexp.hxx | 10
sw/source/filter/xml/xmlfmte.cxx | 10
sw/source/filter/xml/xmlfonte.cxx | 6
sw/source/filter/xml/xmlimp.cxx | 46 +-
sw/source/filter/xml/xmlimp.hxx | 54 +-
sw/source/filter/xml/xmlimpit.hxx | 2
sw/source/filter/xml/xmlitem.hxx | 6
sw/source/filter/xml/xmliteme.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 2
sw/source/filter/xml/xmlmeta.cxx | 6
sw/source/filter/xml/xmltble.cxx | 10
sw/source/filter/xml/xmltbli.cxx | 12
sw/source/filter/xml/xmltbli.hxx | 20
sw/source/filter/xml/xmltext.cxx | 4
sw/source/filter/xml/xmltexte.cxx | 12
sw/source/filter/xml/xmltexte.hxx | 24 -
sw/source/filter/xml/xmltexti.cxx | 10
sw/source/filter/xml/xmltexti.hxx | 46 +-
sw/source/ui/chrdlg/chardlg.cxx | 6
sw/source/ui/config/mailconfigpage.cxx | 6
sw/source/ui/config/optcomp.cxx | 6
sw/source/ui/dbui/addresslistdialog.cxx | 18
sw/source/ui/dbui/addresslistdialog.hxx | 6
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 16
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 10
sw/source/ui/dbui/dbtablepreviewdialog.hxx | 4
sw/source/ui/dbui/mmaddressblockpage.cxx | 8
sw/source/ui/dbui/mmaddressblockpage.hxx | 4
sw/source/ui/dbui/mmdocselectpage.cxx | 4
sw/source/ui/dbui/mmgreetingspage.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 10
sw/source/ui/dbui/mmlayoutpage.hxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dbui/mmoutputpage.hxx | 2
sw/source/ui/dbui/mmpreparemergepage.cxx | 6
sw/source/ui/dbui/selectdbtabledialog.cxx | 12
sw/source/ui/dialog/macassgn.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 12
sw/source/ui/dialog/swdlgfact.hxx | 30 -
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/envelp/envlop1.cxx | 6
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labelexp.cxx | 6
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/mailmrge.cxx | 24 -
sw/source/ui/envelp/swuilabimp.hxx | 2
sw/source/ui/fldui/changedb.cxx | 8
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/index/cntex.cxx | 14
sw/source/ui/index/cnttab.cxx | 6
sw/source/ui/index/swuiidxmrk.cxx | 6
sw/source/ui/misc/glossary.cxx | 10
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 4
sw/source/ui/uno/swdetect.cxx | 16
sw/source/ui/vba/vbaapplication.cxx | 6
sw/source/ui/vba/vbaautotextentry.cxx | 2
sw/source/ui/vba/vbabookmarks.cxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 8
sw/source/ui/vba/vbaeventshelper.cxx | 4
sw/source/ui/vba/vbafont.cxx | 36 -
sw/source/ui/vba/vbaglobals.cxx | 2
sw/source/ui/vba/vbaparagraph.cxx | 2
sw/source/ui/vba/vbavariables.cxx | 2
sw/source/uibase/app/appopt.cxx | 8
sw/source/uibase/app/docsh.cxx | 10
sw/source/uibase/app/docsh2.cxx | 12
sw/source/uibase/app/docshini.cxx | 12
sw/source/uibase/app/swmodul1.cxx | 10
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/config/barcfg.cxx | 4
sw/source/uibase/config/dbconfig.cxx | 4
sw/source/uibase/config/fontcfg.cxx | 28 -
sw/source/uibase/config/modcfg.cxx | 10
sw/source/uibase/config/prtopt.cxx | 4
sw/source/uibase/config/usrpref.cxx | 10
sw/source/uibase/dbui/dbmgr.cxx | 2
sw/source/uibase/dbui/dbtree.cxx | 18
sw/source/uibase/dbui/mailmergehelper.cxx | 10
sw/source/uibase/dbui/mmconfigitem.cxx | 16
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 8
sw/source/uibase/dochdl/swdtflvr.cxx | 6
sw/source/uibase/docvw/PostItMgr.cxx | 6
sw/source/uibase/docvw/SidebarTxtControl.hxx | 2
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 20
sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 2
sw/source/uibase/docvw/SidebarWinAcc.hxx | 2
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/docvw/romenu.cxx | 6
sw/source/uibase/envelp/envimg.cxx | 4
sw/source/uibase/envelp/labelcfg.cxx | 6
sw/source/uibase/envelp/labimg.cxx | 4
sw/source/uibase/fldui/fldmgr.cxx | 14
sw/source/uibase/fldui/xfldui.cxx | 14
sw/source/uibase/inc/SwXFilterOptions.hxx | 64 +--
sw/source/uibase/inc/barcfg.hxx | 4
sw/source/uibase/inc/conttree.hxx | 2
sw/source/uibase/inc/cption.hxx | 4
sw/source/uibase/inc/dbconfig.hxx | 4
sw/source/uibase/inc/dbinsdlg.hxx | 14
sw/source/uibase/inc/edtwin.hxx | 2
sw/source/uibase/inc/envimg.hxx | 8
sw/source/uibase/inc/fldmgr.hxx | 12
sw/source/uibase/inc/fontcfg.hxx | 4
sw/source/uibase/inc/glosdoc.hxx | 4
sw/source/uibase/inc/glossary.hxx | 2
sw/source/uibase/inc/hyp.hxx | 8
sw/source/uibase/inc/imaildsplistener.hxx | 4
sw/source/uibase/inc/label.hxx | 2
sw/source/uibase/inc/labelcfg.hxx | 2
sw/source/uibase/inc/labimg.hxx | 4
sw/source/uibase/inc/maildispatcher.hxx | 14
sw/source/uibase/inc/mailmrge.hxx | 12
sw/source/uibase/inc/mmconfigitem.hxx | 26 -
sw/source/uibase/inc/navicfg.hxx | 4
sw/source/uibase/inc/olmenu.hxx | 22 -
sw/source/uibase/inc/regionsw.hxx | 2
sw/source/uibase/inc/sharedconnection.hxx | 2
sw/source/uibase/inc/srcedtw.hxx | 2
sw/source/uibase/inc/stmenu.hxx | 16
sw/source/uibase/inc/swrenamexnameddlg.hxx | 16
sw/source/uibase/inc/swuicnttab.hxx | 4
sw/source/uibase/inc/swuiidxmrk.hxx | 4
sw/source/uibase/inc/tablemgr.hxx | 4
sw/source/uibase/inc/uiitems.hxx | 8
sw/source/uibase/inc/uivwimp.hxx | 26 -
sw/source/uibase/inc/unoatxt.hxx | 158 +++----
sw/source/uibase/inc/unodispatch.hxx | 52 +-
sw/source/uibase/inc/unomailmerge.hxx | 78 +--
sw/source/uibase/inc/unomod.hxx | 58 +-
sw/source/uibase/inc/unotools.hxx | 14
sw/source/uibase/inc/unotxvw.hxx | 262 ++++++-------
sw/source/uibase/inc/usrpref.hxx | 20
sw/source/uibase/inc/workctrl.hxx | 2
sw/source/uibase/inc/wrtsh.hxx | 4
sw/source/uibase/lingu/hhcwrp.cxx | 8
sw/source/uibase/lingu/olmenu.cxx | 10
sw/source/uibase/misc/glosdoc.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 6
sw/source/uibase/shells/annotsh.cxx | 8
sw/source/uibase/shells/basesh.cxx | 10
sw/source/uibase/shells/drawsh.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 6
sw/source/uibase/shells/frmsh.cxx | 2
sw/source/uibase/shells/grfshex.cxx | 4
sw/source/uibase/shells/textsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 4
sw/source/uibase/shells/textsh2.cxx | 16
sw/source/uibase/sidebar/PageMarginControl.cxx | 12
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 10
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 4
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 10
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 6
sw/source/uibase/smartmenu/stmenu.cxx | 2
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/table/tablemgr.cxx | 2
sw/source/uibase/uiview/pview.cxx | 6
sw/source/uibase/uiview/srcview.cxx | 10
sw/source/uibase/uiview/uivwimp.cxx | 10
sw/source/uibase/uiview/view.cxx | 6
sw/source/uibase/uiview/view2.cxx | 18
sw/source/uibase/uiview/viewling.cxx | 10
sw/source/uibase/uiview/viewmdi.cxx | 4
sw/source/uibase/uiview/viewsrch.cxx | 6
sw/source/uibase/uno/SwXDocumentSettings.cxx | 8
sw/source/uibase/uno/SwXDocumentSettings.hxx | 34 -
sw/source/uibase/uno/SwXFilterOptions.cxx | 12
sw/source/uibase/uno/dlelstnr.cxx | 10
sw/source/uibase/uno/unoatxt.cxx | 6
sw/source/uibase/uno/unodoc.cxx | 12
sw/source/uibase/uno/unofreg.cxx | 8
sw/source/uibase/uno/unomailmerge.cxx | 12
sw/source/uibase/uno/unomod.cxx | 12
sw/source/uibase/uno/unotxdoc.cxx | 26 -
sw/source/uibase/uno/unotxvw.cxx | 16
sw/source/uibase/utlui/condedit.cxx | 2
sw/source/uibase/utlui/content.cxx | 6
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/navicfg.cxx | 4
sw/source/uibase/utlui/navipi.cxx | 4
sw/source/uibase/utlui/numfmtlb.cxx | 4
sw/source/uibase/utlui/uiitems.cxx | 2
sw/source/uibase/utlui/uitool.cxx | 2
sw/source/uibase/utlui/viewlayoutctrl.cxx | 4
sw/source/uibase/wrtsh/select.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
322 files changed, 3043 insertions(+), 3227 deletions(-)
New commits:
commit 2633976ef3406d48907bd922f067ea04e39c94f1
Author: Noel Grandin <noel at peralex.com>
Date: Fri Nov 6 10:51:51 2015 +0200
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f2f02bc..8faf03b 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 03d7095..6814270 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 9a5e5fe..e895bf3 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 d771d27..0726549 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 d39f3c7..5fdb656 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 57684d5..fda48d7 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 b3b7f6b..c349edc 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 dd789db..cc48ec6 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 ed4138e..c29ca47 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 4cfc258..35c50b2 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 3e89f6e..aa594c5 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 fbaf7a6..7f91d40 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 cd14308..8ccd616 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 dd6146f..060be01 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 13a2c8b..87f9dbd 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 5a5ec60..b0199a1 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 d77f116..17c7d52 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 24eb0d2..e6c149e 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 84bdabf..bd1c881 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 46d6e0d..55752ae 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 54d4f28..03e4ac8 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 0a1a5bf..dce86d8 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 0f68488..d9831f3 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list