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

Hold ScHeaderFooterContentObj by rtl::Reference

Browse Source 
...there appears to be no good reason not to (it's a UNO implementation,
deriving from WeakImplHelper), and witnessed at least one JunitTest_sc_unoapi
failure where an incoming URP call on ScHeaderFooterTextObj::getString obtained
an apparently dangling

  ScHeaderFooterContentObj& rContentObj = aTextData.GetContentObj()

that pointed to garbage.

Change-Id: I51a2a03ded18509ee61488d96bd30a6d364825d7
This commit is contained in:
Stephan Bergmann
2015-01-23 16:08:29 +01:00
parent 05e7b1db35
commit e753d31d5d
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sc/inc/textuno.hxx
View File

@@ -94,7 +94,7 @@ public:
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
static ScHeaderFooterContentObj* getImplementation( const com::sun::star::uno::Reference< static rtl::Reference<ScHeaderFooterContentObj> getImplementation( const com::sun::star::uno::Reference<
com::sun::star::sheet::XHeaderFooterContent> xObj ); com::sun::star::sheet::XHeaderFooterContent> xObj );
// XServiceInfo // XServiceInfo
@@ -112,7 +112,7 @@ class ScHeaderFooterTextData : boost::noncopyable
{ {
private: private:
EditTextObject* mpTextObj; EditTextObject* mpTextObj;
ScHeaderFooterContentObj& rContentObj; rtl::Reference<ScHeaderFooterContentObj> rContentObj;
sal_uInt16 nPart; sal_uInt16 nPart;
ScEditEngineDefaulter* pEditEngine; ScEditEngineDefaulter* pEditEngine;
SvxEditEngineForwarder* pForwarder; SvxEditEngineForwarder* pForwarder;
@@ -120,7 +120,7 @@ private:
public: public:
ScHeaderFooterTextData( ScHeaderFooterTextData(
ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj); rtl::Reference<ScHeaderFooterContentObj> const & rContent, sal_uInt16 nP, const EditTextObject* pTextObj);
~ScHeaderFooterTextData(); ~ScHeaderFooterTextData();
// helper functions // helper functions
@@ -130,7 +130,7 @@ public:
ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; }
sal_uInt16 GetPart() const { return nPart; } sal_uInt16 GetPart() const { return nPart; }
ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } rtl::Reference<ScHeaderFooterContentObj> GetContentObj() const { return rContentObj; }
const EditTextObject* GetTextObject() const { return mpTextObj;} const EditTextObject* GetTextObject() const { return mpTextObj;}
}; };
@@ -156,7 +156,7 @@ private:
public: public:
ScHeaderFooterTextObj( ScHeaderFooterTextObj(
ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj); rtl::Reference<ScHeaderFooterContentObj> const & rContent, sal_uInt16 nP, const EditTextObject* pTextObj);
virtual ~ScHeaderFooterTextObj(); virtual ~ScHeaderFooterTextObj();
const EditTextObject* GetTextObject() const; const EditTextObject* GetTextObject() const;

4
sc/source/core/data/attrib.cxx
View File

@@ -591,9 +591,9 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ )
{ {
if ( xContent.is() ) if ( xContent.is() )
{ {
ScHeaderFooterContentObj* pImp = rtl::Reference<ScHeaderFooterContentObj> pImp =
ScHeaderFooterContentObj::getImplementation( xContent ); ScHeaderFooterContentObj::getImplementation( xContent );
if (pImp) if (pImp.is())
{ {
const EditTextObject* pImpLeft = pImp->GetLeftEditObject(); const EditTextObject* pImpLeft = pImp->GetLeftEditObject();
delete pLeftArea; delete pLeftArea;

8
sc/source/ui/unoobj/fielduno.cxx
View File

@@ -505,15 +505,15 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
// Get the parent text range instance. // Get the parent text range instance.
uno::Reference<text::XTextRange> xTextRange; uno::Reference<text::XTextRange> xTextRange;
ScHeaderFooterContentObj& rContentObj = mrData.GetContentObj(); rtl::Reference<ScHeaderFooterContentObj> rContentObj = mrData.GetContentObj();
uno::Reference<text::XText> xText; uno::Reference<text::XText> xText;
sal_uInt16 nPart = mrData.GetPart(); sal_uInt16 nPart = mrData.GetPart();
if (nPart == SC_HDFT_LEFT) if (nPart == SC_HDFT_LEFT)
xText = rContentObj.getLeftText(); xText = rContentObj->getLeftText();
else if (nPart == SC_HDFT_CENTER) else if (nPart == SC_HDFT_CENTER)
xText = rContentObj.getCenterText(); xText = rContentObj->getCenterText();
else else
xText = rContentObj.getRightText(); xText = rContentObj->getRightText();
uno::Reference<text::XTextRange> xTemp(xText, uno::UNO_QUERY); uno::Reference<text::XTextRange> xTemp(xText, uno::UNO_QUERY);
xTextRange = xTemp; xTextRange = xTemp;

28
sc/source/ui/unoobj/textuno.cxx
View File

@@ -91,9 +91,9 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv
ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft,
const EditTextObject* pCenter, const EditTextObject* pCenter,
const EditTextObject* pRight ) : const EditTextObject* pRight ) :
mxLeftText(new ScHeaderFooterTextObj(*this, SC_HDFT_LEFT, pLeft)), mxLeftText(new ScHeaderFooterTextObj(this, SC_HDFT_LEFT, pLeft)),
mxCenterText(new ScHeaderFooterTextObj(*this, SC_HDFT_CENTER, pCenter)), mxCenterText(new ScHeaderFooterTextObj(this, SC_HDFT_CENTER, pCenter)),
mxRightText(new ScHeaderFooterTextObj(*this, SC_HDFT_RIGHT, pRight)) mxRightText(new ScHeaderFooterTextObj(this, SC_HDFT_RIGHT, pRight))
{ {
} }
@@ -164,10 +164,10 @@ const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
return theScHeaderFooterContentObjUnoTunnelId::get().getSeq(); return theScHeaderFooterContentObjUnoTunnelId::get().getSeq();
} }
ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( rtl::Reference<ScHeaderFooterContentObj> ScHeaderFooterContentObj::getImplementation(
const uno::Reference<sheet::XHeaderFooterContent> xObj ) const uno::Reference<sheet::XHeaderFooterContent> xObj )
{ {
ScHeaderFooterContentObj* pRet = NULL; rtl::Reference<ScHeaderFooterContentObj> pRet;
uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
if (xUT.is()) if (xUT.is())
pRet = reinterpret_cast<ScHeaderFooterContentObj*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId()))); pRet = reinterpret_cast<ScHeaderFooterContentObj*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
@@ -175,7 +175,7 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation(
} }
ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterTextData::ScHeaderFooterTextData(
ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : rtl::Reference<ScHeaderFooterContentObj> const & rContent, sal_uInt16 nP, const EditTextObject* pTextObj) :
mpTextObj(pTextObj ? pTextObj->Clone() : NULL), mpTextObj(pTextObj ? pTextObj->Clone() : NULL),
rContentObj( rContent ), rContentObj( rContent ),
nPart( nP ), nPart( nP ),
@@ -253,7 +253,7 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine)
} }
ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterTextObj::ScHeaderFooterTextObj(
ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : rtl::Reference<ScHeaderFooterContentObj> const & rContent, sal_uInt16 nP, const EditTextObject* pTextObj) :
aTextData(rContent, nP, pTextObj) aTextData(rContent, nP, pTextObj)
{ {
// ScHeaderFooterTextData acquires rContent // ScHeaderFooterTextData acquires rContent
@@ -322,14 +322,14 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException
const EditTextObject* pData; const EditTextObject* pData;
sal_uInt16 nPart = aTextData.GetPart(); sal_uInt16 nPart = aTextData.GetPart();
ScHeaderFooterContentObj& rContentObj = aTextData.GetContentObj(); rtl::Reference<ScHeaderFooterContentObj> rContentObj = aTextData.GetContentObj();
if (nPart == SC_HDFT_LEFT) if (nPart == SC_HDFT_LEFT)
pData = rContentObj.GetLeftEditObject(); pData = rContentObj->GetLeftEditObject();
else if (nPart == SC_HDFT_CENTER) else if (nPart == SC_HDFT_CENTER)
pData = rContentObj.GetCenterEditObject(); pData = rContentObj->GetCenterEditObject();
else else
pData = rContentObj.GetRightEditObject(); pData = rContentObj->GetRightEditObject();
if (pData) if (pData)
{ {
// for pure text, no font info is needed in pool defaults // for pure text, no font info is needed in pool defaults
@@ -421,21 +421,21 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
case SC_HDFT_LEFT: case SC_HDFT_LEFT:
{ {
uno::Reference<text::XTextRange> xTemp( uno::Reference<text::XTextRange> xTemp(
aTextData.GetContentObj().getLeftText(), uno::UNO_QUERY); aTextData.GetContentObj()->getLeftText(), uno::UNO_QUERY);
xTextRange = xTemp; xTextRange = xTemp;
} }
break; break;
case SC_HDFT_CENTER: case SC_HDFT_CENTER:
{ {
uno::Reference<text::XTextRange> xTemp( uno::Reference<text::XTextRange> xTemp(
aTextData.GetContentObj().getCenterText(), uno::UNO_QUERY); aTextData.GetContentObj()->getCenterText(), uno::UNO_QUERY);
xTextRange = xTemp; xTextRange = xTemp;
} }
break; break;
case SC_HDFT_RIGHT: case SC_HDFT_RIGHT:
{ {
uno::Reference<text::XTextRange> xTemp( uno::Reference<text::XTextRange> xTemp(
aTextData.GetContentObj().getRightText(), uno::UNO_QUERY); aTextData.GetContentObj()->getRightText(), uno::UNO_QUERY);
xTextRange = xTemp; xTextRange = xTemp;
} }
break; break;