diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-02-14 12:33:39 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-02-16 18:17:28 +0100 |
| commit | d24fe1116ddd9eec3a0884c7b222455c44bd6eb4 (patch) | |
| tree | 0f18d9100d8d5a8166d1376724733cd17d1af6f3 | |
| parent | 5a94be3e677e4b7ccb2990a3a79fbf2219322f80 (diff) | |
MSForms: Make Drop-Down form field to have a default size
Similar to MSO Drop-down form field and LO Input List.
Change-Id: Idba278d8c2a2106b6f3cc22d8b9f8570f45bfae9
Reviewed-on: https://gerrit.libreoffice.org/67908
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
| -rw-r--r-- | include/xmloff/odffields.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textfld.cxx | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx index bbc1becb6576..27525fb39374 100644 --- a/include/xmloff/odffields.hxx +++ b/include/xmloff/odffields.hxx @@ -22,7 +22,7 @@ #define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT" -#define ODF_FORMTEXT_DEFAULT_LENGTH 5 +#define ODF_FORMFIELD_DEFAULT_LENGTH 5 #define ODF_FORMCHECKBOX "vnd.oasis.opendocument.field.FORMCHECKBOX" #define ODF_FORMCHECKBOX_HELPTEXT "Checkbox_HelpText" diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 1512d2991a32..631373f98d99 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -859,7 +859,9 @@ namespace sw { namespace mark { if (nCurrentIdx < vListEntries.getLength()) return vListEntries[nCurrentIdx]; } - return OUString(); + + sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194}; + return OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH); } } } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 0e05aae0602d..dd34a47e16bd 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -725,8 +725,8 @@ FIELD_INSERT: if(pCursorPos) { // Insert five enspace into the text field so the field has extent - sal_Unicode vEnSpaces[ODF_FORMTEXT_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194}; - bool bSuccess = rSh.GetDoc()->getIDocumentContentOperations().InsertString(*pCursorPos, OUString(vEnSpaces, ODF_FORMTEXT_DEFAULT_LENGTH)); + sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194}; + bool bSuccess = rSh.GetDoc()->getIDocumentContentOperations().InsertString(*pCursorPos, OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH)); if(bSuccess) { IDocumentMarkAccess* pMarksAccess = rSh.GetDoc()->getIDocumentMarkAccess(); |