summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.cxx3
-rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.cxx3
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLConverter.cxx4
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx4
-rw-r--r--sc/source/filter/xml/XMLTableSourceContext.cxx4
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx5
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx2
-rw-r--r--sc/source/filter/xml/xmldrani.cxx6
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx6
-rw-r--r--sc/source/filter/xml/xmlexternaltabi.cxx2
11 files changed, 22 insertions, 19 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index fd7f45387e89..a9e94fb3061d 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -39,7 +39,6 @@
#include "document.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmluconv.hxx>
#include <xmloff/nmspmap.hxx>
#include <sax/tools/converter.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -187,7 +186,7 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE))
{
util::DateTime aDateTime;
- GetScImport().GetMM100UnitConverter().convertDateTime(aDateTime, sValue);
+ ::sax::Converter::convertDateTime(aDateTime, sValue);
util::Date aDate;
aDate.Day = aDateTime.Day;
aDate.Month = aDateTime.Month;
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index c6f8c4244869..ea0db551e56f 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -37,7 +37,6 @@
#include <sax/tools/converter.hxx>
#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmluconv.hxx>
#include "xmlimprt.hxx"
using ::rtl::OUString;
@@ -111,7 +110,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
case XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY:
{
double fTime;
- if( SvXMLUnitConverter::convertTime( fTime, sValue ) )
+ if (::sax::Converter::convertDuration( fTime, sValue ))
pCellRangeSource->nRefresh = Max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 );
}
break;
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 2eb6641cefab..627037f0f0dd 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -267,7 +267,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons
{
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TIME);
rtl::OUStringBuffer sBuffer;
- rExport.GetMM100UnitConverter().convertTime(sBuffer, fTempValue);
+ ::sax::Converter::convertDuration(sBuffer, fTempValue);
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear());
bSetAttributes = true;
}
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 5997e4f55df6..46246980090e 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -32,8 +32,8 @@
#include "XMLConverter.hxx"
#include <com/sun/star/util/DateTime.hpp>
#include <tools/datetime.hxx>
+#include <sax/tools/converter.hxx>
#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmluconv.hxx>
#include "rangelst.hxx"
#include "rangeutl.hxx"
#include "docuno.hxx"
@@ -351,7 +351,7 @@ void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUS
{
util::DateTime aAPIDateTime;
ConvertCoreToAPIDateTime(aDateTime, aAPIDateTime);
- SvXMLUnitConverter::convertDateTime(sDate, aAPIDateTime);
+ ::sax::Converter::convertDateTime(sDate, aAPIDateTime);
}
void ScXMLConverter::ConvertCoreToAPIDateTime(const DateTime& aDateTime, util::DateTime& rDateTime)
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 21a5513e90e1..d377b9150691 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -35,7 +35,6 @@
#include "XMLExportDatabaseRanges.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmluconv.hxx>
#include <xmloff/nmspmap.hxx>
#include <sax/tools/converter.hxx>
#include "xmlexprt.hxx"
@@ -657,7 +656,8 @@ private:
if (nRefresh)
{
OUStringBuffer aBuf;
- SvXMLUnitConverter::convertTime(aBuf, static_cast<double>(nRefresh) / 86400.0);
+ ::sax::Converter::convertDuration(aBuf,
+ static_cast<double>(nRefresh) / 86400.0);
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, aBuf.makeStringAndClear());
}
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 6877984f21fa..bf75878abe33 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -40,7 +40,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmluconv.hxx>
+#include <sax/tools/converter.hxx>
#include <com/sun/star/sheet/XSheetLinkable.hpp>
using namespace com::sun::star;
@@ -90,7 +90,7 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
else if (IsXMLToken(aLocalName, XML_REFRESH_DELAY))
{
double fTime;
- if( SvXMLUnitConverter::convertTime( fTime, sValue ) )
+ if (::sax::Converter::convertDuration( fTime, sValue ))
nRefresh = Max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 );
}
}
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index c6c0b47272d3..f070aae481d5 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -692,7 +692,8 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref
void ScXMLChangeInfoContext::EndElement()
{
aInfo.sUser = sAuthorBuffer.makeStringAndClear();
- GetScImport().GetMM100UnitConverter().convertDateTime(aInfo.aDateTime, sDateTimeBuffer.makeStringAndClear());
+ ::sax::Converter::convertDateTime(aInfo.aDateTime,
+ sDateTimeBuffer.makeStringAndClear());
aInfo.sComment = sCommentBuffer.makeStringAndClear();
pChangeTrackingImportHelper->SetActionInfo(aInfo);
}
@@ -1203,7 +1204,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport,
else if (IsXMLToken(aLocalName, XML_TIME_VALUE))
{
bEmpty = false;
- GetScImport().GetMM100UnitConverter().convertTime(rDateTimeValue, sValue);
+ ::sax::Converter::convertDuration(rDateTimeValue, sValue);
fValue = rDateTimeValue;
}
}
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 4ba69c00c21a..06d80ced67cf 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -199,7 +199,7 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport,
{
if (sValue.getLength())
{
- rXMLImport.GetMM100UnitConverter().convertTime(fValue, sValue);
+ ::sax::Converter::convertDuration(fValue, sValue);
bIsEmpty = false;
}
}
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 19066e0c5178..785d03e0ae9f 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -53,8 +53,10 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmluconv.hxx>
#include <xmloff/xmlerror.hxx>
+
+#include <sax/tools/converter.hxx>
+
#include <com/sun/star/sheet/DataImportMode.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
@@ -215,7 +217,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport,
case XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY :
{
double fTime;
- if( SvXMLUnitConverter::convertTime( fTime, sValue ) )
+ if (::sax::Converter::convertDuration( fTime, sValue ))
nRefresh = Max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 );
}
break;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 732d40ed9030..cf0e55c9ecfa 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3208,7 +3208,8 @@ void ScXMLExport::WriteAreaLink( const ScMyCell& rMyCell )
AddAttribute( XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, sValue.makeStringAndClear() );
if( rAreaLink.nRefresh )
{
- SvXMLUnitConverter::convertTime( sValue, (double)rAreaLink.nRefresh / 86400 );
+ ::sax::Converter::convertDuration( sValue,
+ (double)rAreaLink.nRefresh / 86400 );
AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sValue.makeStringAndClear() );
}
SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, true, true );
@@ -3609,7 +3610,8 @@ void ScXMLExport::WriteTableSource()
if( nRefresh )
{
rtl::OUStringBuffer sBuffer;
- SvXMLUnitConverter::convertTime( sBuffer, (double)nRefresh / 86400 );
+ ::sax::Converter::convertDuration( sBuffer,
+ (double)nRefresh / 86400 );
AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() );
}
SvXMLElementExport aSourceElem(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, true, true);
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx
index 1394c942f2a1..872c6dcaf26c 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -332,7 +332,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext(
{
if (sValue.getLength())
{
- mrScImport.GetMM100UnitConverter().convertTime(mfCellValue, sValue);
+ ::sax::Converter::convertDuration(mfCellValue, sValue);
mbIsNumeric = true;
mbIsEmpty = false;
}
generated by cgit (git 2.34.1) at 2025-03-10 21:55:08 +0000