[Libreoffice-commits] core.git: 13 commits - chart2/source comphelper/source dbaccess/source extensions/source filter/source oox/source reportdesign/source sc/source sw/qa sw/source test/source toolkit/source ucb/source writerfilter/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 25 14:43:34 UTC 2016
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 12 ++---
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 12 ++---
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 12 ++---
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 12 ++---
comphelper/source/misc/anycompare.cxx | 2
dbaccess/source/ui/misc/propertystorage.cxx | 4 -
extensions/source/update/check/updatecheckconfig.cxx | 8 +--
filter/source/flash/swffilter.cxx | 16 +++---
oox/source/export/drawingml.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 2
sc/source/ui/unoobj/fielduno.cxx | 8 +--
sc/source/ui/vba/vbasheetobject.cxx | 2
sw/qa/extras/globalfilter/globalfilter.cxx | 8 +--
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 6 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 4 -
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 4 -
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 ++---
sw/qa/extras/rtfexport/rtfexport.cxx | 4 -
sw/qa/extras/rtfimport/rtfimport.cxx | 24 +++++-----
sw/qa/extras/ww8export/ww8export.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4 -
sw/source/filter/ww8/docxtablestyleexport.cxx | 4 -
test/source/beans/xpropertyset.cxx | 2
toolkit/source/controls/unocontrolbase.cxx | 2
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2
27 files changed, 87 insertions(+), 87 deletions(-)
New commits:
commit 21f5a2716f35d91fe79c8bf1698b6809bcf31957
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:43:06 2016 +0200
Some more sal_Bool -> bool
Change-Id: I576f264f31fabf58de6cafa28eb7ba5e5f43c148
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 7bf99d7..8936937 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -788,7 +788,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
const boost::optional<PropertyMap::Property> aHorizontalMergeVal = (*aCellIterator)->getProperty(PROP_HORIZONTAL_MERGE);
if (aHorizontalMergeVal)
{
- if (aHorizontalMergeVal->second.get<sal_Bool>())
+ if (aHorizontalMergeVal->second.get<bool>())
{
// first cell in a merge
HorizontallyMergedCell aMerge(nRow, nCell);
commit e4738bfd0e5a05e157993f105b8cf7a0b83b1131
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:42:55 2016 +0200
Some more sal_Bool -> bool
Change-Id: I974a1c8d64f5b13b9052365c3219dcd2dc6927dc
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 9881433..e1ee6f2 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -147,7 +147,7 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags )
const beans::NamedValue* pValue(
std::find_if(pAry,pAry+nLen,
[] (beans::NamedValue const& rNV) { return rNV.Name == "KeepAlive"; } ));
- if ( pValue != pAry+nLen && !pValue->Value.get<sal_Bool>() )
+ if ( pValue != pAry+nLen && !pValue->Value.get<bool>() )
return true;
return false;
commit 35e26c8a4bd7886420714775bf17d58ecc71a48f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:42:48 2016 +0200
Some more sal_Bool -> bool
Change-Id: Ibb07e8c5b9ef44dac5ce23c590783c1462c532d7
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index 0993d75..6ad6636 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -138,7 +138,7 @@ template <typename T> T UnoControlBase::ImplGetPropertyValueClass( sal_uInt16 nP
bool UnoControlBase::ImplGetPropertyValue_BOOL( sal_uInt16 nProp )
{
- return ImplGetPropertyValuePOD<sal_Bool>(nProp);
+ return ImplGetPropertyValuePOD<bool>(nProp);
}
sal_Int16 UnoControlBase::ImplGetPropertyValue_INT16( sal_uInt16 nProp )
commit da81ff5c0eb3119c486ad7b8930e2036877795a5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:42:40 2016 +0200
Some more sal_Bool -> bool
Change-Id: I4ee61f3f1d14cf4a90224199ed72e4de0890b5af
diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index c771042..536bc2f 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -80,7 +80,7 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
if (type == cppu::UnoType<bool>::get())
{
// boolean type
- bool bOld = any.get<sal_Bool>();
+ bool bOld = any.get<bool>();
xPropSet->setPropertyValue(rName, makeAny(!bOld));
}
else if (type == cppu::UnoType<sal_Int8>::get())
commit 1f8983592f2a64246090151dca8c03c02027ec2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:42:28 2016 +0200
Some more sal_Bool -> bool
Change-Id: Ie056687f7845e3ee133627f8961795f6bd8730f7
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 2ac43bf..b32f3b8 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -535,19 +535,19 @@ void Test::testCharHighlightODF()
{
case 1: // non-transparent highlight
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(64), getProperty<sal_Int32>(xRun, "CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(xRun, "CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun, "CharBackTransparent"));
break;
case 2: // transparent backcolor
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(COL_TRANSPARENT), getProperty<sal_Int32>(xRun, "CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xRun, "CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xRun, "CharBackTransparent"));
break;
case 3: // non-transparent backcolor
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(128), getProperty<sal_Int32>(xRun, "CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(xRun, "CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun, "CharBackTransparent"));
break;
case 4: // non-transparent highlight again
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(64), getProperty<sal_Int32>(xRun, "CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(xRun, "CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun, "CharBackTransparent"));
break;
}
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index f751fff..549755c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -661,7 +661,7 @@ DECLARE_OOXMLEXPORT_TEST(testI120928, "i120928.docx")
DECLARE_OOXMLEXPORT_TEST(testFdo64826, "fdo64826.docx")
{
// 'Track-Changes' (Track Revisions) wasn't exported.
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(mxComponent, "RecordChanges")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(mxComponent, "RecordChanges")));
}
DECLARE_OOXMLEXPORT_TEST(testPageBackground, "page-background.docx")
@@ -812,7 +812,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo56679, "fdo56679.docx")
uno::Reference< text::XTextRange > xParagraph = getParagraph( 1 );
uno::Reference< text::XTextRange > xText = getRun( xParagraph, 2, "This is a simple sentence.");
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xText, "CharUnderlineHasColor")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xText, "CharUnderlineHasColor")));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF0000), getProperty<sal_Int32>(xText, "CharUnderlineColor"));
}
@@ -1112,7 +1112,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo67737, "fdo67737.docx")
const beans::PropertyValue& rProp = aProps[i];
if (rProp.Name == "MirroredY")
{
- CPPUNIT_ASSERT_EQUAL( true, bool(rProp.Value.get<sal_Bool>()) );
+ CPPUNIT_ASSERT_EQUAL( true, bool(rProp.Value.get<bool>()) );
return;
}
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 7b4e2cd..bc2eab2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -125,8 +125,8 @@ DECLARE_OOXMLEXPORT_TEST(testGroupshapePicture, "groupshape-picture.docx")
DECLARE_OOXMLEXPORT_TEST(testAutofit, "autofit.docx")
{
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(getShape(1), "TextAutoGrowHeight")));
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(2), "TextAutoGrowHeight")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(getShape(1), "TextAutoGrowHeight")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(getShape(2), "TextAutoGrowHeight")));
}
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChangesDeletedParagraphMark.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 46c5390..a7ad465 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -899,7 +899,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79591, "fdo79591.docx")
DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx")
{
// The problem was that the shape in the header wasn't in the background.
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(1), "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(getShape(1), "Opaque")));
}
DECLARE_OOXMLEXPORT_TEST(testFdo80894, "TextFrameRotation.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 09c0840..9af064c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -86,13 +86,13 @@ DECLARE_OOXMLEXPORT_TEST(testN789482, "n789482.docx")
getRun(xParagraph, 1, "Before. ");
CPPUNIT_ASSERT_EQUAL(OUString("Delete"), getProperty<OUString>(getRun(xParagraph, 2), "RedlineType"));
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(getRun(xParagraph, 2), "IsStart"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getRun(xParagraph, 2), "IsStart"));
getRun(xParagraph, 3, "www.test.com");
CPPUNIT_ASSERT_EQUAL(OUString("http://www.test.com/"), getProperty<OUString>(getRun(xParagraph, 3), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString("Delete"), getProperty<OUString>(getRun(xParagraph, 4), "RedlineType"));
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(getRun(xParagraph, 4), "IsStart"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(getRun(xParagraph, 4), "IsStart"));
getRun(xParagraph, 5, " After.");
}
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 458da13..08cc3c4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1398,7 +1398,7 @@ DECLARE_OOXMLIMPORT_TEST(testTableWidth, "table_width.docx")
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
// Relative width wasn't recognized during import.
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xTables->getByIndex(0), "IsWidthRelative")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xTables->getByIndex(0), "IsWidthRelative")));
uno::Reference<text::XTextFramesSupplier> xFramesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xFrames(xFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -1445,7 +1445,7 @@ DECLARE_OOXMLIMPORT_TEST(testN779630, "n779630.docx")
CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.DateField")));
CPPUNIT_ASSERT_EQUAL(OUString("date default text"), getProperty<OUString>(xPropertySet, "HelpText"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(8), getProperty<sal_Int16>(xPropertySet, "DateFormat"));
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xPropertySet, "Dropdown")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xPropertySet, "Dropdown")));
// Second shape: combo box
xControlShape.set(getShape(2), uno::UNO_QUERY);
@@ -1454,7 +1454,7 @@ DECLARE_OOXMLIMPORT_TEST(testN779630, "n779630.docx")
CPPUNIT_ASSERT_EQUAL(true, bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
CPPUNIT_ASSERT_EQUAL(OUString("dropdown default text"), getProperty<OUString>(xPropertySet, "DefaultText"));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty< uno::Sequence<OUString> >(xPropertySet, "StringItemList").getLength());
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xPropertySet, "Dropdown")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xPropertySet, "Dropdown")));
}
DECLARE_OOXMLIMPORT_TEST(testIndentation, "indentation.docx")
@@ -1822,9 +1822,9 @@ DECLARE_OOXMLIMPORT_TEST(testWpsOnly, "wps-only.docx")
CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGHT, getProperty<text::WrapTextMode>(xShape, "Surround"));
// This should be in front of text.
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xShape, "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xShape, "Opaque")));
// And this should be behind the document.
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(2), "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(getShape(2), "Opaque")));
}
DECLARE_OOXMLIMPORT_TEST(lineWpsOnly, "line-wps-only.docx")
@@ -1888,7 +1888,7 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx")
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xShape, "HoriOrientRelation"));
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xShape, "VertOrientRelation"));
// Make sure the shape is not in the background, as we have behindDoc="0" in the doc.
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xShape, "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xShape, "Opaque")));
// The 3 paragraphs on the rectangles inside the groupshape ended up in the
// body text, make sure we don't have multiple paragraphs there anymore.
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 58a35c1..c08a47a 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -59,7 +59,7 @@ public:
bool CjkNumberedListTestHelper(sal_Int16& rValue)
{
- sal_Bool isNumber = false;
+ bool isNumber = false;
uno::Reference<text::XTextRange> xPara(getParagraph(1));
uno::Reference<beans::XPropertySet> properties(xPara, uno::UNO_QUERY);
properties->getPropertyValue("NumberingIsNumber") >>= isNumber;
@@ -696,7 +696,7 @@ DECLARE_RTFEXPORT_TEST(testLineNumbering, "linenumbering.rtf")
{
uno::Reference<text::XLineNumberingProperties> xLineNumberingProperties(mxComponent, uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropertySet = xLineNumberingProperties->getLineNumberingProperties();
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xPropertySet, "IsOn")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xPropertySet, "IsOn")));
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), getProperty<sal_Int32>(xPropertySet, "Interval"));
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5fc69e6..a9168c3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -256,8 +256,8 @@ DECLARE_RTFIMPORT_TEST(testN750757, "n750757.rtf")
uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin")));
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xParaEnum->nextElement(), "ParaContextMargin")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(xParaEnum->nextElement(), "ParaContextMargin")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(xParaEnum->nextElement(), "ParaContextMargin")));
}
DECLARE_RTFIMPORT_TEST(testFdo45563, "fdo45563.rtf")
@@ -568,7 +568,7 @@ DECLARE_RTFIMPORT_TEST(testFdo49501, "fdo49501.rtf")
{
uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStyle, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
sal_Int32 nExpected(convertTwipToMm100(567));
CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle, "LeftMargin"));
CPPUNIT_ASSERT_EQUAL(nExpected, getProperty<sal_Int32>(xStyle, "RightMargin"));
@@ -1795,8 +1795,8 @@ DECLARE_RTFIMPORT_TEST(testShpzDhgt, "shpz-dhgt.rtf")
DECLARE_RTFIMPORT_TEST(testBackground, "background.rtf")
{
// The first shape wasn't in the foreground.
- CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(getShape(1), "Opaque")));
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(getShape(2), "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<bool>(getShape(1), "Opaque")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(getShape(2), "Opaque")));
}
DECLARE_RTFIMPORT_TEST(testLevelfollow, "levelfollow.rtf")
@@ -2452,25 +2452,25 @@ DECLARE_RTFIMPORT_TEST(testLndscpsxn, "lndscpsxn.rtf")
xCursor->jumpToFirstPage();
OUString pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
uno::Reference<style::XStyle> xStylePage(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStylePage, "IsLandscape"));
// check that the second page has no landscape flag
xCursor->jumpToPage(2);
pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xStylePage, "IsLandscape"));
// check that the third page has landscape flag
xCursor->jumpToPage(3);
pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStylePage, "IsLandscape"));
// check that the last page has no landscape flag
xCursor->jumpToLastPage();
pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_False, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xStylePage, "IsLandscape"));
}
DECLARE_RTFIMPORT_TEST(testLandscape, "landscape.rtf")
@@ -2492,19 +2492,19 @@ DECLARE_RTFIMPORT_TEST(testLandscape, "landscape.rtf")
xCursor->jumpToFirstPage();
OUString pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
uno::Reference<style::XStyle> xStylePage(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStylePage, "IsLandscape"));
// check that the second page has landscape flag
xCursor->jumpToPage(2);
pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStylePage, "IsLandscape"));
// check that the last page has landscape flag
xCursor->jumpToLastPage();
pageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
xStylePage.set(pageStyles->getByName(pageStyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_True, getProperty<sal_Bool>(xStylePage, "IsLandscape"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStylePage, "IsLandscape"));
}
DECLARE_RTFIMPORT_TEST(testTdf97035, "tdf97035.rtf")
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 60e3fd1..452c8c2 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -216,7 +216,7 @@ DECLARE_WW8EXPORT_TEST(testFdo42144, "fdo42144.odt")
{
// Footer wasn't disabled -- instead empty footer was exported.
uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<sal_Bool>(xStyle, "FooterIsOn")));
+ CPPUNIT_ASSERT_EQUAL(false, bool(getProperty<bool>(xStyle, "FooterIsOn")));
}
DECLARE_WW8EXPORT_TEST(testCharacterBorder, "charborder.odt")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 383d7c5..caccb2d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5240,9 +5240,9 @@ void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType,
else if (rGrabBag[i].Name == "locked")
bLocked = true;
else if (rGrabBag[i].Name == "default")
- bDefault = rGrabBag[i].Value.get<sal_Bool>();
+ bDefault = rGrabBag[i].Value.get<bool>();
else if (rGrabBag[i].Name == "customStyle")
- bCustomStyle = rGrabBag[i].Value.get<sal_Bool>();
+ bCustomStyle = rGrabBag[i].Value.get<bool>();
else
SAL_WARN("sw.ww8", "Unhandled style property: " << rGrabBag[i].Name);
}
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 86e20e9..043608c 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -605,9 +605,9 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
for (sal_Int32 i = 0; i < rStyle.getLength(); ++i)
{
if (rStyle[i].Name == "default")
- bDefault = rStyle[i].Value.get<sal_Bool>();
+ bDefault = rStyle[i].Value.get<bool>();
else if (rStyle[i].Name == "customStyle")
- bCustomStyle = rStyle[i].Value.get<sal_Bool>();
+ bCustomStyle = rStyle[i].Value.get<bool>();
else if (rStyle[i].Name == "styleId")
aStyleId = rStyle[i].Value.get<OUString>();
else if (rStyle[i].Name == "name")
commit 1f0e049d13260e17ec91ead172ae471892e9e059
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:42:02 2016 +0200
Some more sal_Bool -> bool
Change-Id: I1ddb99cf9b401d11e0701974646e1e22739c14ee
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 08b0222..74e351c 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -857,7 +857,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
}
else if (rName == SC_UNONAME_ISFIXED)
{
- SvxDateType eType = rVal.get<sal_Bool>() ? SVXDATETYPE_FIX : SVXDATETYPE_VAR;
+ SvxDateType eType = rVal.get<bool>() ? SVXDATETYPE_FIX : SVXDATETYPE_VAR;
p->SetType(eType);
}
else if (rName == SC_UNONAME_DATETIME)
@@ -892,7 +892,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
}
else if (rName == SC_UNONAME_ISFIXED)
{
- SvxTimeType eType = rVal.get<sal_Bool>() ? SVXTIMETYPE_FIX : SVXTIMETYPE_VAR;
+ SvxTimeType eType = rVal.get<bool>() ? SVXTIMETYPE_FIX : SVXTIMETYPE_VAR;
p->SetType(eType);
}
else if (rName == SC_UNONAME_DATETIME)
@@ -917,9 +917,9 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::
else
{
if (rName == SC_UNONAME_ISDATE)
- mbIsDate = rVal.get<sal_Bool>();
+ mbIsDate = rVal.get<bool>();
else if (rName == SC_UNONAME_ISFIXED)
- mbIsFixed = rVal.get<sal_Bool>();
+ mbIsFixed = rVal.get<bool>();
else if (rName == SC_UNONAME_DATETIME)
maDateTime = rVal.get<util::DateTime>();
else if (rName == SC_UNONAME_NUMFMT)
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index aaca382..889754f 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -379,7 +379,7 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName )
sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception)
{
- return mxControlProps->getPropertyValue( "Printable" ).get< sal_Bool >();
+ return mxControlProps->getPropertyValue( "Printable" ).get<bool>();
}
void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) throw (uno::RuntimeException, std::exception)
commit 9788477e3e156edf454fccefb69da173e8e9fea6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:41:50 2016 +0200
Some more sal_Bool -> bool
Change-Id: Ic36c3d707e75c541e443cc4c0b4da9625ae08ef3
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 5d4b0a2..8ed293d 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2459,7 +2459,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
aPageItem.SetDescName(xPageStyle->getName());
uno::Reference<beans::XPropertySet> xProp(xPageStyle,uno::UNO_QUERY_THROW);
aPageItem.PutValue(xProp->getPropertyValue(PROPERTY_PAGESTYLELAYOUT),MID_PAGE_LAYOUT);
- aPageItem.SetLandscape(getStyleProperty<sal_Bool>(m_xReportDefinition,PROPERTY_ISLANDSCAPE));
+ aPageItem.SetLandscape(getStyleProperty<bool>(m_xReportDefinition,PROPERTY_ISLANDSCAPE));
aPageItem.SetNumType((SvxNumType)getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE));
pDescriptor->Put(aPageItem);
pDescriptor->Put(SvxBrushItem(::Color(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BACKCOLOR)),RPTUI_ID_BRUSH));
commit da0e5863d83249c0cc34e6d070161235ba87aed1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:41:31 2016 +0200
Some more sal_Bool -> bool
Change-Id: Iaae2c92e011c55f8739ecb7972ef9a3f71300765
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cb3c291..6c4de9b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2136,7 +2136,7 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
}
if (GetDocumentType() == DOCUMENT_DOCX)
{
- sal_Bool bTextAutoGrowHeight = false;
+ bool bTextAutoGrowHeight = false;
GET(bTextAutoGrowHeight, TextAutoGrowHeight);
mpFS->singleElementNS(XML_a, (bTextAutoGrowHeight ? XML_spAutoFit : XML_noAutofit), FSEND);
}
commit 46a795c6299f6dd89d5f3d81f337016584098d83
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:41:21 2016 +0200
Some more sal_Bool -> bool
Change-Id: I32874fb49b361c14f33810e606ede1e49c1acd30
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index f6cfaf4..182be5d 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -235,7 +235,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean
aFilterData = findPropertyValue<Sequence< PropertyValue > >(aDescriptor, "FilterData", aFilterData);
// #i56084# check if selection shall be exported only; if yes, get the selected page and the selection itself
- if(findPropertyValue<sal_Bool>(aDescriptor, "SelectionOnly", false))
+ if(findPropertyValue<bool>(aDescriptor, "SelectionOnly", false))
{
Reference< XDesktop2 > xDesktop(Desktop::create(mxContext));
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean
}
// #i56084# no multiple files (suppress) when selection since selection can only export a single page
- if (!mbExportSelection && findPropertyValue<sal_Bool>(aFilterData, "ExportMultipleFiles", false ))
+ if (!mbExportSelection && findPropertyValue<bool>(aFilterData, "ExportMultipleFiles", false ))
{
ExportAsMultipleFiles(aDescriptor);
}
@@ -369,7 +369,7 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a
// AS: Only export the background config if we're exporting all of the pages, otherwise we'll
// screw it up.
- bool bExportAll = findPropertyValue<sal_Bool>(aFilterData, "ExportAll", true);
+ bool bExportAll = findPropertyValue<bool>(aFilterData, "ExportAll", true);
if (bExportAll)
{
osl_removeFile(fullpath.pData);
@@ -387,7 +387,7 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a
mxSelectedShapes,
mxSelectedDrawPage,
findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75),
- findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false));
+ findPropertyValue<bool>(aFilterData, "ExportOLEAsJPEG", false));
const sal_Int32 nPageCount = xDrawPages->getCount();
if ( mxStatusIndicator.is() )
@@ -404,17 +404,17 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a
continue;
// AS: Export the background, the background objects, and then the slide contents.
- if (bExportAll || findPropertyValue<sal_Bool>(aFilterData, "ExportBackgrounds", true))
+ if (bExportAll || findPropertyValue<bool>(aFilterData, "ExportBackgrounds", true))
{
backgroundfilename = exportBackground(aFlashExporter, xDrawPage, swfdirpath, nPage, "b");
}
- if (bExportAll || findPropertyValue<sal_Bool>(aFilterData, "ExportBackgroundObjects", true))
+ if (bExportAll || findPropertyValue<bool>(aFilterData, "ExportBackgroundObjects", true))
{
objectsfilename = exportBackground(aFlashExporter, xDrawPage, swfdirpath, nPage, "o");
}
- if (bExportAll || findPropertyValue<sal_Bool>(aFilterData, "ExportSlideContents", true))
+ if (bExportAll || findPropertyValue<bool>(aFilterData, "ExportSlideContents", true))
{
fullpath = swfdirpath + STR("/slide") + VAL(nPage+1) + STR("p.swf");
@@ -464,7 +464,7 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes
mxSelectedShapes,
mxSelectedDrawPage,
findPropertyValue<sal_Int32>(aFilterData, "CompressMode", 75),
- findPropertyValue<sal_Bool>(aFilterData, "ExportOLEAsJPEG", false));
+ findPropertyValue<bool>(aFilterData, "ExportOLEAsJPEG", false));
return aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator );
}
commit c21bc9e5aa8aa1003a10b6e39182e4e70af80486
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:41:02 2016 +0200
Some more sal_Bool -> bool
Change-Id: I2dcc7bb0c8d5a6e205d627330735237f85fd9f9f
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 2d3ba91..4bec357 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -145,7 +145,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
rInfo.Version = getStringValue(UPDATE_VERSION);
rInfo.Description = getStringValue(UPDATE_DESCRIPTION);
- sal_Bool isDirectDownload = false;
+ bool isDirectDownload = false;
m_aNameAccess.getValue(IS_DIRECT_DOWNLOAD) >>= isDirectDownload;
rInfo.Sources.push_back( DownloadSource( isDirectDownload, getStringValue(DOWNLOAD_URL) ) );
@@ -253,7 +253,7 @@ UpdateCheckConfig::get(
bool
UpdateCheckConfig::isAutoCheckEnabled() const
{
- sal_Bool nValue = false;
+ bool nValue = false;
const_cast < UpdateCheckConfig *> (this)->getByName( AUTOCHECK_ENABLED ) >>= nValue;
return nValue;
}
@@ -261,7 +261,7 @@ UpdateCheckConfig::isAutoCheckEnabled() const
bool
UpdateCheckConfig::isAutoDownloadEnabled() const
{
- sal_Bool nValue = false;
+ bool nValue = false;
const_cast < UpdateCheckConfig *> (this)->getByName( AUTODOWNLOAD_ENABLED ) >>= nValue;
return nValue;
}
@@ -520,7 +520,7 @@ UpdateCheckConfig::commitChanges()
aChangesSet[i].Accessor >>= aString;
if( aString.endsWith(AUTOCHECK_ENABLED "']") )
{
- sal_Bool bEnabled = false;
+ bool bEnabled = false;
aChangesSet[i].Element >>= bEnabled;
m_rListener->autoCheckStatusChanged(bEnabled);
}
commit 5258b85ff4cc49ea02873ba7311f9873eb101d4e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:40:46 2016 +0200
Some more sal_Bool -> bool
Change-Id: I997d780abb5fc02156c2e6d7a3ecc34ca46b67cb
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index c3234a0..d5ab60a 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -82,7 +82,7 @@ namespace dbaui
const SfxPoolItem& rItem( m_rItemSet.Get( m_nItemID ) );
// try some known item types
- if ( ItemAdapter< SfxBoolItem, sal_Bool >::tryGet( rItem, _out_rValue )
+ if ( ItemAdapter< SfxBoolItem, bool >::tryGet( rItem, _out_rValue )
|| ItemAdapter< SfxStringItem, OUString >::tryGet( rItem, _out_rValue )
)
return;
@@ -93,7 +93,7 @@ namespace dbaui
void SetItemPropertyStorage::setPropertyValue( const Any& _rValue )
{
// try some known item types
- if ( ItemAdapter< SfxBoolItem, sal_Bool >::trySet( m_rItemSet, m_nItemID, _rValue )
+ if ( ItemAdapter< SfxBoolItem, bool >::trySet( m_rItemSet, m_nItemID, _rValue )
|| ItemAdapter< SfxStringItem, OUString >::trySet( m_rItemSet, m_nItemID, _rValue )
)
return;
commit 4b9faadd866f66e3e086e37d07cdaf81d988939f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:40:18 2016 +0200
Some more sal_Bool -> bool
Change-Id: Ie29e3610ae7fc7a489b367fd6797db7547d47c49
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 18ae7bd..5704888 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -167,7 +167,7 @@ namespace comphelper
pComparator.reset( new ScalarPredicateLess< sal_Unicode >() );
break;
case TypeClass_BOOLEAN:
- pComparator.reset( new ScalarPredicateLess< sal_Bool >() );
+ pComparator.reset( new ScalarPredicateLess< bool >() );
break;
case TypeClass_BYTE:
pComparator.reset( new ScalarPredicateLess< sal_Int8 >() );
commit 279f0505545eed63be061f6eee47655ddd082ed8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 25 16:40:05 2016 +0200
Some more sal_Bool -> bool
Change-Id: I4df1afecfe4c554fa98060e6ba1507911323656c
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index f1c8f12..d81103e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -309,11 +309,11 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
}
//PROP_CHART_STATISTIC_MEAN_VALUE
-class WrappedMeanValueProperty : public WrappedStatisticProperty< sal_Bool >
+class WrappedMeanValueProperty : public WrappedStatisticProperty< bool >
{
public:
- virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
- virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& aNewValue ) const override;
+ virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
+ virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& aNewValue ) const override;
explicit WrappedMeanValueProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
@@ -323,14 +323,14 @@ public:
WrappedMeanValueProperty::WrappedMeanValueProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
- : WrappedStatisticProperty< sal_Bool >( "MeanValue", uno::makeAny( false ), spChart2ModelContact, ePropertyType )
+ : WrappedStatisticProperty< bool >( "MeanValue", uno::makeAny( false ), spChart2ModelContact, ePropertyType )
{
}
WrappedMeanValueProperty::~WrappedMeanValueProperty()
{
}
-sal_Bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
+bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
{
bool bRet = false;
uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY );
@@ -339,7 +339,7 @@ sal_Bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::X
return bRet;
}
-void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& aNewValue ) const
+void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& aNewValue ) const
{
uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY );
if( xRegCnt.is() )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 37ac487..4ecc8ef 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -89,11 +89,11 @@ public:
virtual ~WrappedSymbolSizeProperty();
};
-class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< sal_Bool >
+class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< bool >
{
public:
- virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
- virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& bDrawLines ) const override;
+ virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
+ virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override;
virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
throw (beans::UnknownPropertyException, uno::RuntimeException) override;
@@ -492,7 +492,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc
WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
- : WrappedSeriesOrDiagramProperty< sal_Bool >( "Lines"
+ : WrappedSeriesOrDiagramProperty< bool >( "Lines"
, uno::makeAny( true ), spChart2ModelContact, ePropertyType )
{
}
@@ -501,7 +501,7 @@ WrappedSymbolAndLinesProperty::~WrappedSymbolAndLinesProperty()
{
}
-sal_Bool WrappedSymbolAndLinesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& /*xSeriesPropertySet*/ ) const
+bool WrappedSymbolAndLinesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& /*xSeriesPropertySet*/ ) const
{
//do not export this property anymore, instead use a linestyle none for no lines
return true;
@@ -509,7 +509,7 @@ sal_Bool WrappedSymbolAndLinesProperty::getValueFromSeries( const Reference< bea
void WrappedSymbolAndLinesProperty::setValueToSeries(
const Reference< beans::XPropertySet >& xSeriesPropertySet,
- const sal_Bool& bDrawLines ) const
+ const bool& bDrawLines ) const
{
if(!xSeriesPropertySet.is())
return;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index ac66707..0e66927 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -205,7 +205,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
case SCHATTR_REGRESSION_SET_INTERCEPT:
{
uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept");
}
break;
@@ -226,14 +226,14 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
case SCHATTR_REGRESSION_SHOW_EQUATION:
{
uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties());
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation");
}
break;
case SCHATTR_REGRESSION_SHOW_COEFF:
{
uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties());
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
}
break;
@@ -286,7 +286,7 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS
case SCHATTR_REGRESSION_SET_INTERCEPT:
{
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept");
}
break;
@@ -304,13 +304,13 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS
case SCHATTR_REGRESSION_SHOW_EQUATION:
{
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowEquation");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowEquation");
}
break;
case SCHATTR_REGRESSION_SHOW_COEFF:
{
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowCorrelationCoefficient");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowCorrelationCoefficient");
}
break;
}
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 54864931..9e1f0cc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -482,7 +482,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_REGRESSION_SET_INTERCEPT:
{
uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet ));
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept");
}
break;
@@ -503,14 +503,14 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_REGRESSION_SHOW_EQUATION:
{
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet ));
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation");
}
break;
case SCHATTR_REGRESSION_SHOW_COEFF:
{
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet ));
- bChanged = lclConvertToPropertySet<sal_Bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
+ bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
}
break;
@@ -751,7 +751,7 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_REGRESSION_SET_INTERCEPT:
{
uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr ));
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept");
}
break;
@@ -772,14 +772,14 @@ void StatisticsItemConverter::FillSpecialItem(
case SCHATTR_REGRESSION_SHOW_EQUATION:
{
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr ));
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowEquation");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowEquation");
}
break;
case SCHATTR_REGRESSION_SHOW_COEFF:
{
uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr ));
- lclConvertToItemSet<sal_Bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
+ lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient");
}
break;
More information about the Libreoffice-commits
mailing list