Kaydet (Commit) d6bba47b authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane Kaydeden (comit) Fridrich Strba

remove ::connectivity::to(Date)?(Time)?String; same as DBTypeConversion::*

Change-Id: I5f2ef1ecff7e2071b55c27b9dc60e7d92950435c
Reviewed-on: https://gerrit.libreoffice.org/4563Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst f042e22f
...@@ -111,50 +111,6 @@ namespace connectivity ...@@ -111,50 +111,6 @@ namespace connectivity
return ( *pStr == 0 ) && ( *pWild == 0 ); return ( *pStr == 0 ) && ( *pWild == 0 );
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
OUString toDateString(const ::com::sun::star::util::Date& rDate)
{
sal_Char s[11];
snprintf(s,
sizeof(s),
"%04d-%02d-%02d",
(int)rDate.Year,
(int)rDate.Month,
(int)rDate.Day);
s[10] = 0;
return OUString::createFromAscii(s);
}
//------------------------------------------------------------------
OUString toTimeString(const ::com::sun::star::util::Time& rTime)
{
sal_Char s[9];
snprintf(s,
sizeof(s),
"%02d:%02d:%02d",
(int)rTime.Hours,
(int)rTime.Minutes,
(int)rTime.Seconds);
s[8] = 0;
return OUString::createFromAscii(s);
}
//------------------------------------------------------------------
OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime)
{
sal_Char s[20];
snprintf(s,
sizeof(s),
"%04d-%02d-%02d %02d:%02d:%02d",
(int)rDateTime.Year,
(int)rDateTime.Month,
(int)rDateTime.Day,
(int)rDateTime.Hours,
(int)rDateTime.Minutes,
(int)rDateTime.Seconds);
s[19] = 0;
return OUString::createFromAscii(s);
}
#ifdef SOLAR_JAVA #ifdef SOLAR_JAVA
::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const Reference<XComponentContext >& _rxContext) ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const Reference<XComponentContext >& _rxContext)
{ {
......
...@@ -983,13 +983,13 @@ OUString ORowSetValue::getString( ) const ...@@ -983,13 +983,13 @@ OUString ORowSetValue::getString( ) const
aRet = OUString::number(static_cast<double>(*this)); aRet = OUString::number(static_cast<double>(*this));
break; break;
case DataType::DATE: case DataType::DATE:
aRet = connectivity::toDateString(*this); aRet = DBTypeConversion::toDateString(*this);
break; break;
case DataType::TIME: case DataType::TIME:
aRet = connectivity::toTimeString(*this); aRet = DBTypeConversion::toTimeString(*this);
break; break;
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
aRet = connectivity::toDateTimeString(*this); aRet = DBTypeConversion::toDateTimeString(*this);
break; break;
case DataType::BINARY: case DataType::BINARY:
case DataType::VARBINARY: case DataType::VARBINARY:
......
...@@ -53,11 +53,6 @@ namespace connectivity ...@@ -53,11 +53,6 @@ namespace connectivity
{ {
return match(rWild.getStr(), rStr.getStr(), cEscape); return match(rWild.getStr(), rStr.getStr(), cEscape);
} }
//------------------------------------------------------------------------------
OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const ::com::sun::star::util::Date& rDate);
OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const ::com::sun::star::util::Time& rTime);
OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime);
// typedefs // typedefs
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment