diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 18:04:44 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 18:08:25 +0000 |
| commit | 8a78e5b7a060cfd12ccbe5c9cf83b703c2b530cc (patch) | |
| tree | a9cb69864c8405f28bf7948514dbdb8f1dfa2d07 /svl/inc/svl/zforlist.hxx | |
| parent | 4c3acb4393a9ef9862aad0cec84426498fa7248c (diff) | |
fix up merging issues, so it compiles
Diffstat (limited to 'svl/inc/svl/zforlist.hxx')
| -rw-r--r-- | svl/inc/svl/zforlist.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 25e06a9237e2..783fce26bec9 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -425,7 +425,7 @@ public: /** Same as <method>PutEntry</method> but the format code string is considered to be of language/country eLnge and is converted to language/country eNewLnge */ - sal_Bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos, + bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); @@ -433,7 +433,7 @@ public: is considered to be of the System language/country eLnge and is converted to another System language/country eNewLnge. In this case the automatic currency is converted too. */ - sal_Bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos, + bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); |