mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: Actually only .uno:StyleApply and .uno:StyleWatercanMode can return...

Browse Source 
...a value, at least according to sfx2/sdi/sfx.sdi.

Change-Id: I1a12c025386cfc6eae529782cdb69207ffa388c5
Reviewed-on: https://gerrit.libreoffice.org/48041
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Jan Holesovsky
2018-01-17 11:11:34 +01:00
parent abe4eaf57b
commit 67ea8e1432
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sw/source/uibase/app/docst.cxx
View File

@@ -295,7 +295,6 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
{ {
sal_uInt16 nSlot = rReq.GetSlot(); sal_uInt16 nSlot = rReq.GetSlot();
sal_uInt16 nRet = SFXSTYLEBIT_ALL;
const SfxItemSet* pArgs = rReq.GetArgs(); const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem; const SfxPoolItem* pItem;
@@ -323,7 +322,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
if (sName.isEmpty() && m_xBasePool.get()) if (sName.isEmpty() && m_xBasePool.get())
sName = SfxStyleDialog::GenerateUnusedName(*m_xBasePool); sName = SfxStyleDialog::GenerateUnusedName(*m_xBasePool);
nRet = Edit( sName, sParent, nFamily, nMask, true, OString(), nullptr, rReq.IsAPI() ); Edit(sName, sParent, nFamily, nMask, true, OString(), nullptr, rReq.IsAPI());
// Update Watermark if new page style was created // Update Watermark if new page style was created
if( nFamily == SfxStyleFamily::Page ) if( nFamily == SfxStyleFamily::Page )
@@ -498,47 +497,55 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
} }
if (!aParam.isEmpty() || nSlot == SID_STYLE_WATERCAN ) if (!aParam.isEmpty() || nSlot == SID_STYLE_WATERCAN )
{ {
sal_uInt16 nRet = SFXSTYLEBIT_ALL;
bool bReturns = false;
switch(nSlot) switch(nSlot)
{ {
case SID_STYLE_EDIT: case SID_STYLE_EDIT:
nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell ); Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell);
break; break;
case SID_STYLE_DELETE: case SID_STYLE_DELETE:
nRet = sal_uInt16(Delete(aParam, nFamily)); Delete(aParam, nFamily);
break; break;
case SID_STYLE_HIDE: case SID_STYLE_HIDE:
case SID_STYLE_SHOW: case SID_STYLE_SHOW:
nRet = sal_uInt16(Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE)); Hide(aParam, nFamily, nSlot == SID_STYLE_HIDE);
break; break;
case SID_STYLE_APPLY: case SID_STYLE_APPLY:
// Shell-switch in ApplyStyles // Shell-switch in ApplyStyles
nRet = static_cast<sal_uInt16>(ApplyStyles(aParam, nFamily, pActShell, rReq.GetModifier() )); nRet = static_cast<sal_uInt16>(ApplyStyles(aParam, nFamily, pActShell, rReq.GetModifier() ));
bReturns = true;
break; break;
case SID_STYLE_WATERCAN: case SID_STYLE_WATERCAN:
nRet = static_cast<sal_uInt16>(DoWaterCan(aParam, nFamily)); nRet = static_cast<sal_uInt16>(DoWaterCan(aParam, nFamily));
bReturns = true;
break; break;
case SID_STYLE_UPDATE_BY_EXAMPLE: case SID_STYLE_UPDATE_BY_EXAMPLE:
nRet = static_cast<sal_uInt16>(UpdateStyle(aParam, nFamily, pActShell)); UpdateStyle(aParam, nFamily, pActShell);
break; break;
case SID_STYLE_NEW_BY_EXAMPLE: case SID_STYLE_NEW_BY_EXAMPLE:
nRet = static_cast<sal_uInt16>(MakeByExample(aParam, nFamily, nMask, pActShell )); MakeByExample(aParam, nFamily, nMask, pActShell);
break; break;
default: default:
OSL_FAIL("Invalid SlotId"); OSL_FAIL("Invalid SlotId");
} }
if (bReturns)
{
if(rReq.IsAPI()) // Basic only gets TRUE or FALSE
rReq.SetReturnValue(SfxUInt16Item(nSlot, sal_uInt16(nRet !=0)));
else
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet));
}
rReq.Done(); rReq.Done();
} }
break; break;
} }
} }
if(rReq.IsAPI()) // Basic only gets TRUE or FALSE
rReq.SetReturnValue(SfxUInt16Item(nSlot, sal_uInt16(nRet !=0)));
else
rReq.SetReturnValue(SfxUInt16Item(nSlot, nRet));
} }
class ApplyStyle class ApplyStyle