Kaydet (Commit) ac49b8ab authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

fdo#65163 reintroduce embedded picture for form components

but not for report components (fdo#53001)

Change-Id: Ie07e1c2993304d4deb2124e72baa7a326b587918
üst c8b7165b
......@@ -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!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment