ooo-build r12821 - in trunk: . patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Jun  6 01:18:07 2008
New Revision: 12821
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12821&view=rev

Log:
2008-06-05  Kohei Yoshida  <kyoshida novell com>

	* patches/test/calc-external-defined-names.diff: Today's progress.
	Nothing interesting; 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 01:18:07 2008
@@ -50,7 +50,7 @@
      // 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..c588bca 100644
+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,
@@ -71,8 +71,19 @@
  	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", 
++            rtl::OUStringToOString(aFilterName, RTL_TEXTENCODING_UTF8).getStr(),
++            rtl::OUStringToOString(aOptions, 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..78b6365 100644
+index 49cf4a7..4c975b2 100644
 --- sc/source/core/tool/compiler.cxx
 +++ sc/source/core/tool/compiler.cxx
 @@ -86,6 +86,8 @@
@@ -92,21 +103,27 @@
  #if 0
              fprintf( stderr, "Token '%s'\n",
                       rtl::OUStringToOString( aUpper, RTL_TEXTENCODING_UTF8 ).getStr() );
-@@ -2964,8 +2967,12 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
+@@ -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 )
-@@ -3000,6 +3007,8 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
+-              && !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 )
  {
@@ -115,7 +132,7 @@
  #if 0
      fprintf( stderr, "CompileString '%s'\n",
               rtl::OUStringToOString( rFormula, RTL_TEXTENCODING_UTF8 ).getStr() );
-@@ -3040,6 +3049,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula,
+@@ -3040,6 +3051,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula,
      eLastOp = ocOpen;
      while( NextNewToken( bInArray ) )
      {
@@ -123,7 +140,7 @@
          if( pRawToken->GetOpCode() == ocOpen )
              nBrackets++;
          else if( pRawToken->GetOpCode() == ocClose )
-@@ -5154,6 +5164,7 @@ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
+@@ -5154,6 +5166,7 @@ ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
  ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToken* pTokenP,
          BOOL bAllowArrAdvance )
  {
@@ -131,7 +148,7 @@
      BOOL bNext = TRUE;
      BOOL bSpaces = FALSE;
      ScToken* t = pTokenP;
-@@ -5202,6 +5213,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
+@@ -5202,6 +5215,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
              break;
          case svSingleRef:
          {
@@ -139,7 +156,7 @@
              SingleRefData& rRef = t->GetSingleRef();
              ComplRefData aRef;
              aRef.Ref1 = aRef.Ref2 = rRef;
-@@ -5269,6 +5281,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
+@@ -5269,6 +5283,7 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
          }
          case svExternal:
          {
@@ -147,7 +164,7 @@
              // mapped or translated name of AddIns
              String aAddIn( t->GetExternal() );
              bool bMapped = mxSymbols->isODF_11();   // ODF 1.1 directly uses programmatical name
-@@ -5300,6 +5313,8 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
+@@ -5300,6 +5315,8 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
      {
          if( bNext )
              t = pArr->Next();
@@ -451,3 +468,25 @@
                  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 );
+ }