diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-06-07 21:12:25 -0700 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-07-07 15:07:11 +0200 |
| commit | 9515c9073758dcdad311820de45c7424ad287a07 (patch) | |
| tree | 6dea30b71a6f77a812d301a580ad840ffa5d639a | |
| parent | 0b87c46a182a9fb15f5dbbdd2f00bde04c99e79b (diff) | |
gcc 4.0 doesn't support the C++0x usage of enum::value
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
| -rw-r--r-- | oox/source/core/filterdetect.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 44f050aad..c9843e611 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -173,7 +173,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs ) Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("file:///" ) ) ); Reference< com::sun::star::uri::XUriReference > xPart = xFac->parse( rAttribs.getString( XML_Target, OUString() ) ); - Reference< com::sun::star::uri::XUriReference > xAbs = xFac->makeAbsolute( xBase, xPart, sal_True, com::sun::star::uri::RelativeUriExcessParentSegments_RETAIN ); + Reference< com::sun::star::uri::XUriReference > xAbs = xFac->makeAbsolute( xBase, xPart, sal_True, com::sun::star::uri::RelativeUriExcessParentSegments_RETAIN ); if ( xAbs.is() ) maTargetPath = xAbs->getPath(); diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index d1f1d8c6f..7e1a39098 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -201,7 +201,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> // file://base/word. We need something more than some // simple string concatination here to handle that. uno::Reference< com::sun::star::uri::XUriReference > xPart = xFac->parse( sMyTarget ); - uno::Reference< com::sun::star::uri::XUriReference > xAbs = xFac->makeAbsolute( xBase, xPart, sal_True, com::sun::star::uri::RelativeUriExcessParentSegments::RelativeUriExcessParentSegments_RETAIN ); + uno::Reference< com::sun::star::uri::XUriReference > xAbs = xFac->makeAbsolute( xBase, xPart, sal_True, com::sun::star::uri::RelativeUriExcessParentSegments_RETAIN ); rDocumentTarget = xAbs->getPath(); // path will start with the fragment separator. need to // remove that |