diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-14 18:18:20 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-19 10:38:27 +0200 |
| commit | 1cbbf63b7670a3d85a5a29df6124467e954cc7e9 (patch) | |
| tree | fdf87eee766cbdd3aedd5fd587e59eca8423b277 /framework/source | |
| parent | 83ac9db1a68a2fbdd2322a8b185cc24e74d34dc3 (diff) | |
Always prefer Value over ResourceURL
Make this not depend on a particular implementation in
the UIControllerFactory class.
Change-Id: I277a6e6c9fa986cbdb0cf03975f91731c6187dca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100966
Tested-by: Jenkins
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/resourcemenucontroller.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index f1f7dace3289..60a7af1aefba 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -95,7 +95,8 @@ ResourceMenuController::ResourceMenuController( const css::uno::Reference< css:: } else if ( aPropValue.Name == "ResourceURL" ) { - aPropValue.Value >>= m_aMenuURL; + if ( m_aMenuURL.isEmpty() ) + aPropValue.Value >>= m_aMenuURL; } else if ( aPropValue.Name == "Frame" ) aPropValue.Value >>= m_xFrame; |