extensions/source/propctrlr/formcomponenthandler.cxx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
New commits: commit 86cc39cc51074788f59dc56f9371d1d4ed615eb6 Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Thu Dec 4 19:14:52 2014 +0100 fdo#65163 reintroduce embedded picture for form components but not for report components (fdo#53001) Change-Id: Ie07e1c2993304d4deb2124e72baa7a326b587918 Reviewed-on: https://gerrit.libreoffice.org/13303 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index f3ae47c..84dda32 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -69,6 +69,7 @@ #include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/resource/XStringResourceManager.hpp> #include <com/sun/star/resource/MissingResourceException.hpp> +#include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/graphic/GraphicObject.hpp> #include <com/sun/star/text/WritingMode2.hpp> @@ -127,6 +128,7 @@ namespace pcr using namespace sdb; using namespace sdbc; using namespace sdbcx; + using namespace report; using namespace container; using namespace ui::dialogs; using namespace inspection; @@ -2775,8 +2777,17 @@ namespace pcr aFileDlg.SetTitle(aStrTrans); // non-linked images ( e.g. those located in the document // stream ) only if document is available - Reference< XModel > xModel( impl_getContextDocument_nothrow() ); - bool bHandleNonLink = false; + bool bHandleNonLink; + { + Reference< XModel > xModel( impl_getContextDocument_nothrow() ); + bHandleNonLink = xModel.is(); + // Not implemented in reports + if (bHandleNonLink) + { + Reference< XReportDefinition > xReportDef( xModel, ::com::sun::star::uno::UNO_QUERY ); + bHandleNonLink = !xReportDef.is(); + } + } Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY); DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!");
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits