mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler errors and warnings..

Browse Source 
Change-Id: Id35cdec02c7a5175e1b429b723679541292ddfb3
This commit is contained in:
Tomaž Vajngerl
2013-07-23 22:59:31 +02:00
parent 038d162b17
commit 0153ea7e11
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svtools/ruler.hxx
View File

@@ -693,7 +693,7 @@ private:
protected: protected:
long GetRulerVirHeight() const; long GetRulerVirHeight() const;
MapMode GetMapMode() const { return maMapMode; } MapMode GetCurrentMapMode() const { return maMapMode; }
RulerUnitData GetCurrentRulerUnit() const; RulerUnitData GetCurrentRulerUnit() const;
public: public:

24
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
View File

@@ -35,16 +35,16 @@ static const char* lclBasicStatisticsLabels[] =
"Groups", "Count", "Sum", "Mean", "Variance", NULL "Groups", "Count", "Sum", "Mean", "Variance", NULL
}; };
static const char* lclBasicStatisticsFormula[] =
{
"=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)", NULL
};
static const char* lclAnovaLabels[] = static const char* lclAnovaLabels[] =
{ {
"Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL "Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL
}; };
static const char* lclAnovaFormula[] =
{
"=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)", NULL
};
static const OUString lclWildcardRange("%RANGE%"); static const OUString lclWildcardRange("%RANGE%");
OUString lclCreateMultiParameterFormula( OUString lclCreateMultiParameterFormula(
@@ -65,16 +65,6 @@ OUString lclCreateMultiParameterFormula(
return aResult; return aResult;
} }
class CellAddressIterator
{
public:
CellAddressIterator(ScAddress& aStartAddress)
{}
virtual ~CellAddressIterator()
{}
};
} }
ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
@@ -147,10 +137,10 @@ void ScAnalysisOfVarianceDialog::CalculateInputAndWriteToOutput( )
OUString aFormulaString; OUString aFormulaString;
OUString aFormulaTemplate; OUString aFormulaTemplate;
for(sal_Int32 i = 0; lclAnovaFormula[i] != NULL; i++) for(sal_Int32 i = 0; lclBasicStatisticsFormula[i] != NULL; i++)
{ {
aAddress = ScAddress(outCol, outRow, outTab); aAddress = ScAddress(outCol, outRow, outTab);
aFormulaTemplate = OUString::createFromAscii(lclAnovaFormula[i]); aFormulaTemplate = OUString::createFromAscii(lclBasicStatisticsFormula[i]);
aFormulaString = aFormulaTemplate.replaceAll(lclWildcardRange, aReferenceString); aFormulaString = aFormulaTemplate.replaceAll(lclWildcardRange, aReferenceString);
pDocShell->GetDocFunc().SetFormulaCell(aAddress, new ScFormulaCell(mDocument, aAddress, aFormulaString), true); pDocShell->GetDocFunc().SetFormulaCell(aAddress, new ScFormulaCell(mDocument, aAddress, aFormulaString), true);
outCol++; outCol++;

4
svx/source/dialog/svxruler.cxx
View File

@@ -436,10 +436,10 @@ SvxRuler::~SvxRuler()
void SvxRuler::NormalizePosition(long& rValue) const void SvxRuler::NormalizePosition(long& rValue) const
{ {
long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue), GetMapMode()).Height(); long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue), GetCurrentMapMode()).Height();
long aTickDivider = GetCurrentRulerUnit().nTick1; long aTickDivider = GetCurrentRulerUnit().nTick1;
aNewPositionLogic = (aNewPositionLogic / aTickDivider) * aTickDivider; aNewPositionLogic = (aNewPositionLogic / aTickDivider) * aTickDivider;
rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic), GetMapMode()).Height(); rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic), GetCurrentMapMode()).Height();
} }
long SvxRuler::ConvertHPosPixel(long nVal) const long SvxRuler::ConvertHPosPixel(long nVal) const