mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use ABC instead of Pimpl for SwXTextRanges

Browse Source 
- abstract base class reduces boilerplate
- Pimpl is pointless here, except for SolarMutex, which is handled by
  overriding release

Change-Id: Ia08dc26104f70411a783ade681be3bcebb3b9acb
This commit is contained in:
Bjoern Michaelsen
2015-06-01 20:37:51 +02:00
parent aa0301e6d9
commit 82eac6775f
5 changed files with 53 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sw/source/core/inc/unoparaframeenum.hxx
View File

@@ -73,45 +73,10 @@ enum ParaFrameMode
PARAFRAME_PORTION_TEXTRANGE, PARAFRAME_PORTION_TEXTRANGE,
}; };
typedef ::cppu::WeakImplHelper struct SwXParaFrameEnumeration
< ::com::sun::star::lang::XServiceInfo : public SwSimpleEnumeration_Base
, ::com::sun::star::container::XEnumeration
> SwXParaFrameEnumeration_Base;
class SwXParaFrameEnumeration
: public SwXParaFrameEnumeration_Base
{ {
static SwXParaFrameEnumeration* Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat = nullptr);
private:
class Impl;
::sw::UnoImplPtr<Impl> m_pImpl;
virtual ~SwXParaFrameEnumeration();
public:
SwXParaFrameEnumeration(const SwPaM& rPaM,
const enum ParaFrameMode eParaFrameMode, SwFrameFormat *const pFormat = 0);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(
const OUString& rServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
}; };
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX #endif // INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX

11
sw/source/core/unocore/unoobj.cxx
View File

@@ -2984,17 +2984,10 @@ SwXTextCursor::createContentEnumeration(const OUString& rServiceName)
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
SolarMutexGuard g; SolarMutexGuard g;
if (rServiceName != "com.sun.star.text.TextContent") if (rServiceName != "com.sun.star.text.TextContent")
{
throw uno::RuntimeException(); throw uno::RuntimeException();
} SwUnoCrsr& rUnoCursor( m_pImpl->GetCursorOrThrow() );
return SwXParaFrameEnumeration::Create(rUnoCursor, PARAFRAME_PORTION_TEXTRANGE);
SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
uno::Reference< container::XEnumeration > xRet =
new SwXParaFrameEnumeration(rUnoCursor, PARAFRAME_PORTION_TEXTRANGE);
return xRet;
} }
uno::Reference< container::XEnumeration > SAL_CALL uno::Reference< container::XEnumeration > SAL_CALL

90
sw/source/core/unocore/unoobj2.cxx
View File

@@ -1234,9 +1234,7 @@ throw (uno::RuntimeException, std::exception)
throw uno::RuntimeException(); throw uno::RuntimeException();
} }
const uno::Reference< container::XEnumeration > xRet = return SwXParaFrameEnumeration::Create(*pNewCrsr, PARAFRAME_PORTION_TEXTRANGE);
new SwXParaFrameEnumeration(*pNewCrsr, PARAFRAME_PORTION_TEXTRANGE);
return xRet;
} }
uno::Reference< container::XEnumeration > SAL_CALL uno::Reference< container::XEnumeration > SAL_CALL
@@ -1575,22 +1573,24 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL); pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
} }
struct SwXParaFrameEnumeration::Impl struct SwXParaFrameEnumerationImpl SAL_FINAL : public SwXParaFrameEnumeration
{ {
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SwXParaFrameEnumerationImpl(const SwPaM& rPaM,
const enum ParaFrameMode eParaFrameMode, SwFrameFormat *const pFormat = 0);
// created by hasMoreElements // created by hasMoreElements
uno::Reference< text::XTextContent > m_xNextObject; uno::Reference< text::XTextContent > m_xNextObject;
FrameClientList_t m_Frames; FrameClientList_t m_Frames;
::sw::UnoCursorPointer m_pUnoCursor; ::sw::UnoCursorPointer m_pUnoCursor;
explicit Impl(SwPaM const & rPaM)
: m_pUnoCursor(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false))
{
if (rPaM.HasMark())
{
GetCursor()->SetMark();
*GetCursor()->GetMark() = *rPaM.GetMark();
}
}
SwUnoCrsr* GetCursor() SwUnoCrsr* GetCursor()
{ return &(*m_pUnoCursor); } { return &(*m_pUnoCursor); }
@@ -1680,23 +1680,31 @@ lcl_FillFrame(SwUnoCrsr& rUnoCrsr, FrameClientList_t & rFrames)
} }
} }
SwXParaFrameEnumeration::SwXParaFrameEnumeration( SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat)
{ return new SwXParaFrameEnumerationImpl(rPaM, eParaFrameMode, pFormat); }
SwXParaFrameEnumerationImpl::SwXParaFrameEnumerationImpl(
const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode,
SwFrameFormat *const pFormat) SwFrameFormat* const pFormat)
: m_pImpl( new SwXParaFrameEnumeration::Impl(rPaM) ) : m_pUnoCursor(rPaM.GetDoc()->CreateUnoCrsr(*rPaM.GetPoint(), false))
{ {
if (rPaM.HasMark())
{
GetCursor()->SetMark();
*GetCursor()->GetMark() = *rPaM.GetMark();
}
if (PARAFRAME_PORTION_PARAGRAPH == eParaFrameMode) if (PARAFRAME_PORTION_PARAGRAPH == eParaFrameMode)
{ {
FrameClientSortList_t frames; FrameClientSortList_t frames;
::CollectFrameAtNode(rPaM.GetPoint()->nNode, ::CollectFrameAtNode(rPaM.GetPoint()->nNode,
frames, false); frames, false);
::std::transform(frames.begin(), frames.end(), ::std::transform(frames.begin(), frames.end(),
::std::back_inserter(m_pImpl->m_Frames), ::std::back_inserter(m_Frames),
::boost::bind(&FrameClientSortListEntry::pFrameClient, _1)); ::boost::bind(&FrameClientSortListEntry::pFrameClient, _1));
} }
else if (pFormat) else if (pFormat)
{ {
m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFormat))); m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFormat)));
} }
else if ((PARAFRAME_PORTION_CHAR == eParaFrameMode) || else if ((PARAFRAME_PORTION_CHAR == eParaFrameMode) ||
(PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode)) (PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode))
@@ -1704,60 +1712,54 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
if (PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode) if (PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode)
{ {
//get all frames that are bound at paragraph or at character //get all frames that are bound at paragraph or at character
SwPosFlyFrms aFlyFrms(rPaM.GetDoc()->GetAllFlyFormats(m_pImpl->GetCursor(), false, true)); SwPosFlyFrms aFlyFrms(rPaM.GetDoc()->GetAllFlyFormats(GetCursor(), false, true));
for(SwPosFlyFrms::const_iterator aIter(aFlyFrms.begin()); aIter != aFlyFrms.end(); ++aIter) for(SwPosFlyFrms::const_iterator aIter(aFlyFrms.begin()); aIter != aFlyFrms.end(); ++aIter)
{ {
SwFrameFormat *const pFrameFormat = const_cast<SwFrameFormat*>(&((*aIter)->GetFormat())); SwFrameFormat *const pFrameFormat = const_cast<SwFrameFormat*>(&((*aIter)->GetFormat()));
m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat))); m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
} }
} }
lcl_FillFrame(*m_pImpl->GetCursor(), m_pImpl->m_Frames); lcl_FillFrame(*GetCursor(), m_Frames);
} }
} }
SwXParaFrameEnumeration::~SwXParaFrameEnumeration()
{
}
sal_Bool SAL_CALL sal_Bool SAL_CALL
SwXParaFrameEnumeration::hasMoreElements() throw (uno::RuntimeException, std::exception) SwXParaFrameEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
if (!m_pImpl->GetCursor()) if (!GetCursor())
throw uno::RuntimeException(); throw uno::RuntimeException();
m_pImpl->PurgeFrameClients(); PurgeFrameClients();
return m_pImpl->m_xNextObject.is() || return m_xNextObject.is() ||
lcl_CreateNextObject(*m_pImpl->GetCursor(),m_pImpl->m_xNextObject, m_pImpl->m_Frames); lcl_CreateNextObject(*GetCursor(), m_xNextObject, m_Frames);
} }
uno::Any SAL_CALL SwXParaFrameEnumeration::nextElement() uno::Any SAL_CALL SwXParaFrameEnumerationImpl::nextElement()
throw (container::NoSuchElementException, throw (container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException, std::exception) lang::WrappedTargetException, uno::RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
if (!m_pImpl->GetCursor()) if (!GetCursor())
throw uno::RuntimeException(); throw uno::RuntimeException();
m_pImpl->PurgeFrameClients(); PurgeFrameClients();
if (!m_pImpl->m_xNextObject.is() && m_pImpl->m_Frames.size()) if (!m_xNextObject.is() && m_Frames.size())
{ {
lcl_CreateNextObject(*m_pImpl->GetCursor(), lcl_CreateNextObject(*GetCursor(),
m_pImpl->m_xNextObject, m_pImpl->m_Frames); m_xNextObject, m_Frames);
} }
if (!m_pImpl->m_xNextObject.is()) if (!m_xNextObject.is())
{
throw container::NoSuchElementException(); throw container::NoSuchElementException();
}
uno::Any aRet; uno::Any aRet;
aRet <<= m_pImpl->m_xNextObject; aRet <<= m_xNextObject;
m_pImpl->m_xNextObject = 0; m_xNextObject = nullptr;
return aRet; return aRet;
} }
OUString SAL_CALL OUString SAL_CALL
SwXParaFrameEnumeration::getImplementationName() throw (uno::RuntimeException, std::exception) SwXParaFrameEnumerationImpl::getImplementationName() throw (uno::RuntimeException, std::exception)
{ {
return OUString("SwXParaFrameEnumeration"); return OUString("SwXParaFrameEnumeration");
} }
@@ -1771,14 +1773,14 @@ static const size_t g_nServicesParaFrameEnum(
sizeof(g_ServicesParaFrameEnum)/sizeof(g_ServicesParaFrameEnum[0])); sizeof(g_ServicesParaFrameEnum)/sizeof(g_ServicesParaFrameEnum[0]));
sal_Bool SAL_CALL sal_Bool SAL_CALL
SwXParaFrameEnumeration::supportsService(const OUString& rServiceName) SwXParaFrameEnumerationImpl::supportsService(const OUString& rServiceName)
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return cppu::supportsService(this, rServiceName); return cppu::supportsService(this, rServiceName);
} }
uno::Sequence< OUString > SAL_CALL uno::Sequence< OUString > SAL_CALL
SwXParaFrameEnumeration::getSupportedServiceNames() SwXParaFrameEnumerationImpl::getSupportedServiceNames()
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return ::sw::GetSupportedServiceNamesImpl( return ::sw::GetSupportedServiceNamesImpl(

2
sw/source/core/unocore/unoparagraph.cxx
View File

@@ -1438,7 +1438,7 @@ throw (uno::RuntimeException, std::exception)
SwPosition aPos( rTextNode ); SwPosition aPos( rTextNode );
SwPaM aPam( aPos ); SwPaM aPam( aPos );
uno::Reference< container::XEnumeration > xRet = uno::Reference< container::XEnumeration > xRet =
new SwXParaFrameEnumeration(aPam, PARAFRAME_PORTION_PARAGRAPH); SwXParaFrameEnumeration::Create(aPam, PARAFRAME_PORTION_PARAGRAPH);
return xRet; return xRet;
} }

6
sw/source/core/unocore/unoport.cxx
View File

@@ -851,11 +851,7 @@ uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumerat
if(!pUnoCrsr) if(!pUnoCrsr)
throw uno::RuntimeException(); throw uno::RuntimeException();
uno::Reference< container::XEnumeration > xRet = return SwXParaFrameEnumeration::Create(*pUnoCrsr, PARAFRAME_PORTION_CHAR, m_pFrameFormat);
new SwXParaFrameEnumeration(*pUnoCrsr, PARAFRAME_PORTION_CHAR,
m_pFrameFormat);
return xRet;
} }
namespace namespace