INTEGRATION: CWS opofxmlstorage (1.9.356); FILE MERGED

2006/09/11 12:25:23 mav 1.9.356.2: #i68684# support iconified objects
2006/08/16 15:57:39 mav 1.9.356.1: #i68684# support iconified objects

1 files changed, 15 insertions, 2 deletions

diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index 812db4e286..bee3e04fcd 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: swcli.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:23:17 $
+ *  last change: $Author: obo $ $Date: 2006-10-13 11:13:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -148,6 +148,14 @@ void SwOleClient::ViewChanged()
     if ( bInDoVerb )
         return;
 
+    if ( GetAspect() == embed::Aspects::MSOLE_ICON )
+    {
+        // the iconified object seems not to need such a scaling handling
+        // since the replacement image and the size a completely controlled by the container
+        // TODO/LATER: when the icon exchange is implemented the scaling handling might be required again here
+        return;
+    }
+
     SwWrtShell &rSh  = ((SwView*)GetViewShell())->GetWrtShell();
     Window 	   *pWin = rSh.GetWin();
 
@@ -166,6 +174,11 @@ void SwOleClient::ViewChanged()
     {
         // Nothing will be done
     }
+    catch( uno::Exception& )
+    {
+        // this is an error
+        OSL_ENSURE( sal_False, "Something goes wrong on requesting object size!\n" );
+    }
     
     Size aVisSize( aSz.Width, aSz.Height );