diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-28 15:21:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-28 17:32:43 +0200 |
| commit | 836c9bbb6486e9c0c81de9d7534b934699131d3d (patch) | |
| tree | acf708b1da9dfb686781e5c624a08a246bd2c959 /include/vcl/fixed.hxx | |
| parent | 9e6b275a19b3f11e9a5d87d1cbb9ad192705572f (diff) | |
move builder attributes from OString to OUString
Change-Id: I235188c9a086337b104e600f31a1c81deeca6c17
Reviewed-on: https://gerrit.libreoffice.org/37076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/fixed.hxx')
| -rw-r--r-- | include/vcl/fixed.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index d73c91e26789..df7deaf9408c 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -73,7 +73,7 @@ public: static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const override; - virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual bool set_property(const OString &rKey, const OUString &rValue) override; void set_mnemonic_widget(vcl::Window *pWindow); vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -176,9 +176,9 @@ public: bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual bool set_property(const OString &rKey, const OUString &rValue) override; - static Image loadThemeImage(const OString &rFileName); + static Image loadThemeImage(const OUString &rFileName); }; #endif // INCLUDED_VCL_FIXED_HXX |