[Libreoffice-commits] .: 4 commits - binfilter/bf_sch binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 22 07:31:41 PST 2010
binfilter/bf_sch/source/core/sch_chaxis.cxx | 100 ++++++++---------
binfilter/bf_svtools/source/config/svt_inetoptions.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 12 +-
binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx | 7 -
4 files changed, 64 insertions(+), 57 deletions(-)
New commits:
commit 3ab78b997b320a92a2fa833665e2debeba96ad65
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 22 15:30:48 2010 +0000
make possible to build with c++0x
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
index f3e667f..24bfc99 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
@@ -711,12 +711,12 @@ SvxShapeControlPropertyValueMapping[] =
// note that order matters:
// valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_
// and use the first matching entry
- {style::ParagraphAdjust_LEFT, (sal_Int16)awt::TextAlign::LEFT},
- {style::ParagraphAdjust_CENTER, (sal_Int16)awt::TextAlign::CENTER},
- {style::ParagraphAdjust_RIGHT, (sal_Int16)awt::TextAlign::RIGHT},
- {style::ParagraphAdjust_BLOCK, (sal_Int16)awt::TextAlign::RIGHT},
- {style::ParagraphAdjust_STRETCH, (sal_Int16)awt::TextAlign::LEFT},
- {style::ParagraphAdjust_MAKE_FIXED_SIZE,(sal_Int16)awt::TextAlign::LEFT},
+ {(sal_Int16)style::ParagraphAdjust_LEFT, (sal_Int16)awt::TextAlign::LEFT},
+ {(sal_Int16)style::ParagraphAdjust_CENTER, (sal_Int16)awt::TextAlign::CENTER},
+ {(sal_Int16)style::ParagraphAdjust_RIGHT, (sal_Int16)awt::TextAlign::RIGHT},
+ {(sal_Int16)style::ParagraphAdjust_BLOCK, (sal_Int16)awt::TextAlign::RIGHT},
+ {(sal_Int16)style::ParagraphAdjust_STRETCH, (sal_Int16)awt::TextAlign::LEFT},
+ {(sal_Int16)style::ParagraphAdjust_MAKE_FIXED_SIZE,(sal_Int16)awt::TextAlign::LEFT},
{-1,-1}
};
commit 36406f27d68eaa29dd525248d7dac6205f2c32bd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 22 14:29:30 2010 +0000
make it possible to build with c++0x
diff --git a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
index a02de3b..1e3c4f0 100644
--- a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
@@ -237,7 +237,7 @@ SvtInetOptions::Impl::notifyListeners(
{
aEvents.realloc(nCount);
aNotifications.
- push_back(std::make_pair< List::value_type::first_type,
+ push_back(std::pair< List::value_type::first_type,
List::value_type::second_type >(
aIt->first, aEvents));
}
commit cb1a2f96425cab17de84b6412b54fdd5b71d0519
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 22 14:21:05 2010 +0000
remove some warnings, and make it possible to build with c++0x
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx b/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
index 1002783..2d0d049 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
@@ -193,8 +193,8 @@ namespace xmloff
{ XML_START, TextAlign::LEFT },
{ XML_CENTER, TextAlign::CENTER },
{ XML_END, TextAlign::RIGHT },
- { XML_JUSTIFY, -1 },
- { XML_JUSTIFIED, -1 },
+ { XML_JUSTIFY, (sal_uInt16)-1 },
+ { XML_JUSTIFIED, (sal_uInt16)-1 },
{ XML_TOKEN_INVALID, 0 }
};
rReturn = aTextAlignMap;
@@ -259,6 +259,9 @@ namespace xmloff
rReturn = aListLinkageMap;
}
break;
+
+ default:
+ break;
}
}
commit 497238ba5ab7cc1e24fd6e609a32ba57d783ec96
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 22 14:14:14 2010 +0000
fix some warnings
diff --git a/binfilter/bf_sch/source/core/sch_chaxis.cxx b/binfilter/bf_sch/source/core/sch_chaxis.cxx
index 1ec99a6..4d77c0f 100644
--- a/binfilter/bf_sch/source/core/sch_chaxis.cxx
+++ b/binfilter/bf_sch/source/core/sch_chaxis.cxx
@@ -151,53 +151,53 @@ namespace binfilter {
/*N*/ delete mpTextAttr;
/*N*/ }
-/*N*/ ChartAxis::ChartAxis(ChartModel* pModel,long nId,long nUId) :
-/*N*/ mnInnerPos(-1),
-/*N*/ mbInnerPos(FALSE),
-/*N*/ mbCenterText(FALSE),
-/*N*/ mbColText(FALSE),
-/*N*/ mnUId(nUId),
-/*N*/ mbAlternativIdUsed(FALSE),
-/*N*/ mnAlternateId(0),
-/*N*/ mnTickLen(150),
-/*N*/ mnHelpTickLen(100),
-/*N*/ mpAxisList(NULL),
-/*N*/ mpAxisObj(NULL),
-/*N*/ mbSecondary(FALSE),
-/*N*/ mpGridAttr(NULL),
-/*N*/ mpTextAttr(NULL),
-/*N*/ mpNumFormatter(NULL),
-/*N*/ mpModel(pModel),
-/*N*/ mbPercent(FALSE),
-/*N*/ mbRadial(FALSE),
-/*N*/ mpAxisAttr(NULL),
-/*N*/ mnId(nId),
-/*N*/ mbFlippedXY(FALSE),
-/*N*/ mnPosition(0),
-/*N*/ maArea(0,0,0,0),
-/*N*/ mfMin(0.0),
-/*N*/ mfMax(0.0),
-/*N*/ mfStep(0.0),
-/*N*/ mfStepHelp(0.0),
-/*N*/ mfOrigin(0.0),
-/*N*/ mbAutoMin(FALSE),
-/*N*/ mbAutoMax(FALSE),
-/*N*/ mbAutoOrigin(FALSE),
-/*N*/ mbAutoStep(FALSE),
-/*N*/ mbAutoStepHelp(FALSE),
-/*N*/ mbLogarithm(FALSE),
-/*N*/ meTextOrient( CHTXTORIENT_AUTOMATIC ),
-/*N*/ mnTotalSize(0),
-/*N*/ mpTotal(NULL),
-/*N*/ mbTotalActual(FALSE),
-/*N*/ mbTotalAlloc(FALSE),
-/*N*/ mbColStackOK(FALSE),
-/*N*/ mpColStack(NULL),
-/*N*/ mbShowDescr(FALSE),
-/*N*/ mnTicks(CHAXIS_MARK_OUTER),
-/*N*/ mnHelpTicks(0),
-/*N*/ mbPercentCol(TRUE),
-/*N*/ mnMaxTextWidth(-1)
+/*N*/ ChartAxis::ChartAxis(ChartModel* pModel,long nId,long nUId)
+/*N*/ : mbInnerPos(FALSE)
+/*N*/ , mnInnerPos(-1)
+/*N*/ , mbColText(FALSE)
+/*N*/ , mbCenterText(FALSE)
+/*N*/ , mnMaxTextWidth(-1)
+/*N*/ , mnAlternateId(0)
+/*N*/ , mbAlternativIdUsed(FALSE)
+/*N*/ , mbPercentCol(TRUE)
+/*N*/ , mpTotal(NULL)
+/*N*/ , mnTotalSize(0)
+/*N*/ , mbTotalActual(FALSE)
+/*N*/ , mbTotalAlloc(FALSE)
+/*N*/ , mpColStack(NULL)
+/*N*/ , mbColStackOK(FALSE)
+/*N*/ , mnUId(nUId)
+/*N*/ , mbShowDescr(FALSE)
+/*N*/ , mpNumFormatter(NULL)
+/*N*/ , mpAxisList(NULL)
+/*N*/ , mpAxisObj(NULL)
+/*N*/ , mpGridAttr(NULL)
+/*N*/ , mpTextAttr(NULL)
+/*N*/ , mnTicks(CHAXIS_MARK_OUTER)
+/*N*/ , mnHelpTicks(0)
+/*N*/ , mnTickLen(150)
+/*N*/ , mnHelpTickLen(100)
+/*N*/ , mbSecondary(FALSE)
+/*N*/ , mnId(nId)
+/*N*/ , mbFlippedXY(FALSE)
+/*N*/ , mnPosition(0)
+/*N*/ , mbRadial(FALSE)
+/*N*/ , maArea(0,0,0,0)
+/*N*/ , mbPercent(FALSE)
+/*N*/ , mpAxisAttr(NULL)
+/*N*/ , mpModel(pModel)
+/*N*/ , mfMin(0.0)
+/*N*/ , mfMax(0.0)
+/*N*/ , mfStep(0.0)
+/*N*/ , mfStepHelp(0.0)
+/*N*/ , mfOrigin(0.0)
+/*N*/ , mbAutoMin(FALSE)
+/*N*/ , mbAutoMax(FALSE)
+/*N*/ , mbAutoOrigin(FALSE)
+/*N*/ , mbAutoStep(FALSE)
+/*N*/ , mbAutoStepHelp(FALSE)
+/*N*/ , mbLogarithm(FALSE)
+/*N*/ , meTextOrient( CHTXTORIENT_AUTOMATIC )
/*N*/ {
/*N*/ mpAxisAttr=new SfxItemSet(mpModel->GetPool(),nAxisWhichPairs);
/*N*/ SetDefaults(); //attribute fuellen
@@ -495,10 +495,12 @@ namespace binfilter {
/*N*/ double fData = GetData(nCol, nRow);//mpModel->GetData(nCol, nRow, mbPercent);
/*N*/
/*N*/ if (fData != DBL_MIN)
+/*N*/ {
/*N*/ if (fData < 0.0)
/*N*/ fMinTotal += fData;
/*N*/ else if (fData > 0.0)
/*N*/ fMaxTotal += fData;
+/*N*/ }
/*N*/ }
/*N*/ }
/*N*/
@@ -557,6 +559,7 @@ namespace binfilter {
/*N*/ double fData = GetData( nCol, 0 );
/*N*/
/*N*/ if (fData != DBL_MIN)
+/*N*/ {
/*N*/ if (nCol == 0) //naja, so eigentlich nicht.... aber die X-Achse sollte eh vollständig sein
/*N*/ {
/*N*/ fMin = fData;
@@ -571,7 +574,8 @@ namespace binfilter {
/*N*/
/*N*/ if (fMax < fData)
/*N*/ fMax = fData;
-/*N*/ }
+/*N*/ }
+/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ else // y axis
More information about the Libreoffice-commits
mailing list