ooo-build r12775 - in trunk: . patches/dev300



Author: jiaojh
Date: Wed Jun  4 03:43:49 2008
New Revision: 12775
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12775&view=rev

Log:
    * patches/dev300/form-control-visibility.diff:
      update for import and property name.
      import using key DFF_Prop_fHidden.
      property name and export/import name using "enablevisible".
      update to dev300-m14.
    * ChangeLog:
      add miss change log.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/form-control-visibility.diff

Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff	(original)
+++ trunk/patches/dev300/form-control-visibility.diff	Wed Jun  4 03:43:49 2008
@@ -1,46 +1,46 @@
---- xmloff/source/forms/strings.hxx.orig	2008-05-05 18:14:36.000000000 +0800
-+++ xmloff/source/forms/strings.hxx	2008-05-05 18:20:40.000000000 +0800
+--- xmloff/source/forms/strings.hxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ xmloff/source/forms/strings.hxx	2008-06-04 11:59:18.000000000 +0800
 @@ -114,6 +114,7 @@ namespace xmloff
  	XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP,			"Tabstop" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_STATE,				"State" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLED,			"Enabled" );
-+	XMLFORM_CONSTASCII_STRING( PROPERTY_VISIBLE,			"EnableVisible" );
++	XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE,		"EnableVisible" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH,		"MaxTextLen" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT,			"LineCount" );
  	XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX,			"TabIndex" );
---- xmloff/source/forms/formattributes.hxx.orig	2008-05-05 18:14:36.000000000 +0800
-+++ xmloff/source/forms/formattributes.hxx	2008-05-05 18:20:40.000000000 +0800
+--- xmloff/source/forms/formattributes.hxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ xmloff/source/forms/formattributes.hxx	2008-06-04 11:59:19.000000000 +0800
 @@ -69,6 +69,7 @@ namespace xmloff
  	#define CCA_VALUE					0x00200000
      #define CCA_ORIENTATION             0x00400000
      #define CCA_VISUAL_EFFECT           0x00800000
-+    #define CCA_VISIBLE                 0x01000000
++    #define CCA_ENABLEVISIBLE                 0x01000000
  
  	// flags for database control atttributes
  	#define DA_BOUND_COLUMN				0x00000001
---- xmloff/source/forms/formattributes.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ xmloff/source/forms/formattributes.cxx	2008-05-05 18:20:40.000000000 +0800
+--- xmloff/source/forms/formattributes.cxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ xmloff/source/forms/formattributes.cxx	2008-06-04 11:59:19.000000000 +0800
 @@ -60,6 +60,7 @@ namespace xmloff
  			case CCA_CURRENT_SELECTED: 	return "current-selected";
  			case CCA_CURRENT_VALUE: 	return "current-value";
  			case CCA_DISABLED: 			return "disabled";
-+			case CCA_VISIBLE: 			return "visible";
++			case CCA_ENABLEVISIBLE: 	return "enablevisible";
  			case CCA_DROPDOWN: 			return "dropdown";
  			case CCA_FOR: 				return "for";
  			case CCA_IMAGE_DATA: 		return "image-data";
---- xmloff/source/forms/elementexport.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ xmloff/source/forms/elementexport.cxx	2008-05-05 18:20:40.000000000 +0800
+--- xmloff/source/forms/elementexport.cxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ xmloff/source/forms/elementexport.cxx	2008-06-04 11:59:19.000000000 +0800
 @@ -523,15 +523,15 @@ namespace xmloff
  		{
  			static sal_Int32 nBooleanPropertyAttributeIds[] =
  			{	// attribute flags
 -				CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP
-+				CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_VISIBLE
++				CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
  			};
  			static const ::rtl::OUString* pBooleanPropertyNames[] =
  			{	// property names
 -				&PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP
-+				&PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_VISIBLE
++				&PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_ENABLEVISIBLE
  			};
  			static sal_Bool nBooleanPropertyAttrFlags[] =
  			{	// attribute defaults
@@ -49,86 +49,85 @@
  			};
  		#if OSL_DEBUG_LEVEL > 0
  			sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
---- toolkit/inc/toolkit/awt/vclxwindow.hxx.orig	2008-05-09 15:00:12.000000000 +0800
-+++ toolkit/inc/toolkit/awt/vclxwindow.hxx	2008-05-09 15:01:22.000000000 +0800
-@@ -112,6 +112,7 @@ private:
- 	sal_Bool						mbSynthesizingVCLEvent : 1;
-     sal_Bool                        mbWithDefaultProps : 1;
- 	sal_Bool						mbDrawingOntoParent;
-+	sal_Bool						mbDirectVisible;
- 
-     UnoPropertyArrayHelper *GetPropHelper();
- 	
---- toolkit/inc/toolkit/helper/property.hxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ toolkit/inc/toolkit/helper/property.hxx	2008-05-05 18:20:40.000000000 +0800
-@@ -191,6 +191,7 @@ namespace rtl {
+--- toolkit/inc/toolkit/helper/property.hxx.orig	2008-06-04 11:58:16.000000000 +0800
++++ toolkit/inc/toolkit/helper/property.hxx	2008-06-04 11:59:31.000000000 +0800
+@@ -188,6 +188,7 @@ namespace rtl {
  #define BASEPROPERTY_URL                            134  // ::rtl::OUString
  #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
 +#define BASEPROPERTY_VISIBLE                        137  // sal_Bool
+ #define BASEPROPERTY_GROUPNAME                      138  // ::rtl::OUString
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
- #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
---- toolkit/source/helper/property.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ toolkit/source/helper/property.cxx	2008-05-05 18:20:40.000000000 +0800
-@@ -269,7 +269,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
+--- toolkit/source/helper/property.cxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ toolkit/source/helper/property.cxx	2008-06-04 11:59:19.000000000 +0800
+@@ -270,7 +270,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
  			DECL_PROP_3		( "RowHeight",				TREE_ROWHEIGHT,			sal_Int32,			BOUND, MAYBEDEFAULT, MAYBEVOID ),
  			DECL_PROP_2		( "InvokesStopNodeEditing",	TREE_INVOKESSTOPNODEEDITING, sal_Bool,		BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
 -            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT )
 +            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
-+            DECL_PROP_2     ( "EnableVisible",                VISIBLE,                bool,    BOUND, MAYBEDEFAULT )
++            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT )
              };
  			pPropertyInfos = aImplPropertyInfos;
  			nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
---- toolkit/source/awt/vclxwindow.cxx.orig	2008-05-05 11:01:12.000000000 +0800
-+++ toolkit/source/awt/vclxwindow.cxx	2008-05-20 18:34:59.000000000 +0800
-@@ -208,6 +208,7 @@ private:
+--- toolkit/source/awt/vclxwindow.cxx.orig	2008-06-04 11:58:09.000000000 +0800
++++ toolkit/source/awt/vclxwindow.cxx	2008-06-04 11:59:19.000000000 +0800
+@@ -208,6 +208,8 @@ private:
      ::vos::IMutex&                      mrMutex;
      ::toolkit::AccessibilityClient      maAccFactory;
      bool                                mbDisposed;
-+    bool                                mbEnableVisible;
++    sal_Bool                            mbEnableVisible;
++    sal_Bool                            mbDirectVisible;
      ::osl::Mutex                        maListenerContainerMutex;
      ::cppu::OInterfaceContainerHelper   maWindow2Listeners;
  
-@@ -229,6 +230,11 @@ public:
+@@ -229,6 +231,15 @@ public:
      */
      VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex );
  
 +    /** synchronously mbEnableVisible
 +    */
-+    void    setEnableVisible( bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
-+    bool    isEnableVisible() { return mbEnableVisible; }
++    void    setEnableVisible( sal_Bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
++    sal_Bool    isEnableVisible() { return mbEnableVisible; }
++    /** synchronously mbDirectVisible;
++    */
++    void    setDirectVisible( sal_Bool bDirectVisible ) { mbDirectVisible = bDirectVisible; }
++    sal_Bool    isDirectVisible() { return mbDirectVisible; }
 +
      /** asynchronously notifies a mouse event to the VCLXWindow's XMouseListeners
      */
      void    notifyMouseEvent( const awt::MouseEvent& _rMouseEvent, MouseEventType _nType );
-@@ -299,6 +305,7 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWind
+@@ -299,6 +310,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWind
      ,mrAntiImpl( _rAntiImpl )
      ,mrMutex( _rMutex )
      ,mbDisposed( false )
-+    ,mbEnableVisible(true)
++    ,mbEnableVisible(sal_True)
++    ,mbDirectVisible(sal_True)
      ,maListenerContainerMutex( )
      ,maWindow2Listeners( maListenerContainerMutex )
  #ifdef THREADED_NOTIFICATION
-@@ -560,7 +567,8 @@ VCLXWindow::VCLXWindow( bool bWithDefaul
-       mbDesignMode( false ),
-       mbSynthesizingVCLEvent( false ),
-       mbWithDefaultProps( !!bWithDefaultProps ),
--      mbDrawingOntoParent( false )
-+      mbDrawingOntoParent( false ),
-+      mbDirectVisible( true )
- {
- 	DBG_CTOR( VCLXWindow, 0 );
+@@ -601,7 +614,12 @@ void VCLXWindow::SetWindow( Window* pWin
+     SetOutputDevice( pWindow );
+ 
+     if ( GetWindow() )
++    {
+         GetWindow()->AddEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
++        sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : sal_False;
++        mpImpl->setDirectVisible( bDirectVisible );
++    }
++    
+ }
  
-@@ -1225,7 +1233,13 @@ void VCLXWindow::setVisible( sal_Bool bV
+ void VCLXWindow::suspendVclEventListening( )
+@@ -1224,7 +1242,13 @@ void VCLXWindow::setVisible( sal_Bool bV
  			}
  		}
  */
 -		pWindow->Show( bVisible );
 +        if( mpImpl->isEnableVisible() )
 +        {
-+            mbDirectVisible = bVisible;
++            mpImpl->setDirectVisible( bVisible );
 +		    pWindow->Show( bVisible );
 +        }
 +        else
@@ -136,20 +135,19 @@
  	}
  }
  
-@@ -1542,6 +1556,8 @@ void VCLXWindow::ImplGetPropertyIds( std
+@@ -1538,6 +1562,7 @@ void VCLXWindow::ImplGetPropertyIds( std
+                          BASEPROPERTY_HELPURL,
+                          BASEPROPERTY_TEXT,
+                          BASEPROPERTY_PRINTABLE,
++                         BASEPROPERTY_ENABLEVISIBLE, // for visibility
                           BASEPROPERTY_TABSTOP,
                           0);
  
-+    // for visibility
-+    rIds.push_back( BASEPROPERTY_VISIBLE );
-     // lovely hack from:
-     // void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId )
-     std::list< sal_uInt16 >::const_iterator iter;
-@@ -1612,6 +1628,23 @@ void VCLXWindow::setProperty( const ::rt
+@@ -1611,6 +1636,23 @@ void VCLXWindow::setProperty( const ::rt
  					setEnable( b );
  			}
  			break;
-+            case BASEPROPERTY_VISIBLE:
++            case BASEPROPERTY_ENABLEVISIBLE:
 +            {
 +                sal_Bool b = sal_Bool();
 +                if ( Value >>= b )
@@ -160,7 +158,7 @@
 +                        // if mbEnableVisible change from false to true.
 +                        // it will ignore the mbDirectVisible, setVisilbe
 +                        // and set mbDirectVisible as true.
-+                        if( mbDirectVisible || b )
++                        if( mpImpl->isDirectVisible() || b )
 +                            setVisible( b );
 +                    }
 +                }
@@ -169,52 +167,52 @@
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
-@@ -2070,6 +2103,10 @@ void VCLXWindow::setProperty( const ::rt
+@@ -2069,6 +2111,10 @@ void VCLXWindow::setProperty( const ::rt
  				aProp <<= (sal_Bool) GetWindow()->IsEnabled();
  			    break;
  
-+			case BASEPROPERTY_VISIBLE:
++			case BASEPROPERTY_ENABLEVISIBLE:
 +				aProp <<= (sal_Bool) GetWindow()->IsVisible();
 +			    break;
 +
  			case BASEPROPERTY_TEXT:
  			case BASEPROPERTY_LABEL:
  			case BASEPROPERTY_TITLE:
-@@ -2444,7 +2481,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal
- 				BOOL bOldNW =pWindow->IsNativeWidgetEnabled();
- 				if( bOldNW )
- 					pWindow->EnableNativeWidget(FALSE);
--                pWindow->PaintToDevice( pDev, aP, aSz );
-+                if( mpImpl->isEnableVisible() )
-+                    pWindow->PaintToDevice( pDev, aP, aSz );
- 				if( bOldNW )
- 					pWindow->EnableNativeWidget(TRUE);
-             }
---- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ toolkit/source/controls/unocontrolmodel.cxx	2008-05-05 18:20:40.000000000 +0800
+@@ -2362,8 +2408,8 @@ void VCLXWindow::draw( sal_Int32 nX, sal
+ 	Window* pWindow = GetWindow();
+     if ( !pWindow )
+         return;
+-
+-	if ( pWindow )
++    
++	if ( pWindow && mpImpl->isEnableVisible() )
+ 	{
+ 		TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
+         if ( pTabPage )
+--- toolkit/source/controls/unocontrolmodel.cxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ toolkit/source/controls/unocontrolmodel.cxx	2008-06-04 11:59:19.000000000 +0800
 @@ -338,6 +338,7 @@ void UnoControlModel::ImplPropertyChange
              case BASEPROPERTY_SCALEIMAGE:
              case BASEPROPERTY_ENABLED:
              case BASEPROPERTY_PRINTABLE:
-+            case BASEPROPERTY_VISIBLE:
++            case BASEPROPERTY_ENABLEVISIBLE:
              case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
  
-             case BASEPROPERTY_HELPTEXT:
---- toolkit/source/controls/unocontrol.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ toolkit/source/controls/unocontrol.cxx	2008-05-09 17:50:30.000000000 +0800
-@@ -1286,6 +1286,19 @@ void UnoControl::createPeer( const Refer
+             case BASEPROPERTY_GROUPNAME:
+--- toolkit/source/controls/unocontrol.cxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ toolkit/source/controls/unocontrol.cxx	2008-06-04 11:59:19.000000000 +0800
+@@ -1286,6 +1286,18 @@ void UnoControl::createPeer( const Refer
  		}
  		//issue79712 ends
  		
 +		// Visible
-+		aPropName = GetPropertyName( BASEPROPERTY_VISIBLE );
++		aPropName = GetPropertyName( BASEPROPERTY_ENABLEVISIBLE );
 +		if ( xInfo->hasPropertyByName( aPropName ) )
 +		{
 +			aVal = xPSet->getPropertyValue( aPropName );
 +			sal_Bool b = sal_Bool();
 +			if ( ( aVal >>=b ) && !b )
 +            {
-+                aDescr.WindowAttributes ^= awt::WindowAttribute::SHOW;
 +                maComponentInfos.bVisible = b;
 +            }
 +		}
@@ -222,45 +220,37 @@
  		// Align
  		aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
  		if ( xInfo->hasPropertyByName( aPropName ) )
---- sc/source/filter/inc/xlescher.hxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ sc/source/filter/inc/xlescher.hxx	2008-05-05 18:20:40.000000000 +0800
-@@ -96,6 +96,7 @@ const sal_uInt16 EXC_OBJ_CMO_UNKNOWN    
- 
- // ftCmo: flags
- const sal_uInt16 EXC_OBJ_CMO_PRINTABLE      = 0x0010;   /// Object printable
-+const sal_uInt16 EXC_OBJ_CMO_VISIBLE        = 0x0002;   /// Object visible
- 
- // ftPioGrbit: flags
- const sal_uInt16 EXC_OBJ_PIO_MANUALSIZE     = 0x0001;
---- sc/source/filter/inc/xiescher.hxx.orig	2008-05-05 11:01:01.000000000 +0800
-+++ sc/source/filter/inc/xiescher.hxx	2008-05-05 18:20:40.000000000 +0800
-@@ -94,6 +94,7 @@ public:
+--- sc/source/filter/inc/xiescher.hxx.orig	2008-06-04 11:59:12.000000000 +0800
++++ sc/source/filter/inc/xiescher.hxx	2008-06-04 11:59:19.000000000 +0800
+@@ -94,6 +94,8 @@ public:
      void                SetObjData( sal_uInt16 nObjType, sal_uInt16 nObjId, sal_uInt16 nObjFlags );
      /** Sets shape data from Escher stream. */
      void                SetShapeData( sal_uInt32 nShapeId, sal_uInt32 nShapeFlags, sal_uInt32 nShapeBlipId );
-+    inline void         SetVisible( const sal_uInt32 nObjVisible ) { mnObjVisible = nObjVisible; }
++    /** Sets shape data from Escher stream. */
++    inline void         SetVisible( const bool nObjVisible ) { mnObjVisible = nObjVisible; }
      /** Sets whether this is an area object (then its width and height must be greater than 0). */
      inline void         SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
      /** Sets the object anchor explicitly. */
-@@ -126,6 +127,7 @@ public:
+@@ -126,6 +128,8 @@ public:
      inline bool         IsInsertSdr() const { return mbInsSdr; }
      /** Returns true, if Escher object is printable. */
      inline bool         IsPrintable() const { return ::get_flag( mnObjFlags, EXC_OBJ_CMO_PRINTABLE ); }
-+    inline bool         IsVisible() const { return !::get_flag( mnObjVisible, (sal_uInt32)EXC_OBJ_CMO_VISIBLE ); }
++    /** Returns true, if Escher objest is not hidden. */
++    inline bool         IsVisible() const { return mnObjVisible; }
  
      /** Returns true, if the passed size is valid for this object. */
      bool                IsValidSize( const Rectangle& rAnchorRect ) const;
-@@ -162,6 +164,7 @@ private:
+@@ -162,6 +166,7 @@ private:
      bool                mbValid;        /// true = Object is valid, do processing and insertion.
      bool                mbAreaObj;      /// true = Width and height must be greater than 0.
      bool                mbInsSdr;       /// true = Insert the SdrObject into draw page.
-+    sal_uInt32          mnObjVisible;   /// falgs for visibility
++    bool                mnObjVisible;   /// falgs for visibility
  };
  
  // ----------------------------------------------------------------------------
---- sc/source/filter/excel/xiescher.cxx.orig	2008-05-05 18:14:37.000000000 +0800
-+++ sc/source/filter/excel/xiescher.cxx	2008-05-05 18:20:40.000000000 +0800
-@@ -296,7 +296,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
+--- sc/source/filter/excel/xiescher.cxx.orig	2008-06-04 11:58:09.000000000 +0800
++++ sc/source/filter/excel/xiescher.cxx	2008-06-04 11:59:19.000000000 +0800
+@@ -297,7 +297,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
      mnShapeBlipId( 0 ),
      mbValid( true ),
      mbAreaObj( false ),
@@ -270,7 +260,7 @@
  {
  }
  
-@@ -820,6 +821,7 @@ void XclImpTbxControlObj::DoProcessSdrOb
+@@ -864,6 +865,7 @@ void XclImpTbxControlObj::DoProcessSdrOb
  
      // control printable?
      aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), IsPrintable() );
@@ -278,11 +268,11 @@
  
      // #118053# #i51348# set internal name of the control (use name from SdrObject, if extant)
      OUString aCtrlName = rSdrObj.GetName();
-@@ -1587,6 +1589,7 @@ SdrObject* XclImpDffManager::ProcessObj(
+@@ -1686,6 +1688,7 @@ SdrObject* XclImpDffManager::ProcessObj(
  
      // set shape information from Escher stream
      xDrawObj->SetShapeData( rObjData.nShapeId, rObjData.nSpFlags, GetPropertyValue( DFF_Prop_pib ) );
-+    xDrawObj->SetVisible( GetPropertyValue( DFF_Prop_fPrint ) );
++    xDrawObj->SetVisible( !GetPropertyBool( DFF_Prop_fHidden ) );
  
      /*  Connect textbox data (string, alignment, text orientation) to object.
          #98132# don't ask for a text-ID, Escher export doesn't set one. */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]