diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-05-14 08:24:30 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-05-14 08:24:30 +0200 |
| commit | 70ef2fe7ea6d6951b3ee60489d44dc272c333966 (patch) | |
| tree | 8183aeacf31393469748cf7ea901f91e0f4df0fa /include | |
| parent | 601b4d14eebd08fdba2c81f14e796e05e159af39 (diff) | |
| parent | 90cc23eabdbc9248192a584c3dc41444cdab3bfd (diff) | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: Iddad99c684fb0a7401ae39f64c54f55808b83d6c
Diffstat (limited to 'include')
| -rw-r--r-- | include/connectivity/statementcomposer.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/button.hxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 944a4321b12a..88fa61f553b1 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -68,6 +68,7 @@ namespace dbtools void setDisposeComposer( bool _bDoDispose ); void setFilter( const OUString& _rFilter ); + void setHavingClause( const OUString& _rHavingClause ); void setOrder( const OUString& _rOrder ); /** returns the composer which has been fed with the current settings diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index b0b2884c9ad0..f37b714faf9f 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -350,7 +350,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); - Size CalcMinimumSize() const; + Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<RadioButton&,void>& rLink ) { maToggleHdl = rLink; } |