GNOME.org
 

ooo-build r14628 - in trunk/patches: dev300 vba

Author: noelpwer
Date: Fri Nov 28 09:59:09 2008
New Revision: 14628
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14628&view=rev

Log:
2008-11-27  Noel Power < noel power novell com >

        * patches/dev300/apply: re-enable and tweak as many VBA related
        patches as possible
        * patches/dev300/form-control-visibility.diff:
        * patches/dev300/controls-with-images-import.diff:
        * patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff:
        * patches/vba/ObjectModule.diff:
        * patches/vba/basic-ide-module-object-name-combile.diff:
        * patches/vba/sc-vbaimport-override-controlname.diff:
        * patches/vba/vba-userform-geometry-tweak.diff:
        * patches/vba/enhanced-form-userform-controls.diff:


Modified:
   trunk/patches/dev300/apply
   trunk/patches/dev300/controls-with-images-import.diff
   trunk/patches/dev300/form-control-visibility.diff
   trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
   trunk/patches/vba/ObjectModule.diff
   trunk/patches/vba/basic-ide-module-object-name-combile.diff
   trunk/patches/vba/enhanced-form-userform-controls.diff
   trunk/patches/vba/sc-vbaimport-override-controlname.diff
   trunk/patches/vba/vba-userform-geometry-tweak.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 09:59:09 2008
@@ -1499,7 +1499,7 @@
 mono-climaker-bridgetest.diff
 
 # FIXME 2008-11-26: easiest to skip all this...
-[ VBAObjects > dev300-m99 ]
+[ VBAObjects >= dev300-m35 ]
 SectionOwner => noelpwer
 
 
@@ -1517,21 +1517,10 @@
 
 vba-support-export-palette.diff, i#68900
 
-# superceeded by vbaevens-service-sources.diff
-# leave here for a while 'till we are sure all is ok
-#vba-keep-codenames-in-sync.diff
-
 # always get non-filtered range selection when querying for current selection
 # address.
 vba-get-nonfiltered-range-selection.diff, n#415002, kohei
 
-# FIXME 2008-11-26: easiest to skip all this...
-[ VBAObjects > dev300-m99 ]
-#associating sheet and codename when insert a sheet
-# sc-insert-sheet-codename.diff, i#80869, jianhua
-
-# hack for when resolving a symbol in the module ThisWorkbook
-#vba-symbol-searchhack-for-thisworkbook.diff
 vba-allow-ranges-for-cell-functions.diff
 
 vba-error-object.diff
@@ -1553,25 +1542,30 @@
 
 # export of macro bindings for shapes
 # FIXME 2008-11-26: doesn't apply to dev300-m35
+# it seems filter code has changed :-( XclExpControlObjHelper has
+# dissapeared
 #sc-export-shape-macro-bindings.diff, n#304739, noelpwer
 
 # export of hlink bindings for shapes
 # FIXME 2008-11-26: doesn't apply to dev300-m35
 #sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
 
+
 # attributes present in the vba streams can override the default shape name
 # used for the control in the binary format
 # FIXME 2008-11-26: doesn't apply to dev300-m35
 #sc-vbaimport-override-controlname.diff, n#359933, noelpwer
 
+
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
 # FIXME 2008-11-26: doesn't apply to dev300-m35
-#default-autotext-and-form-name.diff, n#353687
+#default-autotext-and-form-name.diff, n#353687, i#85358
 
 # fix --disable-vba build
 oovbaapi-disable-vba.diff
 
+
 #fix for n#309981
 vba-fixup-singlerange-sheetref.diff, n#309981, noelpwer
 #always (try) to set the default property to an SbxUnoObject
@@ -1582,29 +1576,23 @@
 #also allow paramaters to be supported for Get properties
 vba-support-properties-inmodules.diff
 controls-with-images-in-document.diff, i#38215, noelpwer
+
+
 # import graphic for image control
 # FIXME 2008-11-26: causes compilation error in dev300-m35
-#controls-with-images-import.diff, Fong
+controls-with-images-import.diff, Fong
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#enhanced-form-userform-controls.diff, noelpwer
+enhanced-form-userform-controls.diff, noelpwer
 # object module support... getting there
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#ObjectModule.diff
+ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#vba-userform.diff
-# fix userform activate event re-compute; extracted from vcl92
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#vba-userform-activate-fix.diff, i#91038
+vba-userform.diff
 # uno interface for vba mode
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#vba-compatible-mode-uno.diff, Fong
+vba-compatible-mode-uno.diff, Fong
 # support to display spinbutton in userform
-# FIXME 2008-11-26: doesn't apply to dev300-m35
-#vba-spinbutton-in-userform.diff, Fong
+vba-spinbutton-in-userform.diff, Fong
 
 vbaevents-services-sources.diff, i#68893
 
@@ -1619,7 +1607,7 @@
 # comparison of tow empty type fix in vba mode
 vba-empty-comparison-fix.diff, n#397438, Fong
 # Add Worksheet.EnableSelection ( depends on cws-scsheetprotection02-sc.diff )
-# FIXME 2008-11-26: dependency on commented out diff
+# FIXME ( when cws-scsheetprotection02-sc.diff applies )
 #vba-worksheet-enableselection.diff, n#405312, Fong
 
 # keywords (including NAME, LINE, TEXT) can be used as variable
@@ -1633,23 +1621,19 @@
 #the other ( no idea )
 userform-possible-groupingtweak.diff
 #disable to delete or rename objectmodule name in basic ide
-# FIXME 2008-11-26: doesn't compile on dev300-m35
-#basic-ide-objectmodule.diff, Fong
+basic-ide-objectmodule.diff, Fong
 # display a friendly name for objectmodule tab
-# FIXME 2008-11-26: doesn't compile on dev300-m35
-#basic-ide-module-object-name-combile.diff, Fong
-#vba-fix-ide-friendly-modulename.diff, n#439971, Fong
+basic-ide-module-object-name-combile.diff, Fong
+vba-fix-ide-friendly-modulename.diff, n#439971, Fong
 # display a friendly basic macro tree in macrochoose dialog
-# FIXME 2008-11-26: doesn't compile on dev300-m35
-#vba-basic-macrochoose-dialog.diff, Fong
-#vba-fix-basic-macro-organizer.diff, n#439972, Fong
+vba-basic-macrochoose-dialog.diff, Fong
+vba-fix-basic-macro-organizer.diff, n#439972, Fong
 # fix bug accessing default member of userform control
 range-listBox-compare.diff, n#421939
 # fix bug comparing string that can't be converted to number
 stringnumbercompare.diff, n#422559
 # fix import sizes and geometry of userforms
-# FIXME 2008-11-26: doesn't apply because some diff above is skipped because of a FIXME
-#vba-userform-geometry-tweak.diff
+vba-userform-geometry-tweak.diff
 # n#426415
 vba-allow-forms-resetvalue-binding.diff
 # n#426415

Modified: trunk/patches/dev300/controls-with-images-import.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-import.diff	(original)
+++ trunk/patches/dev300/controls-with-images-import.diff	Fri Nov 28 09:59:09 2008
@@ -293,8 +293,8 @@
  	return sal_True;
  }
  
-@@ -1564,6 +1599,12 @@ sal_Bool OCX_OptionButton::Import(com::s
-     }
+@@ -1564,8 +1599,14 @@ sal_Bool OCX_OptionButton::Import(com::s
+     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
  
  	aFontData.Import(rPropSet);
 +
@@ -306,6 +306,8 @@
  	return sal_True;
  }
  
+ sal_Bool OCX_OptionButton::WriteContents(SvStorageStreamRef &rContents,
+ 	const uno::Reference< beans::XPropertySet > &
 @@ -2198,6 +2139,12 @@ sal_Bool OCX_ToggleButton::Import(com::s
  	}
  

Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff	(original)
+++ trunk/patches/dev300/form-control-visibility.diff	Fri Nov 28 09:59:09 2008
@@ -220,59 +220,3 @@
  		// Align
  		aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
  		if ( xInfo->hasPropertyByName( aPropName ) )
---- sc/source/filter/inc/xiescher.hxx.orig	2008-06-04 15:22:46.000000000 +0800
-+++ sc/source/filter/inc/xiescher.hxx	2008-06-04 15:23:11.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 );
-+    /** 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 +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 ); }
-+    /** 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 +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.
-+    bool                mnObjVisible;   /// falgs for visibility
- };
- 
- // ----------------------------------------------------------------------------
---- sc/source/filter/excel/xiescher.cxx.orig	2008-04-11 04:16:07.000000000 +0800
-+++ sc/source/filter/excel/xiescher.cxx	2008-06-04 15:23:11.000000000 +0800
-@@ -296,7 +296,8 @@ XclImpDrawObjBase::XclImpDrawObjBase( co
-     mnShapeBlipId( 0 ),
-     mbValid( true ),
-     mbAreaObj( false ),
--    mbInsSdr( true )
-+    mbInsSdr( true ),
-+    mnObjVisible( 0 )
- {
- }
- 
-@@ -790,6 +791,7 @@ void XclImpTbxControlObj::DoProcessSdrOb
- 
-     // control printable?
-     aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), IsPrintable() );
-+    aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), IsVisible() );
- 
-     // #118053# #i51348# set internal name of the control (use name from SdrObject, if extant)
-     OUString aCtrlName = rSdrObj.GetName();
-@@ -1552,6 +1554,7 @@ SdrObject* XclImpDffManager::ProcessObj(
- 
-     // set shape information from Escher stream
-     xDrawObj->SetShapeData( rObjData.nShapeId, rObjData.nSpFlags, GetPropertyValue( DFF_Prop_pib ) );
-+    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. */

Modified: trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
==============================================================================
--- trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff	(original)
+++ trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff	Fri Nov 28 09:59:09 2008
@@ -20,6 +20,6 @@
 -        gdk_color_free (link_color);
 -    }
 -
-     // menu disabled entries handling
-     aStyleSet.SetSkipDisabledInMenus( TRUE );
-     // menu colors
+     // Tab colors
+     aStyleSet.SetActiveTabColor( aBackFieldColor ); // same as the window color.
+     Color aSelectedBackColor = getColor( pStyle->bg[GTK_STATE_ACTIVE] );

Modified: trunk/patches/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/vba/ObjectModule.diff	(original)
+++ trunk/patches/vba/ObjectModule.diff	Fri Nov 28 09:59:09 2008
@@ -1208,76 +1208,6 @@
                      case 0xDE:  Olesize(); break;
  					case 0x01BA: Codename( TRUE ); break;
  
-diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
-index 9c687ed..c8339df 100644
---- sc/source/filter/excel/xiescher.cxx
-+++ sc/source/filter/excel/xiescher.cxx
-@@ -834,7 +834,7 @@ bool XclImpTbxControlObj::FillMacroDescr
-         {
-             // set the macro name
-             rEvent.ScriptType = XclControlObjHelper::GetTbxScriptType();
--            rEvent.ScriptCode = XclControlObjHelper::GetScMacroName( GetMacroName() );
-+            rEvent.ScriptCode = XclControlObjHelper::GetScMacroName( GetMacroName(), GetDocShell() );
-             return true;
-         }
-     }
-@@ -1728,7 +1728,7 @@ SdrObject* XclImpDffManager::ProcessObj(
-             if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ) )
-             {
-                 if ( rMacro.Len() > 0 )
--                pInfo->SetMacro( XclControlObjHelper::GetScMacroName( rMacro ) );
-+                pInfo->SetMacro( XclControlObjHelper::GetScMacroName( rMacro, GetDocShell() ) );
-                 if ( aHlink.getLength() > 0 )
-                 pInfo->SetHlink( aHlink );
-             }
-diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
-index 8e8e694..693a323 100644
---- sc/source/filter/excel/xlescher.cxx
-+++ sc/source/filter/excel/xlescher.cxx
-@@ -37,7 +37,10 @@
- #include "xistream.hxx"
- #include "xestream.hxx"
- #include "globstr.hrc"
--
-+#include <sfx2/objsh.hxx>
-+#include <basic/sbstar.hxx>
-+#include <basic/sbmod.hxx>
-+#include <basic/sbmeth.hxx>
- using ::rtl::OUString;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::UNO_QUERY;
-@@ -405,9 +408,16 @@ OUString XclControlObjHelper::GetTbxScri
- #define EXC_TBX_MACRONAME_PRE "vnd.sun.star.script:Standard."
- #define EXC_TBX_MACRONAME_SUF "?language=Basic&location=document"
- 
--OUString XclControlObjHelper::GetScMacroName( const String& rXclMacroName )
-+OUString XclControlObjHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
- {
--    return CREATE_OUSTRING( EXC_TBX_MACRONAME_PRE ) + rXclMacroName + CREATE_OUSTRING( EXC_TBX_MACRONAME_SUF );
-+    String sTmp( rXclMacroName );
-+    if (  ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
-+                    if( StarBASIC* pBasic = pDocShell->GetBasic() )
-+                        if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
-+                            if( SbModule* pModule = pMethod->GetModule() )
-+                                sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 );
-+    
-+    return CREATE_OUSTRING( EXC_TBX_MACRONAME_PRE ) + sTmp + CREATE_OUSTRING( EXC_TBX_MACRONAME_SUF );
- }
- 
- String XclControlObjHelper::GetXclMacroName( const OUString& rScMacroName )
-diff --git sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx
-index e28b1c4..9263024 100644
---- sc/source/filter/inc/xlescher.hxx
-+++ sc/source/filter/inc/xlescher.hxx
-@@ -278,7 +278,7 @@ public:
-     static ::rtl::OUString GetTbxScriptType();
- 
-     /** Returns the Calc macro name from an Excel macro name. */
--    static ::rtl::OUString GetScMacroName( const String& rXclMacroName );
-+    static ::rtl::OUString GetScMacroName( const String& rXclMacroName, SfxObjectShell* pShell = NULL );
-     /** Returns the Excel macro name from a Calc macro name. */
-     static String       GetXclMacroName( const ::rtl::OUString& rScMacroName );
- };
 diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
 index 4a4af03..eee88d8 100644
 --- sc/source/ui/docshell/docfunc.cxx

Modified: trunk/patches/vba/basic-ide-module-object-name-combile.diff
==============================================================================
--- trunk/patches/vba/basic-ide-module-object-name-combile.diff	(original)
+++ trunk/patches/vba/basic-ide-module-object-name-combile.diff	Fri Nov 28 09:59:09 2008
@@ -74,9 +74,11 @@
  
  	if ( !aModName.Len() )
          aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
-@@ -272,6 +293,20 @@ ModulWindow* BasicIDEShell::CreateBasWin
+@@ -272,7 +293,20 @@ ModulWindow* BasicIDEShell::CreateBasWin
  		DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
  	}
+-    if( nKey )
+-	    pTabBar->InsertPage( (USHORT)nKey, aModName );
 +    if( nKey )
 +	{
 +		if( xLib.is() )
@@ -90,7 +92,6 @@
 +				aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
 +			}
 +		}
--	pTabBar->InsertPage( (USHORT)nKey, aModName );
 +		pTabBar->InsertPage( (USHORT)nKey, aModName );
 +	}	
  	pTabBar->Sort();

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Fri Nov 28 09:59:09 2008
@@ -1126,8 +1126,8 @@
 +++ toolkit/inc/toolkit/controls/dialogcontrol.hxx
 @@ -52,6 +52,7 @@
  #include <cppuhelper/basemutex.hxx>
+ #include <cppuhelper/basemutex.hxx>
  #include <list>
- #include <map>
 +#include <com/sun/star/graphic/XGraphicObject.hpp>
  
  //	----------------------------------------------------

Modified: trunk/patches/vba/sc-vbaimport-override-controlname.diff
==============================================================================
--- trunk/patches/vba/sc-vbaimport-override-controlname.diff	(original)
+++ trunk/patches/vba/sc-vbaimport-override-controlname.diff	Fri Nov 28 09:59:09 2008
@@ -111,8 +111,8 @@
  #include "xicontent.hxx"
 +#include "scextopt.hxx"
 +
-
- #include "xlescher.hxx"
+ #include "namebuff.hxx"
+ 
  using ::rtl::OUString;
 @@ -1172,8 +1172,13 @@ void XclImpOleObj::DoProcessSdrObj( SdrO
          // printable

Modified: trunk/patches/vba/vba-userform-geometry-tweak.diff
==============================================================================
--- trunk/patches/vba/vba-userform-geometry-tweak.diff	(original)
+++ trunk/patches/vba/vba-userform-geometry-tweak.diff	Fri Nov 28 09:59:09 2008
@@ -288,10 +288,10 @@
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
 @@ -190,6 +190,7 @@ namespace rtl {
+ #define BASEPROPERTY_URL                            134  // ::rtl::OUString
+ #define BASEPROPERTY_UNIT                           135  // ::awt::FieldUnit
  #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
- #define BASEPROPERTY_ENABLEVISIBLE                  137  // sal_Bool
- #define BASEPROPERTY_GROUPNAME                      138  // ::rtl::OUString
-+#define BASEPROPERTY_VBAFORM                      139  // sal_Bool
++#define BASEPROPERTY_VBAFORM                      137  // sal_Bool
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
@@ -358,11 +358,11 @@
 --- toolkit/source/helper/property.cxx
 +++ toolkit/source/helper/property.cxx
 @@ -271,7 +271,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     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT )
-+            DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,    BOUND, MAYBEDEFAULT ),
+-            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT )
++            DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
 +            DECL_PROP_2     ( "VBAForm",          VBAFORM,          sal_Bool,    BOUND, MAYBEDEFAULT ),
              };
  			pPropertyInfos = aImplPropertyInfos;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]