diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-27 08:32:54 +0100 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-02-27 08:32:54 +0100 |
commit | f73ffb91b85422067274fafc0d411aef8a6e6abb (patch) | |
tree | ddcdd880d45643557ad4172f22b3a1de5db44a2f /sw/sdi | |
parent | 5c57c9b6eb30265fe7312ff2b4d6ce7363cf2006 (diff) |
fdo#73159 Make back border dialog work again
I removed border dialog with commit
8560fb88c7252e5ad60674e447f2e194298f08de
because it seems unused and when the corresponding
command was called only a blank window was opened.
It seems it was just bugous, so revert this commit
and fix the dialog.
Conflicts:
sw/inc/swabstdlg.hxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
Change-Id: I68f8c13457e899a894f03bdd60ebedfb2b70afea
Diffstat (limited to 'sw/sdi')
-rw-r--r-- | sw/sdi/_basesh.sdi | 6 | ||||
-rw-r--r-- | sw/sdi/swriter.sdi | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index 66ab3fb9608c..2891ebae24f0 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -274,6 +274,12 @@ interface BaseTextSelection DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] + FN_FORMAT_BORDER_DLG // status(final|play) + [ + ExecMethod = ExecDlg ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + SID_ATTR_BORDER_INNER // status() [ StateMethod = GetBorderState ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 675540b0e2ba..82d26838aea9 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -624,6 +624,31 @@ SfxVoidItem SwBackspace FN_BACKSPACE ] //-------------------------------------------------------------------------- +SfxVoidItem BorderDialog FN_FORMAT_BORDER_DLG +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_FORMAT; +] + +//-------------------------------------------------------------------------- SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS () [ |