diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-11 15:44:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-13 06:21:03 +0000 |
| commit | eb012bf0a8dcdb84e61bb13ca8a96c089ae479d3 (patch) | |
| tree | debfcac2d93d1c82d7c68c81e28650c2d0c22945 | |
| parent | 9a1e22daae669d38d2ae5142a59c66c28d3871bf (diff) | |
editeng: com::sun::star->css
Change-Id: Ied65d2de394ce54cb2c35abb152cf58ac3139395
Reviewed-on: https://gerrit.libreoffice.org/18503
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
46 files changed, 457 insertions, 477 deletions
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index 6d16b51e8b45..61cb5833b741 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -50,8 +50,8 @@ AccessibleComponentBase::~AccessibleComponentBase() // XAccessibleComponent sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::awt::Point& aPoint) + throw (css::uno::RuntimeException, std::exception) { awt::Size aSize (getSize()); return (aPoint.X >= 0) @@ -84,7 +84,7 @@ awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() awt::Point SAL_CALL AccessibleComponentBase::getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); return awt::Point (aBBox.X, aBBox.Y); @@ -94,7 +94,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation() awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return awt::Point(); } @@ -102,8 +102,8 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() -::com::sun::star::awt::Size SAL_CALL AccessibleComponentBase::getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL AccessibleComponentBase::getSize() + throw (css::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); return awt::Size (aBBox.Width, aBBox.Height); @@ -113,9 +113,9 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() void SAL_CALL AccessibleComponentBase::addFocusListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& /*xListener*/) - throw (::com::sun::star::uno::RuntimeException) + const css::uno::Reference< + css::awt::XFocusListener >& /*xListener*/) + throw (css::uno::RuntimeException) { // Ignored } @@ -123,9 +123,9 @@ void SAL_CALL AccessibleComponentBase::addFocusListener ( -void SAL_CALL AccessibleComponentBase::removeFocusListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& /*xListener*/ ) - throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleComponentBase::removeFocusListener (const css::uno::Reference< + css::awt::XFocusListener >& /*xListener*/ ) + throw (css::uno::RuntimeException) { // Ignored } @@ -134,7 +134,7 @@ void SAL_CALL AccessibleComponentBase::removeFocusListener (const ::com::sun::st void SAL_CALL AccessibleComponentBase::grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY); uno::Reference<XAccessibleSelection> xSelection ( @@ -151,7 +151,7 @@ void SAL_CALL AccessibleComponentBase::grabFocus() sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return Color(COL_BLACK).GetColor(); } @@ -160,7 +160,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return Color(COL_WHITE).GetColor(); } @@ -170,9 +170,9 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() // XAccessibleExtendedComponent -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL +css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleComponentBase::getFont() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return uno::Reference<awt::XFont>(); } @@ -181,14 +181,14 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() OUString SAL_CALL AccessibleComponentBase::getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleComponentBase::getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString(); } diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 24d669872ee7..64e53572accf 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -152,7 +152,7 @@ bool AccessibleContextBase::GetState (sal_Int16 aState) void AccessibleContextBase::SetRelationSet ( const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet) - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { OSL_TRACE ("setting relation set"); @@ -211,7 +211,7 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); throw lang::IndexOutOfBoundsException ( @@ -224,7 +224,7 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return mxParent; @@ -235,7 +235,7 @@ uno::Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. @@ -271,7 +271,7 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL AccessibleContextBase::getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return maRole; @@ -282,7 +282,7 @@ sal_Int16 SAL_CALL OUString SAL_CALL AccessibleContextBase::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -294,7 +294,7 @@ OUString SAL_CALL OUString SAL_CALL AccessibleContextBase::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -316,7 +316,7 @@ OUString SAL_CALL */ uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleContextBase::getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -343,7 +343,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL */ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleContextBase::getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::utl::AccessibleStateSetHelper* pStateSet = NULL; @@ -384,7 +384,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL AccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Delegate request to parent. @@ -451,21 +451,21 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( // XServiceInfo OUString SAL_CALL AccessibleContextBase::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return OUString("AccessibleContextBase"); } sal_Bool SAL_CALL AccessibleContextBase::supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString > SAL_CALL AccessibleContextBase::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); static const OUString sServiceNames[2] = { @@ -480,9 +480,9 @@ uno::Sequence< OUString > SAL_CALL // XTypeProvider -uno::Sequence< ::com::sun::star::uno::Type> +uno::Sequence< css::uno::Type> AccessibleContextBase::getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -493,7 +493,7 @@ uno::Sequence< ::com::sun::star::uno::Type> uno::Sequence<sal_Int8> SAL_CALL AccessibleContextBase::getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -568,7 +568,7 @@ void AccessibleContextBase::SetAccessibleName ( OUString AccessibleContextBase::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("Empty Description"); } @@ -577,7 +577,7 @@ OUString AccessibleContextBase::CreateAccessibleDescription() OUString AccessibleContextBase::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("Empty Name"); } @@ -618,7 +618,7 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) void AccessibleContextBase::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 0dc65b211950..20436ec92d97 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -96,8 +96,8 @@ namespace accessibility SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, SVX_UNOEDIT_NUMBERING_PROPERTIE, - {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() ); @@ -169,7 +169,7 @@ namespace accessibility return GetTextRange( 0, GetTextLen() ); } - ::com::sun::star::lang::Locale AccessibleEditableTextPara::implGetLocale() + css::lang::Locale AccessibleEditableTextPara::implGetLocale() { DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= SAL_MAX_INT32, "AccessibleEditableTextPara::getLocale: paragraph index value overflow"); @@ -195,7 +195,7 @@ namespace accessibility } } - void AccessibleEditableTextPara::implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ ) + void AccessibleEditableTextPara::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ ) { DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" ); @@ -206,7 +206,7 @@ namespace accessibility rBoundary.endPos = nLength; } - void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ) + void AccessibleEditableTextPara::implGetLineBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ) { SvxTextForwarder& rCacheTF = GetTextForwarder(); const sal_Int32 nParaIndex = GetParagraphIndex(); @@ -1180,7 +1180,7 @@ namespace accessibility setSelection(0,0); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) throw (css::uno::RuntimeException, std::exception) { // #104444# Added to XAccessibleComponent interface svtools::ColorConfig aColorConfig; @@ -1188,7 +1188,7 @@ namespace accessibility return static_cast<sal_Int32>(nColor); } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) throw (css::uno::RuntimeException, std::exception) { // #104444# Added to XAccessibleComponent interface Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() ); @@ -1243,7 +1243,7 @@ namespace accessibility return OCommonAccessibleText::getCharacter( nIndex ); } - uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1531,7 +1531,7 @@ namespace accessibility sal_uInt32 crChar = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>(anyChar.pReserved)); if (COL_AUTO == crChar ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent; + uno::Reference< css::accessibility::XAccessibleComponent > xComponent; if (mxParent.is()) { xComponent.set(mxParent,uno::UNO_QUERY); @@ -1542,7 +1542,7 @@ namespace accessibility } if (xComponent.is()) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY); + uno::Reference< css::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY); if (xContext->getAccessibleRole() == AccessibleRole::SHAPE || xContext->getAccessibleRole() == AccessibleRole::TABLE_CELL) { @@ -1570,7 +1570,7 @@ namespace accessibility sal_uInt32 crCharUnderLine = static_cast<sal_uInt32>( reinterpret_cast<sal_uIntPtr>( anyCharUnderLine.pReserved)); if (COL_AUTO == crCharUnderLine ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent; + uno::Reference< css::accessibility::XAccessibleComponent > xComponent; if (mxParent.is()) { xComponent.set(mxParent,uno::UNO_QUERY); @@ -1581,7 +1581,7 @@ namespace accessibility } if (xComponent.is()) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY); + uno::Reference< css::accessibility::XAccessibleContext > xContext(xComponent,uno::UNO_QUERY); if (xContext->getAccessibleRole() == AccessibleRole::SHAPE || xContext->getAccessibleRole() == AccessibleRole::TABLE_CELL) { @@ -1683,7 +1683,7 @@ namespace accessibility } return nIndex; } - bool AccessibleEditableTextPara::ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment ) + bool AccessibleEditableTextPara::ExtendByField( css::accessibility::TextSegment& Segment ) { sal_Int32 nParaIndex = GetParagraphIndex(); SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); @@ -1749,14 +1749,14 @@ namespace accessibility return bExtend; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::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) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::getTextAtIndex: paragraph index value overflow"); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; @@ -1811,8 +1811,8 @@ namespace accessibility SvxTextForwarder& rCacheTF = GetTextForwarder(); sal_Int32 nParaIndex = GetParagraphIndex(); CheckPosition(nIndex); - if (nIndex != 0 && nIndex == getCharacterCount()) - --nIndex; + if (nIndex != 0 && nIndex == getCharacterCount()) + --nIndex; sal_Int32 nLine, nLineCount=rCacheTF.GetLineCount( nParaIndex ); sal_Int32 nCurIndex; //the problem is that rCacheTF.GetLineLen() will include the bullet length. But for the bullet line, @@ -1864,14 +1864,14 @@ namespace accessibility return aResult; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::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) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::getTextBeforeIndex: paragraph index value overflow"); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; i18n::Boundary aBoundary; @@ -2029,14 +2029,14 @@ namespace accessibility return aResult; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::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) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::getTextBehindIndex: paragraph index value overflow"); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; aResult.SegmentStart = -1; aResult.SegmentEnd = -1; i18n::Boundary aBoundary; @@ -2649,7 +2649,7 @@ namespace accessibility } // XAccessibleHypertext - ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount( ) throw (css::uno::RuntimeException, std::exception) { SvxAccessibleTextAdapter& rT = GetTextForwarder(); const sal_Int32 nPara = GetParagraphIndex(); @@ -2665,9 +2665,9 @@ namespace accessibility return nHyperLinks; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > xRef; + css::uno::Reference< css::accessibility::XAccessibleHyperlink > xRef; SvxAccessibleTextAdapter& rT = GetTextForwarder(); const sal_Int32 nPara = GetParagraphIndex(); @@ -2696,7 +2696,7 @@ namespace accessibility return xRef; } - ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { const sal_Int32 nPara = GetParagraphIndex(); SvxAccessibleTextAdapter& rT = GetTextForwarder(); @@ -2744,10 +2744,10 @@ namespace accessibility } // XAccessibleMultiLineText - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; sal_Int32 nPara = GetParagraphIndex(); SvxTextForwarder &rCacheTF = GetTextForwarder(); const bool bValidPara = 0 <= nPara && nPara < rCacheTF.GetParagraphCount(); @@ -2780,10 +2780,10 @@ namespace accessibility } // XAccessibleMultiLineText - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret( ) throw (uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret( ) throw (uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; try { aResult = getTextAtLineNumber( getNumberOfLineWithCaret() ); diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index f313cb3915bd..3e73c05e4b04 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -82,9 +82,9 @@ namespace accessibility return aDesc; } - uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > xKeyBinding; + uno::Reference< css::accessibility::XAccessibleKeyBinding > xKeyBinding; if( isValid() && ( nIndex == 0 ) ) { diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index 507f53210a45..be10ace80baa 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.hxx +++ b/editeng/source/accessibility/AccessibleHyperlink.hxx @@ -35,7 +35,7 @@ class SvxAccessibleTextAdapter; namespace accessibility { - class AccessibleHyperlink : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleHyperlink > + class AccessibleHyperlink : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleHyperlink > { private: @@ -51,17 +51,17 @@ namespace accessibility virtual ~AccessibleHyperlink(); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleHyperlink - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getStartIndex() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getEndIndex() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isValid() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getStartIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getEndIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // end of namespace accessibility diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 09b07a764f4d..78d6c72cefbb 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -336,7 +336,7 @@ namespace accessibility ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } - sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (css::uno::RuntimeException, std::exception) { // #104444# Added to XAccessibleComponent interface @@ -345,7 +345,7 @@ namespace accessibility return static_cast<sal_Int32>(nColor); } - sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) throw (css::uno::RuntimeException, std::exception) { // #104444# Added to XAccessibleComponent interface diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 879400100a8d..980905077d39 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -553,7 +553,7 @@ namespace accessibility return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex ); } - uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -770,14 +770,14 @@ namespace accessibility return aRes; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::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) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex ); EPosition aPos( mpImpl->Range2Internal(nIndex) ); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; if( AccessibleTextType::PARAGRAPH == aTextType ) { @@ -821,7 +821,7 @@ namespace accessibility return aResult; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::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) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -829,7 +829,7 @@ namespace accessibility bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex ); EPosition aPos( mpImpl->Range2Internal(nIndex) ); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; if( AccessibleTextType::PARAGRAPH == aTextType ) { @@ -867,7 +867,7 @@ namespace accessibility return aResult; } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::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) + css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -876,7 +876,7 @@ namespace accessibility mpImpl->RemoveLineBreakCount( nIndex ); EPosition aPos( mpImpl->Range2Internal(nIndex) ); - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; if( AccessibleTextType::PARAGRAPH == aTextType ) { diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 6da42720332e..2449258d24f8 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1057,22 +1057,22 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v case KEY_END: case KEY_PAGEUP: case KEY_PAGEDOWN: - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) { @@ -1082,7 +1082,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView ); if ( aCurSel.HasRange() ) { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aSelection(pEditView->GetWindow()->GetPrimarySelection()); + Reference<css::datatransfer::clipboard::XClipboard> aSelection(pEditView->GetWindow()->GetPrimarySelection()); pEditView->pImpEditView->CutCopy( aSelection, false ); } @@ -1100,10 +1100,10 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v break; case KEY_BACKSPACE: case KEY_DELETE: - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: + case css::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH: { if ( !bReadOnly && !rKeyEvent.GetKeyCode().IsMod2() ) { @@ -1140,19 +1140,19 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v sal_uInt8 nDel = 0, nMode = 0; switch( nCode ) { - case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: + case css::awt::Key::DELETE_WORD_BACKWARD: nMode = DELMODE_RESTOFWORD; nDel = DEL_LEFT; break; - case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case css::awt::Key::DELETE_WORD_FORWARD: nMode = DELMODE_RESTOFWORD; nDel = DEL_RIGHT; break; - case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: nMode = DELMODE_RESTOFCONTENT; nDel = DEL_LEFT; break; - case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: + case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH: nMode = DELMODE_RESTOFCONTENT; nDel = DEL_RIGHT; break; @@ -2394,7 +2394,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara ) return aInfos; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > +css::uno::Reference< css::datatransfer::XTransferable > EditEngine::CreateTransferable( const ESelection& rSelection ) const { EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) ); @@ -2407,7 +2407,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara ) void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int32, const long*, const SvxFont&, sal_Int32, sal_Int32, sal_uInt8, const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool, - const ::com::sun::star::lang::Locale*, const Color&, const Color&) + const css::lang::Locale*, const Color&, const Color&) { } @@ -2671,7 +2671,7 @@ bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent ) return false; } -bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ) +bool EditEngine::HasValidData( const css::uno::Reference< css::datatransfer::XTransferable >& rTransferable ) { bool bValidData = false; diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index fe1fcf30972f..dc4d677f0d40 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -246,7 +246,7 @@ public: const SvxFieldItem* GetField() const; const SvxFieldData* GetFieldData(sal_Int32 nPara, size_t nPos, sal_Int32 nType) const; - bool HasField( sal_Int32 nType = com::sun::star::text::textfield::Type::UNSPECIFIED ) const; + bool HasField( sal_Int32 nType = css::text::textfield::Type::UNSPECIFIED ) const; const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 28a57a306a62..c9f1e42f8b77 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -117,7 +117,7 @@ LanguageType EditView::CheckLanguage( SvtLinguConfig().GetOptions( aLinguOpt ); // The default document language from "Tools/Options - Language Settings - Languages: Western" aLangList[0] = MsLangId::resolveSystemLanguageByScriptType( aLinguOpt.nDefaultLanguage, - ::com::sun::star::i18n::ScriptType::LATIN); + css::i18n::ScriptType::LATIN); // The one from "Tools/Options - Language Settings - Languages: User interface" aLangList[1] = rSettings.GetUILanguageTag().getLanguageType(); // The one from "Tools/Options - Language Settings - Languages: Locale setting" @@ -503,11 +503,11 @@ sal_uInt32 EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFor void EditView::Cut() { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); pImpEditView->CutCopy( aClipBoard, true ); } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > EditView::GetTransferable() +css::uno::Reference< css::datatransfer::XTransferable > EditView::GetTransferable() { uno::Reference< datatransfer::XTransferable > xData = GetEditEngine()->CreateTransferable( pImpEditView->GetEditSelection() ); @@ -516,19 +516,19 @@ void EditView::Cut() void EditView::Copy() { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); pImpEditView->CutCopy( aClipBoard, false ); } void EditView::Paste() { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); pImpEditView->Paste( aClipBoard ); } void EditView::PasteSpecial() { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); pImpEditView->Paste(aClipBoard, true ); } @@ -620,7 +620,7 @@ void EditView::InsertText( const EditTextObject& rTextObject ) pImpEditView->pEditEngine->FormatAndUpdate( this ); } -void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, bool bUseSpecial ) +void EditView::InsertText( css::uno::Reference< css::datatransfer::XTransferable > xDataObj, const OUString& rBaseURL, bool bUseSpecial ) { pImpEditView->pEditEngine->UndoActionStart( EDITUNDO_INSERT ); pImpEditView->DeleteSelected(); @@ -1145,7 +1145,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) if( !aSel.HasRange() ) { - aSel = rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aSel = rEditEngine.GetWord( aSel, css::i18n::WordType::DICTIONARY_WORD ); } if( aSel.HasRange() ) diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index c6694317eddc..828867b547a8 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -54,8 +54,8 @@ protected: public: EditSpellWrapper( vcl::Window* pWin, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, + css::uno::Reference< + css::linguistic2::XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ); diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index 236ee3821421..64efb2204f24 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -25,7 +25,7 @@ #include <tools/stream.hxx> -class EditDataObject : public ::com::sun::star::datatransfer::XTransferable, +class EditDataObject : public css::datatransfer::XTransferable, public ::cppu::OWeakObject { @@ -46,15 +46,15 @@ public: OUString& GetURL() { return maOfficeBookmark; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } - // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::datatransfer::XTransferable + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx index 5cfbb9f6241f..62b2b2a451c1 100644 --- a/editeng/source/editeng/eerdll2.hxx +++ b/editeng/source/editeng/eerdll2.hxx @@ -29,8 +29,7 @@ class SfxPoolItem; class GlobalEditData { private: - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLanguageGuessing > xLanguageGuesser; + css::uno::Reference< css::linguistic2::XLanguageGuessing > xLanguageGuesser; SfxPoolItem** ppDefItems; rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; @@ -43,7 +42,7 @@ public: rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; } - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetLanguageGuesser(); + css::uno::Reference< css::linguistic2::XLanguageGuessing > GetLanguageGuesser(); }; #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 209480c79105..9f37a3f10601 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1091,7 +1091,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWi { if ( !bReadOnly ) { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); CutCopy( aClipBoard, true ); bDone = true; } @@ -1099,7 +1099,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWi break; case KeyFuncType::COPY: { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); CutCopy( aClipBoard, false ); bDone = true; } @@ -1109,7 +1109,7 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWi if ( !bReadOnly && IsPasteEnabled() ) { pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE ); - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); Paste( aClipBoard, pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() ); pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE ); bDone = true; @@ -1145,12 +1145,12 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent ) if ( rMouseEvent.IsMiddle() && !bReadOnly && ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) ) { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); Paste( aClipBoard ); } else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() ) { - Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); + Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection()); CutCopy( aClipBoard, false ); } @@ -1200,7 +1200,7 @@ bool ImpEditView::IsWrongSpelledWord( const EditPaM& rPaM, bool bMarkIfWrong ) bool bIsWrong = false; if ( rPaM.GetNode()->GetWrongList() ) { - EditSelection aSel = pEditEngine->SelectWord( rPaM, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + EditSelection aSel = pEditEngine->SelectWord( rPaM, css::i18n::WordType::DICTIONARY_WORD ); bIsWrong = rPaM.GetNode()->GetWrongList()->HasWrong( aSel.Min().GetIndex(), aSel.Max().GetIndex() ); if ( bIsWrong && bMarkIfWrong ) { @@ -1340,7 +1340,7 @@ bool ImpEditView::IsBulletArea( const Point& rPos, sal_Int32* pPara ) return false; } -void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, bool bCut ) +void ImpEditView::CutCopy( css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard, bool bCut ) { if ( rxClipboard.is() && GetEditSelection().HasRange() ) { @@ -1358,7 +1358,7 @@ void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::d if( xFlushableClipboard.is() ) xFlushableClipboard->flushClipboard(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1374,7 +1374,7 @@ void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::d } } -void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, bool bUseSpecial ) +void ImpEditView::Paste( css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard, bool bUseSpecial ) { if ( rxClipboard.is() ) { @@ -1385,7 +1385,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat SolarMutexReleaser aReleaser; xDataObj = rxClipboard->getContents(); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -1623,8 +1623,8 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect ) } } -void ImpEditView::dragGestureRecognized(const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE) - throw (::com::sun::star::uno::RuntimeException, +void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& rDGE) + throw (css::uno::RuntimeException, std::exception) { DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" ); @@ -1707,8 +1707,8 @@ void ImpEditView::dragGestureRecognized(const ::com::sun::star::datatransfer::dn } } -void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& rDSDE ) - throw (::com::sun::star::uno::RuntimeException, +void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -1802,8 +1802,8 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo } } -void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) - throw (::com::sun::star::uno::RuntimeException, +void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -1877,7 +1877,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro } } -void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -1890,7 +1890,7 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg // Only check for text, will also be there if bin or rtf datatransfer::DataFlavor aTextFlavor; SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aTextFlavor ); - const ::com::sun::star::datatransfer::DataFlavor* pFlavors = rDTDEE.SupportedDataFlavors.getConstArray(); + const css::datatransfer::DataFlavor* pFlavors = rDTDEE.SupportedDataFlavors.getConstArray(); int nFlavors = rDTDEE.SupportedDataFlavors.getLength(); for ( int n = 0; n < nFlavors; n++ ) { @@ -1904,7 +1904,7 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg dragOver( rDTDEE ); } -void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; @@ -1917,8 +1917,8 @@ void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTarge } } -void ImpEditView::dragOver(const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE) - throw (::com::sun::star::uno::RuntimeException, +void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rDTDE) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aVclGuard; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 793a85eb1331..87556e5947fd 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -229,7 +229,7 @@ private: Pointer* pPointer; DragAndDropInfo* pDragAndDropInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; + css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > mxDnDListener; long nInvMore; @@ -252,19 +252,19 @@ private: protected: // DragAndDropClient - void dragGestureRecognized(const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge) - throw (::com::sun::star::uno::RuntimeException, + void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, + void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void drop(const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde) - throw (::com::sun::star::uno::RuntimeException, + void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void dragOver(const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde) - throw (::com::sun::star::uno::RuntimeException, + void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void ShowDDCursor( const Rectangle& rRect ); @@ -302,8 +302,8 @@ public: bool MouseMove( const MouseEvent& rMouseEvent ); void Command( const CommandEvent& rCEvt ); - void CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, bool bCut ); - void Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, bool bUseSpecial = false ); + void CutCopy( css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard, bool bCut ); + void Paste( css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard, bool bUseSpecial = false ); void SetVisDocStartPos( const Point& rPos ) { aVisDocStartPos = rPos; } @@ -315,12 +315,12 @@ public: EditSelection& GetEditSelection() { return aEditSelection; } void SetEditSelection( const EditSelection& rEditSelection ); - bool HasSelection() const { return aEditSelection.HasRange(); } + bool HasSelection() const { return aEditSelection.HasRange(); } void DrawSelection() { DrawSelection( aEditSelection ); } void DrawSelection( EditSelection, vcl::Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); - vcl::Window* GetWindow() const { return pOutWin; } + vcl::Window* GetWindow() const { return pOutWin; } EESelectionMode GetSelectionMode() const { return eSelectionMode; } void SetSelectionMode( EESelectionMode eMode ); @@ -374,7 +374,7 @@ public: /// Invokes the registered callback, if there are any. void libreOfficeKitCallback(int nType, const char* pPayload) const; - bool IsWrongSpelledWord( const EditPaM& rPaM, bool bMarkIfWrong ); + bool IsWrongSpelledWord( const EditPaM& rPaM, bool bMarkIfWrong ); OUString SpellIgnoreOrAddWord( bool bAdd ); const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pPara, sal_Int32* pPos ) const; @@ -448,13 +448,11 @@ private: EEHorizontalTextDirection eDefaultHorizontalTextDirection; sal_Int32 nBigTextObjectStart; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyphenator; + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller; + css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator; SpellInfo* pSpellInfo; - mutable ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > xBI; - mutable ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > xISC; + mutable css::uno::Reference < css::i18n::XBreakIterator > xBI; + mutable css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC; ConvInfo * pConvInfo; @@ -539,7 +537,7 @@ private: EditTextObject* CreateTextObject(EditSelection aSelection, SfxItemPool*, bool bAllowBigObjects = false, sal_Int32 nBigObjStart = 0); EditSelection InsertTextObject( const EditTextObject&, EditPaM aPaM ); - EditSelection InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial ); + EditSelection InsertText( css::uno::Reference< css::datatransfer::XTransferable >& rxDataObj, const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial ); EditPaM Clear(); EditPaM RemoveText(); @@ -584,19 +582,19 @@ private: EditPaM PageDown( const EditPaM& rPaM, EditView* pView); EditPaM CursorUp( const EditPaM& rPaM, EditView* pEditView ); EditPaM CursorDown( const EditPaM& rPaM, EditView* pEditView ); - EditPaM CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); - EditPaM CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); + EditPaM CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = css::i18n::CharacterIteratorMode::SKIPCELL ); + EditPaM CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = css::i18n::CharacterIteratorMode::SKIPCELL ); EditPaM CursorStartOfLine( const EditPaM& rPaM ); EditPaM CursorEndOfLine( const EditPaM& rPaM ); static EditPaM CursorStartOfParagraph( const EditPaM& rPaM ); static EditPaM CursorEndOfParagraph( const EditPaM& rPaM ); EditPaM CursorStartOfDoc(); EditPaM CursorEndOfDoc(); - EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, bool bAcceptStartOfWord = true ); + EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, bool bAcceptStartOfWord = true ); EditSelection SelectSentence( const EditSelection& rCurSel ) const; EditPaM CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, bool bToLeft ); EditPaM CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, bool bStart ); @@ -669,12 +667,12 @@ private: inline const ParaPortion* FindParaPortion( const ContentNode* pNode ) const; inline ParaPortion* FindParaPortion( ContentNode* pNode ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CreateTransferable( const EditSelection& rSelection ); + css::uno::Reference< css::datatransfer::XTransferable > CreateTransferable( const EditSelection& rSelection ); void SetValidPaperSize( const Size& rSz ); - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const; - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; + css::uno::Reference < css::i18n::XBreakIterator > ImplGetBreakIterator() const; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; SpellInfo * CreateSpellInfo( bool bMultipleDocs ); @@ -717,7 +715,7 @@ public: void InitWritingDirections( sal_Int32 nPara ); bool IsRightToLeft( sal_Int32 nPara ) const; - sal_uInt8 GetRightToLeft( sal_Int32 nPara, sal_Int32 nChar, sal_Int32* pStart = NULL, sal_Int32* pEnd = NULL ); + sal_uInt8 GetRightToLeft( sal_Int32 nPara, sal_Int32 nChar, sal_Int32* pStart = NULL, sal_Int32* pEnd = NULL ); bool HasDifferentRTLLevels( const ContentNode* pNode ); void SetTextRanger( TextRanger* pRanger ); @@ -776,7 +774,7 @@ public: EditPaM InsertLineBreak(const EditSelection& aEditSelection); EditPaM InsertTab(const EditSelection& rEditSelection); EditPaM InsertField(const EditSelection& rCurSel, const SvxFieldItem& rFld); - bool UpdateFields(); + bool UpdateFields(); EditPaM Read(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, const EditSelection& rSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL); void Write(SvStream& rOutput, EETextFormat eFormat, const EditSelection& rSel); @@ -818,19 +816,19 @@ public: Rectangle PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags = 0 ); Rectangle GetEditCursor( ParaPortion* pPortion, sal_Int32 nIndex, sal_uInt16 nFlags = 0 ); - bool IsModified() const { return aEditDoc.IsModified(); } + bool IsModified() const { return aEditDoc.IsModified(); } void SetModifyFlag( bool b ) { aEditDoc.SetModified( b ); } void SetModifyHdl( const Link<>& rLink ) { aModifyHdl = rLink; } Link<> GetModifyHdl() const { return aModifyHdl; } - bool IsInSelectionMode() { return bInSelection; } + bool IsInSelectionMode() { return bInSelection; } void IndentBlock( EditView* pView, bool bRight ); // For Undo/Redo - bool Undo( EditView* pView ); - bool Redo( EditView* pView ); + bool Undo( EditView* pView ); + bool Redo( EditView* pView ); // OV-Special void InvalidateFromParagraph( sal_Int32 nFirstInvPara ); @@ -889,17 +887,13 @@ public: EditView* GetActiveView() const { return pActiveView; } void SetActiveView( EditView* pView ); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > + css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpeller(); - void SetSpeller( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) + void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) { xSpeller = xSpl; } - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > + css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator() const { return xHyphenator; } - void SetHyphenator( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > &xHyph ) + void SetHyphenator( css::uno::Reference< css::linguistic2::XHyphenator > &xHyph ) { xHyphenator = xHyph; } void GetAllMisspellRanges( std::vector<editeng::MisspellRanges>& rRanges ) const; @@ -911,15 +905,14 @@ public: LanguageType GetDefaultLanguage() const { return eDefLanguage; } LanguageType GetLanguage( const EditPaM& rPaM, sal_Int32* pEndPos = NULL ) const; - ::com::sun::star::lang::Locale GetLocale( const EditPaM& rPaM ) const; + css::lang::Locale GetLocale( const EditPaM& rPaM ) const; void DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, bool bSpellAtCursorPos = false, bool bInteruptable = true ); EESpellState Spell( EditView* pEditView, bool bMultipleDoc ); EESpellState HasSpellErrors(); void ClearSpellErrors(); EESpellState StartThesaurus( EditView* pEditView ); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > + css::uno::Reference< css::linguistic2::XSpellAlternatives > ImpSpell( EditView* pEditView ); // text conversion functions @@ -927,7 +920,7 @@ public: void ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const vcl::Font *pTargetFont ); ConvInfo * GetConvInfo() const { return pConvInfo; } - bool HasConvertibleTextPortion( LanguageType nLang ); + bool HasConvertibleTextPortion( LanguageType nLang ); void SetLanguageAndFont( const ESelection &rESel, LanguageType nLang, sal_uInt16 nLangWhichId, const vcl::Font *pFont, sal_uInt16 nFontWhichId ); @@ -936,9 +929,8 @@ public: bool IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const; //find the next error within the given selection - forward only! - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > - ImpFindNextError(EditSelection& rSelection); + css::uno::Reference< css::linguistic2::XSpellAlternatives > + ImpFindNextError(EditSelection& rSelection); //spell and return a sentence bool SpellSentence(EditView& rView, svx::SpellPortions& rToFill, bool bIsGrammarChecking ); //put spelling back to start of current sentence - needed after switch of grammar support @@ -946,15 +938,15 @@ public: //applies a changed sentence void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ); //adds one or more portions of text to the SpellPortions depending on language changes - void AddPortionIterated( - EditView& rEditView, - const EditSelection &rSel, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > xAlt, - svx::SpellPortions& rToFill); + void AddPortionIterated( + EditView& rEditView, + const EditSelection &rSel, + css::uno::Reference< css::linguistic2::XSpellAlternatives > xAlt, + svx::SpellPortions& rToFill); //adds one portion to the SpellPortions void AddPortion( const EditSelection &rSel, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > xAlt, + css::uno::Reference< css::linguistic2::XSpellAlternatives > xAlt, svx::SpellPortions& rToFill, bool bIsField ); @@ -988,7 +980,7 @@ public: void SetAutoCompleteText(const OUString& rStr, bool bUpdateTipWindow); EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); - short ReplaceTextOnly( ContentNode* pNode, sal_Int32 nCurrentStart, sal_Int32 nLen, const OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets ); + short ReplaceTextOnly( ContentNode* pNode, sal_Int32 nCurrentStart, sal_Int32 nLen, const OUString& rText, const css::uno::Sequence< sal_Int32 >& rOffsets ); void SetAsianCompressionMode( sal_uInt16 n ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index a78b6c526303..90e131bf0170 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -793,23 +793,23 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE break; case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM, pEditView ); break; - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: + case css::awt::Key::MOVE_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: + case css::awt::Key::MOVE_TO_END_OF_LINE: aPaM = CursorEndOfLine( aPaM ); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case css::awt::Key::MOVE_WORD_BACKWARD: aPaM = WordLeft( aPaM ); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case css::awt::Key::MOVE_WORD_FORWARD: aPaM = WordRight( aPaM ); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); if( aPaM == aOldPaM ) { @@ -818,7 +818,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE } bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: + case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); if( aPaM == aOldPaM ) { @@ -827,39 +827,39 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE } bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: aPaM = CursorStartOfDoc(); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case css::awt::Key::MOVE_TO_END_OF_DOCUMENT: aPaM = CursorEndOfDoc(); bKeyModifySelection = false; break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: + case css::awt::Key::SELECT_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: + case css::awt::Key::SELECT_TO_END_OF_LINE: aPaM = CursorEndOfLine( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_BACKWARD: + case css::awt::Key::SELECT_BACKWARD: aPaM = CursorLeft( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_FORWARD: + case css::awt::Key::SELECT_FORWARD: aPaM = CursorRight( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: + case css::awt::Key::SELECT_WORD_BACKWARD: aPaM = WordLeft( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case css::awt::Key::SELECT_WORD_FORWARD: aPaM = WordRight( aPaM ); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); if( aPaM == aOldPaM ) { @@ -868,7 +868,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE } bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); if( aPaM == aOldPaM ) { @@ -877,11 +877,11 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE } bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: aPaM = CursorStartOfDoc(); bKeyModifySelection = true; break; - case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + case css::awt::Key::SELECT_TO_END_OF_DOCUMENT: aPaM = CursorEndOfDoc(); bKeyModifySelection = true; break; @@ -3482,7 +3482,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer } bDone = true; } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -3504,7 +3504,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer } bDone = true; } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -3752,9 +3752,9 @@ sal_Int32 ImpEditEngine::GetChar( sal_Int32 nCount = 1; lang::Locale aLocale = GetLocale( aPaM ); sal_Int32 nRight = _xBI->nextCharacters( - pParaPortion->GetNode()->GetString(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount ); + pParaPortion->GetNode()->GetString(), nChar, aLocale, css::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount ); sal_Int32 nLeft = _xBI->previousCharacters( - pParaPortion->GetNode()->GetString(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount ); + pParaPortion->GetNode()->GetString(), nRight, aLocale, css::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount ); if ( ( nLeft != nChar ) && ( nRight != nChar ) ) { nChar = ( std::abs( nRight - nChar ) < std::abs( nLeft - nChar ) ) ? nRight : nLeft; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9bacfcc9dfa7..ae3be6a1f042 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1823,7 +1823,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te if ( !bHangingPunctuation && bCanHyphenate && GetHyphenator().is() ) { i18n::Boundary aBoundary = _xBI->getWordBoundary( - pNode->GetString(), nBreakPos, GetLocale( EditPaM( pNode, nBreakPos ) ), ::com::sun::star::i18n::WordType::DICTIONARY_WORD, true); + pNode->GetString(), nBreakPos, GetLocale( EditPaM( pNode, nBreakPos ) ), css::i18n::WordType::DICTIONARY_WORD, true); sal_Int32 nWordStart = nBreakPos; sal_Int32 nWordEnd = aBoundary.endPos; DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" ); @@ -2105,7 +2105,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_Int32 nStart, sal_I // the search has to be performed on a per word base EditSelection aWordSel( EditPaM( pNode, nStart ) ); - aWordSel = SelectWord( aWordSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aWordSel = SelectWord( aWordSel, css::i18n::WordType::DICTIONARY_WORD ); if ( aWordSel.Min().GetIndex() < nStart ) aWordSel.Min().SetIndex( nStart ); @@ -2212,8 +2212,8 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_Int32 nStart, sal_I if ( nKashidaPos>=0 ) rArray.push_back( nKashidaPos ); - aWordSel = WordRight( aWordSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); - aWordSel = SelectWord( aWordSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aWordSel = WordRight( aWordSel.Max(), css::i18n::WordType::DICTIONARY_WORD ); + aWordSel = SelectWord( aWordSel, css::i18n::WordType::DICTIONARY_WORD ); } } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index ba50da1367a1..6589ec6deb23 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1436,7 +1436,7 @@ LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, sal_Int32* pEndPos return pLangItem->GetLanguage(); } -::com::sun::star::lang::Locale ImpEditEngine::GetLocale( const EditPaM& rPaM ) const +css::lang::Locale ImpEditEngine::GetLocale( const EditPaM& rPaM ) const { return LanguageTag( GetLanguage( rPaM ) ).getLocale(); } @@ -1820,7 +1820,7 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, // move to next word/paragraph if necessary if ( aRes.isEmpty() ) - aCurSel = WordRight( aCurSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); pConvInfo->aConvContinue = CreateEPaM( aCurSel.Max() ); } @@ -1867,7 +1867,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) break; } - aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = SelectWord( aCurSel, css::i18n::WordType::DICTIONARY_WORD ); aWord = GetSelected( aCurSel ); // If afterwards a dot, this must be handed over! @@ -1890,7 +1890,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) } if ( !xSpellAlt.is() ) - aCurSel = WordRight( aCurSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); else pSpellInfo->eState = EE_SPELL_ERRORFOUND; } @@ -1918,7 +1918,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r break; } - aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = SelectWord( aCurSel, css::i18n::WordType::DICTIONARY_WORD ); aWord = GetSelected( aCurSel ); // If afterwards a dot, this must be handed over! @@ -1937,7 +1937,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r xSpellAlt = xSpeller->spell( aWord, GetLanguage( aCurSel.Max() ), aEmptySeq ); if ( !xSpellAlt.is() ) - aCurSel = WordRight( aCurSel.Min(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); else { pSpellInfo->eState = EE_SPELL_ERRORFOUND; @@ -2454,7 +2454,7 @@ EESpellState ImpEditEngine::HasSpellErrors() return EE_SPELL_OK; } - aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = SelectWord( aCurSel, css::i18n::WordType::DICTIONARY_WORD ); aWord = GetSelected( aCurSel ); if ( !aWord.isEmpty() ) { @@ -2462,7 +2462,7 @@ EESpellState ImpEditEngine::HasSpellErrors() SvxSpellWrapper::CheckSpellLang( xSpeller, eLang ); xSpellAlt = xSpeller->spell( aWord, eLang, aEmptySeq ); } - aCurSel = WordRight( aCurSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = WordRight( aCurSel.Max(), css::i18n::WordType::DICTIONARY_WORD ); } return EE_SPELL_ERRORFOUND; @@ -2477,7 +2477,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView ) { EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() ); if ( !aCurSel.HasRange() ) - aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); + aCurSel = SelectWord( aCurSel, css::i18n::WordType::DICTIONARY_WORD ); OUString aWord( GetSelected( aCurSel ) ); Reference< XThesaurus > xThes( SvxGetThesaurus() ); diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 18dc864562e2..650ecb5cdad5 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -489,7 +489,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_ // When no selection => use the Attribute on the word. // ( the RTF-parser should actually never call the Method without a Range ) if ( ( nSpecial == ATTRSPECIAL_WHOLEWORD ) && !aSel.HasRange() ) - aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, false ); + aSel = SelectWord( aSel, css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, false ); sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() ); sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() ); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 43a3877543fd..8b43dda6f2b2 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -330,7 +330,7 @@ void TextConvWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, const OUString& rReplaceWith, - const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, + const css::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) { diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 50cbbcf0bc07..3ed3c4f5d6d1 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -64,7 +64,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion void ChangeText( const OUString &rNewText, const OUString& rOrigText, - const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, + const css::uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); @@ -81,7 +81,7 @@ protected: const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, const OUString& rReplaceWith, - const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, + const css::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) SAL_OVERRIDE; @@ -94,9 +94,9 @@ protected: public: TextConvWrapper( vcl::Window* pWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::lang::Locale& rSourceLocale, - const ::com::sun::star::lang::Locale& rTargetLocale, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::lang::Locale& rSourceLocale, + const css::lang::Locale& rTargetLocale, const vcl::Font* pTargetFont, sal_Int32 nOptions, bool bIsInteractive, diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 3ee4bb02fc67..25c2fcc9b97f 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -861,7 +861,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const // now all signed case 0: { - ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; + css::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; aUpperLowerMarginScale.Upper = (sal_Int32)(bConvert ? convertTwipToMm100(nUpper) : nUpper); aUpperLowerMarginScale.Lower = (sal_Int32)(bConvert ? convertTwipToMm100(nLower) : nPropUpper); aUpperLowerMarginScale.ScaleUpper = (sal_Int16)nPropUpper; @@ -889,7 +889,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { case 0: { - ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; + css::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; if ( !(rVal >>= aUpperLowerMarginScale )) return false; { @@ -1810,13 +1810,13 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool } -bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert) +bool SvxBoxItem::LineToSvxLine(const css::table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert) { return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, true); } bool -SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, bool bConvert) +SvxBoxItem::LineToSvxLine(const css::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, bool bConvert) { SvxBorderStyle const nStyle = (rLine.LineStyle < 0 || BORDER_LINE_STYLE_MAX < rLine.LineStyle) @@ -2723,19 +2723,19 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case 0: { // 2 BorderLines, flags, valid flags and distance - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 5 ); - aSeq[0] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) ); - aSeq[1] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) ); + css::uno::Sequence< css::uno::Any > aSeq( 5 ); + aSeq[0] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) ); + aSeq[1] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) ); if ( IsTable() ) nVal |= 0x01; if ( IsDist() ) nVal |= 0x02; if ( IsMinDist() ) nVal |= 0x04; - aSeq[2] = ::com::sun::star::uno::makeAny( nVal ); - aSeq[3] = ::com::sun::star::uno::makeAny( static_cast<sal_Int16>(nValidFlags) ); - aSeq[4] = ::com::sun::star::uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()) ); - rVal = ::com::sun::star::uno::makeAny( aSeq ); + aSeq[2] = css::uno::makeAny( nVal ); + aSeq[3] = css::uno::makeAny( static_cast<sal_Int16>(nValidFlags) ); + aSeq[4] = css::uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()) ); + rVal = css::uno::makeAny( aSeq ); return true; } @@ -2783,7 +2783,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { case 0: { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq; + css::uno::Sequence< css::uno::Any > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == 5 )) { // 2 BorderLines, flags, valid flags and distance @@ -2869,7 +2869,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else if (rVal.getValueType() == cppu::UnoType<css::uno::Sequence < sal_Int16 >>::get() ) { // serialization for basic macro recording - ::com::sun::star::uno::Sequence < sal_Int16 > aSeq; + css::uno::Sequence < sal_Int16 > aSeq; rVal >>= aSeq; if (aSeq.getLength() >= 4 && aSeq.getLength() <= 6) { @@ -4208,7 +4208,7 @@ bool SvxFrameDirectionItem::GetPresentation( return true; } -bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SvxFrameDirectionItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { sal_Int16 nVal = sal_Int16(); @@ -4242,7 +4242,7 @@ bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal, return bRet; } -bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxFrameDirectionItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { // translate SvxFrameDirection into WritingDirection2 diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index b44355f0b4c9..48264095dd97 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -60,8 +60,8 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::style; sal_Int32 SvxNumberType::nRefCount = 0; -com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> SvxNumberType::xFormatter = 0; -static void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& _xFormatter) +css::uno::Reference<css::text::XNumberingFormatter> SvxNumberType::xFormatter = 0; +static void lcl_getFormatter(css::uno::Reference<css::text::XNumberingFormatter>& _xFormatter) { if(!_xFormatter.is()) { @@ -942,13 +942,13 @@ SvStream& SvxNumBulletItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion return rStream; } -bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxNumBulletItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= SvxCreateNumRule( pNumRule ); return true; } -bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxNumBulletItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { uno::Reference< container::XIndexReplace > xRule; if( rVal >>= xRule ) diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index e750af86c7af..e09f0186b4ce 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -961,7 +961,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nVal = 0; if (rAnySeq[1] >>= nVal) - aSeq[n].Alignment = (com::sun::star::style::TabAlign) nVal; + aSeq[n].Alignment = (css::style::TabAlign) nVal; else return false; } @@ -1245,7 +1245,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const -bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxPageModelItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -1259,7 +1259,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxPageModelItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; bool bRet; @@ -1475,14 +1475,14 @@ bool SvxParaVertAlignItem::GetPresentation( return true; } -bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxParaVertAlignItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= (sal_Int16)GetValue(); return true; } -bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { sal_Int16 nVal = sal_Int16(); diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 1a040606494c..c48cac264bcb 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -228,9 +228,9 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const { aCharString = rTxt.copy( nPos + nIdx, 1 ); sal_Int32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 ); - if ( nCharacterType & ::com::sun::star::i18n::KCharacterType::LOWER ) + if ( nCharacterType & css::i18n::KCharacterType::LOWER ) break; - if ( ! ( nCharacterType & ::com::sun::star::i18n::KCharacterType::UPPER ) ) + if ( ! ( nCharacterType & css::i18n::KCharacterType::UPPER ) ) break; ++nPos; } @@ -257,7 +257,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo) const while( nPos < nTxtLen ) { sal_uInt32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 ); - if ( ( nCharacterType & ::com::sun::star::i18n::KCharacterType::UPPER ) ) + if ( ( nCharacterType & css::i18n::KCharacterType::UPPER ) ) break; if ( aCharString == " " ) break; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 9c76d7eab65f..3e35828cdd53 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -187,7 +187,7 @@ bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const return( pFontList == static_cast<const SvxFontListItem&>(rAttr).pFontList ); } -bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxFontListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= aFontNameSeq; return true; @@ -252,7 +252,7 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { case 0: { - com::sun::star::awt::FontDescriptor aFontDescriptor; + css::awt::FontDescriptor aFontDescriptor; aFontDescriptor.Name = aFamilyName; aFontDescriptor.StyleName = aStyleName; aFontDescriptor.Family = (sal_Int16)(eFamily); @@ -281,7 +281,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) { case 0: { - com::sun::star::awt::FontDescriptor aFontDescriptor; + css::awt::FontDescriptor aFontDescriptor; if ( !( rVal >>= aFontDescriptor )) return false; @@ -828,7 +828,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { case 0: { - ::com::sun::star::frame::status::FontHeight aFontHeight; + css::frame::status::FontHeight aFontHeight; // Point (i.e. Twips) is asked for, thus re-calculate if // CONVERT_TWIPS is not set. @@ -965,7 +965,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { case 0: { - ::com::sun::star::frame::status::FontHeight aFontHeight; + css::frame::status::FontHeight aFontHeight; if ( rVal >>= aFontHeight ) { // Height @@ -2921,7 +2921,7 @@ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const return new SvxTwoLinesItem( *this ); } -bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxTwoLinesItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -2954,7 +2954,7 @@ bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal, return bRet; } -bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SvxTwoLinesItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -3081,7 +3081,7 @@ bool SvxCharRotateItem::GetPresentation( return true; } -bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxCharRotateItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -3101,7 +3101,7 @@ bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal, return bRet; } -bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SvxCharRotateItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -3299,7 +3299,7 @@ bool SvxCharReliefItem::GetPresentation return true; } -bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SvxCharReliefItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -3323,7 +3323,7 @@ bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal, return bRet; } -bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 7ce8509a41c8..1ba2575ff674 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; -TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, 0)); +TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0)); SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, (sal_uInt16)eValue ) @@ -75,7 +75,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, return true; } -bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SvxWritingModeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { sal_Int32 nVal = 0; bool bRet = ( rVal >>= nVal ); @@ -110,7 +110,7 @@ bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uIn return bRet; } -bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SvxWritingModeItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { rVal <<= (WritingMode)GetValue(); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 5ea505d86040..5c7caa620cb3 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -72,7 +72,7 @@ sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ return USHRT_MAX; } -bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvXMLAttrContainerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { Reference<XNameContainer> xContainer = new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) ); @@ -81,7 +81,7 @@ bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return true; } -bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvXMLAttrContainerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { Reference<XInterface> xRef; SvUnoAttributeContainer* pContainer = NULL; diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index bbc1fc15bb98..07189ce3f138 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -27,10 +27,10 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ), pAutocorr_List( pNewAutocorr_List ) { @@ -71,10 +71,10 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) } SvXMLExceptionListExport::SvXMLExceptionListExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ), rList( rNewList ) { diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index c1dadc45a4f0..a3b0d3259ed4 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -31,10 +31,10 @@ private: const SvxAutocorrWordList *pAutocorr_List; public: SvXMLAutoCorrectExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLAutoCorrectExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; @@ -51,10 +51,10 @@ private: const SvStringsISortDtor & rList; public: SvXMLExceptionListExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLExceptionListExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index c389d5e5f169..d2c14a2f5714 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -27,7 +27,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( const uno::Reference< uno::XComponentContext > xContext, SvxAutocorrWordList *pNewAutocorr_List, SvxAutoCorrect &rNewAutoCorrect, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage) + const css::uno::Reference < css::embed::XStorage >& rNewStorage) : SvXMLImport( xContext, "" ), pAutocorr_List (pNewAutocorr_List), rAutoCorrect ( rNewAutoCorrect ), @@ -51,15 +51,14 @@ SvXMLImportContext *SvXMLAutoCorrectImport::CreateFastContext( sal_Int32 Element SvXMLWordListContext::SvXMLWordListContext( SvXMLAutoCorrectImport& rImport, sal_Int32 /*Element*/, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XFastAttributeList > & /*xAttrList*/ ) : + const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) : SvXMLImportContext ( rImport ), rLocalRef(rImport) { rLocalRef.rAutoCorrect.refreshBlockList( rLocalRef.xStorage ); } -com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext( +css::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { @@ -76,8 +75,7 @@ SvXMLWordListContext::~SvXMLWordListContext() SvXMLWordContext::SvXMLWordContext( SvXMLAutoCorrectImport& rImport, sal_Int32 /*Element*/, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XFastAttributeList > & xAttrList ) : + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) : SvXMLImportContext ( rImport ), rLocalRef(rImport) { @@ -133,14 +131,13 @@ SvXMLImportContext *SvXMLExceptionListImport::CreateFastContext(sal_Int32 Elemen SvXMLExceptionListContext::SvXMLExceptionListContext( SvXMLExceptionListImport& rImport, sal_Int32 /*Element*/, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XFastAttributeList > & /* xAttrList */ ) : + const css::uno::Reference< css::xml::sax::XFastAttributeList > & /* xAttrList */ ) : SvXMLImportContext ( rImport ), rLocalRef(rImport) { } -com::sun::star::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext( +css::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { @@ -157,8 +154,7 @@ SvXMLExceptionListContext::~SvXMLExceptionListContext() SvXMLExceptionContext::SvXMLExceptionContext( SvXMLExceptionListImport& rImport, sal_Int32 /*Element*/, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XFastAttributeList > & xAttrList ) : + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) : SvXMLImportContext ( rImport ), rLocalRef(rImport) { diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 533a84b1700b..0965f67b4112 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -36,13 +36,13 @@ protected: public: SvxAutocorrWordList *pAutocorr_List; SvxAutoCorrect &rAutoCorrect; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStorage; + css::uno::Reference < css::embed::XStorage > xStorage; SvXMLAutoCorrectImport( const ::css::uno::Reference< ::css::uno::XComponentContext > xContext, SvxAutocorrWordList *pNewAutocorr_List, SvxAutoCorrect &rNewAutoCorrect, - const ::css::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage); + const ::css::uno::Reference < css::embed::XStorage >& rNewStorage); virtual ~SvXMLAutoCorrectImport() throw (); }; @@ -55,7 +55,7 @@ public: SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); - virtual com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, + virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; @@ -100,7 +100,7 @@ public: SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); - virtual com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, + virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx index 56bdbe80d1af..082f894b0b50 100644 --- a/editeng/source/misc/forbiddencharacterstable.cxx +++ b/editeng/source/misc/forbiddencharacterstable.cxx @@ -25,14 +25,14 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext) +SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( const css::uno::Reference< css::uno::XComponentContext >& rxContext) { m_xContext = rxContext; } -const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault ) +const css::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault ) { - com::sun::star::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL; + css::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL; Map::iterator it = maMap.find( nLanguage ); if ( it != maMap.end() ) pForbiddenCharacters = &(it->second); @@ -45,7 +45,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge return pForbiddenCharacters; } -void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars ) +void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const css::i18n::ForbiddenCharacters& rForbiddenChars ) { maMap[ nLanguage ] = rForbiddenChars; } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 735eb6168001..660d14d3a9a2 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -593,9 +593,9 @@ namespace editeng { // get the break iterator service Reference< XBreakIterator > xBreakIter = i18n::BreakIterator::create( m_xContext ); - sal_Int32 nNextAsianScript = xBreakIter->beginOfScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN ); + sal_Int32 nNextAsianScript = xBreakIter->beginOfScript( m_sCurrentPortion, m_nCurrentStartIndex, css::i18n::ScriptType::ASIAN ); if ( -1 == nNextAsianScript ) - nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN ); + nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, css::i18n::ScriptType::ASIAN ); if ( ( nNextAsianScript >= m_nCurrentStartIndex ) && ( nNextAsianScript < m_sCurrentPortion.getLength() ) ) { // found asian text diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 04226e4fbb66..4f1cde233efa 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -104,13 +104,13 @@ static inline bool IsWordDelim( const sal_Unicode c ) static inline bool IsLowerLetter( sal_Int32 nCharType ) { return CharClass::isLetterType( nCharType ) && - 0 == ( ::com::sun::star::i18n::KCharacterType::UPPER & nCharType); + 0 == ( css::i18n::KCharacterType::UPPER & nCharType); } static inline bool IsUpperLetter( sal_Int32 nCharType ) { return CharClass::isLetterType( nCharType ) && - 0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType); + 0 == ( css::i18n::KCharacterType::LOWER & nCharType); } bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const OUString& rTxt, @@ -121,19 +121,19 @@ bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const OUString& rTxt, short nScript = rCC.getScript( rTxt, nStt ); switch( nScript ) { - case ::com::sun::star::i18n::UnicodeScript_kCJKRadicalsSupplement: - case ::com::sun::star::i18n::UnicodeScript_kHangulJamo: - case ::com::sun::star::i18n::UnicodeScript_kCJKSymbolPunctuation: - case ::com::sun::star::i18n::UnicodeScript_kHiragana: - case ::com::sun::star::i18n::UnicodeScript_kKatakana: - case ::com::sun::star::i18n::UnicodeScript_kHangulCompatibilityJamo: - case ::com::sun::star::i18n::UnicodeScript_kEnclosedCJKLetterMonth: - case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibility: - case ::com::sun::star::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA: - case ::com::sun::star::i18n::UnicodeScript_kCJKUnifiedIdeograph: - case ::com::sun::star::i18n::UnicodeScript_kHangulSyllable: - case ::com::sun::star::i18n::UnicodeScript_kCJKCompatibilityIdeograph: - case ::com::sun::star::i18n::UnicodeScript_kHalfwidthFullwidthForm: + case css::i18n::UnicodeScript_kCJKRadicalsSupplement: + case css::i18n::UnicodeScript_kHangulJamo: + case css::i18n::UnicodeScript_kCJKSymbolPunctuation: + case css::i18n::UnicodeScript_kHiragana: + case css::i18n::UnicodeScript_kKatakana: + case css::i18n::UnicodeScript_kHangulCompatibilityJamo: + case css::i18n::UnicodeScript_kEnclosedCJKLetterMonth: + case css::i18n::UnicodeScript_kCJKCompatibility: + case css::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA: + case css::i18n::UnicodeScript_kCJKUnifiedIdeograph: + case css::i18n::UnicodeScript_kHangulSyllable: + case css::i18n::UnicodeScript_kCJKCompatibilityIdeograph: + case css::i18n::UnicodeScript_kHalfwidthFullwidthForm: return true; default: ; //do nothing } @@ -146,8 +146,7 @@ static bool lcl_IsSymbolChar( CharClass& rCC, const OUString& rTxt, { for( ; nStt < nEnd; ++nStt ) { - if( ::com::sun::star::i18n::UnicodeType::PRIVATE_USE == - rCC.getType( rTxt, nStt )) + if( css::i18n::UnicodeType::PRIVATE_USE == rCC.getType( rTxt, nStt )) return true; } return false; @@ -201,8 +200,8 @@ static TransliterationWrapper& GetIgnoreTranslWrapper() { static int bIsInit = 0; static TransliterationWrapper aWrp( ::comphelper::getProcessComponentContext(), - ::com::sun::star::i18n::TransliterationModules_IGNORE_KANA | - ::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH ); + css::i18n::TransliterationModules_IGNORE_KANA | + css::i18n::TransliterationModules_IGNORE_WIDTH ); if( !bIsInit ) { aWrp.loadModuleIfNeeded( GetAppLang().getLanguageType() ); @@ -403,12 +402,11 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString& r if( !FindInWrdSttExceptList(eLang, sWord) ) { // Check that word isn't correctly spelled before correcting: - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller = + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller = SvxGetSpellChecker(); if( xSpeller->hasLanguage(eLang) ) { - Sequence< ::com::sun::star::beans::PropertyValue > aEmptySeq; + Sequence< css::beans::PropertyValue > aEmptySeq; if (!xSpeller->spell(sWord, eLang, aEmptySeq).is()) { return false; @@ -1640,7 +1638,7 @@ void SvxAutoCorrect::refreshBlockList( const uno::Reference< embed::XStorage >& } // Text with attribution (only the SWG - SWG format!) -bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, +bool SvxAutoCorrect::PutText( const css::uno::Reference < css::embed::XStorage >&, const OUString&, const OUString&, SfxObjectShell&, OUString& ) { return false; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index a90090fee639..7a8fa910eba5 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -86,23 +86,21 @@ public: virtual ~ThesDummy_Impl(); // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::lang::Locale > SAL_CALL + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - hasLocale( const ::com::sun::star::lang::Locale& rLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + hasLocale( const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XThesaurus - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XMeaning > > SAL_CALL + virtual css::uno::Sequence< + css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, - const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::lang::Locale& rLocale, + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -213,25 +211,24 @@ class SpellDummy_Impl : public: // XSupportedLanguages (for XSpellChecker1) - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getLanguages() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasLanguage( sal_Int16 nLanguage ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language) virtual sal_Bool SAL_CALL isValid( const OUString& rWord, sal_Int16 nLanguage, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& rWord, sal_Int16 nLanguage, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -310,39 +307,39 @@ class HyphDummy_Impl : public: // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::lang::Locale > SAL_CALL + virtual css::uno::Sequence< + css::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - hasLocale( const ::com::sun::star::lang::Locale& rLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + hasLocale( const css::lang::Locale& rLocale ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHyphenator - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL + virtual css::uno::Reference< + css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& rWord, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, sal_Int16 nMaxLeading, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< + css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& rWord, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, sal_Int16 nIndex, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< + css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& rWord, - const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::lang::Locale& rLocale, + const css::beans::PropertyValues& rProperties ) + throw(css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -695,7 +692,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() DictionaryType_POSITIVE, linguistic::GetWritableDictionaryURL( aDicName ) ); } - catch(const com::sun::star::uno::Exception &) + catch(const css::uno::Exception &) { } @@ -765,8 +762,7 @@ uno::Reference< XDictionary > SvxGetChangeAllList() #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> SvxAlternativeSpelling SvxGetAltSpelling( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord ) + const css::uno::Reference< css::linguistic2::XHyphenatedWord > & rHyphWord ) { SvxAlternativeSpelling aRes; if (rHyphWord.is() && rHyphWord->isAlternativeSpelling()) diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 5a15d5372fb7..af4f4cdcf728 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -153,7 +153,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText bool bEndOfLine, bool bEndOfParagraph, bool bEndOfBullet, - const ::com::sun::star::lang::Locale* pLocale, + const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor) { diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index c581b9395474..a7b40beef188 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -52,7 +52,7 @@ public: bool bEndOfLine, bool bEndOfParagraph, bool bEndOfBullet, - const ::com::sun::star::lang::Locale* pLocale, + const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor) SAL_OVERRIDE; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 8f5067a1dc14..1694876416df 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1727,7 +1727,7 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_I bool bEndOfLine, bool bEndOfParagraph, bool bEndOfBullet, - const ::com::sun::star::lang::Locale* pLocale, + const css::lang::Locale* pLocale, const Color& rOverlineColor, const Color& rTextLineColor) { diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 31a32877a8c9..fd129b962bd2 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -223,12 +223,12 @@ namespace class theSvxUnoTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextFieldUnoTunnelId> {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw() { return theSvxUnoTextFieldUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -778,10 +778,10 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam return aValue; } -void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} // OComponentHelper void SvxUnoTextField::disposing() @@ -877,7 +877,7 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName return cppu::supportsService( this, ServiceName ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) { uno::Reference< uno::XInterface > xRet; diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 7544e35f5263..f8de955a724f 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -393,7 +393,7 @@ bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPar bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const { - ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD ); + ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD ); if( aRes.nStartPara == nPara && aRes.nStartPara == aRes.nEndPara ) diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index 93d90290a69f..9c8db1f88d26 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -388,7 +388,7 @@ bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const { - ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD ); + ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD ); if( aRes.nStartPara == nPara && aRes.nStartPara == aRes.nEndPara ) diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 5e26bd66653a..80faa93a556b 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -478,7 +478,7 @@ const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > xRule ) throw( Illeg return pRule->getNumRule(); } -com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw() +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw() { DBG_ASSERT( pRule, "No default SvxNumRule!" ); if( pRule ) @@ -544,7 +544,7 @@ Reference< XAnyCompare > SvxCreateNumRuleCompare() throw() return new SvxUnoNumberingRulesCompare(); } -::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw() +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule() throw() { SvxNumRule aTempRule( SvxNumRuleFlags::NONE, 10, false ); return SvxCreateNumRule( &aTempRule ); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 87b48a49169f..8ff68cac078b 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -87,10 +87,10 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 }, - {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, - {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("TextField"), EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 }, + { OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, + { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aSvxTextPortionPropertyMap; @@ -116,8 +116,8 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + { OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -2162,7 +2162,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( return xRet; } -// com::sun::star::text::XTextPortionAppend (new import API) +// css::text::XTextPortionAppend (new import API) uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( const OUString& rText, const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 4efcc4608c1f..cdb3d8e9a8a3 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -144,10 +144,10 @@ void SvxEditEngineSource::UpdateData() } class SvxSimpleUnoModel : public cppu::WeakAggImplHelper4< - ::com::sun::star::frame::XModel, - ::com::sun::star::ucb::XAnyCompareFactory, - ::com::sun::star::style::XStyleFamiliesSupplier, - ::com::sun::star::lang::XMultiServiceFactory > + css::frame::XModel, + css::ucb::XAnyCompareFactory, + css::style::XStyleFamiliesSupplier, + css::lang::XMultiServiceFactory > { public: SvxSimpleUnoModel(); @@ -155,33 +155,33 @@ public: // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL lockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unlockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -213,19 +213,19 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co } -uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstance( ServiceSpecifier ); } -Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) { Sequence< OUString > aSeq; return aSeq; } // XAnyCompareFactory -uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCompareByName( const OUString& PropertyName ) +uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCompareByName( const OUString& PropertyName ) throw(uno::RuntimeException, std::exception) { (void)PropertyName; @@ -241,57 +241,57 @@ uno::Reference< container::XNameAccess > SAL_CALL SvxSimpleUnoModel::getStyleFam } // XModel -sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) { (void)aURL; (void)aArgs; return sal_False; } -OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (css::uno::RuntimeException, std::exception) { OUString aStr; return aStr; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs( ) throw (css::uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aSeq; return aSeq; } -void SAL_CALL SvxSimpleUnoModel::connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::connectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxSimpleUnoModel::disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::disconnectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxSimpleUnoModel::lockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::lockControllers( ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxSimpleUnoModel::unlockControllers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::unlockControllers( ) throw (css::uno::RuntimeException, std::exception) { } -sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) { return sal_True; } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController( ) throw (css::uno::RuntimeException, std::exception) { uno::Reference< frame::XController > xRet; return xRet; } -void SAL_CALL SvxSimpleUnoModel::setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::setCurrentController( const css::uno::Reference< css::frame::XController >& ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) { uno::Reference< XInterface > xRet; return xRet; @@ -299,15 +299,15 @@ void SAL_CALL SvxSimpleUnoModel::setCurrentController( const ::com::sun::star::u // XComponent -void SAL_CALL SvxSimpleUnoModel::dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::dispose( ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxSimpleUnoModel::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxSimpleUnoModel::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception) { } @@ -317,11 +317,11 @@ class SvxXMLTextExportComponent : public SvXMLExport { public: SvxXMLTextExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, EditEngine* pEditEngine, const ESelection& rSel, const OUString& rFileName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHandler ); + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler ); virtual ~SvxXMLTextExportComponent(); @@ -331,18 +331,18 @@ public: virtual void _ExportContent() SAL_OVERRIDE; private: - com::sun::star::uno::Reference< com::sun::star::text::XText > mxText; + css::uno::Reference< css::text::XText > mxText; ESelection maSelection; }; SvxXMLTextExportComponent::SvxXMLTextExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, EditEngine* pEditEngine, const ESelection& rSel, const OUString& rFileName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler) + const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler) : SvXMLExport( xContext, "", rFileName, xHandler, (static_cast<frame::XModel*>(new SvxSimpleUnoModel())), FUNIT_CM ), maSelection( rSel ) { @@ -352,10 +352,9 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, -// SVX_UNOEDIT_OUTLINER_PROPERTIES, - {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType<com::sun::star::container::XIndexReplace>::get(), 0, 0 }, - {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, - {OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 716133c5cf89..5f20e25a7287 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -109,7 +109,7 @@ class SvxXMLXTextImportComponent : public SvXMLImport { public: SvxXMLXTextImportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XText > & rText ); virtual ~SvxXMLXTextImportComponent() throw (); @@ -121,7 +121,7 @@ private: SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< XText > & xText ) : SvXMLImport(xContext, ""), mxText( xText ) |