diff options
| author | Pelin Kuran <pelinrkuran@gmail.com> | 2020-01-28 16:03:55 +0300 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-02-27 15:43:03 +0100 |
| commit | e8c07076689d593b9d2863d166b1933ecb6f480a (patch) | |
| tree | 4d94757c4cacbefb94dc08297a604d399e4dd5ea /sw/source | |
| parent | 5320fccc290f338d344c5d3c75101c98057788cd (diff) | |
tdf#114441: Convert use of sal_uLong to better integer types
Change-Id: I29b3b76dcc7960938155be768ed110c090607fbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87619
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/config/optcomp.cxx | 16 | ||||
| -rw-r--r-- | sw/source/uibase/inc/optcomp.hxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 36a056da3cf2..8be4045f154c 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -108,7 +108,7 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage() { } -static sal_uLong convertBools2Ulong_Impl +static sal_uInt32 convertBools2Ulong_Impl ( bool _bUsePrtMetrics, bool _bAddSpacing, @@ -127,8 +127,8 @@ static sal_uLong convertBools2Ulong_Impl bool bEmptyDbFieldHidesPara ) { - sal_uLong nRet = 0; - sal_uLong nSetBit = 1; + sal_uInt32 nRet = 0; + sal_uInt32 nSetBit = 1; if ( _bUsePrtMetrics ) nRet |= nSetBit; @@ -290,7 +290,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, weld::Button&, void) } } -void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions ) +void SwCompatibilityOptPage::SetCurrentOptions( sal_uInt32 nOptions ) { const int nCount = m_xOptionsLB->n_children(); OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" ); @@ -302,9 +302,9 @@ void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions ) } } -sal_uLong SwCompatibilityOptPage::GetDocumentOptions() const +sal_uInt32 SwCompatibilityOptPage::GetDocumentOptions() const { - sal_uLong nRet = 0; + sal_uInt32 nRet = 0; if ( m_pWrtShell ) { const IDocumentSettingAccess& rIDocumentSettingAccess = m_pWrtShell->getIDocumentSettingAccess(); @@ -345,7 +345,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) bool bModified = false; if ( m_pWrtShell ) { - sal_uLong nSavedOptions = m_nSavedOptions; + sal_uInt32 nSavedOptions = m_nSavedOptions; const int nCount = m_xOptionsLB->n_children(); OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" ); @@ -456,7 +456,7 @@ void SwCompatibilityOptPage::Reset( const SfxItemSet* ) { m_xOptionsLB->select(0); - sal_uLong nOptions = GetDocumentOptions(); + sal_uInt32 nOptions = GetDocumentOptions(); SetCurrentOptions( nOptions ); m_nSavedOptions = nOptions; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index d0b565aae4b2..e087d3852362 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -42,7 +42,7 @@ private: // impl object std::unique_ptr<SwCompatibilityOptPage_Impl> m_pImpl; // saved options after "Reset"; used in "FillItemSet" for comparison - sal_uLong m_nSavedOptions; + sal_uInt32 m_nSavedOptions; bool m_bSavedMSFormsMenuOption; // controls @@ -60,8 +60,8 @@ private: // private methods void InitControls( const SfxItemSet& rSet ); - void SetCurrentOptions( sal_uLong nOptions ); - sal_uLong GetDocumentOptions() const; + void SetCurrentOptions( sal_uInt32 nOptions ); + sal_uInt32 GetDocumentOptions() const; void WriteOptions(); public: |