framework/source/uielement/resourcemenucontroller.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1cbbf63b7670a3d85a5a29df6124467e954cc7e9
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Fri Aug 14 18:18:20 2020 +0300
Commit: Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Wed Aug 19 10:38:27 2020 +0200
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 <momonas...@gmail.com>
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
