ooo-build r11284 - trunk/patches/test/vba
- From: jiaojh svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11284 - trunk/patches/test/vba
- Date: Wed, 16 Jan 2008 14:59:01 +0000 (GMT)
Author: jiaojh
Date: Wed Jan 16 14:59:01 2008
New Revision: 11284
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11284&view=rev
Log:
update for Noel's comments.
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 Wed Jan 16 14:59:01 2008
@@ -213,7 +213,7 @@
// #117718# define map to hold types of module
//
--- svx/source/msfilter/svxmsbas.cxx.bak 2007-12-25 13:34:06.000000000 +0800
-+++ svx/source/msfilter/svxmsbas.cxx 2007-12-28 13:15:09.000000000 +0800
++++ svx/source/msfilter/svxmsbas.cxx 2008-01-11 12:30:54.000000000 +0800
@@ -88,6 +88,7 @@ using namespace com::sun::star::awt;
#include <com/sun/star/container/XNameContainer.hpp>
@@ -260,12 +260,11 @@
modeTypeComment = modeTypeComment + sClassOption;
}
-@@ -418,12 +419,37 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
+@@ -418,12 +419,36 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
aSource += rtl::OUString::createFromAscii("\nEnd Sub");
}
::rtl::OUString aModName( sModule );
- if ( aSource.getLength() )
-+ //if ( aSource.getLength() )
{
+ Reference< script::XObjectProvider > xVBAObjectProvider;
+ if( mType == ::com::sun::star::script::ModuleType_Document )
@@ -300,7 +299,7 @@
if( xLib->hasByName( aModName ) )
xLib->replaceByName( aModName, aSourceAny );
else
-@@ -433,6 +459,8 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
+@@ -433,6 +458,8 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
bRet = true;
}
}
@@ -657,7 +656,7 @@
..\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.bak 2007-12-25 13:34:06.000000000 +0800
-+++ basic/source/classes/sbxmod.cxx 2007-12-28 13:15:09.000000000 +0800
++++ basic/source/classes/sbxmod.cxx 2008-01-10 21:37:45.000000000 +0800
@@ -62,6 +62,8 @@
#include "sbunoobj.hxx"
#include <basic/hilight.hxx>
@@ -781,7 +780,7 @@
/////////////////////////////////////////////////////////////////////////
// Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
--- basic/source/classes/sb.cxx.bak 2007-12-25 13:34:06.000000000 +0800
-+++ basic/source/classes/sb.cxx 2007-12-28 13:15:09.000000000 +0800
++++ basic/source/classes/sb.cxx 2008-01-11 00:33:53.000000000 +0800
@@ -70,6 +70,7 @@
#include "disas.hxx"
#include "runtime.hxx"
@@ -867,7 +866,7 @@
else
{
--- basic/source/basmgr/basmgr.cxx.bak 2007-12-25 13:34:07.000000000 +0800
-+++ basic/source/basmgr/basmgr.cxx 2007-12-28 13:15:09.000000000 +0800
++++ basic/source/basmgr/basmgr.cxx 2008-01-10 19:51:43.000000000 +0800
@@ -102,6 +102,8 @@
#include <com/sun/star/script/XStarBasicDialogInfo.hpp>
#include <com/sun/star/script/XStarBasicLibraryInfo.hpp>
@@ -1064,7 +1063,7 @@
#include <com/sun/star/script/provider/XScript.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
--- sfx2/source/doc/docmacromode.cxx.bak 2007-12-25 14:10:42.000000000 +0800
-+++ sfx2/source/doc/docmacromode.cxx 2007-12-28 13:15:48.000000000 +0800
++++ sfx2/source/doc/docmacromode.cxx 2008-01-11 17:34:58.000000000 +0800
@@ -45,6 +45,7 @@
#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
#include <com/sun/star/task/InteractionClassification.hpp>
@@ -1094,46 +1093,51 @@
Sequence< ::rtl::OUString > aElements = xContainer->getElementNames();
if ( aElements.getLength() )
{
-@@ -451,6 +455,39 @@ namespace sfx2
+@@ -450,8 +454,43 @@ namespace sfx2
+ Any aAny = xContainer->getByName( aStdLibName );
aAny >>= xLib;
if ( xLib.is() )
- bHasMacroLib = xLib->hasElements();
-+ // VBA will introduce some empty Object Module
-+ // If all module only include
-+ // "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport"
-+ // it should be set bHasMacros as false
-+ Sequence< ::rtl::OUString > sNames = xLib->getElementNames();
-+ Reference < XNameContainer > xNameContainer( xContainer->getByName( aStdLibName ), UNO_QUERY_THROW );
-+ sal_Int32 nCount = sNames.getLength();
-+ sal_Bool bVbaOption = sal_True;
-+ ::rtl::OUString sName;
-+ Any aCode;
-+ ModuleInfo sModuleInfo;
-+ ::rtl::OUString sMod;
-+ ::rtl::OUString sVbaOptiona( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" )));
-+ ::rtl::OUString sVbaOptionb( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "\r\n" )));
-+ sVbaOptionb = sVbaOptiona + sVbaOptionb;
-+ for ( sal_Int32 nMod = 0; nMod < nCount; nMod++ )
+ {
-+ sName = sNames[nMod];
-+ if ( xNameContainer->hasByName( sName ) )
-+ aCode = xNameContainer->getByName( sName );
-+ if ( aCode >>= sModuleInfo )
-+ {
-+ sMod = sModuleInfo.ModuleSource;
-+ }
-+ else
+ bHasMacroLib = xLib->hasElements();
+- }
++ if( !bHasMacroLib )
++ return bHasMacroLib;
++ // VBA will introduce some empty Object Module
++ // If all module only include
++ // "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport"
++ // it should be set bHasMacros as false
++ Sequence< ::rtl::OUString > sNames = xLib->getElementNames();
++ Reference < XNameContainer > xNameContainer( xContainer->getByName( aStdLibName ), UNO_QUERY_THROW );
++ sal_Int32 nCount = sNames.getLength();
++ ::rtl::OUString sName;
++ Any aCode;
++ ModuleInfo sModuleInfo;
++ ::rtl::OUString sMod;
++ ::rtl::OUString sVbaOptiona( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" )));
++ ::rtl::OUString sVbaOptionb( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "\r\n" )));
++ sVbaOptionb = sVbaOptiona + sVbaOptionb;
++ for ( sal_Int32 nMod = 0; nMod < nCount; nMod++ )
+ {
-+ aCode >>= sMod;
++ sName = sNames[nMod];
++ if ( xNameContainer->hasByName( sName ) )
++ aCode = xNameContainer->getByName( sName );
++ if ( aCode >>= sModuleInfo )
++ {
++ sMod = sModuleInfo.ModuleSource;
++ if ( sMod.getLength() && !( sMod.equals( sVbaOptiona ) || sMod.equals( sVbaOptionb ) ) )
++ return bHasMacroLib;
++ }
++ else
++ {
++ return bHasMacroLib;
++ }
+ }
-+ if ( sMod.getLength() && !( sMod.equals( sVbaOptiona ) || sMod.equals( sVbaOptionb ) ) )
-+ bVbaOption = sal_False;
-+ }
-+ if ( bVbaOption )
+ bHasMacroLib = sal_False;
- }
++ }
++ }
}
}
+ }
--- basic/inc/basic/sbxobj.hxx.bak 2007-12-28 13:04:08.000000000 +0800
+++ basic/inc/basic/sbxobj.hxx 2007-12-28 13:15:09.000000000 +0800
@@ -80,7 +80,7 @@ public:
@@ -1205,7 +1209,7 @@
const String& GetPageStyle() const { return aPageStyle; }
--- sc/source/core/data/document.cxx.bak 2007-12-25 13:34:10.000000000 +0800
-+++ sc/source/core/data/document.cxx 2007-12-25 14:03:23.000000000 +0800
++++ sc/source/core/data/document.cxx 2008-01-11 12:35:35.000000000 +0800
@@ -107,6 +107,7 @@
#include "bcaslot.hxx"
#include "scextopt.hxx"
@@ -1255,78 +1259,69 @@
BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
BOOL bExternalDocument )
{
-@@ -302,10 +328,11 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
+@@ -300,12 +326,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
+ if (nPos == SC_TAB_APPEND || nPos == nTabCount)
+ {
pTab[nTabCount] = new ScTable(this, nTabCount, rName);
- // if we are mapping codenames then a new tab always has has
- // codename = sheetname
+- // if we are mapping codenames then a new tab always has has
+- // codename = sheetname
- if ( pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
-+ /*if ( pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
- {
- pExtOptions->SetCodeName( rName, nTabCount );
+- {
+- pExtOptions->SetCodeName( rName, nTabCount );
- }
-+ }*/
+ pTab[nTabCount]->SetCodeName( rName );
++nMaxTableNumber;
if ( bExternalDocument )
pTab[nTabCount]->SetVisible( FALSE );
-@@ -340,7 +367,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
+@@ -340,24 +361,10 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
for (i = nTabCount; i > nPos; i--)
{
pTab[i] = pTab[i - 1];
- if ( pTab[i] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
-+ /*if ( pTab[i] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
- {
- String sCodeName = pExtOptions->GetCodeName( i - 1 );
- if ( sCodeName.Len() )
-@@ -348,16 +375,17 @@ BOOL ScDocument::InsertTab( SCTAB nPos,
- OSL_TRACE("Associating codeName %s with tab %d", rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), i );
- pExtOptions->SetCodeName( sCodeName, i );
- }
+- {
+- String sCodeName = pExtOptions->GetCodeName( i - 1 );
+- if ( sCodeName.Len() )
+- {
+- OSL_TRACE("Associating codeName %s with tab %d", rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), i );
+- pExtOptions->SetCodeName( sCodeName, i );
+- }
- }
-+ }*/
- }
-
-- if ( pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
-+ /*if ( pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
- {
- OSL_TRACE("Inserting codeName %s with tab %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(),nPos );
- pExtOptions->SetCodeName( rName, nPos );
- }
-+ }*/
+-
+- if ( pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
+- {
+- OSL_TRACE("Inserting codeName %s with tab %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(),nPos );
+- pExtOptions->SetCodeName( rName, nPos );
+ }
pTab[nPos] = new ScTable(this, nPos, rName);
+ pTab[nPos]->SetCodeName( rName );
++nMaxTableNumber;
for (i = 0; i <= MAXTAB; i++)
-@@ -447,7 +475,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab,
+@@ -447,22 +454,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab,
delete pTab[nTab];
for (i=nTab + 1; i < nTabCount; i++)
{
- if ( pTab[i - 1 ] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
-+ /*if ( pTab[i - 1 ] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
- {
- String sCodeName = pExtOptions->GetCodeName( i );
- if ( sCodeName.Len() )
-@@ -455,15 +483,15 @@ BOOL ScDocument::DeleteTab( SCTAB nTab,
- OSL_TRACE("Associating codeName %s with tab %d", rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), i - 1 );
- pExtOptions->SetCodeName( sCodeName, i - 1 );
- }
+- {
+- String sCodeName = pExtOptions->GetCodeName( i );
+- if ( sCodeName.Len() )
+- {
+- OSL_TRACE("Associating codeName %s with tab %d", rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), i - 1 );
+- pExtOptions->SetCodeName( sCodeName, i - 1 );
+- }
- }
-+ }*/
pTab[i - 1] = pTab[i];
-
- }
-- if ( pTab[i - 1 ] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
-+ /*if ( pTab[i - 1 ] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
- {
- OSL_TRACE("Deleting codename %s as %d", rtl::OUStringToOString( pExtOptions->GetCodeName( nTabCount-1 ), RTL_TEXTENCODING_UTF8 ).getStr(), nTabCount - 1 ) ;
- pExtOptions->DeleteCodeName( nTabCount - 1 );
+-
- }
-+ }*/
+- if ( pTab[i - 1 ] && pExtOptions && ( pExtOptions->GetCodeNameCount() > 0 ) )
+- {
+- OSL_TRACE("Deleting codename %s as %d", rtl::OUStringToOString( pExtOptions->GetCodeName( nTabCount-1 ), RTL_TEXTENCODING_UTF8 ).getStr(), nTabCount - 1 ) ;
+- pExtOptions->DeleteCodeName( nTabCount - 1 );
+ }
pTab[nTabCount - 1] = NULL;
- --nMaxTableNumber;
--- sc/source/core/data/table1.cxx.bak 2007-12-25 13:34:10.000000000 +0800
+++ sc/source/core/data/table1.cxx 2007-12-25 14:03:23.000000000 +0800
@@ -129,6 +129,7 @@ extern BOOL bIsOlk, bOderSo;
@@ -1338,7 +1333,7 @@
bLayoutRTL( FALSE ),
bLoadingRTL( FALSE ),
--- sc/source/filter/excel/excdoc.cxx.bak 2007-12-25 13:34:11.000000000 +0800
-+++ sc/source/filter/excel/excdoc.cxx 2007-12-25 14:03:24.000000000 +0800
++++ sc/source/filter/excel/excdoc.cxx 2008-01-11 12:36:29.000000000 +0800
@@ -168,7 +168,7 @@ void ExcTable::FillAsHeader( ExcBoundshe
String aTmpString;
SCTAB nScTabCount = rTabInfo.GetScTabCount();
@@ -1348,17 +1343,16 @@
rR.pObjRecs = NULL; // per sheet
-@@ -182,7 +182,8 @@ void ExcTable::FillAsHeader( ExcBoundshe
+@@ -182,7 +182,7 @@ void ExcTable::FillAsHeader( ExcBoundshe
if( HasVbaStorage() )
{
Add( new XclObproj );
- const String& rCodeName = GetExtDocOptions().GetDocSettings().maGlobCodeName;
-+ //const String& rCodeName = GetExtDocOptions().GetDocSettings().maGlobCodeName;
+ const String rCodeName = GetDoc().GetCodeName();
if( rCodeName.Len() )
Add( new XclCodename( rCodeName ) );
}
-@@ -403,8 +404,12 @@ void ExcTable::FillAsTable( size_t nCode
+@@ -403,8 +403,12 @@ void ExcTable::FillAsTable( size_t nCode
Add( new XclExpCondFormatBuffer( GetRoot() ) );
if( HasVbaStorage() )
@@ -1373,7 +1367,7 @@
}
// list of HLINK records, generated by the cell table
-@@ -429,7 +434,7 @@ void ExcTable::FillAsEmptyTable( size_t
+@@ -429,7 +433,7 @@ void ExcTable::FillAsEmptyTable( size_t
{
InitializeTable( mnScTab );
@@ -1382,7 +1376,7 @@
{
if( GetBiff() <= EXC_BIFF5 )
{
-@@ -438,7 +443,9 @@ void ExcTable::FillAsEmptyTable( size_t
+@@ -438,7 +442,9 @@ void ExcTable::FillAsEmptyTable( size_t
else
{
Add( new ExcBof8 );
@@ -1393,7 +1387,7 @@
}
// sheet view settings: WINDOW2, SCL, PANE, SELECTION
aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );
-@@ -480,7 +487,7 @@ void ExcDocument::ReadDoc( void )
+@@ -480,7 +486,7 @@ void ExcDocument::ReadDoc( void )
aHeader.FillAsHeader( maBoundsheetList );
SCTAB nScTab = 0, nScTabCount = GetTabInfo().GetScTabCount();
@@ -1470,21 +1464,19 @@
return sCodeName;
}
--- sc/source/ui/view/tabview5.cxx.bak 2007-12-25 13:34:11.000000000 +0800
-+++ sc/source/ui/view/tabview5.cxx 2007-12-25 14:03:24.000000000 +0800
-@@ -347,10 +347,15 @@ void ScTabView::TabChanged()
++++ sc/source/ui/view/tabview5.cxx 2008-01-11 12:38:19.000000000 +0800
+@@ -347,10 +347,10 @@ void ScTabView::TabChanged()
aViewData.GetDocument()->BroadcastUno( SfxSimpleHint( SC_HINT_TABLECHANGED ) );
ScExtDocOptions* pExtOptions = aViewData.GetDocument()->GetExtDocOptions();
String sSheetModuleName;
- aViewData.GetDocument()->GetName( aViewData.GetTabNo(), sSheetModuleName);
+- // Use code name if that exists
+- if ( pExtOptions )
+- sSheetModuleName = pExtOptions->GetCodeName( aViewData. GetTabNo() );
+ aViewData.GetDocument()->GetCodeName( aViewData.GetTabNo(), sSheetModuleName);
+ if ( !sSheetModuleName.Len() > 0 )
+ aViewData.GetDocument()->GetName( aViewData.GetTabNo(), sSheetModuleName);
+
-+/*
- // Use code name if that exists
- if ( pExtOptions )
- sSheetModuleName = pExtOptions->GetCodeName( aViewData. GetTabNo() );
-+*/
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") );
@@ -1518,74 +1510,88 @@
}
}
--- sc/inc/scextopt.hxx.bak 2007-12-25 13:34:11.000000000 +0800
-+++ sc/inc/scextopt.hxx 2008-01-09 21:38:09.000000000 +0800
-@@ -57,7 +57,7 @@
++++ sc/inc/scextopt.hxx 2008-01-11 12:39:24.000000000 +0800
+@@ -57,7 +57,6 @@
struct ScExtDocSettings
{
ScRange maOleSize; /// Visible range if embedded.
- String maGlobCodeName; /// Global codename (VBA module name).
-+ //String maGlobCodeName; /// Global codename (VBA module name).
double mfTabBarWidth; /// Width of the tabbar, relative to frame window width (0.0 ... 1.0).
sal_uInt32 mnLinkCnt; /// Recursive counter for loading external documents.
SCTAB mnDisplTab; /// Index of displayed sheet.
-@@ -136,13 +136,13 @@ public:
+@@ -135,15 +134,6 @@ public:
+ /** Returns read/write access to the settings of a sheet, may create a new struct. */
ScExtTabSettings& GetOrCreateTabSettings( SCTAB nTab );
- /** Returns the number of sheet codenames. */
+- /** Returns the number of sheet codenames. */
- size_t GetCodeNameCount() const;
-+ //size_t GetCodeNameCount() const;
- /** Returns the specified codename (empty string = no codename). */
+- /** Returns the specified codename (empty string = no codename). */
- const String& GetCodeName( size_t nIdx ) const;
-+ //const String& GetCodeName( size_t nIdx ) const;
- /** Appends a codename for a sheet. */
+- /** Appends a codename for a sheet. */
- void AppendCodeName( const String& rCodeName );
- void SetCodeName( const String& rCodeName, size_t nIdx );
- void DeleteCodeName( size_t nIdx );
-+ //void AppendCodeName( const String& rCodeName );
-+ //void SetCodeName( const String& rCodeName, size_t nIdx );
-+ //void DeleteCodeName( size_t nIdx );
-
+-
private:
::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
+ };
--- sc/source/ui/view/scextopt.cxx.bak 2007-12-25 13:34:11.000000000 +0800
-+++ sc/source/ui/view/scextopt.cxx 2008-01-09 21:38:06.000000000 +0800
-@@ -140,7 +140,7 @@ void ScExtTabSettingsCont::CopyFromMap(
++++ sc/source/ui/view/scextopt.cxx 2008-01-11 12:40:34.000000000 +0800
+@@ -140,15 +140,12 @@ void ScExtTabSettingsCont::CopyFromMap(
// ============================================================================
-typedef ::std::map< size_t, String > TabCodeNameMap;
-+//typedef ::std::map< size_t, String > TabCodeNameMap;
/** Implementation struct for ScExtDocOptions containing all members. */
struct ScExtDocOptionsImpl
{
-@@ -148,7 +148,7 @@ struct ScExtDocOptionsImpl
+
ScExtDocSettings maDocSett; /// Global document settings.
ScExtTabSettingsCont maTabSett; /// Settings for all sheets.
- // StringVec maCodeNames; /// Codenames for all sheets (VBA module names).
+-// StringVec maCodeNames; /// Codenames for all sheets (VBA module names).
- TabCodeNameMap maCodeNames; /// Codenames for all sheets (VBA module names).
-+// TabCodeNameMap maCodeNames; /// Codenames for all sheets (VBA module names).
bool mbChanged; /// Use only if something has been changed.
-@@ -211,7 +211,7 @@ ScExtTabSettings& ScExtDocOptions::GetOr
+@@ -211,36 +208,5 @@ ScExtTabSettings& ScExtDocOptions::GetOr
{
return mxImpl->maTabSett.GetOrCreateTabSettings( nTab );
}
-
-+/*
- size_t ScExtDocOptions::GetCodeNameCount() const
- {
- return mxImpl->maCodeNames.size();
-@@ -241,6 +241,6 @@ void ScExtDocOptions::DeleteCodeName( si
- TabCodeNameMap::iterator it = mxImpl->maCodeNames.find( nIdx );
- if ( it != mxImpl->maCodeNames.end() )
- mxImpl->maCodeNames.erase( it );
+-size_t ScExtDocOptions::GetCodeNameCount() const
+-{
+- return mxImpl->maCodeNames.size();
+-}
+-
+-const String& ScExtDocOptions::GetCodeName( size_t nIdx ) const
+-{
+- DBG_ASSERT( nIdx < GetCodeNameCount(), "ScExtDocOptions::GetCodeName - invalid index" );
+- return (nIdx < GetCodeNameCount()) ? mxImpl->maCodeNames[ nIdx ] : EMPTY_STRING;
+-}
+-
+-void ScExtDocOptions::AppendCodeName( const String& rCodeName )
+-{
+- mxImpl->maCodeNames[ mxImpl->maCodeNames.size() ] = rCodeName;
+-}
+-
+-
+-void ScExtDocOptions::SetCodeName( const String& rCodeName, size_t nIdx )
+-{
+- // No holes allowed
+- DBG_ASSERT( nIdx <= GetCodeNameCount(), "ScExtDocOptions::GetCodeName - invalid index" );
+- mxImpl->maCodeNames[ nIdx ] = rCodeName;
+-}
+-
+-void ScExtDocOptions::DeleteCodeName( size_t nIdx )
+-{
+- TabCodeNameMap::iterator it = mxImpl->maCodeNames.find( nIdx );
+- if ( it != mxImpl->maCodeNames.end() )
+- mxImpl->maCodeNames.erase( it );
-}
-+}*/
// ============================================================================
--- basic/source/runtime/runtime.cxx.bak 2007-12-25 13:34:14.000000000 +0800
-+++ basic/source/runtime/runtime.cxx 2007-12-25 14:03:24.000000000 +0800
++++ basic/source/runtime/runtime.cxx 2008-01-11 14:28:41.000000000 +0800
@@ -82,6 +82,17 @@ void StarBASIC::StaticEnableReschedule(
{
bStaticGlobalEnableReschedule = bReschedule;
@@ -1605,7 +1611,7 @@
struct SbiArgvStack { // Argv stack:
--- sc/source/ui/docshell/docfunc.cxx.bak 2007-12-25 13:34:14.000000000 +0800
-+++ sc/source/ui/docshell/docfunc.cxx 2007-12-25 14:03:24.000000000 +0800
++++ sc/source/ui/docshell/docfunc.cxx 2008-01-11 12:41:08.000000000 +0800
@@ -58,6 +58,12 @@
#include <svtools/PasswordHelper.hxx>
#endif
@@ -1627,11 +1633,10 @@
// STATIC DATA -----------------------------------------------------------
//========================================================================
-@@ -2022,6 +2029,87 @@ BOOL ScDocFunc::MoveBlock( const ScRange
+@@ -2022,6 +2029,86 @@ BOOL ScDocFunc::MoveBlock( const ScRange
}
//------------------------------------------------------------------------
-+//enum ModuleType { Unknown = 0, Normal, Class, Form, Document };
+script::ModuleInfo lcl_InitModuleInfo( ScDocShell& rDocSh, String& sModule )
+{
+ ::rtl::OUString aModName( sModule );
@@ -1715,7 +1720,7 @@
BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi )
{
-@@ -2031,8 +2119,12 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
+@@ -2031,8 +2118,12 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
ScDocShellModificator aModificator( rDocShell );
ScDocument* pDoc = rDocShell.GetDocument();
@@ -1728,7 +1733,7 @@
if (bRecord)
pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
-@@ -2047,6 +2139,11 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
+@@ -2047,6 +2138,11 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab,
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoInsertTab( &rDocShell, nTab, bAppend, rName));
// Views updaten:
@@ -1740,7 +1745,7 @@
rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) );
rDocShell.PostPaintExtras();
-@@ -2068,8 +2165,12 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
+@@ -2068,8 +2164,12 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
BOOL bSuccess = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
@@ -1753,7 +1758,7 @@
BOOL bWasLinked = pDoc->IsLinked(nTab);
ScDocument* pUndoDoc = NULL;
ScRefUndoData* pUndoData = NULL;
-@@ -2110,6 +2211,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
+@@ -2110,6 +2210,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
pUndoData = new ScRefUndoData( pDoc );
}
@@ -1762,7 +1767,7 @@
if (pDoc->DeleteTab( nTab, pUndoDoc ))
{
if (bRecord)
-@@ -2120,6 +2223,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
+@@ -2120,6 +2222,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab,
new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData ));
}
// Views updaten:
@@ -1777,7 +1782,7 @@
if (bWasLinked)
--- basctl/source/basicide/basidesh.cxx.bak 2007-12-25 13:34:14.000000000 +0800
-+++ basctl/source/basicide/basidesh.cxx 2008-01-10 17:51:27.000000000 +0800
++++ basctl/source/basicide/basidesh.cxx 2008-01-14 23:12:18.000000000 +0800
@@ -97,6 +97,8 @@
#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
@@ -2067,7 +2072,7 @@
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
--- basctl/source/inc/basidesh.hxx.bak 2007-12-25 13:34:14.000000000 +0800
-+++ basctl/source/inc/basidesh.hxx 2008-01-10 17:49:27.000000000 +0800
++++ basctl/source/inc/basidesh.hxx 2008-01-14 23:12:23.000000000 +0800
@@ -62,8 +62,10 @@
#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
