summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Ballach <sab@openoffice.org>2001-07-18 06:59:42 +0000
committerSascha Ballach <sab@openoffice.org>2001-07-18 06:59:42 +0000
commit30b7001aa89b20c57664996e96003a3ae878b9fd (patch)
tree731ef76f659e16d6c570059c6ace4d6686db73e5
parentd7ee6042461f99cf0588777b8680bce38516bcfd (diff)
#89805#; add english number formatter
-rw-r--r--sc/inc/document.hxx5
-rw-r--r--sc/source/core/data/documen2.cxx9
-rw-r--r--sc/source/core/data/poolhelp.cxx9
-rw-r--r--sc/source/core/inc/poolhelp.hxx6
4 files changed, 21 insertions, 8 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3ed5887946a3..44dc28c2c524 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: document.hxx,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: nn $ $Date: 2001-06-25 20:15:44 $
+ * last change: $Author: sab $ $Date: 2001-07-18 07:57:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1255,6 +1255,7 @@ public:
const ScMarkData* pMarkData = NULL );
SvNumberFormatter* GetFormatTable() const;
+ SvNumberFormatter* GetEnglishFormatTable() const;
ULONG GetStandardIndexEnglishUS();
void Sort( USHORT nTab, const ScSortParam& rSortParam, BOOL bKeepQuery );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f8aac831301d..4672f8ea16c9 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: documen2.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: nn $ $Date: 2001-07-11 19:22:05 $
+ * last change: $Author: sab $ $Date: 2001-07-18 07:58:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -595,6 +595,11 @@ SvNumberFormatter* ScDocument::GetFormatTable() const
return xPoolHelper->GetFormTable();
}
+SvNumberFormatter* ScDocument::GetEnglishFormatTable() const
+{
+ return xPoolHelper->GetEngFormTable();
+}
+
ULONG ScDocument::GetStandardIndexEnglishUS()
{
if (nStandardIndexEnglishUS == -1)
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 2ade7b26b439..74a370eac3cd 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: poolhelp.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: nn $ $Date: 2001-04-24 18:29:32 $
+ * last change: $Author: sab $ $Date: 2001-07-18 07:58:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,10 @@ ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc )
pFormTable->SetColorLink( &aColorLink );
pFormTable->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT );
+ pEngFormTable = new SvNumberFormatter( pSourceDoc->GetServiceManager(), LANGUAGE_ENGLISH_US );
+ pEngFormTable->SetColorLink( &aColorLink );
+ pEngFormTable->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT );
+
pEditPool = EditEngine::CreatePool();
pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
pEditPool->FreezeIdRanges();
@@ -106,6 +110,7 @@ ScPoolHelper::~ScPoolHelper()
delete pEnginePool;
delete pEditPool;
delete pFormTable;
+ delete pEngFormTable;
delete pStylePool;
delete pDocPool;
}
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index e77b07d4b80d..51b37d8b22ea 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: poolhelp.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: nn $ $Date: 2001-01-31 16:39:50 $
+ * last change: $Author: sab $ $Date: 2001-07-18 07:59:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,6 +84,7 @@ private:
ScDocumentPool* pDocPool;
ScStyleSheetPool* pStylePool;
SvNumberFormatter* pFormTable;
+ SvNumberFormatter* pEngFormTable;
SfxItemPool* pEditPool; // EditTextObjectPool
SfxItemPool* pEnginePool; // EditEnginePool
@@ -98,6 +99,7 @@ public:
ScDocumentPool* GetDocPool() const { return pDocPool; }
ScStyleSheetPool* GetStylePool() const { return pStylePool; }
SvNumberFormatter* GetFormTable() const { return pFormTable; }
+ SvNumberFormatter* GetEngFormTable() const { return pEngFormTable; }
SfxItemPool* GetEditPool() const { return pEditPool; }
SfxItemPool* GetEnginePool() const { return pEnginePool; }
};