summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/core/tool/compiler.cxx13
-rw-r--r--sc/source/core/tool/editutil.cxx12
-rw-r--r--sc/source/core/tool/optutil.cxx12
-rw-r--r--sc/source/filter/excel/excimp8.cxx10
-rw-r--r--sc/source/filter/html/htmlexp.cxx10
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx12
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx9
-rw-r--r--sc/source/ui/app/inputhdl.cxx16
-rw-r--r--sc/source/ui/app/inputwin.cxx6
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx12
-rw-r--r--sc/source/ui/docshell/docsh3.cxx12
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx23
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx13
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx15
-rw-r--r--sc/source/ui/view/cellsh1.cxx9
-rw-r--r--sc/source/ui/view/colrowba.cxx10
-rw-r--r--sc/source/ui/view/gridwin5.cxx13
17 files changed, 118 insertions, 89 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6f7184784f35..65e63dddfad2 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: compiler.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: sab $ $Date: 2001-06-20 14:21:36 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:02:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,6 +77,9 @@
#include <tools/solar.h>
#include <unotools/charclass.hxx>
#include <unotools/collatorwrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
@@ -981,7 +984,7 @@ BOOL ScCompiler::IsReference( const String& rName )
// englisches 1.E2 oder 1.E+2 ist wiederum Zahl 100, 1.E-2 ist 0,01
sal_Unicode ch1 = rName.GetChar(0);
sal_Unicode cDecSep = ( pSymbolTable == pSymbolTableEnglish ? '.' :
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0) );
+ ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0) );
if ( ch1 == cDecSep )
return FALSE;
BOOL bMyAlpha;
@@ -3488,7 +3491,7 @@ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pToken,
else
{
SolarMath::DoubleToString( aStr, t->GetDouble(), 'A', INT_MAX,
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
+ ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0),
TRUE );
}
rFormula += aStr;
@@ -3658,7 +3661,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
else
{
SolarMath::DoubleToString( aStr, t->GetDouble(), 'A', INT_MAX,
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
+ ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0),
TRUE );
}
rBuffer.append(aStr);
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 81aa40417881..31a3c715eab0 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: editutil.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: nn $ $Date: 2001-06-29 17:34:38 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:02:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,9 @@
#include <vcl/system.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include "editutil.hxx"
#include "global.hxx"
@@ -561,7 +563,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
else if (aType == TYPE(SvxPagesField))
aRet = lcl_GetNumStr( (USHORT)aData.nTotalPages,aData.eNumType );
else if (aType == TYPE(SvxTimeField))
- aRet = ScGlobal::pLocaleData->getTime(aData.aTime);
+ aRet = ScGlobal::pSysLocale->GetLocaleData().getTime(aData.aTime);
else if (aType == TYPE(SvxFileField))
aRet = aData.aTitle;
else if (aType == TYPE(SvxExtFileField))
@@ -578,7 +580,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
else if (aType == TYPE(SvxTableField))
aRet = aData.aTabName;
else if (aType == TYPE(SvxDateField))
- aRet = ScGlobal::pLocaleData->getDate(aData.aDate);
+ aRet = ScGlobal::pSysLocale->GetLocaleData().getDate(aData.aDate);
else
{
//DBG_ERROR("unbekannter Feldbefehl");
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 05e950a83f98..37ebb89e52cf 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: optutil.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2001-02-02 12:58:40 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:02:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,10 +68,10 @@
#include <vcl/svapp.hxx>
#include "optutil.hxx"
-#include "global.hxx" // for pLocaleData
+#include "global.hxx" // for pSysLocale
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
//------------------------------------------------------------------
@@ -82,7 +82,7 @@ BOOL ScOptionsUtil::IsMetricSystem()
//! which language should be used here - system language or installed office language?
// MeasurementSystem eSys = Application::GetAppInternational().GetMeasurementSystem();
- MeasurementSystem eSys = ScGlobal::pLocaleData->getMeasurementSystemEnum();
+ MeasurementSystem eSys = ScGlobal::pSysLocale->GetLocaleData().getMeasurementSystemEnum();
return ( eSys == MEASURE_METRIC );
}
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index c036fde2eef2..d104792dd898 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: excimp8.cxx,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: dr $ $Date: 2001-06-27 12:49:33 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:07:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -113,7 +113,9 @@
#include <tools/urlobj.hxx>
#include <tools/solmath.hxx>
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include <unotools/charclass.hxx>
#ifndef SC_DRWLAYER_HXX
@@ -3414,7 +3416,7 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan
void XclImpAutoFilterData::CreateFromDouble( String& rStr, double fVal )
{
SolarMath::DoubleToString( rStr, fVal, 'A', INT_MAX,
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE );
+ ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0), TRUE );
}
void XclImpAutoFilterData::SetCellAttribs()
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 150dceff168a..bd288636a0ea 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: htmlexp.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: er $ $Date: 2001-05-08 16:31:41 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:07:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -136,8 +136,8 @@
#include <svx/flditem.hxx>
#undef ITEMID_FIELD
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
@@ -427,7 +427,7 @@ void ScHTMLExport::WriteHeader()
OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) );
aStrOut = GLOBSTR( STR_DOC_PRINTED );
aStrOut.AppendAscii( ": " );
- lcl_AddStamp( aStrOut, rInfo.GetPrinted(), *ScGlobal::pLocaleData );
+ lcl_AddStamp( aStrOut, rInfo.GetPrinted(), ScGlobal::pSysLocale->GetLocaleData() );
OUT_COMMENT( aStrOut );
}
//----------------------------------------------------------
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 5ccacfe8bb86..540d92e433fa 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: eeimpars.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2001-01-30 15:33:42 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:08:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,7 +83,9 @@
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include <unotools/charclass.hxx>
#include "eeimport.hxx"
@@ -176,8 +178,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor )
BOOL bHasGraphics = FALSE;
ScEEParseEntry* pE;
- const sal_Unicode cDecSep = ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0);
- const sal_Unicode cThoSep = ScGlobal::pLocaleData->getNumThousandSep().GetChar(0);
+ const sal_Unicode cDecSep = ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0);
+ const sal_Unicode cThoSep = ScGlobal::pSysLocale->GetLocaleData().getNumThousandSep().GetChar(0);
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
ScDocumentPool* pDocPool = pDoc->GetPool();
ScRangeName* pRangeNames = pDoc->GetRangeName();
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index b71940f444be..1491e87719d5 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xcl97rec.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: dr $ $Date: 2001-06-27 15:17:23 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:09:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,6 +129,9 @@
#include <svx/msoleexp.hxx>
#include <svtools/useroptions.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include <stdio.h>
@@ -2501,7 +2504,7 @@ ExcEScenario::ExcEScenario( ScDocument& rDoc, UINT16 nTab )
rDoc.GetValue( nCol, nRow, nTab, fVal );
sText.Erase();
SolarMath::DoubleToString( sText, fVal, 'A', INT_MAX,
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE );
+ ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep().GetChar(0), TRUE );
}
else
rDoc.GetString( nCol, nRow, nTab, sText );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 3b82c2b03d8b..a87420f8eb4b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inputhdl.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: nn $ $Date: 2001-06-28 17:11:52 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:11:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -87,6 +87,9 @@
#include <offmgr/app.hxx>
#include <svtools/zforlist.hxx>
#include <vcl/sound.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#ifndef _SV_HELP_HXX //autogen
#include <vcl/help.hxx>
@@ -2043,27 +2046,28 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
SvxAutoCorrect* pAuto = OFF_APP()->GetAutoCorrect();
if ( pAuto )
{
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
sal_Unicode cReplace = pAuto->GetStartDoubleQuote();
if( !cReplace )
- cReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkStart().GetChar(0);
+ cReplace = rLocaleData.getDoubleQuotationMarkStart().GetChar(0);
if ( cReplace != '"' )
aString.SearchAndReplaceAll( cReplace, '"' );
cReplace = pAuto->GetEndDoubleQuote();
if( !cReplace )
- cReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkEnd().GetChar(0);
+ cReplace = rLocaleData.getDoubleQuotationMarkEnd().GetChar(0);
if ( cReplace != '"' )
aString.SearchAndReplaceAll( cReplace, '"' );
cReplace = pAuto->GetStartSingleQuote();
if( !cReplace )
- cReplace = ScGlobal::pLocaleData->getQuotationMarkStart().GetChar(0);
+ cReplace = rLocaleData.getQuotationMarkStart().GetChar(0);
if ( cReplace != '\'' )
aString.SearchAndReplaceAll( cReplace, '\'' );
cReplace = pAuto->GetEndSingleQuote();
if( !cReplace )
- cReplace = ScGlobal::pLocaleData->getQuotationMarkEnd().GetChar(0);
+ cReplace = rLocaleData.getQuotationMarkEnd().GetChar(0);
if ( cReplace != '\'' )
aString.SearchAndReplaceAll( cReplace, '\'' );
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 0da77fa0cadb..da84273a4e91 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inputwin.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: nn $ $Date: 2001-06-29 16:19:38 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:11:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -232,7 +232,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
__EXPORT ScInputWindow::~ScInputWindow()
{
- BOOL bDown = ( ScGlobal::pLocaleData == NULL ); // schon nach Clear?
+ BOOL bDown = ( ScGlobal::pSysLocale == NULL ); // after Clear?
// if any view's input handler has a pointer to this input window, reset it
// (may be several ones, #74522#)
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 19de05040150..e8167d9a3dc7 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: scendlg.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: dr $ $Date: 2001-05-22 12:43:40 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:11:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -72,8 +72,8 @@
#include <svtools/useroptions.hxx>
#include <vcl/msgbox.hxx>
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
#include "global.hxx"
@@ -143,9 +143,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
aComment += String( ScResId( STR_ON ) );
aComment += ' ';
- aComment += ScGlobal::pLocaleData->getDate( Date() );
+ aComment += ScGlobal::pSysLocale->GetLocaleData().getDate( Date() );
aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
- aComment += ScGlobal::pLocaleData->getTime( Time() );
+ aComment += ScGlobal::pSysLocale->GetLocaleData().getTime( Time() );
aEdComment .SetText( aComment );
aEdName .SetText( rName );
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index df29223d7286..f1d799e0f166 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: docsh3.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: nn $ $Date: 2001-05-11 17:09:50 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:12:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -86,8 +86,8 @@
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
#include "docsh.hxx"
@@ -562,9 +562,9 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP
String aAuthor = pAction->GetUser();
DateTime aDT = pAction->GetDateTime();
- String aDate = ScGlobal::pLocaleData->getDate( aDT );
+ String aDate = ScGlobal::pSysLocale->GetLocaleData().getDate( aDT );
aDate += ' ';
- aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
+ aDate += ScGlobal::pSysLocale->GetLocaleData().getTime( aDT, FALSE, FALSE );
SfxItemSet aSet( GetPool(),
SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_AUTHOR,
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index b66831bb8e0d..34b2f16ae352 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: acredlin.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: er $ $Date: 2001-04-25 14:03:51 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:12:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,7 +69,9 @@
#include <svtools/undo.hxx>
#include <unotools/textsearch.hxx>
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include <unotools/collatorwrapper.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
@@ -547,9 +549,10 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
aString+=aUser;
aString+='\t';
- aString+=ScGlobal::pLocaleData->getDate(aDateTime);
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
+ aString+=rLocaleData.getDate(aDateTime);
aString+=' ';
- aString+=ScGlobal::pLocaleData->getTime(aDateTime);
+ aString+=rLocaleData.getTime(aDateTime);
aString+='\t';
bIsGenerated=FALSE;
}
@@ -726,9 +729,10 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
{
aString+=aUser;
aString+='\t';
- aString+=ScGlobal::pLocaleData->getDate(aDateTime);
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
+ aString+=rLocaleData.getDate(aDateTime);
aString+=' ';
- aString+=ScGlobal::pLocaleData->getTime(aDateTime);
+ aString+=rLocaleData.getTime(aDateTime);
aString+='\t';
}
else
@@ -840,9 +844,10 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
aString+=aUser;
aString+='\t';
- aString+=ScGlobal::pLocaleData->getDate(aDateTime);
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
+ aString+=rLocaleData.getDate(aDateTime);
aString+=' ';
- aString+=ScGlobal::pLocaleData->getTime(aDateTime);
+ aString+=rLocaleData.getTime(aDateTime);
aString+='\t';
}
else
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index c1db4e4f37ff..a72f468e358f 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: redcom.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2001-01-31 19:36:58 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:12:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,8 +69,8 @@
#include <vcl/msgbox.hxx>
#endif
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
#include "redcom.hxx"
@@ -156,9 +156,10 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction)
String aAuthor = pChangeAction->GetUser();
DateTime aDT = pChangeAction->GetDateTime();
- String aDate = ScGlobal::pLocaleData->getDate( aDT );
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
+ String aDate = rLocaleData.getDate( aDT );
aDate += ' ';
- aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
+ aDate += rLocaleData.getTime( aDT, FALSE, FALSE );
ShowLastAuthor(aAuthor, aDate);
SetNote(aComment);
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 2fa4026c627b..e051adec7cf3 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tpcalc.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: er $ $Date: 2001-05-16 10:52:53 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:13:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,7 +75,9 @@
#ifndef _TOOLS_SOLMATH_HXX //autogen wg. SolarMath
#include <tools/solmath.hxx>
#endif
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include "global.hxx"
#include "globstr.hrc"
@@ -129,7 +131,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent,
aEdPrec ( this, ScResId( ED_PREC ) ),
aSeparatorFL ( this, ScResId( FL_SEPARATOR ) ),
aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ),
- aDecSep ( ScGlobal::pLocaleData->getNumDecimalSep() ),
+ aDecSep ( ScGlobal::pSysLocale->GetLocaleData().getNumDecimalSep() ),
nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) ),
pOldOptions ( new ScDocOptions(
((const ScTpCalcItem&)rCoreAttrs.Get(
@@ -267,9 +269,10 @@ BOOL ScTpCalcOptions::GetEps( double& rEps )
aStr.EraseTrailingChars( ' ' );
int nErrno;
const sal_Unicode* pEnd;
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
rEps = SolarMath::StringToDouble( aStr.GetBuffer(),
- ScGlobal::pLocaleData->getNumThousandSep().GetChar(0),
- ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
+ rLocaleData.getNumThousandSep().GetChar(0),
+ rLocaleData.getNumDecimalSep().GetChar(0),
nErrno, &pEnd );
BOOL bOk = ( nErrno == 0 && *pEnd == '\0' && rEps > 0.0 );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 3aa6199f19a9..f7f5d9a7468e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cellsh1.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: nn $ $Date: 2001-06-22 19:57:51 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:17:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -104,6 +104,9 @@
#include <svtools/sbxcore.hxx>
#include <svtools/useroptions.hxx>
#include <vcl/waitobj.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
#include "cellsh.hxx"
#include "sc.hrc"
@@ -1633,7 +1636,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
String aNoteStr = ((const SfxStringItem&)pReqArgs->
Get( SID_RANGE_NOTETEXT )).GetValue();
- String aDateStr = ScGlobal::pLocaleData->getDate( Date() );
+ String aDateStr = ScGlobal::pSysLocale->GetLocaleData().getDate( Date() );
String aAuthorStr = aUserOpt.GetID();
ScPostIt aNote( aNoteStr, aDateStr, aAuthorStr );
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index da878237e206..6aa7e58326f2 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: colrowba.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: nn $ $Date: 2001-05-14 08:43:38 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:17:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,8 +69,8 @@
#include <svx/svdtrans.hxx>
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
#include "colrowba.hxx"
@@ -97,7 +97,7 @@ String lcl_MetricString( long nTwips, const String& rText )
String aStr = rText;
aStr += ' ';
- aStr += ScGlobal::pLocaleData->getNum( nUserVal, 2 );
+ aStr += ScGlobal::pSysLocale->GetLocaleData().getNum( nUserVal, 2 );
aStr += ' ';
aStr += SdrFormatter::GetUnitStr(eUserMet);
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index f7ae6856ae43..8485e7e331b3 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: gridwin5.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: er $ $Date: 2001-01-31 19:37:51 $
+ * last change: $Author: er $ $Date: 2001-07-02 10:17:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,8 +79,8 @@
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <unotools/localedatawrapper.hxx>
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
#endif
@@ -224,9 +224,10 @@ void __EXPORT ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
DateTime aDT = pFound->GetDateTime();
aTrackText = pFound->GetUser();
aTrackText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
- aTrackText += ScGlobal::pLocaleData->getDate(aDT);
+ const LocaleDataWrapper& rLocaleData = ScGlobal::pSysLocale->GetLocaleData();
+ aTrackText += rLocaleData.getDate(aDT);
aTrackText += ' ';
- aTrackText += ScGlobal::pLocaleData->getTime(aDT);
+ aTrackText += rLocaleData.getTime(aDT);
aTrackText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ":\n" ));
String aComStr=pFound->GetComment();
if(aComStr.Len()>0)
generated by cgit (git 2.34.1) at 2025-01-10 03:30:25 +0000