[Libreoffice-commits] .: 2 commits - extensions/source

[Noel Power]

 extensions/source/propctrlr/formcomponenthandler.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 694d57bb816b7b783de027d3cc1ee632f7c80c61
Merge: 1d0e4a6... f3a9e0d...
Author: Noel Power <noel.power at novell.com>
Date:   Fri Nov 5 11:38:03 2010 +0000

    Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components

commit 1d0e4a66596a9ae6e01bb0d17d5efc3d40888ad4
Author: Noel Power <noel.power at novell.com>
Date:   Tue Nov 2 15:27:59 2010 +0000

    initial import of latest cws container_controls

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5ffafad..e5f320b 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2785,8 +2785,9 @@ namespace pcr
 
         aFileDlg.SetTitle(aStrTrans);
         // non-linked images ( e.g. those located in the document
-        // stream ) cannot *currently* be handled by openoffice basic dialogs.
-        bool bHandleNonLink = ( m_eComponentClass == eFormControl );
+        // stream ) only if document is available
+        Reference< XModel > xModel( impl_getContextDocument_nothrow() );
+        bool bHandleNonLink = xModel.is();
 
         Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY);
         DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!");