loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: I379e89e1e6b9fd8668ba7ac59af33f63487a4f66

21 files changed, 48 insertions, 48 deletions

diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 94ed6402ae40..9147b8e4f3c8 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -156,7 +156,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs )
              Reference< XUriReference > xBase = xFactory->parse( "file:///" );
 
              Reference< XUriReference > xPart = xFactory->parse(  rAttribs.getString( XML_Target, OUString() ) );
-             Reference< XUriReference > xAbs = xFactory->makeAbsolute(  xBase, xPart, sal_True, RelativeUriExcessParentSegments_RETAIN );
+             Reference< XUriReference > xAbs = xFactory->makeAbsolute(  xBase, xPart, true, RelativeUriExcessParentSegments_RETAIN );
 
              if ( xAbs.is() )
                  maTargetPath = xAbs->getPath();
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 29534d008937..3ff9eed37438 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -474,7 +474,7 @@ OUString lclAddRelation( const Reference< XRelationshipAccess >& rRelations, sal
         aEntry[2].First = "TargetMode";
         aEntry[2].Second = "External";
     }
-    rRelations->insertRelationshipByID( sId, aEntry, sal_True );
+    rRelations->insertRelationshipByID( sId, aEntry, true );
 
     return sId;
 }
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index 0f9bd9dc4078..d49430245e7f 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -115,7 +115,7 @@ void ChartConverter::createDataProvider( const Reference< XChartDocument >& rxCh
     try
     {
         if( !rxChartDoc->hasInternalDataProvider() )
-            rxChartDoc->createInternalDataProvider( sal_False );
+            rxChartDoc->createInternalDataProvider( false );
     }
     catch( Exception& )
     {
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e832227071e7..5cb9e8c5a534 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -620,7 +620,7 @@ Reference< XShape > Shape::createAndInsert(
         {
             SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "invisible shape with id: " << msId);
             const OUString sVisible( "Visible" );
-            xSet->setPropertyValue( sVisible, Any( sal_False ) );
+            xSet->setPropertyValue( sVisible, Any( false ) );
         }
 
         ActionLockGuard const alg(mxShape);
@@ -1194,8 +1194,8 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase )
         } else
             xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) );
 
-        xSet->setPropertyValue( "MoveProtect", Any( sal_True ) );
-        xSet->setPropertyValue( "SizeProtect", Any( sal_True ) );
+        xSet->setPropertyValue( "MoveProtect", Any( true ) );
+        xSet->setPropertyValue( "SizeProtect", Any( true ) );
 
         // Replace existing shapes with a new Graphic Object rendered
         // from them
@@ -1274,8 +1274,8 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase )
         xShape.set( xServiceFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW );
         Reference < XPropertySet > xPropSet( xShape, UNO_QUERY_THROW );
         xPropSet->setPropertyValue(  "Graphic", Any( xGraphic ) );
-        xPropSet->setPropertyValue(  "MoveProtect", Any( sal_True ) );
-        xPropSet->setPropertyValue(  "SizeProtect", Any( sal_True ) );
+        xPropSet->setPropertyValue(  "MoveProtect", Any( true ) );
+        xPropSet->setPropertyValue(  "SizeProtect", Any( true ) );
         xPropSet->setPropertyValue(  "Name", Any( OUString( "RenderedShapes" ) ) );
     }
     catch( const Exception& e )
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index ce8ecbcbf212..119b28c242d0 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -192,9 +192,9 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
 
     applyTableCellProperties( rxCell, *this );
     TextCharacterProperties aTextStyleProps;
-    xAt->gotoStart( sal_True );
+    xAt->gotoStart( true );
     Reference< text::XTextRange > xStart( xAt, UNO_QUERY );
-    xAt->gotoEnd( sal_True );
+    xAt->gotoEnd( true );
 
     Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
     oox::drawingml::FillProperties aFillProperties;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 2d45310d1aa7..8195a6dd75a3 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -134,7 +134,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
     pTableStyle->getBand1V().getFillProperties() = pBand1HFillProperties;
 
     //tet bold for 1st row/last row/column
-    ::boost::optional< sal_Bool > textBoldStyle(sal_True);
+    ::boost::optional< sal_Bool > textBoldStyle(true);
     pTableStyle->getFirstRow().getTextBoldStyle() = textBoldStyle;
     pTableStyle->getLastRow().getTextBoldStyle() = textBoldStyle;
     pTableStyle->getFirstCol().getTextBoldStyle() = textBoldStyle;
diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
index 9153360602c3..609cc8b2639e 100644
--- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
@@ -38,17 +38,17 @@ TableStyleTextStyleContext::TableStyleTextStyleContext( ContextHandler2Helper& r
     if( rAttribs.hasAttribute( XML_b ) ) {
         sal_Int32 nB = rAttribs.getToken( XML_b, XML_def );
         if ( nB == XML_on )
-            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_True );
+            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( true );
         else if ( nB == XML_off )
-            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_False );
+            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( false );
     }
 
     if( rAttribs.hasAttribute( XML_i ) ) {
         sal_Int32 nI = rAttribs.getToken( XML_i, XML_def );
         if ( nI == XML_on )
-            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_True );
+            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( true );
         else if ( nI == XML_off )
-            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_False );
+            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( false );
     }
 }
 
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 0db6692aea81..73fc3c23e206 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -223,15 +223,15 @@ sal_Int32 TextField::insertAt(
                     }
                     else
                     {
-                        xText->insertString( xAt, " ", sal_False );
+                        xText->insertString( xAt, " ", false );
                     }
-                    xText->insertTextContent( xAt, xContent, sal_False );
+                    xText->insertTextContent( xAt, xContent, false );
                 }
             }
         }
         else
         {
-            xText->insertString( xAt, getText(), sal_False );
+            xText->insertString( xAt, getText(), false );
         }
     }
     catch( const Exception&  )
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index 789d14ee181e..87961dfa9bd0 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -72,8 +72,8 @@ void TextParagraph::insertAt(
 
         if( !bFirst )
         {
-            xText->insertControlCharacter( xAt, ControlCharacter::APPEND_PARAGRAPH, sal_False );
-            xAt->gotoEnd( sal_True );
+            xText->insertControlCharacter( xAt, ControlCharacter::APPEND_PARAGRAPH, false );
+            xAt->gotoEnd( true );
         }
 
         sal_Int32 nCharHeight = 0;
@@ -100,7 +100,7 @@ void TextParagraph::insertAt(
                 nParagraphSize += nLen;
             }
         }
-        xAt->gotoEnd( sal_True );
+        xAt->gotoEnd( true );
 
         PropertyMap aioBulletList;
         Reference< XPropertySet > xProps( xAt, UNO_QUERY);
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 22d4965043dd..54c81e78083d 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -515,7 +515,7 @@ void TextParagraphProperties::dump() const
     xText->setString( sText );
     Reference< css::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY );
     Reference< css::text::XTextRange > xRange( xStart, UNO_QUERY );
-    xStart->gotoEnd( sal_True );
+    xStart->gotoEnd( true );
     Reference< XPropertySet > xPropSet( xRange, UNO_QUERY );
     pushToPropSet( nullptr, xPropSet, emptyMap, nullptr, false, 0 );
     PropertySet pSet( xPropSet );
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index ff0c2018d5c3..a4c034f0ebcf 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -149,10 +149,10 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
         mrBulletList.setGraphic( mxBlipProps->mxGraphic );
 
     if( mrBulletList.is() )
-        rPropertyMap.setProperty( PROP_IsNumbering, sal_True);
+        rPropertyMap.setProperty( PROP_IsNumbering, true);
     sal_Int16 nLevel = mrTextParagraphProperties.getLevel();
     rPropertyMap.setProperty( PROP_NumberingLevel, nLevel);
-    rPropertyMap.setProperty( PROP_NumberingIsNumber, sal_True);
+    rPropertyMap.setProperty( PROP_NumberingIsNumber, true);
 
     if( mrTextParagraphProperties.getParaAdjust() )
         rPropertyMap.setProperty( PROP_ParaAdjust, mrTextParagraphProperties.getParaAdjust().get());
@@ -171,7 +171,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
             return new TextSpacingContext( *this, mrTextParagraphProperties.getParaBottomMargin() );
         // EG_TextBulletColor
         case A_TOKEN( buClrTx ):        // CT_TextBulletColorFollowText ???
-            mrBulletList.mbBulletColorFollowText <<= sal_True;
+            mrBulletList.mbBulletColorFollowText <<= true;
             break;
         case A_TOKEN( buClr ):          // CT_Color
             return new ColorContext( *this, *mrBulletList.maBulletColorPtr );
@@ -189,7 +189,7 @@ ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
 
         // EG_TextBulletTypeface
         case A_TOKEN( buFontTx ):       // CT_TextBulletTypefaceFollowText
-            mrBulletList.mbBulletFontFollowText <<= sal_True;
+            mrBulletList.mbBulletFontFollowText <<= true;
             break;
         case A_TOKEN( buFont ):         // CT_TextFont
             mrBulletList.maBulletFont.setAttributes( rAttribs );
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 35a49dd0fda2..3585be83a754 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -74,7 +74,7 @@ sal_Int32 TextRun::insertAt(
             if( mbIsLineBreak )
             {
                 OSL_TRACE( "OOX: TextRun::insertAt() insert line break" );
-                xText->insertControlCharacter( xStart, ControlCharacter::LINE_BREAK, sal_False );
+                xText->insertControlCharacter( xStart, ControlCharacter::LINE_BREAK, false );
             }
             else
             {
@@ -82,7 +82,7 @@ sal_Int32 TextRun::insertAt(
                 sal_Int16 nSymbolFontFamily = 0, nSymbolFontPitch = 0;
 
                 if ( !aTextCharacterProps.maSymbolFont.getFontData( aSymbolFontName, nSymbolFontPitch, nSymbolFontFamily, rFilterBase ) )
-                    xText->insertString( xStart, getText(), sal_False );
+                    xText->insertString( xStart, getText(), false );
                 else if ( !getText().isEmpty() )
                 {
                     // #i113673
@@ -121,7 +121,7 @@ sal_Int32 TextRun::insertAt(
                             }
                         }
                         OUString aSubString( getText().copy( nIndex, nCount ) );
-                        xText->insertString( xStart, aSubString, sal_False );
+                        xText->insertString( xStart, aSubString, false );
                         nIndex += nCount;
 
                         if ( nIndex >= getText().getLength() )
@@ -142,14 +142,14 @@ sal_Int32 TextRun::insertAt(
             if( xField.is() )
             {
                 Reference< XTextCursor > xTextFieldCursor = xText->createTextCursor();
-                xTextFieldCursor->gotoEnd( sal_False );
+                xTextFieldCursor->gotoEnd( false );
 
                 PropertySet aFieldProps( xField );
                 aFieldProps.setProperties( maTextCharacterProperties.maHyperlinkPropertyMap );
                 aFieldProps.setProperty( PROP_Representation, getText() );
-                xText->insertTextContent( xStart, xField, sal_False );
+                xText->insertTextContent( xStart, xField, false );
 
-                xTextFieldCursor->gotoEnd( sal_True );
+                xTextFieldCursor->gotoEnd( true );
 
                 aTextCharacterProps.maFillProperties.maFillColor.setSchemeClr( XML_hlink );
                 aTextCharacterProps.maFillProperties.moFillType.set(XML_solidFill);
@@ -168,7 +168,7 @@ sal_Int32 TextRun::insertAt(
             else
             {
                 OSL_TRACE( "OOX: URL field couldn't be created" );
-                xText->insertString( xStart, getText(), sal_False );
+                xText->insertString( xStart, getText(), false );
             }
         }
     }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6096ba997ad4..cb3c291c9b92 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 = sal_False;
+            sal_Bool bTextAutoGrowHeight = false;
             GET(bTextAutoGrowHeight, TextAutoGrowHeight);
             mpFS->singleElementNS(XML_a, (bTextAutoGrowHeight ? XML_spAutoFit : XML_noAutofit), FSEND);
         }
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 0e363b16baa2..9aa5449ee4ae 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -161,7 +161,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
             character in this call, it will be returned in the next call of one
             of the own member functions. The function createFinalString() adds
             a character that has been buffered in the previous call. */
-        OUString aString = createFinalString( mxTextStrm->readString( aDelimiters, sal_False ) );
+        OUString aString = createFinalString( mxTextStrm->readString( aDelimiters, false ) );
         // remove last character from string and remember it for next call
         if( !bIncludeChar && !aString.isEmpty() && (aString[ aString.getLength() - 1 ] == cChar) )
         {
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 4d2b28c1b8d3..17ab0abfe47f 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -399,7 +399,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
         try
         {
             Reference< XVBACompatibility > xVBACompat( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW );
-            xVBACompat->setVBACompatibilityMode( sal_True );
+            xVBACompat->setVBACompatibilityMode( true );
             xVBACompat->setProjectName( maPrjName );
 
         }
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index cf1278320ccb..307406d241e5 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -54,7 +54,7 @@ ContextHandlerRef PPTShapePropertiesContext::onCreateContext( sal_Int32 aElement
     switch( aElementToken )
     {
         case A_TOKEN( xfrm ):
-            mrShape.getShapeProperties().setProperty( PROP_IsPlaceholderDependent, sal_False);
+            mrShape.getShapeProperties().setProperty( PROP_IsPlaceholderDependent, false);
             return ShapePropertiesContext::onCreateContext( aElementToken, rAttribs );
 
         default:
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 5ea3bd275cc4..1fe841ff5edc 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -124,7 +124,7 @@ void ResolveTextFields( XmlFilterBase& rFilter )
                             xPropSet->setPropertyValue( sURL, Any( aURL ) );
                             Reference< text::XTextContent > xContent( rTextField.xTextField, UNO_QUERY);
                             Reference< text::XTextRange > xTextRange( rTextField.xTextCursor, UNO_QUERY );
-                            rTextField.xText->insertTextContent( xTextRange, xContent, sal_True );
+                            rTextField.xText->insertTextContent( xTextRange, xContent, true );
                         }
                         catch( uno::Exception& )
                         {
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index 9f1a4c0c69d3..ef2d137aae3c 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -61,7 +61,7 @@ namespace oox { namespace ppt {
                 if ( !url.isEmpty() )
                 {
                     maSlideProperties.setProperty( PROP_Sound, url);
-                    maSlideProperties.setProperty( PROP_SoundOn, sal_True);
+                    maSlideProperties.setProperty( PROP_SoundOn, true);
                 }
             }
         }
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 73452ec21145..5fee25e42660 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -839,13 +839,13 @@ beans::PropertyValue lcl_createTextpathProps()
 {
     uno::Sequence<beans::PropertyValue> aTextpathPropSeq(4);
     aTextpathPropSeq[0].Name = "TextPath";
-    aTextpathPropSeq[0].Value <<= sal_True;
+    aTextpathPropSeq[0].Value <<= true;
     aTextpathPropSeq[1].Name = "TextPathMode";
     aTextpathPropSeq[1].Value <<= drawing::EnhancedCustomShapeTextPathMode_SHAPE;
     aTextpathPropSeq[2].Name = "ScaleX";
-    aTextpathPropSeq[2].Value <<= sal_False;
+    aTextpathPropSeq[2].Value <<= false;
     aTextpathPropSeq[3].Name = "SameLetterHeights";
-    aTextpathPropSeq[3].Value <<= sal_False;
+    aTextpathPropSeq[3].Value <<= false;
 
     beans::PropertyValue aRet;
     aRet.Name = "TextPath";
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 080b4b56e536..554b15b2805c 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -369,12 +369,12 @@ void InputStream::updateBuffer() throw (IOException, RuntimeException)
 
 OString InputStream::readToElementBegin() throw (IOException, RuntimeException)
 {
-    return OUStringToOString( mxTextStrm->readString( maOpeningBracket, sal_False ), RTL_TEXTENCODING_ISO_8859_1 );
+    return OUStringToOString( mxTextStrm->readString( maOpeningBracket, false ), RTL_TEXTENCODING_ISO_8859_1 );
 }
 
 OString InputStream::readToElementEnd() throw (IOException, RuntimeException)
 {
-    OString aText = OUStringToOString( mxTextStrm->readString( maClosingBracket, sal_False ), RTL_TEXTENCODING_ISO_8859_1 );
+    OString aText = OUStringToOString( mxTextStrm->readString( maClosingBracket, false ), RTL_TEXTENCODING_ISO_8859_1 );
     OSL_ENSURE( aText.endsWith(">"), "InputStream::readToElementEnd - missing closing bracket of XML element" );
     return aText;
 }
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 279aca6eb23a..e6456065628e 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -423,7 +423,7 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
                 if ( xControlShape.is() && !getTypeModel().mbVisible )
                 {
                     PropertySet aControlShapeProp( xControlShape->getControl() );
-                    aControlShapeProp.setProperty( PROP_EnableVisible, uno::makeAny( sal_False ) );
+                    aControlShapeProp.setProperty( PROP_EnableVisible, uno::makeAny( false ) );
                 }
                 /*  Notify the drawing that a new shape has been inserted. For
                     convenience, pass the rectangle that contains position and
@@ -562,12 +562,12 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel,
     else if ( rTypeModel.maPositionHorizontal == "inside" )
     {
         rPropSet.setAnyProperty(PROP_HoriOrient, makeAny(text::HoriOrientation::LEFT));
-        rPropSet.setAnyProperty(PROP_PageToggle, makeAny(sal_True));
+        rPropSet.setAnyProperty(PROP_PageToggle, makeAny(true));
     }
     else if ( rTypeModel.maPositionHorizontal == "outside" )
     {
         rPropSet.setAnyProperty(PROP_HoriOrient, makeAny(text::HoriOrientation::RIGHT));
-        rPropSet.setAnyProperty(PROP_PageToggle, makeAny(sal_True));
+        rPropSet.setAnyProperty(PROP_PageToggle, makeAny(true));
     }
 
     if ( rTypeModel.maPositionHorizontalRelative == "page" )
@@ -839,7 +839,7 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >
         {
             aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
             aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
-            aPropSet.setProperty(PROP_Opaque, sal_False);
+            aPropSet.setProperty(PROP_Opaque, false);
         }
         // fdo#70457: preserve rotation information
         if ( !maTypeModel.maRotation.isEmpty() )