[Libreoffice-commits] .: sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Nov 8 07:52:11 PST 2010
sc/inc/document.hxx | 8 --
sc/inc/global.hxx | 6 -
sc/source/core/data/cell2.cxx | 5 -
sc/source/core/data/docpool.cxx | 28 --------
sc/source/core/data/documen2.cxx | 5 -
sc/source/core/tool/chartpos.cxx | 1
sc/source/core/tool/interpr3.cxx | 115 +++++------------------------------
sc/source/core/tool/interpr4.cxx | 23 -------
sc/source/filter/excel/xeescher.cxx | 11 ---
sc/source/filter/excel/xltoolbar.cxx | 15 ----
10 files changed, 20 insertions(+), 197 deletions(-)
New commits:
commit d3539584ac812792ddd1318278aa1b3bbbd49909
Author: Ricardo Moreno <parcero.cubano at gmail.com>
Date: Mon Nov 8 10:51:25 2010 -0500
Removed commented-out code.
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ed12028..d760afe 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -176,14 +176,6 @@ namespace com { namespace sun { namespace star {
} } }
#include <svl/zforlist.hxx>
-/*
-#ifdef _ZFORLIST_DECLARE_TABLE
-class SvNumberFormatterIndexTable;
-#else
-class Table;
-typedef Table SvNumberFormatterIndexTable;
-#endif
-*/
#define SC_DOC_NEW 0xFFFF
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a1fc0fa..839c0c6 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -551,9 +551,6 @@ class ScGlobal
static ImageList* pOutlineBitmaps;
static ImageList* pOutlineBitmapsHC;
-// static Bitmap* pAnchorBitmap;
-// static Bitmap* pGrayAnchorBitmap;
-
static ScFunctionList* pStarCalcFunctionList;
static ScFunctionMgr* pStarCalcFunctionMgr;
@@ -640,9 +637,6 @@ public:
@param bHC false = standard symbols; true = high contrast symbols. */
static ImageList* GetOutlineSymbols( bool bHC );
-// static const Bitmap& GetAnchorBitmap();
-// static const Bitmap& GetGrayAnchorBitmap();
-
static bool HasStarCalcFunctionList();
static ScFunctionList* GetStarCalcFunctionList();
static ScFunctionMgr* GetStarCalcFunctionMgr();
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 7471fdb..a83a63f 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -553,7 +553,6 @@ BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
case MM_FORMULA :
rPos = aPos;
return TRUE;
-// break;
case MM_REFERENCE :
{
pCode->Reset();
@@ -863,7 +862,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nCol > MAXCOL )
nCol = MAXCOL;
aPos.SetCol( nCol );
-// bPosChanged = TRUE;
}
}
if ( nDy && nCol >= nCol1 && nCol <= nCol2 &&
@@ -877,7 +875,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nRow > MAXROW )
nRow = MAXROW;
aPos.SetRow( nRow );
-// bPosChanged = TRUE;
}
}
if ( nDz && nCol >= nCol1 && nCol <= nCol2 &&
@@ -892,14 +889,12 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nTab > nMaxTab )
nTab = nMaxTab;
aPos.SetTab( nTab );
-// bPosChanged = TRUE;
}
}
}
else if ( r.In( aPos ) )
{
aOldPos.Set( nCol - nDx, nRow - nDy, nTab - nDz );
-// bPosChanged = TRUE;
}
BOOL bHasRefs = FALSE;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index a514be0..85c7193 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
#include "scitems.hxx"
#include <tools/shl.hxx>
#include <vcl/outdev.hxx>
@@ -77,7 +75,6 @@
#include "globstr.hrc"
#include "sc.hrc" // Slot-IDs
-
#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39)
#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20)
@@ -340,7 +337,6 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE );
ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE );
ppPoolDefaults[ ATTR_PAGE_SCALETO - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 );
-// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 );
SetDefaults( ppPoolDefaults );
@@ -1024,24 +1020,6 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
}
break;
-/*
- case ATTR_PAGE_HEADERLEFT:
- rText = "SID_SCATTR_PAGE_HEADERLEFT";
- break;
-
- case ATTR_PAGE_FOOTERLEFT:
- rText = "SID_SCATTR_PAGE_FOOTERLEFT";
- break;
-
- case ATTR_PAGE_HEADERRIGHT:
- rText = "SID_SCATTR_PAGE_HEADERRIGHT";
- break;
-
- case ATTR_PAGE_FOOTERRIGHT:
- rText = "SID_SCATTR_PAGE_FOOTERRIGHT";
- break;
-*/
-
default:
if ( !pIntl )
pIntl = ScGlobal::GetScIntlWrapper();
@@ -1062,8 +1040,4 @@ SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const
return SFX_MAPUNIT_100TH_MM;
}
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7438362..f1c91d3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -883,10 +883,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor());
SCsTAB nDz;
-/* if (nNewPos < nOldPos)
- nDz = ((short)nNewPos) - (short)nOldPos + 1;
- else
-*/ nDz = ((short)nNewPos) - (short)nOldPos;
+ nDz = ((short)nNewPos) - (short)nOldPos;
pTab[nNewPos]->UpdateReference(URM_COPY, 0, 0, nNewPos , MAXCOL, MAXROW,
nNewPos, 0, 0, nDz, NULL);
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index bdf2e19..a7414c5 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -125,7 +125,6 @@ void ScChartPositioner::GlueState()
}
return;
}
-// ULONG nOldPos = aRangeListRef->GetCurPos();
pR = aRangeListRef->First();
nStartCol = pR->aStart.Col();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 08f0481..5cb5feb 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -489,25 +489,11 @@ double ScInterpreter::BinomKoeff(double n, double k)
k--;
n--;
}
-/*
- double f1 = n; // Zaehler
- double f2 = k; // Nenner
- n--;
- k--;
- while (k > 0.0)
- {
- f2 *= k;
- f1 *= n;
- k--;
- n--;
- }
- nVal = f1 / f2;
-*/
+
}
return nVal;
}
-
// The algorithm is based on lanczos13m53 in lanczos.hpp
// in math library from http://www.boost.org
/** you must ensure fZ>0
@@ -651,7 +637,6 @@ double ScInterpreter::GetGamma(double fZ)
return exp( fLogPi - fLogDivisor) * ((::rtl::math::sin( F_PI*fZ) < 0.0) ? -1.0 : 1.0);
}
-
/** You must ensure fZ>0 */
double ScInterpreter::GetLogGamma(double fZ)
{
@@ -672,48 +657,12 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2)
double alpha = fF2/2.0;
double beta = fF1/2.0;
return (GetBetaDist(arg, alpha, beta));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- return (0.5-gauss(Z));
-*/
}
double ScInterpreter::GetTDist(double T, double fDF)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetTDist" );
return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5);
-/*
- USHORT DF = (USHORT) fDF;
- double A = T / sqrt(DF);
- double B = 1.0 + A*A;
- double R;
- if (DF == 1)
- R = 0.5 + atan(A)/F_PI;
- else if (DF % 2 == 0)
- {
- double S0 = A/(2.0 * sqrt(B));
- double C0 = S0;
- for (USHORT i = 2; i <= DF-2; i+=2)
- {
- C0 *= (1.0 - 1.0/(double)i)/B;
- S0 += C0;
- }
- R = 0.5 + S0;
- }
- else
- {
- double S1 = A / (B * F_PI);
- double C1 = S1;
- for (USHORT i = 3; i <= DF-2; i+=2)
- {
- C1 *= (1.0 - 1.0/(double)i)/B;
- S1 += C1;
- }
- R = 0.5 + atan(A)/F_PI + S1;
- }
- return 1.0 - R;
-*/
}
// for LEGACY.CHIDIST, returns right tail, fDF=degrees of freedom
@@ -755,7 +704,7 @@ double ScInterpreter::GetChiSqDistPDF(double fX, double fDF)
else // fDF is small in most cases, we can iterate
{
if (fmod(fDF,2.0)<0.5)
- {
+ {
// even
fValue = 0.5;
fCount = 2.0;
@@ -821,7 +770,6 @@ void ScInterpreter::ScGamma()
}
}
-
void ScInterpreter::ScLogGamma()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogGamma" );
@@ -863,7 +811,7 @@ double ScInterpreter::GetBeta(double fAlpha, double fBeta)
fResult *= fLanczos;
return fResult;
}
-
+
// Same as GetBeta but with logarithm
double ScInterpreter::GetLogBeta(double fAlpha, double fBeta)
{
@@ -939,7 +887,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB)
if (fB < 1.0 && fX == 1.0)
{
SetError(errIllegalArgument);
- return HUGE_VAL;
+ return HUGE_VAL;
}
else
return 0.0;
@@ -963,7 +911,6 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB)
return exp((fA-1.0)*fLogX + (fB-1.0)* fLogY - fLogBeta);
}
-
/*
x^a * (1-x)^b
I_x(a,b) = ---------------- * result of ContFrac
@@ -1125,7 +1072,7 @@ double ScInterpreter::GetBetaDist(double fXin, double fAlpha, double fBeta)
return;
}
}
-
+
void ScInterpreter::ScPhi()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPhi" );
@@ -1345,7 +1292,7 @@ void ScInterpreter::ScB()
}
}
else
- {
+ {
if ( bIsValidX ) // not(0<p<1)
{
if ( p == 0.0 )
@@ -1353,7 +1300,7 @@ void ScInterpreter::ScB()
else if ( p == 1.0 )
PushDouble( (xe == n) ? 1.0 : 0.0 );
else
- PushIllegalArgument();
+ PushIllegalArgument();
}
else
PushIllegalArgument();
@@ -1536,7 +1483,7 @@ void ScInterpreter::ScLogNormDist() //expanded, see #i100119#
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" );
BYTE nParamCount = GetByte();
- if ( !MustHaveParamCount( nParamCount, 1, 4))
+ if ( !MustHaveParamCount( nParamCount, 1, 4))
return;
bool bCumulative = nParamCount == 4 ? GetBool() : true; // cumulative
double sigma = nParamCount >= 3 ? GetDouble() : 1.0; // standard deviation
@@ -2250,7 +2197,6 @@ public:
double GetValue( double x ) const { return fp - rInt.GetChiSqDistCDF(x, fDF); }
};
-
void ScInterpreter::ScChiSqInv()
{
if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -2271,7 +2217,6 @@ void ScInterpreter::ScChiSqInv()
PushDouble(fVal);
}
-
void ScInterpreter::ScConfidence()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScConfidence" );
@@ -2629,11 +2574,6 @@ void ScInterpreter::ScFTest()
fF2 = fCount1-1.0;
}
PushDouble(2.0*GetFDist(fF, fF1, fF2));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- PushDouble(1.0-2.0*gauss(Z));
-*/
}
void ScInterpreter::ScChiTest()
@@ -2688,25 +2628,6 @@ void ScInterpreter::ScChiTest()
else
fDF = (double)(nC1-1)*(double)(nR1-1);
PushDouble(GetChiDist(fChi, fDF));
-/*
- double fX, fS, fT, fG;
- fX = 1.0;
- for (double fi = fDF; fi >= 2.0; fi -= 2.0)
- fX *= fChi/fi;
- fX *= exp(-fChi/2.0);
- if (fmod(fDF, 2.0) != 0.0)
- fX *= sqrt(2.0*fChi/F_PI);
- fS = 1.0;
- fT = 1.0;
- fG = fDF;
- while (fT >= 1.0E-7)
- {
- fG += 2.0;
- fT *= fChi/fG;
- fS += fT;
- }
- PushDouble(1.0 - fX*fS);
-*/
}
void ScInterpreter::ScKurt()
@@ -3014,7 +2935,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::
short nParamCount = GetByte();
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
return false;
-
+
fSum = 0.0;
fCount = 0.0;
vSum = 0.0;
@@ -3303,9 +3224,9 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
}
SCSIZE k = static_cast<SCSIZE>(f);
vector<double> aSortArray;
- /* TODO: using nth_element() is best for one single value, but LARGE/SMALL
- * actually are defined to return an array of values if an array of
- * positions was passed, in which case, depending on the number of values,
+ /* TODO: using nth_element() is best for one single value, but LARGE/SMALL
+ * actually are defined to return an array of values if an array of
+ * positions was passed, in which case, depending on the number of values,
* we may or will need a real sorted array again, see #i32345. */
//GetSortArray(1, aSortArray);
GetNumberSequenceArray(1, aSortArray);
@@ -3324,7 +3245,7 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
void ScInterpreter::ScLarge()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" );
- CalculateSmallLarge(FALSE);
+ CalculateSmallLarge(FALSE);
}
void ScInterpreter::ScSmall()
@@ -3948,7 +3869,7 @@ void ScInterpreter::ScProbability()
void ScInterpreter::ScCorrel()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCorrel" );
- // This is identical to ScPearson()
+ // This is identical to ScPearson()
ScPearson();
}
@@ -3958,12 +3879,12 @@ void ScInterpreter::ScCovar()
CalculatePearsonCovar(FALSE,FALSE);
}
-void ScInterpreter::ScPearson()
+void ScInterpreter::ScPearson()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" );
CalculatePearsonCovar(TRUE,FALSE);
}
-void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy)
+void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" );
if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -4074,7 +3995,7 @@ void ScInterpreter::ScRSQ()
void ScInterpreter::ScSTEXY()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" );
- CalculatePearsonCovar(TRUE,TRUE);
+ CalculatePearsonCovar(TRUE,TRUE);
}
void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope)
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e0ecf26..7b8f0e8 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1576,13 +1576,11 @@ BOOL ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
PopDoubleRef( aRange, TRUE );
return DoubleRefToPosSingleRef( aRange, rAdr );
}
- //break;
case svSingleRef :
{
PopSingleRef( rAdr );
return TRUE;
}
- //break;
default:
PopError();
SetError( errNoRef );
@@ -2243,12 +2241,10 @@ const String& ScInterpreter::GetString()
case svError:
PopError();
return EMPTY_STRING;
- //break;
case svMissing:
case svEmptyCell:
Pop();
return EMPTY_STRING;
- //break;
case svDouble:
{
double fVal = PopDouble();
@@ -2258,10 +2254,8 @@ const String& ScInterpreter::GetString()
pFormatter->GetInputLineString(fVal, nIndex, aTempStr);
return aTempStr;
}
- //break;
case svString:
return PopString();
- //break;
case svSingleRef:
{
ScAddress aAdr;
@@ -2275,7 +2269,6 @@ const String& ScInterpreter::GetString()
else
return EMPTY_STRING;
}
- //break;
case svDoubleRef:
{ // generate position dependent SingleRef
ScRange aRange;
@@ -2302,7 +2295,6 @@ const String& ScInterpreter::GetString()
PopExternalDoubleRef(pMat);
return GetStringFromMatrix(pMat);
}
- //break;
case svMatrix:
{
ScMatrixRef pMat = PopMatrix();
@@ -3451,17 +3443,6 @@ void ScInterpreter::ScTableOp()
pDok->DecInterpreterTableOpLevel();
}
-
-/*
-
-void ScInterpreter::ScErrCell()
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrCell" );
- double fErrNum = GetDouble();
- PushError((USHORT) fErrNum);
-}
-*/
-
void ScInterpreter::ScDBArea()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBArea" );
@@ -3597,7 +3578,6 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
meVolaileType(NOT_VOLATILE)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTT" );
-// pStack = new ScToken*[ MAXSTACK ];
BYTE cMatFlag = pMyFormulaCell->GetMatrixFlag();
bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE );
@@ -3638,7 +3618,6 @@ void ScInterpreter::GlobalExit() // static
StackVar ScInterpreter::Interpret()
{
-// StackPrinter __stack_printer__("ScInterpreter::Interpret");
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Interpret" );
short nRetTypeExpr = NUMBERFORMAT_UNDEFINED;
ULONG nRetIndexExpr = 0;
@@ -3746,7 +3725,6 @@ StackVar ScInterpreter::Interpret()
case ocNeg : ScNeg(); break;
case ocPercentSign : ScPercentSign(); break;
case ocPi : ScPi(); break;
-// case ocDefPar : ScDefPar(); break;
case ocRandom : ScRandom(); break;
case ocTrue : ScTrue(); break;
case ocFalse : ScFalse(); break;
@@ -4007,7 +3985,6 @@ StackVar ScInterpreter::Interpret()
case ocBetaInv : ScBetaInv(); break;
case ocExternal : ScExternal(); break;
case ocTableOp : ScTableOp(); break;
-// case ocErrCell : ScErrCell(); break;
case ocStop : break;
case ocErrorType : ScErrorType(); break;
case ocCurrent : ScCurrent(); break;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e930a86..6181118 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -876,17 +876,6 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference<
bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
{
return XclMacroHelper::SetMacroLink( rEvent, meEventType );
-/*
- String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
- if( aMacroName.Len() )
- {
- sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
- sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( aMacroName, true, false );
- mxMacroLink = GetFormulaCompiler().CreateNameXFormula( nExtSheet, nNameIdx );
- return true;
- }
- return false;
-*/
}
void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 0f0d985..ebb6dab 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -257,21 +257,6 @@ bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference<
if ( tbcd.get() )
{
std::vector< css::beans::PropertyValue > props;
-/*
- if ( bBuiltin )
- {
- rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
- if ( sCommand.getLength() > 0 )
- {
- beans::PropertyValue aProp;
-
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
- aProp.Value <<= sCommand;
- props.push_back( aProp );
- }
-
- }
-*/
bool bBeginGroup = false;
if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuToolbar ) )
return false;
More information about the Libreoffice-commits
mailing list