diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-25 08:43:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-29 14:48:11 -0700 |
| commit | 22a09c25c8f56e3aab3ac1de6009461b4f063862 (patch) | |
| tree | 613c8119bf9d4ec54fd3098142961f6ae1722cf5 /filter | |
| parent | f206f0d5b0409573f003f141c1c5d519ba7d74c8 (diff) | |
fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4)
Conflicts:
framework/source/uifactory/menubarfactory.cxx
Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Reviewed-on: https://gerrit.libreoffice.org/9921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 6 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 59b8ae401042..a9cfc013e062 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1150,7 +1150,7 @@ void SVGFilter::implExportTextShapeIndex() { OUString sTextShapeIdList = mTextShapeIdListMap[xDrawPage].trim(); - const OUString& rPageId = implGetValidIDFromInterface( xDrawPage ); + const OUString& rPageId = implGetValidIDFromInterface( Reference<XInterface>(xDrawPage, UNO_QUERY) ); if( !rPageId.isEmpty() && !sTextShapeIdList.isEmpty() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, rPageId ); @@ -1710,7 +1710,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, } - const OUString& rShapeId = implGetValidIDFromInterface( rxShape ); + const OUString& rShapeId = implGetValidIDFromInterface( Reference<XInterface>(rxShape, UNO_QUERY) ); if( !rShapeId.isEmpty() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", rShapeId ); @@ -1892,7 +1892,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r { // We create a map of text shape ids. implRegisterInterface( rxShape ); - const OUString& rShapeId = implGetValidIDFromInterface( rxShape ); + const OUString& rShapeId = implGetValidIDFromInterface( Reference<XInterface>(rxShape, UNO_QUERY) ); if( !rShapeId.isEmpty() ) { mTextShapeIdListMap[rxPage] += rShapeId; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 3a26b52c4c05..b08037f7778d 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -842,7 +842,7 @@ sal_Bool SVGTextWriter::createParagraphEnumeration() { if( mrTextShape.is() ) { - msShapeId = implGetValidIDFromInterface( mrTextShape ); + msShapeId = implGetValidIDFromInterface( Reference<XInterface>(mrTextShape, UNO_QUERY) ); Reference< XEnumerationAccess > xEnumerationAccess( mrTextShape, UNO_QUERY_THROW ); Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration(), UNO_QUERY_THROW ); @@ -1006,7 +1006,7 @@ sal_Bool SVGTextWriter::nextParagraph() return sal_False; } - const OUString& rParagraphId = implGetValidIDFromInterface( xTextContent ); + const OUString& rParagraphId = implGetValidIDFromInterface( Reference<XInterface>(xTextContent, UNO_QUERY) ); if( !rParagraphId.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId ); @@ -1114,7 +1114,7 @@ sal_Bool SVGTextWriter::nextTextPortion() { implRegisterInterface( xPortionTextRange ); - const OUString& rTextPortionId = implGetValidIDFromInterface( xPortionTextRange ); + const OUString& rTextPortionId = implGetValidIDFromInterface( Reference<XInterface>(xPortionTextRange, UNO_QUERY) ); if( !rTextPortionId.isEmpty() ) { msHyperlinkIdList += rTextPortionId; @@ -1566,7 +1566,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, implRegisterInterface( mrCurrentTextParagraph ); // Add the needed info to the BulletListItemMap - OUString sId = implGetValidIDFromInterface( mrCurrentTextParagraph ); + OUString sId = implGetValidIDFromInterface( Reference<XInterface>(mrCurrentTextParagraph, UNO_QUERY) ); if( !sId.isEmpty() ) { sId += ".bp"; @@ -1585,7 +1585,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, } } - const OUString& rTextPortionId = implGetValidIDFromInterface( mrCurrentTextPortion ); + const OUString& rTextPortionId = implGetValidIDFromInterface( Reference<XInterface>(mrCurrentTextPortion, UNO_QUERY) ); if( !rTextPortionId.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rTextPortionId ); |