diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 11:39:03 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 13:44:16 +0200 |
| commit | 738844c52eddb4884ac96476d4e7b74e5e58f2c9 (patch) | |
| tree | 0343167d56a38cdebaf7b11af0b9f38a00d3e393 | |
| parent | 7d722ac710a0c19b03c0c4c7615c299df43a843d (diff) | |
SwDocShell::Delete/Hide return types want to be bool
Change-Id: I8adde9de3c8af05cf5cfe2e9d944248d893f7ee8
| -rw-r--r-- | sw/inc/docsh.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 50bfdf3e7e40..b38f47a86309 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -130,8 +130,8 @@ class SW_DLLPUBLIC SwDocShell SwWrtShell* pActShell = 0, const bool bBasic = false ); - SAL_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily); - SAL_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); + SAL_DLLPRIVATE bool Delete(const OUString &rName, sal_uInt16 nFamily); + SAL_DLLPRIVATE bool Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); SAL_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, const sal_uInt16 nFamily, SwWrtShell* pShell = 0, diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index e110b0d75ed3..904f19a6270e 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -460,11 +460,11 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell ); break; case SID_STYLE_DELETE: - nRet = Delete(aParam, nFamily); + nRet = sal_uInt16(Delete(aParam, nFamily)); break; case SID_STYLE_HIDE: case SID_STYLE_SHOW: - nRet = Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE); + nRet = sal_uInt16(Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE)); break; case SID_STYLE_APPLY: // Shell-switch in ApplyStyles @@ -870,7 +870,7 @@ sal_uInt16 SwDocShell::Edit( return nRet; } -sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) +bool SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) { SfxStyleSheetBase *pStyle = m_xBasePool->Find(rName, (SfxStyleFamily)nFamily); @@ -882,12 +882,12 @@ sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) m_xBasePool->Remove(pStyle); GetWrtShell()->EndAllAction(); - return sal_True; + return true; } - return sal_False; + return false; } -sal_uInt16 SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden) +bool SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden) { SfxStyleSheetBase *pStyle = m_xBasePool->Find(rName, (SfxStyleFamily)nFamily); @@ -900,9 +900,9 @@ sal_uInt16 SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHid xTmp->SetHidden( bHidden ); GetWrtShell()->EndAllAction(); - return sal_True; + return true; } - return sal_False; + return false; } // apply template |