ooo-build r11920 - trunk/patches/test/vba
- From: jiaojh svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11920 - trunk/patches/test/vba
- Date: Mon, 17 Mar 2008 10:53:30 +0000 (GMT)
Author: jiaojh
Date: Mon Mar 17 10:53:29 2008
New Revision: 11920
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11920&view=rev
Log:
update for ModuleType and ClassName
Modified:
trunk/patches/test/vba/ModuleInfo.diff
Modified: trunk/patches/test/vba/ModuleInfo.diff
==============================================================================
--- trunk/patches/test/vba/ModuleInfo.diff (original)
+++ trunk/patches/test/vba/ModuleInfo.diff Mon Mar 17 10:53:29 2008
@@ -1,5 +1,5 @@
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ udkapi/com/sun/star/script/ModuleInfo.idl 2008-02-20 10:42:00.000000000 +0800
++++ udkapi/com/sun/star/script/ModuleInfo.idl 2008-03-17 14:13:38.000000000 +0800
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
@@ -60,7 +60,7 @@
+
+#endif
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ udkapi/com/sun/star/script/ModuleType.idl 2008-02-20 10:42:00.000000000 +0800
++++ udkapi/com/sun/star/script/ModuleType.idl 2008-03-17 15:22:19.000000000 +0800
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
@@ -106,13 +106,13 @@
+
+//=============================================================================
+module com { module sun { module star { module script {
-+published enum ModuleType
++published constants ModuleType
+{
-+ Unknown,
-+ Normal,
-+ Class,
-+ Form,
-+ Document
++ const long Unknown = 0;
++ const long Normal = 1;
++ const long Class = 2;
++ const long Form = 3;
++ const long Document = 4;
+};
+
+//=============================================================================
@@ -121,7 +121,7 @@
+
+#endif
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ udkapi/com/sun/star/script/XObjectProvider.idl 2008-02-20 10:42:00.000000000 +0800
++++ udkapi/com/sun/star/script/XObjectProvider.idl 2008-03-17 14:13:38.000000000 +0800
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
@@ -175,8 +175,8 @@
+
+}; }; }; };
+#endif
---- udkapi/com/sun/star/script/makefile.mk.orig 2008-02-19 09:39:10.000000000 +0800
-+++ udkapi/com/sun/star/script/makefile.mk 2008-02-20 10:42:59.000000000 +0800
+--- udkapi/com/sun/star/script/makefile.mk.orig 2008-03-17 12:35:48.000000000 +0800
++++ udkapi/com/sun/star/script/makefile.mk 2008-03-17 14:13:38.000000000 +0800
@@ -89,6 +89,9 @@ IDLFILES=\
XScriptEventsAttacher.idl\
XDefaultMethod.idl\
@@ -187,8 +187,8 @@
DateType.idl\
# ------------------------------------------------------------------
---- svx/source/msfilter/msvbasic.hxx.orig 2006-06-20 00:20:43.000000000 +0800
-+++ svx/source/msfilter/msvbasic.hxx 2008-02-20 10:42:00.000000000 +0800
+--- svx/source/msfilter/msvbasic.hxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ svx/source/msfilter/msvbasic.hxx 2008-03-17 14:13:38.000000000 +0800
@@ -50,11 +50,13 @@
#ifndef _DYNARY_HXX
#include <tools/dynary.hxx>
@@ -212,8 +212,8 @@
// #117718# define map to hold types of module
//
---- svx/source/msfilter/svxmsbas.cxx.orig 2007-12-07 20:21:21.000000000 +0800
-+++ svx/source/msfilter/svxmsbas.cxx 2008-02-20 10:42:00.000000000 +0800
+--- svx/source/msfilter/svxmsbas.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ svx/source/msfilter/svxmsbas.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -88,6 +88,7 @@ using namespace com::sun::star::awt;
#include <com/sun/star/container/XNameContainer.hpp>
@@ -308,8 +308,8 @@
SFX_APP()->LeaveBasicCall();
}
return bRet;
---- svx/source/msfilter/msvbasic.cxx.orig 2006-09-17 13:28:12.000000000 +0800
-+++ svx/source/msfilter/msvbasic.cxx 2008-02-20 10:42:00.000000000 +0800
+--- svx/source/msfilter/msvbasic.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ svx/source/msfilter/msvbasic.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -453,7 +453,7 @@ ModuleType VBA_Impl::GetModuleType( cons
{
return iter->second;
@@ -362,8 +362,8 @@
OSL_TRACE("Module %s is of type Normal VBA",
::rtl::OUStringToOString( value ,
RTL_TEXTENCODING_ASCII_US ).pData->buffer );
---- sc/inc/servuno.hxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/inc/servuno.hxx 2008-02-20 10:42:00.000000000 +0800
+--- sc/inc/servuno.hxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ sc/inc/servuno.hxx 2008-03-17 14:13:38.000000000 +0800
@@ -103,7 +103,8 @@ class ScDocShell;
#define SC_SERVICE_FORMULAPARS 38
#define SC_SERVICE_OPCODEMAPPER 39
@@ -374,9 +374,9 @@
#define SC_SERVICE_INVALID USHRT_MAX
---- sc/source/ui/unoobj/servuno.cxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/ui/unoobj/servuno.cxx 2008-02-20 10:42:00.000000000 +0800
-@@ -77,8 +77,106 @@
+--- sc/source/ui/unoobj/servuno.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ sc/source/ui/unoobj/servuno.cxx 2008-03-17 17:04:52.000000000 +0800
+@@ -77,8 +77,94 @@
#include <svx/xmlgrhlp.hxx>
#endif
@@ -462,18 +462,6 @@
+ if( xIf.is() )
+ {
+ aObj <<= xIf;
-+ aType = aObj.getValueType();
-+ uno::TypeClass aTypeClass = aType.getTypeClass();
-+ if( bWorkbook )
-+ {
-+ uno::Type aNewType( aTypeClass, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.org.openoffice.excel.Workbook") ) );
-+ aObj.setValue( (void*)&xIf, aNewType );
-+ }
-+ else
-+ {
-+ uno::Type aNewType( aTypeClass, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.org.openoffice.excel.Worksheet") ) );
-+ aObj.setValue( (void*)&xIf, aNewType );
-+ }
+ }
+ }
+ }
@@ -483,7 +471,7 @@
//------------------------------------------------------------------------
-@@ -128,7 +226,8 @@ static const sal_Char* __FAR_DATA aProvN
+@@ -128,7 +214,8 @@ static const sal_Char* __FAR_DATA aProvN
SC_SERVICENAME_CHDATAPROV, // SC_SERVICE_CHDATAPROV
SC_SERVICENAME_FORMULAPARS, // SC_SERVICE_FORMULAPARS
@@ -493,7 +481,7 @@
};
//
-@@ -180,6 +279,7 @@ static const sal_Char* __FAR_DATA aOldNa
+@@ -180,6 +267,7 @@ static const sal_Char* __FAR_DATA aOldNa
"", // SC_SERVICE_SHEETDOCSET
"", // SC_SERVICE_CHDATAPROV
"", // SC_SERVICE_FORMULAPARS
@@ -501,7 +489,7 @@
"" // SC_SERVICE_OPCODEMAPPER
};
-@@ -373,6 +473,8 @@ uno::Reference<uno::XInterface> ScServic
+@@ -373,6 +461,8 @@ uno::Reference<uno::XInterface> ScServic
case SC_SERVICE_OPCODEMAPPER:
xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj));
break;
@@ -510,8 +498,8 @@
}
return xRet;
}
---- sc/source/ui/unoobj/makefile.mk.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/ui/unoobj/makefile.mk 2008-02-20 10:42:00.000000000 +0800
+--- sc/source/ui/unoobj/makefile.mk.orig 2008-03-17 12:35:48.000000000 +0800
++++ sc/source/ui/unoobj/makefile.mk 2008-03-17 14:13:38.000000000 +0800
@@ -54,6 +54,7 @@ AUTOSEG=true
.INCLUDE : sc.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
@@ -520,8 +508,8 @@
# --- Files --------------------------------------------------------
SLO1FILES = \
$(SLO)$/docuno.obj \
---- basctl/source/basicide/scriptdocument.cxx.orig 2007-10-09 23:24:54.000000000 +0800
-+++ basctl/source/basicide/scriptdocument.cxx 2008-02-20 10:42:00.000000000 +0800
+--- basctl/source/basicide/scriptdocument.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basctl/source/basicide/scriptdocument.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -61,6 +61,7 @@
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/awt/XWindow2.hpp>
@@ -575,8 +563,8 @@
}
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ basic/inc/basic/sbobjmod.hxx 2008-02-20 10:42:00.000000000 +0800
-@@ -0,0 +1,68 @@
++++ basic/inc/basic/sbobjmod.hxx 2008-03-17 17:14:47.000000000 +0800
+@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -634,7 +622,6 @@
+ SbObjModule( const rtl::OUString& rName, const com::sun::star::script::ModuleInfo& mInfo );
+ virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+ virtual SbxVariable* GetObject();
-+ virtual void SetCodeName( const XubString& rName );
+ virtual BOOL IsClass( const String& );
+};
+#ifndef __SB_SBOBJMODULEREF_HXX
@@ -645,8 +632,8 @@
+#endif
+#endif
+
---- basic/prj/d.lst.orig 2007-05-11 19:42:43.000000000 +0800
-+++ basic/prj/d.lst 2008-02-20 10:42:00.000000000 +0800
+--- basic/prj/d.lst.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/prj/d.lst 2008-03-17 14:13:38.000000000 +0800
@@ -27,6 +27,7 @@ mkdir: %_DEST%\inc%_EXT%\basic
..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
@@ -655,18 +642,19 @@
..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx
..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx
..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx
---- basic/source/classes/sbxmod.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ basic/source/classes/sbxmod.cxx 2008-02-20 10:42:00.000000000 +0800
-@@ -62,6 +62,8 @@
+--- basic/source/classes/sbxmod.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/source/classes/sbxmod.cxx 2008-03-17 17:14:45.000000000 +0800
+@@ -62,6 +62,9 @@
#include "sbunoobj.hxx"
#include <basic/hilight.hxx>
#include <basic/basrdll.hxx>
+#include <basic/sbobjmod.hxx>
+#include <com/sun/star/script/XObjectProvider.hpp>
++#include <com/sun/star/lang/XServiceInfo.hpp>
#ifndef _VOS_MUTEX_HXX_
#include <vos/mutex.hxx>
-@@ -88,6 +90,7 @@ TYPEINIT1(SbProperty,SbxProperty)
+@@ -88,6 +91,7 @@ TYPEINIT1(SbProperty,SbxProperty)
TYPEINIT1(SbProcedureProperty,SbxProperty)
TYPEINIT1(SbJScriptModule,SbModule)
TYPEINIT1(SbJScriptMethod,SbMethod)
@@ -674,7 +662,7 @@
SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
SV_IMPL_VARARR(SbiBreakpoints,USHORT)
-@@ -1903,6 +1906,104 @@ void SyntaxHighlighter::getHighlightPort
+@@ -1903,6 +1907,105 @@ void SyntaxHighlighter::getHighlightPort
m_pSimpleTokenizer->getHighlightPortions( nLine, rLine, portions );
}
@@ -709,16 +697,12 @@
+BOOL
+SbObjModule::IsClass( const XubString& rName )
+{
-+ OSL_TRACE("SbObjectModule check class name for %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ BOOL bIsClass = FALSE;
+ if( SbxObject::IsClass( rName ) )
+ return TRUE;
+ if( GetObject() )
+ {
-+ SbUnoObject* pSbUnoObjce = PTR_CAST( SbUnoObject, &pDocObject );
-+ rtl::OUString sTypeName = pSbUnoObjce->getUnoAny().getValueTypeName();
-+ OSL_TRACE("SbObjModule::IsClass: Class name is %s", rtl::OUStringToOString( sTypeName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+ bIsClass = lcl_IsSameClass( sTypeName, rtl::OUString( rName ) );
++ bIsClass = lcl_IsSameClass( GetClassName(), rtl::OUString( rName ) );
+ }
+ return bIsClass;
+}
@@ -767,20 +751,25 @@
+ com::sun::star::uno::Reference< com::sun::star::script::XObjectProvider > xObjectProvider( m_mInfo.ModuleObjectProvider, com::sun::star::uno::UNO_QUERY_THROW );
+ com::sun::star::uno::Any aObject = xObjectProvider->getObject();
+ pDocObject = new SbUnoObject( rName, aObject );
++ com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObject, com::sun::star::uno::UNO_QUERY_THROW );
++ if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Worksheet" ) ) )
++ {
++ SetClassName( rtl::OUString::createFromAscii( "Worksheet" ) );
++ }
++ else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "org.openoffice.excel.Workbook" ) ) )
++ {
++ SetClassName( rtl::OUString::createFromAscii( "Workbook" ) );
++ }
+ }catch( com::sun::star::uno::RuntimeException e )
+ {
+ OSL_TRACE("Object is not exist." );
+ }
+}
-+void
-+SbObjModule::SetCodeName( const XubString& rName )
-+{
-+}
/////////////////////////////////////////////////////////////////////////
// Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
---- basic/source/classes/sb.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ basic/source/classes/sb.cxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/source/classes/sb.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/source/classes/sb.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -70,6 +70,7 @@
#include "disas.hxx"
#include "runtime.hxx"
@@ -829,8 +818,8 @@
// Sonst testen, ob das Element vorhanden ist
// GBLSEARCH-Flag rausnehmen (wg. Rekursion)
USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
---- basic/source/runtime/methods1.cxx.orig 2007-09-20 23:55:19.000000000 +0800
-+++ basic/source/runtime/methods1.cxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/source/runtime/methods1.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/source/runtime/methods1.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -60,6 +60,9 @@
#ifndef _SBX_HXX
#include <basic/sbx.hxx>
@@ -865,8 +854,8 @@
}
else
{
---- basic/source/basmgr/basmgr.cxx.orig 2007-08-30 17:58:48.000000000 +0800
-+++ basic/source/basmgr/basmgr.cxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/source/basmgr/basmgr.cxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/source/basmgr/basmgr.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -102,6 +102,8 @@
#include <com/sun/star/script/XStarBasicDialogInfo.hpp>
#include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
@@ -973,8 +962,8 @@
pLib->SetModified( FALSE );
}
---- basic/inc/basic/sbstar.hxx.orig 2007-08-30 17:58:14.000000000 +0800
-+++ basic/inc/basic/sbstar.hxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/inc/basic/sbstar.hxx.orig 2008-03-17 12:35:48.000000000 +0800
++++ basic/inc/basic/sbstar.hxx 2008-03-17 14:13:38.000000000 +0800
@@ -51,6 +51,7 @@
#include <basic/sbdef.hxx>
@@ -1010,8 +999,8 @@
// #60175 TRUE: SFX-Resource wird bei Basic-Fehlern nicht angezogen
static void StaticSuppressSfxResource( BOOL bSuppress );
---- basic/inc/basic/sbdef.hxx.orig 2007-04-11 20:51:38.000000000 +0800
-+++ basic/inc/basic/sbdef.hxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/inc/basic/sbdef.hxx.orig 2008-03-17 12:35:49.000000000 +0800
++++ basic/inc/basic/sbdef.hxx 2008-03-17 14:13:38.000000000 +0800
@@ -100,6 +100,7 @@ void setBasicWatchMode( bool bOn );
#define SBXID_BASIC 0x6273 // sb: StarBASIC
@@ -1020,8 +1009,8 @@
#define SBXID_BASICPROP 0x7262 // pr: StarBASIC-Property
#define SBXID_BASICMETHOD 0x6d65 // me: StarBASIC-Methode
#define SBXID_JSCRIPTMOD 0x6a62 // jm: JavaScript-Modul
---- basic/source/uno/namecont.cxx.orig 2007-06-27 22:33:56.000000000 +0800
-+++ basic/source/uno/namecont.cxx 2008-02-20 19:24:04.000000000 +0800
+--- basic/source/uno/namecont.cxx.orig 2008-03-17 12:35:49.000000000 +0800
++++ basic/source/uno/namecont.cxx 2008-03-17 18:45:01.000000000 +0800
@@ -139,6 +139,9 @@
#endif
#include <basic/sbmod.hxx>
@@ -1050,8 +1039,8 @@
throw IllegalArgumentException();
NameContainerNameMap::iterator aIt = mHashMap.find( aName );
---- sfx2/source/doc/objmisc.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ sfx2/source/doc/objmisc.cxx 2008-02-20 10:42:00.000000000 +0800
+--- sfx2/source/doc/objmisc.cxx.orig 2008-03-11 10:57:50.000000000 +0800
++++ sfx2/source/doc/objmisc.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -98,6 +98,9 @@
#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_
#include <com/sun/star/util/XModifiable.hpp>
@@ -1062,8 +1051,35 @@
#include <com/sun/star/script/provider/XScript.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
---- sfx2/source/doc/docmacromode.cxx.orig 2008-01-24 23:54:21.000000000 +0800
-+++ sfx2/source/doc/docmacromode.cxx 2008-02-20 10:42:00.000000000 +0800
+@@ -1420,7 +1423,7 @@ ErrCode SfxObjectShell::CallXScript( con
+ ::com::sun::star::uno::Any& aRet,
+ ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
+- aOutParam, bool bRaiseError )
++ aOutParam, bool bRaiseError, ::com::sun::star::uno::Any* pCaller )
+ {
+ OSL_TRACE( "in CallXScript" );
+ ErrCode nErr = ERRCODE_NONE;
+@@ -1463,6 +1466,17 @@ ErrCode SfxObjectShell::CallXScript( con
+ }
+ OSL_TRACE( "CallXScript, got Script, about to invoke");
+ OSL_TRACE( "CallXScript, number of params is: %d", aParams.getLength() );
++ if ( pCaller && pCaller->hasValue() )
++ {
++ Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
++ if ( xProps.is() )
++ {
++ Sequence< uno::Any > aArgs( 1 );
++ aArgs[ 0 ] = *pCaller;
++ xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
++ }
++
++ }
+ aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
+ OSL_TRACE( "CallXScript, invoke is finished");
+ }
+--- sfx2/source/doc/docmacromode.cxx.orig 2008-03-17 12:35:49.000000000 +0800
++++ sfx2/source/doc/docmacromode.cxx 2008-03-17 14:13:38.000000000 +0800
@@ -45,6 +45,7 @@
#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
#include <com/sun/star/task/InteractionClassification.hpp>
@@ -1138,8 +1154,8 @@
}
}
}
---- basic/inc/basic/sbxobj.hxx.orig 2007-04-11 20:55:16.000000000 +0800
-+++ basic/inc/basic/sbxobj.hxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/inc/basic/sbxobj.hxx.orig 2008-03-17 12:35:49.000000000 +0800
++++ basic/inc/basic/sbxobj.hxx 2008-03-17 14:13:38.000000000 +0800
@@ -80,7 +80,7 @@ public:
virtual SbxClassType GetClass() const;
virtual void Clear();
@@ -1149,8 +1165,8 @@
const String& GetClassName() const { return aClassName; }
void SetClassName( const String &rNew ) { aClassName = rNew; }
// Default-Property
---- basic/source/sbx/sbxobj.cxx.orig 2007-06-27 22:31:34.000000000 +0800
-+++ basic/source/sbx/sbxobj.cxx 2008-02-20 10:42:00.000000000 +0800
+--- basic/source/sbx/sbxobj.cxx.orig 2008-03-17 12:35:49.000000000 +0800
++++ basic/source/sbx/sbxobj.cxx 2008-03-17 16:46:03.000000000 +0800
@@ -187,7 +187,7 @@ void SbxObject::SFX_NOTIFY( SfxBroadcast
}
}
@@ -1160,9 +1176,9 @@
{
return BOOL( aClassName.EqualsIgnoreCaseAscii( rName ) );
}
---- sc/inc/document.hxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/inc/document.hxx 2008-02-20 10:42:00.000000000 +0800
-@@ -307,6 +307,7 @@ private:
+--- sc/inc/document.hxx.orig 2008-03-11 10:57:56.000000000 +0800
++++ sc/inc/document.hxx 2008-03-17 14:13:38.000000000 +0800
+@@ -308,6 +308,7 @@ private:
com::sun::star::uno::Sequence<sal_Int8> aProtectPass;
String aDocName; // opt: Dokumentname
@@ -1170,7 +1186,7 @@
ScRangePairListRef xColNameRanges;
ScRangePairListRef xRowNameRanges;
-@@ -450,6 +451,8 @@ public:
+@@ -451,6 +452,8 @@ public:
const String& GetName() const { return aDocName; }
void SetName( const String& r ) { aDocName = r; }
@@ -1179,7 +1195,7 @@
void GetDocStat( ScDocStat& rDocStat );
-@@ -537,6 +540,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollec
+@@ -538,6 +541,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollec
BOOL HasTable( SCTAB nTab ) const;
SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const;
@@ -1188,9 +1204,9 @@
BOOL GetTable( const String& rName, SCTAB& rTab ) const;
inline SCTAB GetTableCount() const { return nMaxTableNumber; }
SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
---- sc/inc/table.hxx.orig 2008-02-18 11:24:46.000000000 +0800
-+++ sc/inc/table.hxx 2008-02-20 10:42:00.000000000 +0800
-@@ -102,6 +102,7 @@ private:
+--- sc/inc/table.hxx.orig 2008-03-11 10:57:56.000000000 +0800
++++ sc/inc/table.hxx 2008-03-17 14:13:38.000000000 +0800
+@@ -104,6 +104,7 @@ private:
ScColumn aCol[MAXCOLCOUNT];
String aName;
@@ -1198,7 +1214,7 @@
String aComment;
BOOL bScenario;
BOOL bLayoutRTL;
-@@ -232,6 +233,9 @@ public:
+@@ -237,6 +238,9 @@ public:
void GetName( String& rName ) const;
void SetName( const String& rNewName );
@@ -1208,8 +1224,8 @@
const String& GetUpperName() const;
const String& GetPageStyle() const { return aPageStyle; }
---- sc/source/core/data/document.cxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/core/data/document.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/core/data/document.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/core/data/document.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -101,6 +101,7 @@
#include "scextopt.hxx"
#include "postit.hxx"
@@ -1322,9 +1338,9 @@
}
pTab[nTabCount - 1] = NULL;
---- sc/source/core/data/table1.cxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/core/data/table1.cxx 2008-02-20 10:42:01.000000000 +0800
-@@ -129,6 +129,7 @@ extern BOOL bIsOlk, bOderSo;
+--- sc/source/core/data/table1.cxx.orig 2008-03-11 10:57:56.000000000 +0800
++++ sc/source/core/data/table1.cxx 2008-03-17 14:13:39.000000000 +0800
+@@ -130,6 +130,7 @@ extern BOOL bIsOlk, bOderSo;
ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
BOOL bColInfo, BOOL bRowInfo ) :
aName( rNewName ),
@@ -1332,8 +1348,8 @@
bScenario( FALSE ),
bLayoutRTL( FALSE ),
bLoadingRTL( FALSE ),
---- sc/source/filter/excel/excdoc.cxx.orig 2008-02-18 11:24:45.000000000 +0800
-+++ sc/source/filter/excel/excdoc.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/filter/excel/excdoc.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/filter/excel/excdoc.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -168,7 +168,7 @@ void ExcTable::FillAsHeader( ExcBoundshe
String aTmpString;
SCTAB nScTabCount = rTabInfo.GetScTabCount();
@@ -1396,8 +1412,8 @@
for( ; nScTab < nScTabCount; ++nScTab )
{
---- sc/source/filter/excel/xelink.cxx.orig 2007-05-23 03:47:21.000000000 +0800
-+++ sc/source/filter/excel/xelink.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/filter/excel/xelink.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/filter/excel/xelink.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -1296,7 +1296,6 @@ XclExpSupbookBuffer::XclExpSupbookBuffer
{
XclExpTabInfo& rTabInfo = GetTabInfo();
@@ -1415,8 +1431,8 @@
mnOwnDocSB = Append( xSupbook );
for( sal_uInt16 nXclTab = 0; nXclTab < nXclCnt; ++nXclTab )
maSBIndexVec[ nXclTab ].Set( mnOwnDocSB, nXclTab );
---- sc/source/filter/excel/xlocx.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ sc/source/filter/excel/xlocx.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/filter/excel/xlocx.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/filter/excel/xlocx.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -88,7 +88,7 @@
#include <cppuhelper/bootstrap.hxx>
#endif
@@ -1437,8 +1453,8 @@
{
Reference<XComponentContext > xContext( ::cppu::defaultBootstrap_InitialComponentContext(), UNO_QUERY_THROW ); // Fatal error anyway
if ( SbxArray* pMethods = pModule->GetMethods() )
---- sc/source/filter/inc/excimp8.hxx.orig 2008-02-18 11:24:45.000000000 +0800
-+++ sc/source/filter/inc/excimp8.hxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/filter/inc/excimp8.hxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/filter/inc/excimp8.hxx 2008-03-17 14:13:39.000000000 +0800
@@ -69,6 +69,7 @@ class XclImpStream;
class ImportExcel8 : public ImportExcel
@@ -1447,8 +1463,8 @@
protected:
ExcScenarioList aScenList;
---- sc/source/ui/docshell/docsh.cxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/docshell/docsh.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/ui/docshell/docsh.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -207,11 +207,8 @@ const static rtl::OUString sUrlPart2 = r
rtl::OUString sCodeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook") );
if ( pShell )
@@ -1463,8 +1479,8 @@
}
return sCodeName;
}
---- sc/source/ui/view/tabview5.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ sc/source/ui/view/tabview5.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/view/tabview5.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/ui/view/tabview5.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -347,10 +347,10 @@ void ScTabView::TabChanged()
aViewData.GetDocument()->BroadcastUno( SfxSimpleHint( SC_HINT_TABLECHANGED ) );
ScExtDocOptions* pExtOptions = aViewData.GetDocument()->GetExtDocOptions();
@@ -1480,8 +1496,8 @@
static String sUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:Standard") );
static String sUrl2( RTL_CONSTASCII_USTRINGPARAM("?language=Basic&location=document") );
static String sSheetActivateScript( RTL_CONSTASCII_USTRINGPARAM("Worksheet_Activate") );
---- sc/source/filter/excel/excimp8.cxx.orig 2008-02-18 11:24:45.000000000 +0800
-+++ sc/source/filter/excel/excimp8.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/filter/excel/excimp8.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/filter/excel/excimp8.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -148,7 +148,7 @@ using namespace com::sun::star;
@@ -1509,8 +1525,8 @@
}
}
}
---- sc/source/ui/unoobj/viewuno.cxx.orig 2008-02-20 15:26:49.000000000 +0800
-+++ sc/source/ui/unoobj/viewuno.cxx 2008-02-20 15:28:24.000000000 +0800
+--- sc/source/ui/unoobj/viewuno.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/ui/unoobj/viewuno.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -1778,10 +1778,8 @@ void ScTabViewObj::SelectionChanged()
{
ScExtDocOptions* pExtOptions = pViewData->GetDocument()->GetExtDocOptions();
@@ -1523,8 +1539,8 @@
String sSheetSelectionScript( RTL_CONSTASCII_USTRINGPARAM("Worksheet_SelectionChange") );
String sWorkBookSheetSelectionScript( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetSelectionChange") );
---- sc/source/ui/vba/vbaworksheet.cxx.orig 2008-02-19 09:39:07.000000000 +0800
-+++ sc/source/ui/vba/vbaworksheet.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/vba/vbaworksheet.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/ui/vba/vbaworksheet.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -815,8 +815,10 @@ ScVbaWorksheet::getCodeName() throw (css
{
uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
@@ -1551,8 +1567,8 @@
}
else
throw uno::RuntimeException(::rtl::OUString(
---- sc/source/ui/vba/vbaworkbook.cxx.orig 2008-02-19 09:39:07.000000000 +0800
-+++ sc/source/ui/vba/vbaworkbook.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/vba/vbaworkbook.cxx.orig 2008-03-17 12:35:53.000000000 +0800
++++ sc/source/ui/vba/vbaworkbook.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -471,9 +471,10 @@ ScVbaWorkbook::getCodeName() throw (css:
#ifdef VBA_OOBUILD_HACK
uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
@@ -1579,8 +1595,8 @@
#else
void SAL_CALL
ScVbaWorkbook::setCodeName( const ::rtl::OUString& ) throw (css::uno::RuntimeException)
---- basic/source/runtime/runtime.cxx.orig 2008-02-18 11:24:52.000000000 +0800
-+++ basic/source/runtime/runtime.cxx 2008-02-20 10:42:01.000000000 +0800
+--- basic/source/runtime/runtime.cxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ basic/source/runtime/runtime.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -82,6 +82,17 @@ void StarBASIC::StaticEnableReschedule(
{
bStaticGlobalEnableReschedule = bReschedule;
@@ -1599,8 +1615,8 @@
struct SbiArgvStack { // Argv stack:
---- sc/source/ui/docshell/docfunc.cxx.orig 2008-02-18 11:24:53.000000000 +0800
-+++ sc/source/ui/docshell/docfunc.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/docshell/docfunc.cxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ sc/source/ui/docshell/docfunc.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -58,6 +58,12 @@
#include <svtools/PasswordHelper.hxx>
#endif
@@ -1770,8 +1786,8 @@
rDocShell.Broadcast( ScTablesHint( SC_TAB_DELETED, nTab ) );
if (bWasLinked)
---- basctl/source/basicide/basidesh.cxx.orig 2008-01-15 00:00:46.000000000 +0800
-+++ basctl/source/basicide/basidesh.cxx 2008-02-21 11:01:03.000000000 +0800
+--- basctl/source/basicide/basidesh.cxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ basctl/source/basicide/basidesh.cxx 2008-03-17 18:44:51.000000000 +0800
@@ -97,6 +97,8 @@
#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
@@ -1954,8 +1970,8 @@
void BasicIDEShell::CheckWindows()
{
---- sc/source/ui/view/viewfun2.cxx.orig 2008-02-18 11:24:45.000000000 +0800
-+++ sc/source/ui/view/viewfun2.cxx 2008-02-20 10:42:01.000000000 +0800
+--- sc/source/ui/view/viewfun2.cxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ sc/source/ui/view/viewfun2.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -62,6 +62,11 @@
#include <vcl/sound.hxx>
#include <vcl/waitobj.hxx>
@@ -2038,8 +2054,8 @@
SfxApplication* pSfxApp = SFX_APP(); // Navigator
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
---- basctl/source/inc/basidesh.hxx.orig 2007-10-09 23:25:06.000000000 +0800
-+++ basctl/source/inc/basidesh.hxx 2008-02-21 10:45:40.000000000 +0800
+--- basctl/source/inc/basidesh.hxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ basctl/source/inc/basidesh.hxx 2008-03-17 14:13:39.000000000 +0800
@@ -62,7 +62,8 @@
#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
@@ -2098,8 +2114,8 @@
// For Dialog Drag&Drop in Dialog Organizer
static void CopyDialogResources(
---- basctl/source/basicide/basides2.cxx.orig 2008-02-20 14:27:07.000000000 +0800
-+++ basctl/source/basicide/basides2.cxx 2008-02-20 14:27:14.000000000 +0800
+--- basctl/source/basicide/basides2.cxx.orig 2008-03-17 12:35:59.000000000 +0800
++++ basctl/source/basicide/basides2.cxx 2008-03-17 14:13:39.000000000 +0800
@@ -252,9 +252,12 @@ ModulWindow* BasicIDEShell::CreateBasWin
if ( bSuccess )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
