[Libreoffice-commits] .: oox/source writerfilter/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Jun 7 21:12:30 PDT 2011
oox/source/core/filterdetect.cxx | 2 +-
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 51d32f76867d6ae915446990dfb1c76c089e41b8
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Jun 7 21:12:25 2011 -0700
gcc 4.0 doesn't support the C++0x usage of enum::value
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 48d7dee..0603f15 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 d1f1d8c..7e1a390 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
More information about the Libreoffice-commits
mailing list