ooo-build r11792 - in trunk: . patches/src680
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11792 - in trunk: . patches/src680
- Date: Mon, 3 Mar 2008 22:29:45 +0000 (GMT)
Author: kyoshida
Date: Mon Mar 3 22:29:45 2008
New Revision: 11792
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11792&view=rev
Log:
2008-03-03 Kohei Yoshida <kyoshida novell com>
* patches/src680/sc-localized-arg-separator.diff: updated to support
matrix expression parsing.
Modified:
trunk/ChangeLog
trunk/patches/src680/sc-localized-arg-separator.diff
Modified: trunk/patches/src680/sc-localized-arg-separator.diff
==============================================================================
--- trunk/patches/src680/sc-localized-arg-separator.diff (original)
+++ trunk/patches/src680/sc-localized-arg-separator.diff Mon Mar 3 22:29:45 2008
@@ -1,7 +1,6 @@
-Only in sc: Debug
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/compiler.hxx sc/inc/compiler.hxx
---- sc.clean/inc/compiler.hxx 2008-02-05 11:16:54.000000000 -0500
-+++ sc/inc/compiler.hxx 2008-02-06 14:13:41.000000000 -0500
+--- sc.clean/inc/compiler.hxx 2008-03-03 11:24:43.000000000 -0500
++++ sc/inc/compiler.hxx 2008-03-03 16:16:53.000000000 -0500
@@ -236,26 +236,6 @@ typedef ::std::hash_map< String, String,
class SC_DLLPUBLIC ScCompiler
{
@@ -53,13 +52,31 @@
+
+ virtual const String& GetSymbol( const OpCodeMapPtr& rpMap, OpCode e ) const = 0;
+
-+ virtual OpCode GetOpCode( const OpCodeMapPtr& rpMap, const String& rName ) const = 0;
++ virtual OpCode GetOpCode( const OpCodeMapPtr& rpMap, const String& rName, bool bInArray ) const = 0;
+ };
+ friend struct Convention;
+
private:
static NonConstOpCodeMapPtr mxSymbolsODFF; // ODFF symbols
+@@ -415,7 +419,7 @@ private:
+ bool mbCloseBrackets; // whether to close open brackets automatically, default TRUE
+
+ BOOL GetToken();
+- BOOL NextNewToken(bool bAllowBooleans = false);
++ BOOL NextNewToken(bool bInArray = false);
+ OpCode NextToken();
+ void PutCode( ScTokenRef& );
+ void Factor();
+@@ -433,7 +437,7 @@ private:
+ void SetError(USHORT nError);
+ xub_StrLen NextSymbol();
+ BOOL IsValue( const String& );
+- BOOL IsOpCode( const String& );
++ BOOL IsOpCode( const String& rName, bool bInArray );
+ BOOL IsOpCode2( const String& );
+ BOOL IsString();
+ BOOL IsReference( const String& );
@@ -539,7 +543,8 @@ public:
const ScDocument* GetDoc() const { return pDoc; }
const ScAddress& GetPos() const { return aPos; }
@@ -71,8 +88,8 @@
ScToken* CreateStringFromToken( String& rFormula, ScToken* pToken,
BOOL bAllowArrAdvance = FALSE );
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/docoptio.hxx sc/inc/docoptio.hxx
---- sc.clean/inc/docoptio.hxx 2008-02-05 11:16:54.000000000 -0500
-+++ sc/inc/docoptio.hxx 2008-02-07 11:21:22.000000000 -0500
+--- sc.clean/inc/docoptio.hxx 2008-03-03 11:24:44.000000000 -0500
++++ sc/inc/docoptio.hxx 2008-03-03 11:33:34.000000000 -0500
@@ -69,6 +69,7 @@ class SC_DLLPUBLIC ScDocOptions
BOOL bDoAutoSpell; // Auto-Spelling
BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
@@ -116,8 +133,8 @@
}
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/global.hxx sc/inc/global.hxx
---- sc.clean/inc/global.hxx 2008-02-05 11:16:54.000000000 -0500
-+++ sc/inc/global.hxx 2008-02-06 19:27:01.000000000 -0500
+--- sc.clean/inc/global.hxx 2008-03-03 11:24:43.000000000 -0500
++++ sc/inc/global.hxx 2008-03-03 11:33:34.000000000 -0500
@@ -712,11 +712,11 @@ public:
void InitArgumentInfo() const;
@@ -174,10 +191,21 @@
};
//==================================================================
-Only in sc: sc.diff
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
+--- sc.clean/source/core/data/cell2.cxx 2008-03-03 11:24:50.000000000 -0500
++++ sc/source/core/data/cell2.cxx 2008-03-03 14:41:43.000000000 -0500
+@@ -36,7 +36,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sc.hxx"
+
+-
++#include <stdio.h>
+
+ // INCLUDE ---------------------------------------------------------------
+
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
---- sc.clean/source/core/data/documen3.cxx 2008-02-05 11:16:59.000000000 -0500
-+++ sc/source/core/data/documen3.cxx 2008-02-07 12:03:28.000000000 -0500
+--- sc.clean/source/core/data/documen3.cxx 2008-03-03 11:24:50.000000000 -0500
++++ sc/source/core/data/documen3.cxx 2008-03-03 11:33:34.000000000 -0500
@@ -1757,6 +1757,10 @@ void ScDocument::SetDocOptions( const Sc
pFormatter->ChangeNullDate( d,m,y );
pFormatter->ChangeStandardPrec( (USHORT)rOpt.GetStdPrecision() );
@@ -190,8 +218,8 @@
const ScViewOptions& ScDocument::GetViewOptions() const
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/global.cxx sc/source/core/data/global.cxx
---- sc.clean/source/core/data/global.cxx 2008-02-05 11:16:59.000000000 -0500
-+++ sc/source/core/data/global.cxx 2008-02-07 19:48:18.000000000 -0500
+--- sc.clean/source/core/data/global.cxx 2008-03-03 11:24:50.000000000 -0500
++++ sc/source/core/data/global.cxx 2008-03-03 12:29:18.000000000 -0500
@@ -1061,6 +1061,7 @@ const ScFuncDesc* ScFormulaUtil::GetDefa
BOOL ScFormulaUtil::GetNextFunc( const String& rFormula,
@@ -389,19 +417,20 @@
if( aParamList.Len() )
{
aSig.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "( " ));
-@@ -1763,8 +1780,10 @@ String ScFuncDesc::GetSignature() const
+@@ -1763,8 +1780,11 @@ String ScFuncDesc::GetSignature() const
//------------------------------------------------------------------------
-String ScFuncDesc::GetFormulaString( String** aArgArr ) const
+String ScFuncDesc::GetFormulaString( String** aArgArr, ScAddress::Convention eConv ) const
{
++ fprintf(stdout, "ScFuncDesc::GetFormulaString: --begin\n");fflush(stdout);
+ const String& sep = ScCompiler::GetStringFromOpCode(ocSep, false, eConv);
+
String aFormula;
if(pFuncName)
-@@ -1787,7 +1806,7 @@ String ScFuncDesc::GetFormulaString( Str
+@@ -1787,7 +1807,7 @@ String ScFuncDesc::GetFormulaString( Str
{
bLastArg = !( aArgArr[i+1]->Len() > 0 );
if ( !bLastArg )
@@ -410,9 +439,17 @@
}
}
}
+@@ -1795,6 +1815,7 @@ String ScFuncDesc::GetFormulaString( Str
+
+ aFormula += ')';
+ }
++ fprintf(stdout, "ScFuncDesc::GetFormulaString: --end\n");fflush(stdout);
+ return aFormula;
+ }
+
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
---- sc.clean/source/core/tool/compiler.cxx 2008-02-05 11:16:59.000000000 -0500
-+++ sc/source/core/tool/compiler.cxx 2008-02-07 19:49:34.000000000 -0500
+--- sc.clean/source/core/tool/compiler.cxx 2008-03-03 11:24:50.000000000 -0500
++++ sc/source/core/tool/compiler.cxx 2008-03-03 16:30:05.000000000 -0500
@@ -439,6 +439,7 @@ void ScCompiler::SetCompileEnglish( BOOL
if (!pCharClassEnglish)
InitCharClassEnglish();
@@ -440,7 +477,7 @@
+ return rpMap->getSymbol(e);
+ }
+
-+ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName ) const
++ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName, bool bInArray ) const
+ {
+ const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
+ ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
@@ -451,25 +488,72 @@
};
String Convention_A1::MakeColStr( SCCOL nCol )
-@@ -1232,6 +1247,8 @@ static const ScCompiler::Convention *pCo
+@@ -1232,6 +1247,10 @@ static const ScCompiler::Convention *pCo
struct ConventionXL
{
+ static const String maSep;
++ static const String maArrayRowSep;
++ static const String maArrayColSep;
+
static bool GetDocAndTab( const ScCompiler& rComp,
const SingleRefData& rRef,
String& rDocName,
-@@ -1316,6 +1333,8 @@ struct ConventionXL
+@@ -1314,8 +1333,53 @@ struct ConventionXL
+ rBuf.append( sal_Unicode( '!' ) );
+ }
}
++
++ static OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName, bool bInArray )
++ {
++ // TODO: switch to using a hash table for better string lookup performance.
++ if (bInArray)
++ {
++ if (rName.Equals(ConventionXL::maArrayRowSep))
++ {
++ fprintf(stdout, "ConventionXL_A1::GetOpCode: ocArrayRowSep\n");fflush(stdout);
++ return ocArrayRowSep;
++ }
++ else if (rName.Equals(ConventionXL::maArrayColSep))
++ {
++ fprintf(stdout, "ConventionXL_A1::GetOpCode: ocArrayColSep\n");fflush(stdout);
++ return ocArrayColSep;
++ }
++ }
++
++ if (rName.Equals(ConventionXL::maSep))
++ {
++ fprintf(stdout, "ConventionXL_A1::GetOpCode: ocSep\n");fflush(stdout);
++ return ocSep;
++ }
++
++ const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
++ ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
++ if (itr == pHashMap->end())
++ {
++ return ocNone;
++ }
++
++ switch (itr->second)
++ {
++ // opcode found, but the following opcodes must not be valid for XL_A1.
++ case ocSep:
++ case ocArrayColSep:
++ case ocArrayRowSep:
++ return ocNone;
++ }
++ return itr->second;
++ }
};
+const String ConventionXL::maSep = String::CreateFromAscii(",");
++const String ConventionXL::maArrayRowSep = String::CreateFromAscii(";");
++const String ConventionXL::maArrayColSep = String::CreateFromAscii(",");
+
struct ConventionXL_A1 : public Convention_A1, public ConventionXL
{
ConventionXL_A1() : Convention_A1( ScAddress::CONV_XL_A1 ) { }
-@@ -1389,6 +1408,36 @@ struct ConventionXL_A1 : public Conventi
+@@ -1389,6 +1453,25 @@ struct ConventionXL_A1 : public Conventi
MakeRowStr( rBuf, aRef.Ref2.nRow );
}
}
@@ -480,33 +564,22 @@
+ {
+ case ocSep:
+ return ConventionXL::maSep;
++ case ocArrayRowSep:
++ return ConventionXL::maArrayRowSep;
++ case ocArrayColSep:
++ return ConventionXL::maArrayColSep;
+ }
+ return rpMap->getSymbol(e);
+ }
+
-+ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName ) const
++ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName, bool bInArray ) const
+ {
-+ const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
-+ ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
-+ if (itr == pHashMap->end())
-+ {
-+ if (rName.Equals(ConventionXL::maSep))
-+ // TODO: Don't do this!
-+ return ocSep;
-+ return ocNone;
-+ }
-+
-+ switch (itr->second)
-+ {
-+ case ocSep:
-+ return ocNone;
-+ }
-+ return itr->second;
++ ConventionXL::GetOpCode(rpMap, rName, bInArray);
+ }
};
static const ConventionXL_A1 ConvXL_A1;
-@@ -1508,6 +1557,36 @@ struct ConventionXL_R1C1 : public ScComp
+@@ -1508,6 +1591,21 @@ struct ConventionXL_R1C1 : public ScComp
return pCharClass->parseAnyToken( rFormula,
nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
}
@@ -521,37 +594,25 @@
+ return rpMap->getSymbol(e);
+ }
+
-+ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName ) const
++ virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName, bool bInArray ) const
+ {
-+ const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
-+ ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
-+ if (itr == pHashMap->end())
-+ {
-+ if (rName.Equals(ConventionXL::maSep))
-+ // TODO: Don't do this!
-+ return ocSep;
-+ return ocNone;
-+ }
-+
-+ switch (itr->second)
-+ {
-+ case ocSep:
-+ return ocNone;
-+ }
-+ return itr->second;
++ return ConventionXL::GetOpCode(rpMap, rName, bInArray);
+ }
};
static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -1970,13 +2049,14 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1968,15 +2066,16 @@ xub_StrLen ScCompiler::NextSymbol()
+ // Convert symbol to token
+ //---------------------------------------------------------------------------
- BOOL ScCompiler::IsOpCode( const String& rName )
+-BOOL ScCompiler::IsOpCode( const String& rName )
++BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
{
- ScOpCodeHashMap::const_iterator iLook( mxSymbols->getHashMap()->find( rName));
- BOOL bFound = (iLook != mxSymbols->getHashMap()->end());
- if (bFound)
+ bool bFound = false;
-+ OpCode oc = pConv->GetOpCode(mxSymbols, rName);
++ OpCode oc = pConv->GetOpCode(mxSymbols, rName, bInArray);
+ if (oc != ocNone)
{
ScRawToken aToken;
@@ -562,7 +623,76 @@
}
else
{
-@@ -5001,9 +5081,17 @@ ScRangeData* ScCompiler::UpdateMoveTab(
+@@ -2776,8 +2875,9 @@ void ScCompiler::AutoCorrectParsedSymbol
+ }
+ }
+
+-BOOL ScCompiler::NextNewToken( bool bAllowBooleans )
++BOOL ScCompiler::NextNewToken( bool bInArray )
+ {
++ bool bAllowBooleans = bInArray;
+ xub_StrLen nSpaces = NextSymbol();
+
+ #if 0
+@@ -2836,7 +2936,7 @@ BOOL ScCompiler::NextNewToken( bool bAll
+ // IsReference().
+ // IsBoolean before isValue to catch inline bools without the kludge
+ // for inline arrays.
+- if ( !(bMayBeFuncName && IsOpCode( aUpper ))
++ if ( !(bMayBeFuncName && IsOpCode( aUpper, bInArray ))
+ && !IsReference( aOrg )
+ && !(bAllowBooleans && IsBoolean( aUpper ))
+ && !IsValue( aUpper )
+@@ -2872,6 +2972,8 @@ BOOL ScCompiler::NextNewToken( bool bAll
+ ScTokenArray* ScCompiler::CompileString( const String& rFormula,
+ ScAddress::Convention eConv )
+ {
++ fprintf(stdout, "ScCompiler::CompileString: formula = '%s'\n",
++ rtl::OUStringToOString(rFormula, RTL_TEXTENCODING_UTF8).getStr());fflush(stdout);
+ #if 0
+ fprintf( stderr, "CompileString '%s'\n",
+ rtl::OUStringToOString( rFormula, RTL_TEXTENCODING_UTF8 ).getStr() );
+@@ -2970,6 +3072,7 @@ ScTokenArray* ScCompiler::CompileString(
+ }
+ if( !pArr->Add( pRawToken->CreateToken() ) )
+ {
++ fprintf(stdout, "ScCompiler::CompileString: errCodeOverflow\n");fflush(stdout);
+ SetError(errCodeOverflow); break;
+ }
+ eLastOp = pRawToken->GetOpCode();
+@@ -2985,10 +3088,11 @@ ScTokenArray* ScCompiler::CompileString(
+ ScByteToken aToken( ocArrayClose );
+ if( !pArr->AddToken( aToken ) )
+ {
++ fprintf(stdout, "ScCompiler::CompileString: errCodeOverflow\n");fflush(stdout);
+ SetError(errCodeOverflow);
+ }
+ else if ( bAutoCorrect )
+- aCorrectedFormula += mxSymbols->getSymbol(ocArrayClose);
++ aCorrectedFormula += pConv->GetSymbol(mxSymbols, ocArrayClose);
+ }
+
+ ScByteToken aToken( ocClose );
+@@ -2996,15 +3100,17 @@ ScTokenArray* ScCompiler::CompileString(
+ {
+ if( !pArr->AddToken( aToken ) )
+ {
++ fprintf(stdout, "ScCompiler::CompileString: errCodeOverflow\n");fflush(stdout);
+ SetError(errCodeOverflow); break;
+ }
+ if ( bAutoCorrect )
+- aCorrectedFormula += mxSymbols->getSymbol(ocClose);
++ aCorrectedFormula += pConv->GetSymbol(mxSymbols, ocClose);
+ }
+ }
+ if ( nForced >= 2 )
+ pArr->SetRecalcModeForced();
+ // remember pArr, in case a subsequent CompileTokenArray() is executed.
++ fprintf(stdout, "ScCompiler::CompileString: --end\n");fflush(stdout);
+ return pArr = new ScTokenArray( aArr );
+ }
+
+@@ -5001,9 +5107,17 @@ ScRangeData* ScCompiler::UpdateMoveTab(
}
@@ -582,7 +712,7 @@
}
ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
-@@ -5046,7 +5134,7 @@ ScToken* ScCompiler::CreateStringFromTok
+@@ -5046,7 +5160,7 @@ ScToken* ScCompiler::CreateStringFromTok
else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
else if( (USHORT) eOp < mxSymbolsNative->getSymbolCount()) // Keyword:
@@ -591,9 +721,58 @@
else
{
DBG_ERROR("Unbekannter OpCode");
+@@ -5175,20 +5289,19 @@ void ScCompiler::CreateStringFromScMatri
+ SCSIZE nC, nMaxC, nR, nMaxR;
+
+ pMatrix->GetDimensions( nMaxC, nMaxR);
+-
+- rBuffer.append( mxSymbols->getSymbol(ocArrayOpen) );
++ rBuffer.append( pConv->GetSymbol(mxSymbols, ocArrayOpen) );
+ for( nR = 0 ; nR < nMaxR ; nR++)
+ {
+ if( nR > 0)
+ {
+- rBuffer.append( mxSymbols->getSymbol(ocArrayRowSep) );
++ rBuffer.append( pConv->GetSymbol(mxSymbols, ocArrayRowSep) );
+ }
+
+ for( nC = 0 ; nC < nMaxC ; nC++)
+ {
+ if( nC > 0)
+ {
+- rBuffer.append( mxSymbols->getSymbol(ocArrayColSep) );
++ rBuffer.append( pConv->GetSymbol(mxSymbols, ocArrayColSep) );
+ }
+
+ if( pMatrix->IsValue( nC, nR ) )
+@@ -5213,7 +5326,7 @@ void ScCompiler::CreateStringFromScMatri
+ AppendString( rBuffer, pMatrix->GetString( nC, nR ) );
+ }
+ }
+- rBuffer.append( mxSymbols->getSymbol(ocArrayClose) );
++ rBuffer.append( pConv->GetSymbol(mxSymbols, ocArrayClose) );
+ }
+
+ void ScCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
+@@ -5272,6 +5385,7 @@ void ScCompiler::CreateStringFromTokenAr
+
+ void ScCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
+ {
++ fprintf(stdout, "ScCompiler::CreateStringFromTokenArray: --begin\n");fflush(stdout);
+ rBuffer.setLength(0);
+ if( !pArr->GetLen() )
+ return;
+@@ -5284,6 +5398,7 @@ void ScCompiler::CreateStringFromTokenAr
+ ScToken* t = pArr->First();
+ while( t )
+ t = CreateStringFromToken( rBuffer, t, TRUE );
++ fprintf(stdout, "ScCompiler::CreateStringFromTokenArray: --end\n");fflush(stdout);
+ }
+
+ // Put quotes around string if non-alphanumeric characters are contained,
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
---- sc.clean/source/core/tool/docoptio.cxx 2008-02-05 11:16:59.000000000 -0500
-+++ sc/source/core/tool/docoptio.cxx 2008-02-07 19:51:19.000000000 -0500
+--- sc.clean/source/core/tool/docoptio.cxx 2008-03-03 11:24:50.000000000 -0500
++++ sc/source/core/tool/docoptio.cxx 2008-03-03 11:33:34.000000000 -0500
@@ -50,6 +50,7 @@
#include "scresid.hxx"
#include "sc.hrc"
@@ -665,21 +844,8 @@
}
}
aCalcItem.PutProperties(aNames, aValues);
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/filter/inc/fdumper.hxx sc/source/filter/inc/fdumper.hxx
---- sc.clean/source/filter/inc/fdumper.hxx 2008-02-05 11:16:59.000000000 -0500
-+++ sc/source/filter/inc/fdumper.hxx 2008-02-05 16:47:29.000000000 -0500
-@@ -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 -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx
---- sc.clean/source/ui/app/scmod.cxx 2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/app/scmod.cxx 2008-02-07 19:51:55.000000000 -0500
+--- sc.clean/source/ui/app/scmod.cxx 2008-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/app/scmod.cxx 2008-03-03 11:33:34.000000000 -0500
@@ -1253,6 +1253,7 @@ void ScModule::ModifyOptions( const SfxI
|| rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell()
|| rOldOpt.GetYear2000() != rNewOpt.GetYear2000()
@@ -689,8 +855,8 @@
pDoc->SetDocOptions( rNewOpt );
pDocSh->SetDocumentModified();
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/formdlg/formula.cxx sc/source/ui/formdlg/formula.cxx
---- sc.clean/source/ui/formdlg/formula.cxx 2008-02-05 11:16:58.000000000 -0500
-+++ sc/source/ui/formdlg/formula.cxx 2008-02-06 19:56:24.000000000 -0500
+--- sc.clean/source/ui/formdlg/formula.cxx 2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/formdlg/formula.cxx 2008-03-03 11:33:34.000000000 -0500
@@ -306,7 +306,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings*
xub_StrLen nFStart = 0;
@@ -889,8 +1055,8 @@
aFtHeadLine.SetText( *(pDesc->pFuncName) );
else
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
---- sc.clean/source/ui/inc/optdlg.hrc 2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/inc/optdlg.hrc 2008-02-07 10:36:44.000000000 -0500
+--- sc.clean/source/ui/inc/optdlg.hrc 2008-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/inc/optdlg.hrc 2008-03-03 11:33:34.000000000 -0500
@@ -78,6 +78,7 @@
#define BTN_MATCH 18
#define BTN_LOOKUP 19
@@ -900,8 +1066,8 @@
// TP_VIEW:
#define BTN_VSCROLL 1
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/tpcalc.hxx sc/source/ui/inc/tpcalc.hxx
---- sc.clean/source/ui/inc/tpcalc.hxx 2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/inc/tpcalc.hxx 2008-02-07 10:47:59.000000000 -0500
+--- sc.clean/source/ui/inc/tpcalc.hxx 2008-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/inc/tpcalc.hxx 2008-03-03 11:33:34.000000000 -0500
@@ -101,6 +101,7 @@ private:
CheckBox aBtnMatch;
CheckBox aBtnRegex;
@@ -911,8 +1077,8 @@
FixedText aFtPrec;
NumericField aEdPrec;
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/optdlg/tpcalc.cxx sc/source/ui/optdlg/tpcalc.cxx
---- sc.clean/source/ui/optdlg/tpcalc.cxx 2008-02-05 11:16:58.000000000 -0500
-+++ sc/source/ui/optdlg/tpcalc.cxx 2008-02-07 11:23:53.000000000 -0500
+--- sc.clean/source/ui/optdlg/tpcalc.cxx 2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/optdlg/tpcalc.cxx 2008-03-03 11:33:34.000000000 -0500
@@ -96,6 +96,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window
aBtnMatch ( this, ScResId( BTN_MATCH ) ),
aBtnRegex ( this, ScResId( BTN_REGEX ) ),
@@ -938,8 +1104,8 @@
if ( *pLocalOptions != *pOldOptions )
{
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
---- sc.clean/source/ui/src/optdlg.src 2008-02-05 11:16:55.000000000 -0500
-+++ sc/source/ui/src/optdlg.src 2008-02-07 19:55:18.000000000 -0500
+--- sc.clean/source/ui/src/optdlg.src 2008-03-03 11:24:45.000000000 -0500
++++ sc/source/ui/src/optdlg.src 2008-03-03 11:33:34.000000000 -0500
@@ -173,6 +173,13 @@ TabPage RID_SCPAGE_CALC
Size = MAP_APPFONT ( 239 , 10 ) ;
Text [ en-US ] = "~Automatically find column and row labels " ;
@@ -954,14 +1120,10 @@
};
/**************************************************************************/
-Index: registry/schema/org/openoffice/Office/Calc.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Calc.xcs,v
-retrieving revision 1.20
-diff -u -r1.20 Calc.xcs
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs 21 Nov 2007 19:06:51 -0000 1.20
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs 8 Feb 2008 08:06:23 -0000
-@@ -1134,6 +1200,15 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=officecfg.vpj officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+--- officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs 2008-03-03 11:28:58.000000000 -0500
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs 2008-03-03 11:33:35.000000000 -0500
+@@ -1134,6 +1134,15 @@
</info>
<value>true</value>
</prop>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
