various: sal_Bool->bool

Change-Id: I30fa5227f30373f95060148f269450d2945c1bb9

4 files changed, 20 insertions, 22 deletions

diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index b842cd2ce9c8..c90e6e1ef23e 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -100,7 +100,7 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
         if (type == getCppuType<sal_Bool>())
         {
             // boolean type
-            sal_Bool bOld = any.get<sal_Bool>();
+            bool bOld = any.get<sal_Bool>();
             xPropSet->setPropertyValue(rName, makeAny(!bOld));
         }
         else if (type == getCppuType<sal_Int8>())
diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index bf25ba89b384..1cd175a21faf 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -50,7 +50,7 @@ void DataPilotField::testSortInfo()
             && aNewSortInfoValue.Mode == aSortInfoValue.Mode && aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending);
 
     //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing
-    sal_Bool bHasSortInfo;
+    bool bHasSortInfo;
     OUString aHasSortInfo("HasSortInfo");
     xValue = xPropSet->getPropertyValue(aHasSortInfo);
     CPPUNIT_ASSERT( xValue >>= bHasSortInfo );
@@ -83,7 +83,7 @@ void DataPilotField::testLayoutInfo()
             aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines);
 
     //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
-    sal_Bool bHasLayoutInfo;
+    bool bHasLayoutInfo;
     OUString aHasLayoutInfo("HasLayoutInfo");
     xValue = xPropSet->getPropertyValue(aHasLayoutInfo);
     CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo );
@@ -116,7 +116,7 @@ void DataPilotField::testAutoShowInfo()
             aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled);
 
     //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
-    sal_Bool bHasAutoShowInfo;
+    bool bHasAutoShowInfo;
     OUString aHasAutoShowInfo("HasAutoShowInfo");
     xValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
     CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo );
@@ -149,7 +149,7 @@ void DataPilotField::testReference()
             && aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType);
 
     //setting HasReference only makes sense for false, tor true the uno implementation does nothing
-    sal_Bool bHasReference;
+    bool bHasReference;
     OUString aHasReference("HasReference");
     xValue = xPropSet->getPropertyValue(aHasReference);
     CPPUNIT_ASSERT( xValue >>= bHasReference );
@@ -169,7 +169,7 @@ void DataPilotField::testIsGroupField()
     uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW);
     uno::Any xValue;
     OUString aIsGroupField("IsGroupField");
-    sal_Bool bIsGroupField;
+    bool bIsGroupField;
 
     xValue = xPropSet->getPropertyValue(aIsGroupField);
     CPPUNIT_ASSERT( xValue >>= bIsGroupField);
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 8b7f1190f13c..4bd0d27d61a0 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -73,15 +73,15 @@ void XDatabaseRange::testGetSortDescriptor()
 
         if (xProp.Name == "IsSortColumns")
         {
-            sal_Bool bIsSortColumns = sal_True;
+            bool bIsSortColumns = true;
             xProp.Value >>= bIsSortColumns;
-            CPPUNIT_ASSERT(bIsSortColumns == sal_True);
+            CPPUNIT_ASSERT(bIsSortColumns);
         }
         else if (xProp.Name == "ContainsHeader")
         {
-            sal_Bool bContainsHeader = sal_True;
+            bool bContainsHeader = true;
             xProp.Value >>= bContainsHeader;
-            CPPUNIT_ASSERT(bContainsHeader == sal_True);
+            CPPUNIT_ASSERT(bContainsHeader);
         }
         else if (xProp.Name == "MaxFieldCount")
         {
@@ -96,15 +96,15 @@ void XDatabaseRange::testGetSortDescriptor()
         }
         else if (xProp.Name == "BindFormatsToContent")
         {
-            sal_Bool bBindFormatsToContent = sal_False;
+            bool bBindFormatsToContent = false;
             xProp.Value >>= bBindFormatsToContent;
-            CPPUNIT_ASSERT(bBindFormatsToContent == sal_True);
+            CPPUNIT_ASSERT(bBindFormatsToContent);
         }
         else if (xProp.Name == "CopyOutputData")
         {
-            sal_Bool bCopyOutputData = sal_True;
+            bool bCopyOutputData = true;
             xProp.Value >>= bCopyOutputData;
-            CPPUNIT_ASSERT(bCopyOutputData == sal_False);
+            CPPUNIT_ASSERT(bCopyOutputData == false);
         }
         else if (xProp.Name == "OutputPosition")
         {
@@ -112,9 +112,9 @@ void XDatabaseRange::testGetSortDescriptor()
         }
         else if (xProp.Name == "IsUserListEnabled")
         {
-            sal_Bool bIsUserListEnabled  = sal_True;
+            bool bIsUserListEnabled  = true;
             xProp.Value >>= bIsUserListEnabled;
-            CPPUNIT_ASSERT(bIsUserListEnabled == sal_False);
+            CPPUNIT_ASSERT(bIsUserListEnabled == false);
 
         }
         else if (xProp.Name == "UserListIndex")
diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx
index 298c0d43609e..5e1fb609ed10 100644
--- a/test/source/sheet/xprintareas.cxx
+++ b/test/source/sheet/xprintareas.cxx
@@ -21,20 +21,18 @@ namespace apitest {
     void XPrintAreas::testSetAndGetPrintTitleColumns()
     {
         uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW);
-        sal_Bool testState = true;
-        xPrintAreas->setPrintTitleColumns(testState);
+        xPrintAreas->setPrintTitleColumns(sal_True);
 
-        CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == testState);
+        CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == sal_True);
 
     }
 
     void XPrintAreas::testSetAndGetPrintTitleRows()
     {
         uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW);
-        sal_Bool testState = true;
-        xPrintAreas->setPrintTitleRows(testState);
+        xPrintAreas->setPrintTitleRows(sal_True);
 
-        CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == testState);
+        CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == sal_True);
     }
 
     // the rest is right now in progress...