ooo-build r12829 - in trunk: . patches/test
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12829 - in trunk: . patches/test
- Date: Fri, 6 Jun 2008 22:29:09 +0000 (UTC)
Author: kyoshida
Date: Fri Jun 6 22:29:09 2008
New Revision: 12829
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12829&view=rev
Log:
2008-06-06 Kohei Yoshida <kyoshida novell com>
* patches/test/calc-external-defined-names.diff: today's work. again,
no real code but just a bunch of printf statements.
Modified:
trunk/ChangeLog
trunk/patches/test/calc-external-defined-names.diff
Modified: trunk/patches/test/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/test/calc-external-defined-names.diff (original)
+++ trunk/patches/test/calc-external-defined-names.diff Fri Jun 6 22:29:09 2008
@@ -1,492 +1,195 @@
-diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index 72f8e7b..3b6d107 100644
---- sc/source/core/data/cell.cxx
-+++ sc/source/core/data/cell.cxx
-@@ -1710,6 +1710,8 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
- bChanged = TRUE;
- bIsValue = FALSE;
- aErgString = p->GetStringResult();
-+ fprintf(stdout, "ScFormulaCell::InterpretTail: here (%d) aErgString = '%s'\n", __LINE__,
-+ rtl::OUStringToOString(aErgString, RTL_TEXTENCODING_UTF8).getStr());
- }
- break;
- default:
-diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index 4acf571..2fa8737 100644
---- sc/source/core/data/cell2.cxx
-+++ sc/source/core/data/cell2.cxx
-@@ -36,7 +36,7 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
+diff --git sc/source/ui/docshell/arealink.cxx sc/source/ui/docshell/arealink.cxx
+index 3c25701..af15b50 100644
+--- sc/source/ui/docshell/arealink.cxx
++++ sc/source/ui/docshell/arealink.cxx
+@@ -69,6 +69,8 @@
+ #include "sc.hrc" //CHINA001
+ #include "scabstdlg.hxx" //CHINA001
--
+#include <stdio.h>
-
- // INCLUDE ---------------------------------------------------------------
-
-@@ -444,6 +444,8 @@ void ScFormulaCell::GetString( String& rString )
- rString = aErgString;
- else
- rString.Erase();
-+ fprintf(stdout, "ScFormulaCell::GetString: str = '%s'\n",
-+ rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr());
- }
-
- const ScMatrix* ScFormulaCell::GetMatrix()
-@@ -1432,6 +1434,7 @@ void ScFormulaCell::CompileDBFormula()
-
- void ScFormulaCell::CompileDBFormula( BOOL bCreateFormulaString )
- {
-+ fprintf(stdout, "ScFormulaCell::CompileDBFormula: --begin\n");
- // zwei Phasen, muessen (!) nacheinander aufgerufen werden:
- // 1. FormelString mit alten Namen erzeugen
- // 2. FormelString mit neuen Namen kompilieren
-@@ -1484,6 +1487,7 @@ void ScFormulaCell::CompileDBFormula( BOOL bCreateFormulaString )
-
- void ScFormulaCell::CompileNameFormula( BOOL bCreateFormulaString )
++
+ struct AreaLink_Impl
{
-+ fprintf(stdout, "ScFormulaCell::CompileNameFormula: --begin\n");
- // zwei Phasen, muessen (!) nacheinander aufgerufen werden:
- // 1. FormelString mit alten RangeNames erzeugen
- // 2. FormelString mit neuen RangeNames kompilieren
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index 39b95d0..5556627 100644
---- sc/source/core/data/documen3.cxx
-+++ sc/source/core/data/documen3.cxx
-@@ -427,6 +427,17 @@ BOOL ScDocument::HasLink( const String& rDoc,
- BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
- const String& aFileName, const String& aTabName )
+ ScDocShell* m_pDocSh;
+@@ -97,20 +99,35 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
+ bInCreate (FALSE),
+ bDoInsert (TRUE)
{
-+ fprintf(stdout, "ScDocument::LinkExternalTab: --begin\n");
-+
-+ fprintf(stdout, "ScDocument::LinkExternalTab: file name = '%s'\n",
-+ rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8).getStr());
++ fprintf(stdout, "ScAreaLink::ScAreaLink: --begin ctor\n");
+
-+ fprintf(stdout, "ScDocument::LinkExternalTab: tab name = '%s'\n",
-+ rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr());
+ DBG_ASSERT(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell");
+ pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
+ SetRefreshHandler( LINK( this, ScAreaLink, RefreshHdl ) );
+ SetRefreshControl( pImpl->m_pDocSh->GetDocument()->GetRefreshTimerControlAddress() );
+
-+ fprintf(stdout, "ScDocument::LinkExternalTab: doc tab = '%s'\n",
-+ rtl::OUStringToOString(aDocTab, RTL_TEXTENCODING_UTF8).getStr());
-+
- if ( IsClipboard() )
- {
- DBG_ERRORFILE( "LinkExternalTab in Clipboard" );
-@@ -460,6 +471,10 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
- ULONG nRefreshDelay = 0;
-
- BOOL bWasThere = HasLink( aFileName, aFilterName, aOptions );
-+ fprintf(stdout, "ScDocument::LinkExternalTab: filter name = '%s'; options = '%s'\n",
++ fprintf(stdout, "ScAreaLink::ScAreaLink: file name = '%s'; filter name = '%s'; options = '%s'; src area = '%s'\n",
++ rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8).getStr(),
+ rtl::OUStringToOString(aFilterName, RTL_TEXTENCODING_UTF8).getStr(),
-+ rtl::OUStringToOString(aOptions, RTL_TEXTENCODING_UTF8).getStr());
++ rtl::OUStringToOString(aOptions, RTL_TEXTENCODING_UTF8).getStr(),
++ rtl::OUStringToOString(aSourceArea, RTL_TEXTENCODING_UTF8).getStr());
+
- SetLink( rTab, SC_LINK_VALUE, aFileName, aFilterName, aOptions, aTabName, nRefreshDelay );
- if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen
- {
-diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index 49cf4a7..4c975b2 100644
---- sc/source/core/tool/compiler.cxx
-+++ sc/source/core/tool/compiler.cxx
-@@ -86,6 +86,8 @@
- #include "parclass.hxx"
- #include "autonamecache.hxx"
-
-+#include <stdio.h>
-+
- using namespace ::com::sun::star;
- using rtl::OUString;
-
-@@ -2954,6 +2956,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
-
- String aOrg( cSymbol ); // preserve file names in IsReference()
- String aUpper( ScGlobal::pCharClass->upper( aOrg ) );
-+ fprintf(stdout, "ScCompiler::NextNewToken: token = '%s'\n", rtl::OUStringToOString(aUpper, RTL_TEXTENCODING_UTF8).getStr());
- #if 0
- fprintf( stderr, "Token '%s'\n",
- rtl::OUStringToOString( aUpper, RTL_TEXTENCODING_UTF8 ).getStr() );
-@@ -2964,11 +2967,17 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
- // IsReference().
- // IsBoolean before isValue to catch inline bools without the kludge
- // for inline arrays.
-+
-+ bool bIsRef = IsReference(aOrg);
-+ fprintf(stdout, "ScCompiler::NextNewToken: is reference? (%s)\n", bIsRef?"yes":"no");
-+ bool bIsNamedRange = IsNamedRange(aUpper);
-+ fprintf(stdout, "ScCompiler::NextNewToken: is named range? (%s)\n", bIsNamedRange?"yes":"no");
-+
- if ( !(bMayBeFuncName && IsOpCode( aUpper, bInArray ))
-- && !IsReference( aOrg )
-+ && !bIsRef
- && !(bAllowBooleans && IsBoolean( aUpper ))
- && !IsValue( aUpper )
-- && !IsNamedRange( aUpper )
-+ && !bIsNamedRange
- && !IsDBRange( aUpper )
- && !IsColRowName( aUpper )
- && !(bMayBeFuncName && IsMacro( aUpper ))
-@@ -3000,6 +3009,8 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
- ScTokenArray* ScCompiler::CompileString( const String& rFormula,
- ScAddress::Convention eConv )
- {
-+ fprintf(stdout, "ScCompiler::CompileString: --begin (formula = '%s')\n",
-+ rtl::OUStringToOString(rFormula, RTL_TEXTENCODING_UTF8).getStr());
- #if 0
- fprintf( stderr, "CompileString '%s'\n",
- rtl::OUStringToOString( rFormula, RTL_TEXTENCODING_UTF8 ).getStr() );
-@@ -3040,6 +3051,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula,
- eLastOp = ocOpen;
- while( NextNewToken( bInArray ) )
- {
-+ fprintf(stdout, "ScCompiler::CompileString: opcode = %d\n", pRawToken->GetOpCode());
- if( pRawToken->GetOpCode() == ocOpen )
- nBrackets++;
- else if( pRawToken->GetOpCode() == ocClose )
-@@ -5154,6 +5166,7 @@ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
- ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToken* pTokenP,
- BOOL bAllowArrAdvance )
- {
-+ fprintf(stdout, "ScCompiler::CreateStringFromToken: --begin\n");
- BOOL bNext = TRUE;
- BOOL bSpaces = FALSE;
- ScToken* t = pTokenP;
-@@ -5202,6 +5215,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
- break;
- case svSingleRef:
- {
-+ fprintf(stdout, "ScCompiler::CreateStringFromToken: single ref\n");
- SingleRefData& rRef = t->GetSingleRef();
- ComplRefData aRef;
- aRef.Ref1 = aRef.Ref2 = rRef;
-@@ -5269,6 +5283,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
- }
- case svExternal:
- {
-+ fprintf(stdout, "ScCompiler::CreateStringFromToken: external\n");
- // mapped or translated name of AddIns
- String aAddIn( t->GetExternal() );
- bool bMapped = mxSymbols->isODF_11(); // ODF 1.1 directly uses programmatical name
-@@ -5300,6 +5315,8 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
- {
- if( bNext )
- t = pArr->Next();
-+ fprintf(stdout, "ScCompiler::CreateStringFromToken: --end (buf = '%s')\n",
-+ rtl::OUStringToOString(OUString(rBuffer.getStr()), RTL_TEXTENCODING_UTF8).getStr());
- return t;
- }
- return pTokenP;
-diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index 6b48e5c..92c73fa 100644
---- sc/source/core/tool/interpr4.cxx
-+++ sc/source/core/tool/interpr4.cxx
-@@ -3219,6 +3219,7 @@ void ScInterpreter::GlobalExit() // static
++ String aDestAreaStr;
++ aDestArea.Format(aDestAreaStr, SCR_ABS_3D, pImpl->m_pDocSh->GetDocument());
++ fprintf(stdout, "ScAreaLink::ScAreaLink: dest area = '%s'\n",
++ rtl::OUStringToOString(aDestAreaStr, RTL_TEXTENCODING_UTF8).getStr());
+ }
- StackVar ScInterpreter::Interpret()
+ __EXPORT ScAreaLink::~ScAreaLink()
{
-+ fprintf(stdout, "ScInterpreter::Interpret: --begins\n");
- short nRetTypeExpr = NUMBERFORMAT_UNDEFINED;
- ULONG nRetIndexExpr = 0;
- USHORT nErrorFunction = 0;
-@@ -3253,6 +3254,7 @@ StackVar ScInterpreter::Interpret()
- {
- OpCode eOp = pCur->GetOpCode();
- cPar = pCur->GetByte();
-+ fprintf(stdout, "ScInterpreter::Interpret: opcode = %d\n", eOp);
- if ( eOp == ocPush )
- {
- Push( (ScToken&) *pCur );
-@@ -3736,13 +3738,25 @@ StackVar ScInterpreter::Interpret()
- break;
- case svSingleRef :
- {
-+ fprintf(stdout, "ScInterpreter::Interpret: single ref\n");
- ScAddress aAdr;
- PopSingleRef( aAdr );
-+ {
-+ String aTmp, aTmpTabName;
-+ aAdr.Format(aTmp, SCA_ABS_3D, pDok);
-+ pDok->GetName(aAdr.Tab(), aTmpTabName);
-+ fprintf(stdout, "ScInterpreter::Interpret: tab %d is linked ? (%s)\n",
-+ aAdr.Tab(), pDok->IsLinked(aAdr.Tab())?"yes":"no");
-+ fprintf(stdout, "ScInterpreter::Interpret: cell address = '%s' tab = %d tab name = '%s'\n",
-+ rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr(), aAdr.Tab(),
-+ rtl::OUStringToOString(aTmpTabName, RTL_TEXTENCODING_UTF8).getStr());
-+ }
- if( !nGlobalError )
- {
- ScBaseCell* pCell = pDok->GetCell( aAdr );
- if( pCell && pCell->HasStringData() )
- {
-+ fprintf(stdout, "ScInterpreter::Interpret: has string data\n");
- GetCellString( aResult, pCell );
- nRetTypeExpr = NUMBERFORMAT_TEXT;
- nRetIndexExpr = 0;
-@@ -3870,6 +3884,8 @@ StackVar ScInterpreter::Interpret()
- while( maxsp-- )
- (*p++)->DecRef();
- nGlobalError = nGlobError;
-+
-+ fprintf(stdout, "ScInterpreter::Interpret: --end\n");
- return eResult;
++ fprintf(stdout, "ScAreaLink::~ScAreaLink: --begin dtor\n");
+ StopRefreshTimer();
+ delete pImpl;
}
-diff --git sc/source/core/tool/token.cxx sc/source/core/tool/token.cxx
-index 25be397..eabebd7 100644
---- sc/source/core/tool/token.cxx
-+++ sc/source/core/tool/token.cxx
-@@ -214,6 +214,7 @@ ComplRefData& ScRawToken::GetReference()
-
- void ScRawToken::SetExternal( const sal_Unicode* pStr )
+ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
{
-+ fprintf(stdout, "ScRawToken::SetExternal: --begin\n");
- eOp = ocExternal;
- eType = svExternal;
- xub_StrLen nLen = GetStrLen( pStr ) + 1;
-@@ -308,6 +309,7 @@ ScToken* ScRawToken::CreateToken() const
- return new ScJumpToken( eOp, (short*) nJump );
- //break;
- case svExternal :
-+ fprintf(stdout, "ScRawToken::CreateToken: external\n");
- return new ScExternalToken( eOp, sbyte.cByte, String( cStr+1 ) );
- //break;
- case svFAP :
-diff --git sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx
-index 88bfbab..98d07d9 100644
---- sc/source/filter/excel/excform.cxx
-+++ sc/source/filter/excel/excform.cxx
-@@ -63,6 +63,7 @@
- #include "xiname.hxx"
- #endif
-
-+#include <stdio.h>
++ fprintf(stdout, "ScAreaLink::Edit: --begni dtor\n");
+ // use own dialog instead of SvBaseLink::Edit...
+ // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
+ // ein Optionen-Dialog kommt...
+@@ -123,16 +140,21 @@ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
+ pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea, GetRefreshDelay() );
+ pImpl->m_pDialog = pDlg;
+ pDlg->StartExecuteModal( LINK( this, ScAreaLink, AreaEndEditHdl ) );
++ fprintf(stdout, "ScAreaLink::Edit: --end\n");
+ }
- const UINT16 ExcelToSc::nRowMask = 0x3FFF;
- const UINT16 ExcelToSc::nLastInd = 399;
-@@ -152,7 +153,12 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
- bConvert = TRUE;
-
- if( bConvert )
-+ {
-+ fprintf(stdout, "ImportExcel::Formula: converts\n");
- eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
-+ }
-+ else
-+ fprintf(stdout, "ImportExcel::Formula: don't convert\n");
-
- ScFormulaCell* pZelle = NULL;
-
-@@ -915,6 +921,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
- ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen,
- SCsTAB nTab, const FORMULA_TYPE eFT )
+ void __EXPORT ScAreaLink::DataChanged( const String&,
+ const ::com::sun::star::uno::Any& )
{
-+ fprintf(stdout, "ExcelToSc::Convert: --begin\n");
-+
- RootData& rR = GetOldRoot();
- BYTE nOp, nLen;
- sal_Size nIgnore;
-@@ -1334,6 +1342,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
- eRet = ConvOK;
-
- aIn.Seek( nEndPos );
-+ fprintf(stdout, "ExcelToSc::Convert: --end\n");
- return eRet;
++ fprintf(stdout, "ScAreaLink::DataChanged: --begin\n");
+ // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
+ // LinkManager zu setzen, ohne die Daten im Dokument zu aendern
+
+ if (bInCreate)
+- return;
++ {
++ fprintf(stdout, "ScAreaLink::DataChanged: --end (in create)\n");
++ return;
++ }
+
+ SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
+ if (pLinkManager!=NULL)
+@@ -159,10 +181,12 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
+
+ Refresh( aFile, aFilter, aArea, GetRefreshDelay() );
+ }
++ fprintf(stdout, "ScAreaLink::DataChanged: --end\n");
}
-diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
-index ab1c96c..6556fc2 100644
---- sc/source/filter/excel/excform8.cxx
-+++ sc/source/filter/excel/excform8.cxx
-@@ -57,6 +57,7 @@
- #include "xiname.hxx"
- #endif
-
-+#include <stdio.h>
-
- ExcelToSc8::ExcelToSc8( const XclImpRoot& rRoot ) :
- ExcelToSc( rRoot ),
-@@ -85,6 +86,7 @@ BOOL ExcelToSc8::Read3DTabReference( XclImpStream& rStrm, SCTAB& rFirstTab, SCTA
- // otherwise it will seek to the first byte past additional content after <nFormulaLen>
- ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
+ void __EXPORT ScAreaLink::Closed()
{
-+ fprintf(stdout, "ExcelToSc8::Convert: --begin (1)\n");
- BYTE nOp, nLen, nByte;
- UINT16 nUINT16;
- double fDouble;
-@@ -120,6 +122,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
- {
- aIn >> nOp;
++ fprintf(stdout, "ScAreaLink::Closed: --begin\n");
+ // Verknuepfung loeschen: Undo
-+ fprintf(stdout, "ExcelToSc8::Convert: op = 0x%2.2X\n", nOp);
- // #98524# always reset flags
- aSRD.InitFlags();
- aCRD.InitFlags();
-@@ -604,6 +607,9 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
- aIn >> nXtiIndex >> nNameIdx;
- aIn.Ignore( 2 );
+ ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
+@@ -177,6 +201,7 @@ void __EXPORT ScAreaLink::Closed()
+ }
-+ fprintf(stdout, "ExcelToSc8::Convert: name or external name (xti index = %d; name index = %d)\n",
-+ nXtiIndex, nNameIdx);
-+
- if( rLinkMan.IsSelfRef( nXtiIndex ) )
- {
- // internal defined name with explicit sheet, i.e.: =Sheet1!AnyName
-@@ -619,19 +625,33 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
- {
- case xlExtName:
- {
-+ fprintf(stdout, "ExcelToSc8::Convert: external name (%s)\n",
-+ rtl::OUStringToOString(pExtName->GetName(), RTL_TEXTENCODING_UTF8).getStr());
- aStack << aPool.Store( ocNoName, pExtName->GetName() );
-+ String aApplic, aTopic;
-+ if (rLinkMan.GetLinkData(aApplic, aTopic, nXtiIndex))
-+ {
-+ fprintf(stdout, "ExcelToSc8::Convert: app = '%s'; topic = '%s'\n",
-+ rtl::OUStringToOString(aApplic, RTL_TEXTENCODING_UTF8).getStr(),
-+ rtl::OUStringToOString(aTopic, RTL_TEXTENCODING_UTF8).getStr());
-+ }
-+ else
-+ fprintf(stdout, "ExcelToSc8::Convert: link data fetch failed.\n");
-+
- GetTracer().TraceFormulaExtName();
- }
- break;
-
- case xlExtAddIn:
- {
-+ fprintf(stdout, "ExcelToSc8::Convert: external addin\n");
- aStack << aPool.Store( ocExternal, pExtName->GetName() );
- }
- break;
-
- case xlExtDDE:
- {
-+ fprintf(stdout, "ExcelToSc8::Convert: external DDE\n");
- String aApplic, aTopic;
- if( rLinkMan.GetLinkData( aApplic, aTopic, nXtiIndex ) )
- {
-@@ -814,6 +834,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
- ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen,
- SCsTAB nTab, const FORMULA_TYPE eFT )
- {
-+ fprintf(stdout, "ExcelToSc8::Convert: --begin (2)\n");
- BYTE nOp, nLen;//, nByte;
- BOOL bError = FALSE;
- BOOL bArrayFormula = FALSE;
-@@ -841,6 +862,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
- {
- aIn >> nOp;
+ SvBaseLink::Closed();
++ fprintf(stdout, "ScAreaLink::Closed: --end\n");
+ }
-+ fprintf(stdout, "ExcelToSc8::Convert: op = %2.2X\n", nOp);
- // #98524# always reset flags
- aSRD.InitFlags();
- aCRD.InitFlags();
-@@ -1151,6 +1173,8 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
- eRet = ConvOK;
+ void ScAreaLink::SetDestArea(const ScRange& rNew)
+@@ -244,6 +269,7 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
+ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+ const String& rNewArea, ULONG nNewRefresh )
+ {
++ fprintf(stdout, "ScAreaLink::Refresh: --begin\n");
+ // Dokument laden - wie TabLink
+
+ if (!rNewFile.Len() || !rNewFilter.Len())
+@@ -270,6 +296,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+ if ( aOptions.Len() )
+ pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
+
++ fprintf(stdout, "ScAreaLink::Refresh: new url = '%s'\n", rtl::OUStringToOString(aNewUrl, RTL_TEXTENCODING_UTF8).getStr());
+ SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter);
+
+ ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
+@@ -278,6 +305,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+ pSrcShell->DoLoad(pMed);
+
+ ScDocument* pSrcDoc = pSrcShell->GetDocument();
++ fprintf(stdout, "ScAreaLink::Refresh: src document loaded.\n");
+
+ // Optionen koennten gesetzt worden sein
+ String aNewOpt = ScDocumentLoader::GetOptions(*pMed);
+@@ -292,6 +320,8 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+ else
+ aTempArea = rNewArea;
+
++ fprintf(stdout, "ScAreaLink::Refresh: tmp area = '%s'\n", rtl::OUStringToOString(aTempArea, RTL_TEXTENCODING_UTF8).getStr());
++
+ // find total size of source area
+ SCCOL nWidth = 0;
+ SCROW nHeight = 0;
+@@ -497,6 +527,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+ pDoc->BroadcastUno( aHint );
+ }
- aIn.Seek( nEndPos );
-+
-+ fprintf(stdout, "ExcelToSc8::Convert: --end\n");
- return eRet;
++ fprintf(stdout, "ScAreaLink::Refresh: --end (can do: %s)\n", bCanDo?"yes":"no");
+ return bCanDo;
}
-diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 6797bfd..67b6c65 100644
---- sc/source/filter/excel/read.cxx
-+++ sc/source/filter/excel/read.cxx
-@@ -795,6 +795,7 @@ FltError ImportExcel::Read( void )
-
- FltError ImportExcel8::Read( void )
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index f9aac10..7ff4463 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -3957,6 +3957,9 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
+ const ScRange& rDestRange, ULONG nRefresh,
+ BOOL bFitBlock, BOOL bApi )
{
-+ fprintf(stdout, "ImportExcel8::Read: --begin\n");
- #if EXC_INCL_DUMPER
- {
- Biff8RecDumper aDumper( GetRoot(), TRUE );
-diff --git sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
-index 00b76c7..44dfa23 100644
---- sc/source/filter/excel/xilink.cxx
-+++ sc/source/filter/excel/xilink.cxx
-@@ -63,6 +63,8 @@
- #include "xiname.hxx"
- #endif
-
-+#include <stdio.h>
++ fprintf(stdout, "ScDocFunc::InsertAreaLink: --begin (file = '%s')\n",
++ rtl::OUStringToOString(rFile, RTL_TEXTENCODING_UTF8).getStr());
+
- // ============================================================================
- // *** Helper classes ***
- // ============================================================================
-@@ -440,6 +442,9 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) :
- bool bSelf = false;
- XclImpUrlHelper::DecodeUrl( maXclUrl, bSelf, GetRoot(), aEncUrl );
+ //! auch fuer ScViewFunc::InsertAreaLink benutzen!
-+ fprintf(stdout, "XclImpSupbook::XclImpSupbook: decoded excel sURL = '%s'\n",
-+ rtl::OUStringToOString(maXclUrl, RTL_TEXTENCODING_UTF8).getStr());
-+
- if( nSBTabCnt )
- {
- meType = EXC_SBTYPE_EXTERN;
-diff --git sc/source/filter/inc/fdumper.hxx sc/source/filter/inc/fdumper.hxx
-index 3b8a379..b3c7101 100644
---- sc/source/filter/inc/fdumper.hxx
-+++ sc/source/filter/inc/fdumper.hxx
-@@ -36,7 +36,7 @@
- #ifndef SC_FDUMPER_HXX
- #define SC_FDUMPER_HXX
-
--#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0)
-+#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0) && 0
-
- #if SCF_INCL_DUMPER
-
-diff --git sc/source/ui/miscdlgs/linkarea.cxx sc/source/ui/miscdlgs/linkarea.cxx
-index 07e118a..bc1ae5a 100644
---- sc/source/ui/miscdlgs/linkarea.cxx
-+++ sc/source/ui/miscdlgs/linkarea.cxx
-@@ -38,7 +38,7 @@
+ ScDocument* pDoc = rDocShell.GetDocument();
+diff --git sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/lnkbase2.cxx
+index 9267906..bf53fac 100644
+--- sfx2/source/appl/lnkbase2.cxx
++++ sfx2/source/appl/lnkbase2.cxx
+@@ -57,6 +57,8 @@
- #undef SC_DLLIMPLEMENTATION
+ #include <svtools/svdde.hxx>
--
+#include <stdio.h>
++
+ using namespace ::com::sun::star::uno;
- //------------------------------------------------------------------
-
-@@ -84,6 +84,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) :
- pDocInserter( NULL )
+ namespace sfx2
+@@ -365,6 +367,7 @@ void SvBaseLink::SetUpdateMode( USHORT nMode )
+ BOOL SvBaseLink::Update()
{
-+ fprintf(stdout, "ScLinkedAreaDlg::ScLinkedAreaDlg: ctor --begin\n");
- FreeResource();
-
- aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL
-diff --git sc/source/ui/view/tabvwshb.cxx sc/source/ui/view/tabvwshb.cxx
-index c358c34..608c4cb 100644
---- sc/source/ui/view/tabvwshb.cxx
-+++ sc/source/ui/view/tabvwshb.cxx
-@@ -369,6 +369,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
-
- case SID_LINKS:
++ fprintf(stdout, "sfx2/SvBaseLink::Update: --begin\n");
+ if( OBJECT_CLIENT_SO & nObjType )
+ {
+ AddNextRef();
+@@ -388,13 +391,17 @@ BOOL SvBaseLink::Update()
+ if( OBJECT_CLIENT_DDE == nObjType &&
+ LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
+ xObj->RemoveAllDataAdvise( this );
++ fprintf(stdout, "sfx2/SvBaseLink::Update: --end (%d)\n", __LINE__);
+ return TRUE;
+ }
+ if( xObj.Is() )
{
-+ fprintf(stdout, "ScTabViewShell::ExecDrawIns: SID_LINKS\n");
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( pWin, pDoc->GetLinkManager() );
- if ( pDlg )
-diff --git svx/source/svxlink/linkmgr.cxx svx/source/svxlink/linkmgr.cxx
-index 66d77b5..384bad1 100644
---- svx/source/svxlink/linkmgr.cxx
-+++ svx/source/svxlink/linkmgr.cxx
-@@ -102,6 +102,8 @@
- #include <svx/dialogs.hrc>
- #include "unolingu.hxx"
-
-+#include <stdio.h>
-+
- class SvxInternalLink : public sfx2::SvLinkSource
- {
- public:
-@@ -147,6 +149,8 @@ BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
- if( pFilterNm )
- ( sCmd += ::sfx2::cTokenSeperator ) += *pFilterNm;
-
-+ fprintf(stdout, "SvxLinkManager::InsertFileLink: cmd = '%s'\n",
-+ rtl::OUStringToOString(sCmd, RTL_TEXTENCODING_UTF8).getStr());
- return SvLinkManager::InsertLink( &rLink, nFileType,
- sfx2::LINKUPDATE_ONCALL, &sCmd );
+ // sollten wir asynschron sein?
+ if( xObj->IsPending() )
++ {
++ fprintf(stdout, "sfx2/SvBaseLink::Update: --end (%d)\n", __LINE__);
+ return TRUE;
++ }
+
+ // dann brauchen wir das Object auch nicht mehr
+ AddNextRef();
+@@ -403,6 +410,7 @@ BOOL SvBaseLink::Update()
+ }
+ }
+ }
++ fprintf(stdout, "sfx2/SvBaseLink::Update: --end (%d)\n", __LINE__);
+ return FALSE;
}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
