summaryrefslogtreecommitdiff
path: root/oox/source/helper
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/helper')
-rw-r--r--oox/source/helper/attributelist.cxx10
-rw-r--r--oox/source/helper/graphichelper.cxx2
-rw-r--r--oox/source/helper/modelobjecthelper.cxx6
3 files changed, 9 insertions, 9 deletions
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 183794263ef0..8afe869125c8 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -27,8 +27,8 @@ namespace oox {
// ============================================================================
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
using namespace ::com::sun::star::xml::sax;
using ::rtl::OUString;
@@ -201,10 +201,10 @@ OptValue< bool > AttributeList::getBool( sal_Int32 nAttrToken ) const
return OptValue< bool >( onValue.has(), onValue.get() != 0 );
}
-OptValue< DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const
+OptValue< util::DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const
{
OUString aValue = mxAttribs->getOptionalValue( nAttrToken );
- DateTime aDateTime;
+ util::DateTime aDateTime;
bool bValid = (aValue.getLength() == 19) && (aValue[ 4 ] == '-') && (aValue[ 7 ] == '-') &&
(aValue[ 10 ] == 'T') && (aValue[ 13 ] == ':') && (aValue[ 16 ] == ':');
if( bValid )
@@ -216,7 +216,7 @@ OptValue< DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const
aDateTime.Minutes = static_cast< sal_uInt16 >( aValue.copy( 14, 2 ).toInt32() );
aDateTime.Seconds = static_cast< sal_uInt16 >( aValue.copy( 17, 2 ).toInt32() );
}
- return OptValue< DateTime >( bValid, aDateTime );
+ return OptValue< util::DateTime >( bValid, aDateTime );
}
// defaulted return values ----------------------------------------------------
@@ -277,7 +277,7 @@ bool AttributeList::getBool( sal_Int32 nAttrToken, bool bDefault ) const
return getBool( nAttrToken ).get( bDefault );
}
-DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const DateTime& rDefault ) const
+util::DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const util::DateTime& rDefault ) const
{
return getDateTime( nAttrToken ).get( rDefault );
}
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 1c5eaa6000e8..6ddf640caa37 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -302,7 +302,7 @@ OUString GraphicHelper::createGraphicObject( const Reference< XGraphic >& rxGrap
OUString aGraphicObjUrl;
if( mxContext.is() && rxGraphic.is() ) try
{
- Reference< XGraphicObject > xGraphicObj( GraphicObject::create( mxContext ), UNO_SET_THROW );
+ Reference< XGraphicObject > xGraphicObj( graphic::GraphicObject::create( mxContext ), UNO_SET_THROW );
xGraphicObj->setGraphic( rxGraphic );
maGraphicObjects.push_back( xGraphicObj );
aGraphicObjUrl = maGraphicObjScheme + xGraphicObj->getUniqueID();
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 5811b62fc161..0982f3c21180 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -31,7 +31,7 @@ namespace oox {
// ============================================================================
-using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -117,12 +117,12 @@ OUString ModelObjectHelper::insertLineDash( const LineDash& rDash )
return maDashContainer.insertObject( maDashNameBase, Any( rDash ), true );
}
-OUString ModelObjectHelper::insertFillGradient( const Gradient& rGradient )
+OUString ModelObjectHelper::insertFillGradient( const awt::Gradient& rGradient )
{
return maGradientContainer.insertObject( maGradientNameBase, Any( rGradient ), true );
}
-OUString ModelObjectHelper::insertTransGrandient( const Gradient& rGradient )
+OUString ModelObjectHelper::insertTransGrandient( const awt::Gradient& rGradient )
{
return maTransGradContainer.insertObject( maTransGradNameBase, Any( rGradient ), true );
}