[Libreoffice-commits] core.git: editeng/source
Noel Grandin
noel at peralex.com
Sat Sep 12 23:21:28 PDT 2015
editeng/source/accessibility/AccessibleComponentBase.cxx | 38 ++--
editeng/source/accessibility/AccessibleContextBase.cxx | 38 ++--
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 58 +++---
editeng/source/accessibility/AccessibleHyperlink.cxx | 4
editeng/source/accessibility/AccessibleHyperlink.hxx | 20 +-
editeng/source/accessibility/AccessibleImageBullet.cxx | 4
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 14 -
editeng/source/editeng/editeng.cxx | 56 ++---
editeng/source/editeng/editobj2.hxx | 2
editeng/source/editeng/editview.cxx | 16 -
editeng/source/editeng/edtspell.hxx | 4
editeng/source/editeng/eeobj.hxx | 14 -
editeng/source/editeng/eerdll2.hxx | 5
editeng/source/editeng/impedit.cxx | 42 ++--
editeng/source/editeng/impedit.hxx | 114 +++++-------
editeng/source/editeng/impedit2.cxx | 44 ++--
editeng/source/editeng/impedit3.cxx | 8
editeng/source/editeng/impedit4.cxx | 18 -
editeng/source/editeng/impedit5.cxx | 2
editeng/source/editeng/textconv.cxx | 2
editeng/source/editeng/textconv.hxx | 10 -
editeng/source/items/frmitems.cxx | 30 +--
editeng/source/items/numitem.cxx | 8
editeng/source/items/paraitem.cxx | 10 -
editeng/source/items/svxfont.cxx | 6
editeng/source/items/textitem.cxx | 22 +-
editeng/source/items/writingmodeitem.cxx | 6
editeng/source/items/xmlcnitm.cxx | 4
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 8
editeng/source/misc/SvXMLAutoCorrectExport.hxx | 8
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 18 -
editeng/source/misc/SvXMLAutoCorrectImport.hxx | 8
editeng/source/misc/forbiddencharacterstable.cxx | 8
editeng/source/misc/hangulhanja.cxx | 4
editeng/source/misc/svxacorr.cxx | 44 ++--
editeng/source/misc/unolingu.cxx | 94 ++++-----
editeng/source/outliner/outleeng.cxx | 2
editeng/source/outliner/outleeng.hxx | 2
editeng/source/outliner/outliner.cxx | 2
editeng/source/uno/unofield.cxx | 14 -
editeng/source/uno/unofored.cxx | 2
editeng/source/uno/unoforou.cxx | 2
editeng/source/uno/unonrule.cxx | 4
editeng/source/uno/unotext.cxx | 14 -
editeng/source/xml/xmltxtexp.cxx | 97 +++++-----
editeng/source/xml/xmltxtimp.cxx | 4
46 files changed, 457 insertions(+), 477 deletions(-)
New commits:
commit eb012bf0a8dcdb84e61bb13ca8a96c089ae479d3
Author: Noel Grandin <noel at peralex.com>
Date: Fri Sep 11 15:44:09 2015 +0200
editeng: com::sun::star->css
Change-Id: Ied65d2de394ce54cb2c35abb152cf58ac3139395
Reviewed-on: https://gerrit.libreoffice.org/18503
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 6d16b51..61cb583 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 24d6698..64e5357 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 0dc65b2..20436ec 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 f313cb3..3e73c05 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 507f532..be10ace 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 09b07a7..78d6c72 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 8794001..9809050 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 6da4272..2449258 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 fe1fcf3..dc4d677 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 28a57a3..c9f1e42 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 c669431..828867b 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 236ee38..64efb22 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 5cfbb9f..62b2b2a 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 209480c..9f37a3f1 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 793a85e..87556e5 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 a78b6c5..90e131b 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 9bacfcc..ae3be6a 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 ba50da1..6589ec6 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 18dc864..650ecb5 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 43a3877..8b43dda 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 50cbbcf..3ed3c4f 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 3ee4bb0..25c2fcc 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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list