diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-27 22:30:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-04 14:00:06 +0000 |
| commit | a765fcce6c629f3ff8e5843fc67f26d6b96e73d5 (patch) | |
| tree | 1b1c5385f9235cc746e40b714963fd08b6b681c5 | |
| parent | 1e6abaa8b97f537ee76c5e3e7501ccddb88c50ce (diff) | |
fdo#79303: Revert "fdo#70861 SwToSfxPageDescAttr: fix call to ...
... SvxExtParagraphTabPage"
This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.
It is now simply wrong to claim that a SID_ATTR_PARA_PAGENUM item with
value 0 is set, when that is a valid offset value.
SwTxtShell::Execute() will call SfxToSwPageDescAttr() which pulls the
SID_ATTR_PARA_PAGENUM out of the item set and sets it.
Change-Id: If5a155c2874486b3ef7d01883fe73f8e5fca46fe
Signed-off-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit d12fc79394842951807ab8c58a810cd9c5848cb7)
Reviewed-on: https://gerrit.libreoffice.org/13175
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/uibase/utlui/uitool.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/uibase/utlui/uitool.cxx b/sw/source/core/uibase/utlui/uitool.cxx index b3e62598e4f0..175d11ba0d93 100644 --- a/sw/source/core/uibase/utlui/uitool.cxx +++ b/sw/source/core/uibase/utlui/uitool.cxx @@ -639,10 +639,9 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) bPut = false; } - // TODO for now always pass a page number to cui, it can't make a - // difference between 0 and no page number at the moment. + if (oNumOffset) { - SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? oNumOffset.get() : 0 ); + SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() ); rCoreSet.Put( aPageNum ); } |