diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-06 10:51:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-06 11:55:09 +0200 |
| commit | 2633976ef3406d48907bd922f067ea04e39c94f1 (patch) | |
| tree | c29440a174d106805b686299fcaa4a3bacf23592 /sw/source/core/txtnode | |
| parent | 41d83eb8cd8e9544641182ff19a8c635760e75dc (diff) | |
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/fmtatr2.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 26d212917b68..d3b4528b4f02 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -714,8 +714,7 @@ bool Meta::IsInContent() const return pTextNode == nullptr || pTextNode->IsInContent(); } -::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > -Meta::MakeUnoObject() +css::uno::Reference< css::rdf::XMetadatable > Meta::MakeUnoObject() { return SwXMeta::CreateXMeta(*this); } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 633e638633b2..8cda73e9cdec 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3592,8 +3592,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa if (pOldValue && (RES_REMOVE_UNO_OBJECT == pOldValue->Which())) { // invalidate cached uno object - SetXParagraph(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>(0)); + SetXParagraph(css::uno::Reference<css::text::XTextContent>(0)); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index c858d7a7bb2e..5a60a8de4c86 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1462,7 +1462,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos if ( nBegin < nEnd ) { const LanguageType aCurrLang = pNode->GetLang( nBegin ); - const com::sun::star::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang ); + const css::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang ); nBegin = g_pBreakIt->GetBreakIter()->beginOfSentence( rText, nBegin, aCurrLocale ); nEnd = g_pBreakIt->GetBreakIter()->endOfSentence(rText, nEnd, aCurrLocale); if (nEnd > rText.getLength() || nEnd < 0) @@ -1495,11 +1495,11 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos uno::Reference<text::XTextMarkup> const xTextMarkup = new SwXTextMarkup(pNode, aConversionMap); - com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController(); + css::uno::Reference< css::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController(); SwPosition start(*pNode, nBegin); SwPosition end (*pNode, nEnd); - Reference< ::com::sun::star::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end); + Reference< css::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end); rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController); @@ -1512,7 +1512,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos do { const LanguageType nLang = aIter.GetLanguage(); - const com::sun::star::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang ); + const css::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang ); nLangEnd = std::min<sal_Int32>( nEnd, aIter.GetChgPos() ); const sal_Int32 nExpandBegin = aConversionMap.ConvertToViewPosition( nLangBegin ); |