diff options
| author | Ilhan Yesil <ilhanyesil@gmx.de> | 2018-05-08 14:17:56 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2019-09-13 10:45:01 +0200 |
| commit | 260caebf8a2382bcde1fb9ff74ceb1b940654e6f (patch) | |
| tree | dcf1cea94f62144c9ae533cba3e6bf7040bb1e81 /extensions | |
| parent | d27e70fce2acfc9b14f2f07c9096daa50dc2acd8 (diff) | |
tdf#45789 [API CHANGE] Automatic row height in reports
The controls have now an AutoGrow flag which is saved as
style:min-row-height instead of style:row-height on
style:table-row-properties in content.xml.
In this case the table row height will be allowed to grow to accommodate
the content.
Note: in the conceptual model of reportdesigner this is a per-control
property but in the current implementation, it is a per-row property in
the ODF file. Thus, as soon as one control in the row has the AutoGrow
property set, they all do.
Change-Id: I95c25599e06af0f2f12e72a7cfc0881206f02039
Reviewed-on: https://gerrit.libreoffice.org/53977
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/inc/helpids.h | 1 | ||||
| -rw-r--r-- | extensions/inc/strings.hrc | 1 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.hxx | 1 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formstrings.hxx | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h index 2e5f303b51fb..4b3d430b022e 100644 --- a/extensions/inc/helpids.h +++ b/extensions/inc/helpids.h @@ -104,6 +104,7 @@ #define HID_PROP_RIGHT "EXTENSIONS_HID_PROP_RIGHT" #define HID_PROP_HEIGHT "EXTENSIONS_HID_PROP_HEIGHT" #define HID_PROP_WIDTH "EXTENSIONS_HID_PROP_WIDTH" +#define HID_PROP_AUTOGROW "EXTENSIONS_HID_PROP_AUTOGROW" #define HID_PROP_BOUNDCOLUMN "EXTENSIONS_HID_PROP_BOUNDCOLUMN" #define HID_PROP_LISTSOURCETYPE "EXTENSIONS_HID_PROP_LISTSOURCETYPE" #define HID_PROP_LISTSOURCE "EXTENSIONS_HID_PROP_LISTSOURCE" diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc index c14b676d8e8f..1bece38c2cba 100644 --- a/extensions/inc/strings.hrc +++ b/extensions/inc/strings.hrc @@ -106,6 +106,7 @@ #define RID_STR_CLASSID NC_("RID_STR_CLASSID", "Class ID") #define RID_STR_HEIGHT NC_("RID_STR_HEIGHT", "Height") #define RID_STR_WIDTH NC_("RID_STR_WIDTH", "Width") +#define RID_STR_AUTOGROW NC_("RID_STR_AUTOGROW", "Auto grow") #define RID_STR_LISTINDEX NC_("RID_STR_LISTINDEX", "List index") #define RID_STR_ROWHEIGHT NC_("RID_STR_ROWHEIGHT", "Row height") #define RID_STR_FILLCOLOR NC_("RID_STR_FILLCOLOR", "Fill color") diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index caa4e89662af..2592c47c57eb 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -350,7 +350,9 @@ namespace pcr DEF_INFO_2( ACTIVESELECTIONTEXTCOLOR, ACTIVESELECTIONTEXTCOLOR, 211, ACTIVESELECTIONTEXTCOLOR, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( INACTIVESELECTIONBACKGROUNDCOLOR, INACTIVESELECTIONBACKGROUNDCOLOR, 212, INACTIVESELECTIONBACKGROUNDCOLOR, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( INACTIVESELECTIONTEXTCOLOR, INACTIVESELECTIONTEXTCOLOR, 213, INACTIVESELECTIONTEXTCOLOR, DIALOG_VISIBLE, COMPOSEABLE ), - DEF_INFO_2( URL, URL, 214, URL, DIALOG_VISIBLE, COMPOSEABLE ) + DEF_INFO_2( URL, URL, 214, URL, DIALOG_VISIBLE, COMPOSEABLE ), + + DEF_INFO_3( AUTOGROW, AUTOGROW, 215, AUTOGROW, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE) }; s_pPropertyInfos = aPropertyInfos; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 425ed052fec3..9c67e3a9c513 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -338,6 +338,7 @@ namespace pcr #define PROPERTY_ID_INACTIVESELECTIONBACKGROUNDCOLOR 217 #define PROPERTY_ID_INACTIVESELECTIONTEXTCOLOR 218 #define PROPERTY_ID_URL 219 + #define PROPERTY_ID_AUTOGROW 220 } // namespace pcr diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx index 7a2b36d91426..33a554f05790 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.hxx @@ -156,6 +156,7 @@ namespace pcr #define PROPERTY_HASNAVIGATION "HasNavigationBar" #define PROPERTY_POSITIONX "PositionX" #define PROPERTY_POSITIONY "PositionY" + #define PROPERTY_AUTOGROW "AutoGrow" #define PROPERTY_STEP "Step" #define PROPERTY_WORDLINEMODE "FontWordLineMode" #define PROPERTY_PROGRESSVALUE "ProgressValue" |