diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-25 16:58:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-26 08:29:41 +0000 |
| commit | a0fbb8b460114838a1c3fabb57274b04a78d3182 (patch) | |
| tree | 80ad448f9aefa0854e6df35256ddc7cf6a033a92 /include | |
| parent | 80328f390eceb32e1530ca182e6b135c3a0b0264 (diff) | |
Resolves: fdo#61544 improve handling of grid's not enough layout space
(cherry picked from commit b64adf65afb1cfe1bd48fed0d71ac333ad962776)
Conflicts:
vcl/source/window/layout.cxx
Change-Id: I9a73e90f639bb853b67daa98d5daac155dab5900
Reviewed-on: https://gerrit.libreoffice.org/5119
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/layout.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 5237c72c9bce..dd2c0bc8d834 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -388,6 +388,7 @@ public: private: void calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights) const; + Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const; virtual Size calculateRequisition() const; virtual void setAllocation(const Size &rAllocation); public: |