summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorbuldi <dobrakowskirafal@gmail.com>2023-07-06 00:10:57 +0200
committerHossein <hossein@libreoffice.org>2024-01-04 12:38:38 +0100
commitf5e5e86144152e5f98cbb985939a883936fe86d7 (patch)
tree8d8af825c262e1d577fee05401be4a09cb07506f /sw/inc
parentbe1480264062eff93d8307ae14be1c4e8b9ea0ed (diff)
tdf#114441 sal_uLong to better integer type
At first it seemd that sal_uInt16 may be sufficient for storing possible values. But as elsewhere unsigned 32 bit variables are used for such purpose, sal_uInt32 is used which allows having more space for bigger values. Change-Id: Ic2834ffc0fcabad91175aba3753e832dc1807fbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151006 Tested-by: Jenkins Reviewed-by: Hossein <hossein@libreoffice.org>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/docstyle.hxx4
-rw-r--r--sw/inc/format.hxx6
-rw-r--r--sw/inc/numrule.hxx2
-rw-r--r--sw/inc/pagedesc.hxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index b411bfe4b1ce..d550f98c0386 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -111,8 +111,8 @@ public:
virtual const OUString& GetFollow() const override;
const OUString& GetLink() const;
- virtual sal_uLong GetHelpId( OUString& rFile ) override;
- virtual void SetHelpId( const OUString& r, sal_uLong nId ) override;
+ virtual sal_uInt32 GetHelpId( OUString& rFile ) override;
+ virtual void SetHelpId( const OUString& r, sal_uInt32 nId ) override;
/** Preset the members without physical access.
Used by StyleSheetPool. */
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 8ded8c6f61f3..91043b1621de 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwFormat : public sw::BorderCacheOwner, public sw::Broadcasti
sal_uInt16 m_nWhichId;
sal_uInt16 m_nPoolFormatId; /**< Id for "automatically" created formats.
(is not hard attribution!!!) */
- sal_uInt16 m_nPoolHelpId; ///< HelpId for this Pool-style.
+ sal_uInt32 m_nPoolHelpId; ///< HelpId for this Pool-style.
sal_uInt8 m_nPoolHlpFileId; ///< FilePos to Doc to these style helps.
bool m_bAutoFormat : 1; /**< FALSE: it is a template.
default is true! */
@@ -164,8 +164,8 @@ public:
void SetPoolFormatId( sal_uInt16 nId ) { m_nPoolFormatId = nId; }
/// Get and set Help-IDs for document templates.
- sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; }
- void SetPoolHelpId( sal_uInt16 nId ) { m_nPoolHelpId = nId; }
+ sal_uInt32 GetPoolHelpId() const { return m_nPoolHelpId; }
+ void SetPoolHelpId( sal_uInt32 nId ) { m_nPoolHelpId = nId; }
sal_uInt8 GetPoolHlpFileId() const { return m_nPoolHlpFileId; }
void SetPoolHlpFileId( sal_uInt8 nId ) { m_nPoolHlpFileId = nId; }
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index b21cc5259656..20ac33bbfc60 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -254,7 +254,7 @@ public:
/// Query and set Help-IDs for document styles.
sal_uInt16 GetPoolHelpId() const { return mnPoolHelpId; }
- void SetPoolHelpId( sal_uInt16 nId ) { mnPoolHelpId = nId; }
+ void SetPoolHelpId( sal_uInt32 nId ) { mnPoolHelpId = nId; }
sal_uInt8 GetPoolHlpFileId() const { return mnPoolHlpFileId; }
void SetPoolHlpFileId( sal_uInt8 nId ) { mnPoolHlpFileId = nId; }
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 11bb347aa1fb..136117114b30 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -275,7 +275,7 @@ public:
sal_uInt16 GetPoolFormatId() const { return m_Master.GetPoolFormatId(); }
void SetPoolFormatId(sal_uInt16 const nId) { m_Master.SetPoolFormatId(nId); }
sal_uInt16 GetPoolHelpId() const { return m_Master.GetPoolHelpId(); }
- void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); }
+ void SetPoolHelpId(sal_uInt32 const nId){ m_Master.SetPoolHelpId(nId); }
sal_uInt8 GetPoolHlpFileId() const { return m_Master.GetPoolHlpFileId(); }
void SetPoolHlpFileId(sal_uInt8 const nId) { m_Master.SetPoolHlpFileId(nId); }