diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-07-23 22:05:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-27 08:12:27 +0200 |
| commit | 7f381be4d3261149a5b54048f9605fab0340c221 (patch) | |
| tree | 445c49bb915f4c6bd28dac90e17c8d8e73e88ccc /sw/inc/dbfld.hxx | |
| parent | ece1072049fba0c7f77391da7775c7cf3f4725ea (diff) | |
replace sal_uLong variables with sal_uInt32 for SvNumberFormatter IDs
Replace the stopgap type sal_uLong as SvNumberFormatter
format index uses sal_uInt32.
SwInsertDBColAutoPilot uses format indices from SvNumberFormatter and
from the property "FormatKey" which is stored as sal_Int32 but ctor
guards against negative values.
Change type of loop variable in SwCaptionDialog to avoid narrowing
in GetFormatStr/GetFormatKey.
Change-Id: I79980696c07760f7ff026bb1bacf0e069363898c
Reviewed-on: https://gerrit.libreoffice.org/40464
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc/dbfld.hxx')
| -rw-r--r-- | sw/inc/dbfld.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 753d119e8aa6..62318b162b34 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField virtual SwField* Copy() const override; public: - SwDBField(SwDBFieldType*, sal_uLong nFormat = 0); + SwDBField(SwDBFieldType*, sal_uInt32 nFormat = 0); virtual ~SwDBField() override; virtual SwFieldType* ChgTyp( SwFieldType* ) override; @@ -127,7 +127,7 @@ protected: const SwDBData& GetDBData() const {return aDBData;} SwDBData& GetDBData() {return aDBData;} - SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat = 0); + SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uInt32 nFormat = 0); public: /// DBName @@ -267,7 +267,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField { long nNumber; public: - SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0); + SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uInt32 nFormat = 0); virtual OUString Expand() const override; virtual SwField* Copy() const override; |