#103096# optionally apply fixed (no language dependence) number format to text fields

2 files changed, 20 insertions, 7 deletions

diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index 4901a9693973..71e512d0a551 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldmgr.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-06-08 13:47:32 $
+ *  last change: $Author: os $ $Date: 2002-11-15 11:13:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,23 +135,26 @@ struct SwInsertFld_Data
     ULONG nFormatId;
     SwWrtShell* pSh;
     sal_Unicode cSeparator;
+    BOOL bIsAutomaticLanguage;
     ::com::sun::star::uno::Any aDBDataSource;
     ::com::sun::star::uno::Any aDBConnection;
     ::com::sun::star::uno::Any aDBColumn;
 
     SwInsertFld_Data(USHORT nType, USHORT nSub, const String& rPar1, const String& rPar2,
-                    ULONG nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ') :
+                    ULONG nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', BOOL bIsAutoLanguage = TRUE) :
         nTypeId(nType),
         nSubType(nSub),
         sPar1(rPar1),
         sPar2(rPar2),
         nFormatId(nFmtId),
         pSh(pShell),
-        cSeparator(cSep) {}
+        cSeparator(cSep),
+        bIsAutomaticLanguage(bIsAutoLanguage) {}
 
     SwInsertFld_Data() :
         pSh(0),
-        cSeparator(' '){}
+        cSeparator(' '),
+        bIsAutomaticLanguage(TRUE){}
 
 };
 class SwFldMgr
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx
index 2a050a9e1957..ce6a72b9d302 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/ui/inc/numfmtlb.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmtlb.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ *  last change: $Author: os $ $Date: 2002-11-15 11:13:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@ class NumFormatListBox : public ListBox
     SwView*             pVw;
     SvNumberFormatter*  pOwnFormatter;
     LanguageType        eCurLanguage;
+    BOOL                bShowLanguageControl; //determine whether the language control has
+                                              //to be shown in the number format dialog
+    BOOL                bUseAutomaticLanguage;//determine whether language is automatically assigned
 
     DECL_LINK( SelectHdl, ListBox * );
 
@@ -109,6 +112,13 @@ public:
     const String&   GetFormatStr() const;
 
     inline LanguageType GetCurLanguage() const { return eCurLanguage;}
+    void                SetLanguage(LanguageType eSet)  { eCurLanguage = eSet;}
+
+    void            SetAutomaticLanguage(BOOL bSet){bUseAutomaticLanguage = bSet;}
+    BOOL            IsAutomaticLanguage()const {return bUseAutomaticLanguage;}
+
+    void            SetShowLanguageControl(BOOL bSet){bShowLanguageControl = bSet;}
+
 };