diff options
82 files changed, 765 insertions, 766 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index a2ac12a89fcd..36acf9fc2ad7 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -481,7 +481,7 @@ void ODBExport::exportDataSource() if ( aDelimiter.bUsed ) m_aDelimiter.reset( new TDelimiter( aDelimiter ) ); - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATASOURCE, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATASOURCE, true, true); exportConnectionData(); exportDriverSettings(aSettingsMap); @@ -511,14 +511,14 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin if ( aFind != _aSettings.end() ) AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second); } - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS, true, true); Reference<XPropertySet> xProp(getDataSource()); Sequence< OUString> aValue; xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aValue; if ( aValue.getLength() ) { - SvXMLElementExport aElem2(*this,XML_NAMESPACE_DB, XML_TABLE_FILTER, sal_True, sal_True); + SvXMLElementExport aElem2(*this,XML_NAMESPACE_DB, XML_TABLE_FILTER, true, true); exportSequence(aValue,XML_TABLE_INCLUDE_FILTER,XML_TABLE_FILTER_PATTERN); } @@ -544,7 +544,7 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings) if ( aFind != _aSettings.end() ) AddAttribute(XML_NAMESPACE_DB, aFind->first,aFind->second); } - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, true, true); exportAutoIncrement(); exportDelimiter(); exportCharSet(); @@ -552,7 +552,7 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings) void ODBExport::exportConnectionData() { - SvXMLElementExport aConnData(*this,XML_NAMESPACE_DB, XML_CONNECTION_DATA, sal_True, sal_True); + SvXMLElementExport aConnData(*this,XML_NAMESPACE_DB, XML_CONNECTION_DATA, true, true); { OUString sValue; @@ -560,7 +560,7 @@ void ODBExport::exportConnectionData() xProp->getPropertyValue(PROPERTY_URL) >>= sValue; if ( m_aTypeCollection.isFileSystemBased(sValue) ) { - SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, sal_True, sal_True); + SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, true, true); { SvtPathOptions aPathOptions; const OUString sOrigUrl = m_aTypeCollection.cutPrefix(sValue); @@ -595,7 +595,7 @@ void ODBExport::exportConnectionData() catch(const Exception&) { } - SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, sal_True, sal_True); + SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, true, true); } } else @@ -605,7 +605,7 @@ void ODBExport::exportConnectionData() m_aTypeCollection.extractHostNamePort(sValue,sDatabaseName,sHostName,nPort); if ( sHostName.getLength() ) { - SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, sal_True, sal_True); + SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, true, true); { OUString sType = comphelper::string::stripEnd(m_aTypeCollection.getPrefix(sValue), ':'); AddAttribute(XML_NAMESPACE_DB,XML_TYPE,sType); @@ -657,14 +657,14 @@ void ODBExport::exportConnectionData() DBG_UNHANDLED_EXCEPTION(); } - SvXMLElementExport aServerDB(*this,XML_NAMESPACE_DB, XML_SERVER_DATABASE, sal_True, sal_True); + SvXMLElementExport aServerDB(*this,XML_NAMESPACE_DB, XML_SERVER_DATABASE, true, true); } } else { AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue); AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, true, true); } } @@ -679,7 +679,7 @@ template< typename T > void ODBExport::exportDataSourceSettingsSequence( OSequenceIterator< T > i( in->Value ); while (i.hasMoreElements()) { - SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False); + SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, true, false); // (no whitespace inside the tag) Characters(implConvertAny(i.nextElement())); } @@ -690,7 +690,7 @@ void ODBExport::exportDataSourceSettings() if ( m_aDataSourceSettings.empty() ) return; - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, true, true); ::std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin(); ::std::vector< TypedPropertyValue >::iterator aEnd = m_aDataSourceSettings.end(); for ( ; aIter != aEnd; ++aIter ) @@ -717,11 +717,11 @@ void ODBExport::exportDataSourceSettings() AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, sTypeName ); - SvXMLElementExport aDataSourceSetting( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, sal_True, sal_True ); + SvXMLElementExport aDataSourceSetting( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, true, true ); if ( !bIsSequence ) { - SvXMLElementExport aDataValue( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, sal_True, sal_False ); + SvXMLElementExport aDataValue( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, true, false ); // (no whitespace inside the tag) Characters( implConvertAny( aIter->Value ) ); } @@ -766,7 +766,7 @@ void ODBExport::exportCharSet() { AddAttribute(XML_NAMESPACE_DB, XML_ENCODING,m_sCharSet); - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, true, true); } } @@ -778,7 +778,7 @@ void ODBExport::exportDelimiter() AddAttribute(XML_NAMESPACE_DB, XML_STRING,m_aDelimiter->sText); AddAttribute(XML_NAMESPACE_DB, XML_DECIMAL,m_aDelimiter->sDecimal); AddAttribute(XML_NAMESPACE_DB, XML_THOUSAND,m_aDelimiter->sThousand); - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DELIMITER, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DELIMITER, true, true); } } @@ -788,7 +788,7 @@ void ODBExport::exportAutoIncrement() { AddAttribute(XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second); AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first); - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT, true, true); } } @@ -799,13 +799,13 @@ void ODBExport::exportSequence(const Sequence< OUString>& _aValue Reference<XPropertySet> xProp(getDataSource()); if ( _aValue.getLength() ) { - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, true, true); const OUString* pIter = _aValue.getConstArray(); const OUString* pEnd = pIter + _aValue.getLength(); for(;pIter != pEnd;++pIter) { - SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, sal_True, sal_False); + SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, true, false); Characters(*pIter); } } @@ -826,7 +826,7 @@ void ODBExport::exportLogin() AddAttribute(XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED,bValue ? XML_TRUE : XML_FALSE); } if ( bAddLogin ) - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, true, true); } void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection @@ -840,7 +840,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection { boost::scoped_ptr<SvXMLElementExport> pComponents; if ( _bExportContext ) - pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True)); + pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, true, true)); Sequence< OUString> aSeq = _xCollection->getElementNames(); const OUString* pIter = aSeq.getConstArray(); const OUString* pEnd = pIter + aSeq.getLength(); @@ -876,7 +876,7 @@ void ODBExport::exportComponent(XPropertySet* _xProp) sal_Bool bAsTemplate = sal_False; _xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate; AddAttribute(XML_NAMESPACE_DB, XML_AS_TEMPLATE,bAsTemplate ? XML_TRUE : XML_FALSE); - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COMPONENT, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COMPONENT, true, true); } void ODBExport::exportQuery(XPropertySet* _xProp) @@ -895,7 +895,7 @@ void ODBExport::exportQuery(XPropertySet* _xProp) exportStyleName(_xProp,GetAttrList()); - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_QUERY, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_QUERY, true, true); Reference<XColumnsSupplier> xCol(_xProp,UNO_QUERY); exportColumns(xCol); exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT); @@ -919,7 +919,7 @@ void ODBExport::exportTable(XPropertySet* _xProp) exportStyleName(_xProp,GetAttrList()); - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, true, true); Reference<XColumnsSupplier> xCol(_xProp,UNO_QUERY); exportColumns(xCol); exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT); @@ -961,7 +961,7 @@ void ODBExport::exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate) if ( _bUpdate ) { - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_UPDATE_TABLE, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_UPDATE_TABLE, true, true); } } } @@ -976,7 +976,7 @@ void ODBExport::exportFilter(XPropertySet* _xProp if ( !sCommand.isEmpty() ) { AddAttribute(XML_NAMESPACE_DB, XML_COMMAND,sCommand); - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, _eStatementType, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, _eStatementType, true, true); } OSL_POSTCOND(!GetAttrList().getLength(),"Invalid attribute length!"); } @@ -996,18 +996,18 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) TTableColumnMap::iterator aFind = m_aTableDummyColumns.find(xComponent); if ( aFind != m_aTableDummyColumns.end() ) { - SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); + SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, true, true); SvXMLAttributeList* pAtt = new SvXMLAttributeList; Reference<XAttributeList> xAtt = pAtt; exportStyleName(aFind->second.get(),*pAtt); AddAttributeList(xAtt); - SvXMLElementExport aColumn(*this,XML_NAMESPACE_DB, XML_COLUMN, sal_True, sal_True); + SvXMLElementExport aColumn(*this,XML_NAMESPACE_DB, XML_COLUMN, true, true); } return; } - SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); + SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, true, true); Sequence< OUString> aSeq = xNameAccess->getElementNames(); const OUString* pIter = aSeq.getConstArray(); const OUString* pEnd = pIter + aSeq.getLength(); @@ -1051,7 +1051,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) if ( GetAttrList().getLength() ) { - SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COLUMN, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_DB, XML_COLUMN, true, true); } } } diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index 7b844548b3e0..5967898ac341 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -50,7 +50,7 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ), _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) ); { - SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, sal_True, sal_True); + SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true); SvxAutocorrWordList::Content aContent = pAutocorr_List->getSortedContent(); for( SvxAutocorrWordList::Content::iterator it = aContent.begin(); it != aContent.end(); ++it ) @@ -64,7 +64,7 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) XML_NAME, OUString(p->IsTextOnly() ? p->GetLong() : p->GetShort())); - SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, sal_True, sal_True); + SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, true, true); } } GetDocHandler()->endDocument(); @@ -94,14 +94,14 @@ sal_uInt32 SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/) _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ), _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) ); { - SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, sal_True, sal_True); + SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true); sal_uInt16 nBlocks= rList.size(); for ( sal_uInt16 i = 0; i < nBlocks; i++) { AddAttribute( XML_NAMESPACE_BLOCKLIST, XML_ABBREVIATED_NAME, rList[i] ); - SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, sal_True, sal_True); + SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, true, true); } } GetDocHandler()->endDocument(); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 6b49d543ee39..9223bfef92da 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -156,7 +156,7 @@ public: virtual void elementExport( SVGExport* pSVGExport ) const SAL_OVERRIDE { TextField::elementExport( pSVGExport ); - SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); pSVGExport->GetDocHandler()->characters( text ); } virtual ~FixedTextField() {} @@ -301,7 +301,7 @@ public: OUString sDateTimeFormat = sDateFormat + " " + sTimeFormat; pSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeFormat, sDateTimeFormat ); - SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE { @@ -757,22 +757,22 @@ sal_Bool SVGFilter::implExportDocument() mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", "http://www.w3.org/1999/xlink" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" ); - mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, "svg", sal_True, sal_True ); + mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, "svg", true, true ); // Create a ClipPath element that will be used for cutting bitmaps and other elements that could exceed the page margins. { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "ClipPathGroup" ); - SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", msClipPathId ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", "userSpaceOnUse" ); - SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "clipPath", sal_True, sal_True ); + SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "clipPath", true, true ); { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x", OUString::number( 0 ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y", OUString::number( 0 ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", OUString::number( nDocWidth ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", OUString::number( nDocHeight ) ); - SvXMLElementExport aRectElem( *mpSVGExport, XML_NAMESPACE_NONE, "rect", sal_True, sal_True ); + SvXMLElementExport aRectElem( *mpSVGExport, XML_NAMESPACE_NONE, "rect", true, true ); } } } @@ -875,7 +875,7 @@ sal_Bool SVGFilter::implGenerateMetaData() if( nCount != 0 ) { // we wrap all meta presentation info into a svg:defs element - SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aOOOElemMetaSlides ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberOfSlides, OUString::number( nCount ) ); @@ -927,7 +927,7 @@ sal_Bool SVGFilter::implGenerateMetaData() { - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); const OUString aId( aOOOElemMetaSlide ); const OUString aElemTextFieldId( aOOOElemTextField ); std::vector< TextField* > aFieldSet; @@ -1049,7 +1049,7 @@ sal_Bool SVGFilter::implGenerateMetaData() } { - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } // when the aExp2 destructor is called the </g> tag is appended to the output file } @@ -1092,7 +1092,7 @@ sal_Bool SVGFilter::implExportAnimations() sal_Bool bRet = sal_False; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "presentation-animations" ); - SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); for( sal_Int32 i = 0; i < mSelectedPages.getLength(); ++i ) { @@ -1135,7 +1135,7 @@ sal_Bool SVGFilter::implExportAnimations() sId += "-animations"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Animations" ); - SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); UniReference< xmloff::AnimationsExporter > xAnimationsExporter; xAnimationsExporter = new xmloff::AnimationsExporter( *mpSVGExport, xProps ); @@ -1156,7 +1156,7 @@ sal_Bool SVGFilter::implExportAnimations() void SVGFilter::implExportTextShapeIndex() { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextShapeIndex" ); - SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); sal_Int32 nCount = mSelectedPages.getLength(); for( sal_Int32 i = 0; i < nCount; ++i ) @@ -1171,7 +1171,7 @@ void SVGFilter::implExportTextShapeIndex() { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, rPageId ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrIdList, sTextShapeIdList ); - SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } } } @@ -1182,7 +1182,7 @@ void SVGFilter::implExportTextShapeIndex() void SVGFilter::implEmbedBulletGlyphs() { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBulletChars" ); - SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); OUString sPathData = "M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"; implEmbedBulletGlyph( 57356, sPathData ); @@ -1216,10 +1216,10 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat OUString sTransform = "scale(" + sFactor + ",-" + sFactor + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "transform", sTransform ); - SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "d", sPathData ); - SvXMLElementExport aPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "path", sal_True, sal_True ); + SvXMLElementExport aPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "path", true, true ); } @@ -1232,7 +1232,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat sal_Bool SVGFilter::implExportTextEmbeddedBitmaps() { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextEmbeddedBitmaps" ); - SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); OUString sId; @@ -1304,7 +1304,7 @@ sal_Bool SVGFilter::implGenerateScript() mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", "text/ecmascript" ); { - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "script", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "script", true, true ); Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY ); if( xExtDocHandler.is() ) @@ -1406,7 +1406,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & // When the exported slides are more than one we wrap master page elements // with a svg <defs> element. OUString aContainerTag = (mbSinglePage) ? OUString( "g" ) : OUString( "defs" ); - SvXMLElementExport aContainerElement( *mpSVGExport, XML_NAMESPACE_NONE, aContainerTag, sal_True, sal_True ); + SvXMLElementExport aContainerElement( *mpSVGExport, XML_NAMESPACE_NONE, aContainerTag, true, true ); sal_Bool bRet = sal_False; for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i ) @@ -1438,7 +1438,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx // We wrap all slide in a group element with class name "SlideGroup". mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "SlideGroup" ); - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); sal_Bool bRet = sal_False; for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i ) @@ -1455,7 +1455,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); } - SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); { // add id attribute @@ -1470,7 +1470,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx OUString sClipPathAttrValue = "url(#" + msClipPathId + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", sClipPathAttrValue ); - SvXMLElementExport aSlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aSlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); bRet = implExportPage( sPageId, rxPages[i], xShapes, sal_False /* is not a master page */ ) || bRet; } @@ -1510,7 +1510,7 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId, } // insert the <g> open tag related to the DrawPage/MasterPage - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); // In case the page has a background object we append it . if( (mpObjects->find( rxPage ) != mpObjects->end()) ) @@ -1541,7 +1541,7 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId, mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Background" ); // insert the <g> open tag related to the Background - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); // append all elements that make up the Background const Point aNullPt; @@ -1567,7 +1567,7 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId, mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "BackgroundObjects" ); // insert the <g> open tag related to the Background Objects - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); // append all shapes that make up the Master Slide bRet = implExportShapes( xShapes, true ) || bRet; @@ -1636,7 +1636,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, if( xShapes.is() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Group" ); - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); bRet = implExportShapes( xShapes, bMaster ); } @@ -1705,7 +1705,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, } } mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", aShapeClass ); - SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY ); @@ -1713,7 +1713,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, xShapePropSet->getPropertyValue( "Title" ) >>= aTitle; if( !aTitle.isEmpty() ) { - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "title", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "title", true, true ); xExtDocHandler->characters( aTitle ); } @@ -1721,7 +1721,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, xShapePropSet->getPropertyValue( "Description" ) >>= aDescription; if( !aDescription.isEmpty() ) { - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "desc", true, true ); xExtDocHandler->characters( aDescription ); } @@ -1746,11 +1746,11 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, xShapePropSet->getPropertyValue( "Bookmark" ) >>= aBookmark; } - SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); + SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); if( !aBookmark.isEmpty() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xlink:href", aBookmark); - SvXMLElementExport alinkA( *mpSVGExport, XML_NAMESPACE_NONE, "a", sal_True, sal_True ); + SvXMLElementExport alinkA( *mpSVGExport, XML_NAMESPACE_NONE, "a", true, true ); mpSVGWriter->WriteMetaFile( aTopLeft, aSize, rMtf, 0xffffffff, pElementId, @@ -2331,7 +2331,7 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf ) AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" ); { - SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", sal_True, sal_True ); + SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", true, true ); std::vector< ObjectRepresentation > aObjects; diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 86f401ffd4d2..edf34da7a558 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -186,7 +186,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) const OUString aEmbeddedFontStr( "EmbeddedFont_" ); { - SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); + SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", true, true ); OUString aCurIdStr( aEmbeddedFontStr ); OUString aUnitsPerEM( OUString::number( nFontEM ) ); VirtualDevice aVDev; @@ -202,7 +202,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM ); { - SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True ); + SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", true, true ); OUString aFontWeight; OUString aFontStyle; const Size aSize( nFontEM, nFontEM ); @@ -227,7 +227,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::number( aVDev.GetFontMetric().GetDescent() ) ); { - SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True ); + SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", true, true ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::number( aSize.Width() ) ); @@ -239,7 +239,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, sal_False ) ); { - SvXMLElementExport aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", sal_True, sal_True ); + SvXMLElementExport aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", true, true ); } } @@ -284,7 +284,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr } { - SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "glyph", sal_True, sal_True ); + SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "glyph", true, true ); } } } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index a52079465cc1..c1430af477e9 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -174,7 +174,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL || rGradient.GetStyle() == GradientStyle_RADIAL || rGradient.GetStyle() == GradientStyle_ELLIPTICAL ) ) { - SvXMLElementExport aDesc( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); + SvXMLElementExport aDesc( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, true, true ); Color aStartColor( rGradient.GetStartColor() ), aEndColor( rGradient.GetEndColor() ); sal_uInt16 nAngle = rGradient.GetAngle() % 3600; Point aObjRectCenter( rObjRect.Center() ); @@ -215,7 +215,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::number( aLinePoly[ 1 ].X() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::number( aLinePoly[ 1 ].Y() ) ); - apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ) ); + apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, true, true ) ); // write stop values double fBorder = static_cast< double >( rGradient.GetBorder() ) * @@ -226,7 +226,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { - SvXMLElementExport aDesc2( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aDesc2( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } if( rGradient.GetStyle() == GradientStyle_AXIAL ) @@ -236,7 +236,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { - SvXMLElementExport aDesc3( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aDesc3( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } } @@ -248,7 +248,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { - SvXMLElementExport aDesc4( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aDesc4( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } } else @@ -263,7 +263,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::number( ImplRound( fCenterY ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, OUString::number( ImplRound( fRadius ) ) ); - apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, sal_True, sal_True ) ); + apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, true, true ) ); // write stop values ImplGetColorStr( aEndColor, aColorStr ); @@ -271,7 +271,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { - SvXMLElementExport aDesc5( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aDesc5( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } ImplGetColorStr( aStartColor, aColorStr ); @@ -280,7 +280,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { - SvXMLElementExport aDesc6( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aDesc6( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } } } @@ -361,11 +361,11 @@ void SVGAttributeWriter::startFontSettings() endFontSettings(); if( mrExport.IsUsePositionedCharacters() ) { - mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); } else { - mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, sal_True, sal_True ); + mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, true, true ); } } @@ -1158,7 +1158,7 @@ void SVGTextWriter::startTextShape() mbIsTextShapeStarted = sal_True; maParentFont = Font(); mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" ); - mpTextShapeElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, mbIWS ); + mpTextShapeElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, mbIWS ); startTextParagraph(); } } @@ -1278,7 +1278,7 @@ void SVGTextWriter::implExportHyperlinkIds() if( !msHyperlinkIdList.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "HyperlinkIdList" ); - SvXMLElementExport aDescElem( mrExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_False ); + SvXMLElementExport aDescElem( mrExport, XML_NAMESPACE_NONE, "desc", true, false ); mrExport.GetDocHandler()->characters( msHyperlinkIdList.trim() ); msHyperlinkIdList = ""; } @@ -1290,7 +1290,7 @@ void SVGTextWriter::implWriteBulletChars() return; mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletChars" ); - SvXMLElementExport aGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); BulletListItemInfoMap::const_iterator it = maBulletListItemMap.begin(); BulletListItemInfoMap::const_iterator end = maBulletListItemMap.end(); @@ -1304,7 +1304,7 @@ void SVGTextWriter::implWriteBulletChars() sId = "bullet-char(" + it->first+ ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletChar" ); - SvXMLElementExport aBulletCharElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aBulletCharElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); // <g transform="translate(x,y)" > { @@ -1318,7 +1318,7 @@ void SVGTextWriter::implWriteBulletChars() mpContext->AddPaintAttr( COL_TRANSPARENT, rInfo.aColor ); - SvXMLElementExport aPositioningElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aPositioningElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); // <use transform="scale(font-size)" xlink:ref="/" > { @@ -1333,7 +1333,7 @@ void SVGTextWriter::implWriteBulletChars() ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId ); - SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", sal_True, sal_True ); + SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", true, true ); } } // close aPositioningElem } // close aBulletCharElem @@ -1376,7 +1376,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() if( mpTextEmbeddedBitmapMtf && mpTextEmbeddedBitmapMtf->GetActionSize() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBitmaps" ); - SvXMLElementExport aEmbBitmapGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aEmbBitmapGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); const GDIMetaFile& rMtf = *mpTextEmbeddedBitmapMtf; @@ -1423,7 +1423,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBitmap" ); - SvXMLElementExport aEmbBitmapElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aEmbBitmapElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); // <use x="?" y="?" xlink:ref="?" > { @@ -1441,7 +1441,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPoint.Y() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId ); - SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", sal_True, sal_True ); + SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", true, true ); } } // close aEmbBitmapElem } @@ -1810,7 +1810,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, } { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, true, true ); } } @@ -1836,7 +1836,7 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, true, true ); } } @@ -1856,7 +1856,7 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, true, true ); } } @@ -1930,7 +1930,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo { // write polyline/polygon element - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, true, true ); } } @@ -2032,12 +2032,12 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, { if( rPolyPoly.Count() ) { - SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); OUString aPatternId = "pattern" + OUString::number( mnCurPatternId++ ); { - SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); + SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, true, true ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aPatternId ); @@ -2052,7 +2052,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, OUString( "userSpaceOnUse") ); { - SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True ); + SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, true, true ); // The origin of a pattern is positioned at (aRect.Left(), aRect.Top()). // So we need to adjust the pattern coordinate. @@ -2063,7 +2063,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform ); { - SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); GDIMetaFile aTmpMtf; if( pHatch ) @@ -2101,12 +2101,12 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, { if( rPolyPoly.Count() ) { - SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); OUString aGradientId = "gradient" + OUString::number( mnCurGradientId++ ); { - SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); + SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, true, true ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aGradientId ); { @@ -2137,7 +2137,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, } { - SvXMLElementExport aElemLinearGradient( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ); + SvXMLElementExport aElemLinearGradient( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, true, true ); const Color aStartColor = ImplGetColorWithIntensity( rGradient.GetStartColor(), rGradient.GetStartIntensity() ); const Color aEndColor = ImplGetColorWithIntensity( rGradient.GetEndColor(), rGradient.GetEndIntensity() ); @@ -2214,7 +2214,7 @@ void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aStyle ); { - SvXMLElementExport aElemStartStop( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, sal_True, sal_True ); + SvXMLElementExport aElemStartStop( mrExport, XML_NAMESPACE_NONE, aXMLElemStop, true, true ); } } @@ -2272,11 +2272,11 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, OUString aMaskId = "mask" + OUString::number( mnCurMaskId++ ); { - SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); + SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, true, true ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aMaskId ); { - SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, sal_True, sal_True ); + SvXMLElementExport aElemMask( mrExport, XML_NAMESPACE_NONE, aXMLElemMask, true, true ); const PolyPolygon aPolyPolygon( PolyPolygon( Rectangle( rDestPt, rDestSize ) ) ); Gradient aGradient( rGradient ); @@ -2297,7 +2297,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aMaskStyle ); { - SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); + SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ); mpVDev->Push(); ImplWriteActions( rMtf, nWriteFlags, NULL ); @@ -2450,7 +2450,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, mpContext->AddPaintAttr( COL_TRANSPARENT, aTextColor ); // for each line of text there should be at least one group element - SvXMLElementExport aSVGGElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_False ); + SvXMLElementExport aSVGGElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, false ); sal_Bool bIsPlaceholderField = sal_False; @@ -2471,7 +2471,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aPos.X() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, false ); // At least for the single slide case we need really to export placeholder text mrExport.GetDocHandler()->characters( sCleanTextContent ); } @@ -2519,7 +2519,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, false ); mrExport.GetDocHandler()->characters( aGlyph ); } @@ -2541,7 +2541,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aPos.Y() ) ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, false ); mrExport.GetDocHandler()->characters( rText ); } } @@ -2626,7 +2626,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aSz.Height() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, aBuffer.makeStringAndClear() ); { - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemImage, true, true ); } } } @@ -2674,7 +2674,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, try { SvXMLElementExport aElem( mrExport, - XML_NAMESPACE_NONE, "desc", sal_False, sal_False ); + XML_NAMESPACE_NONE, "desc", false, false ); OUStringBuffer sType(OUString::number(nType)); if (pAction && (nType == META_COMMENT_ACTION)) { diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx index 8459c2b6820a..55cb05d52bf3 100644 --- a/include/xmloff/xmlaustp.hxx +++ b/include/xmloff/xmlaustp.hxx @@ -77,10 +77,10 @@ public: if bAsFamily is sal_False, the family name is used as element name */ // TODO: Remove this ugly method as soon as possible - void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, sal_Bool bAsFamily = sal_True ); + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, bool bAsFamily = true ); void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference< SvXMLExportPropertyMapper >& rMapper, - const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, bool bAsFamily = true ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference< SvXMLExportPropertyMapper >& rMapper ); @@ -100,10 +100,10 @@ public: /// Add an item set to the pool and return its generated name. OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); OUString Add( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); - sal_Bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); + bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Add an item set with a pre-defined name (needed for saving sheets separately in Calc). - sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, + bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Find an item set's name. diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx index f6ef3fe09590..70825653f2b8 100644 --- a/include/xmloff/xmlcnimp.hxx +++ b/include/xmloff/xmlcnimp.hxx @@ -38,10 +38,10 @@ public: bool operator ==( const SvXMLAttrContainerData& rCmp ) const; - sal_Bool AddAttr( const OUString& rLName, const OUString& rValue ); - sal_Bool AddAttr( const OUString& rPrefix, const OUString& rNamespace, + bool AddAttr( const OUString& rLName, const OUString& rValue ); + bool AddAttr( const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ); - sal_Bool AddAttr( const OUString& rPrefix, + bool AddAttr( const OUString& rPrefix, const OUString& rLName, const OUString& rValue ); @@ -56,12 +56,12 @@ public: const OUString& GetNamespace( sal_uInt16 i ) const; const OUString& GetPrefix( sal_uInt16 i ) const; - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rLName, const OUString& rValue ); - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ); - sal_Bool SetAt( size_t i, + bool SetAt( size_t i, const OUString& rPrefix, const OUString& rLName, const OUString& rValue ); diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index 70de54525d28..261c89a5715a 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -98,7 +98,7 @@ public: const OUString& rEventQName, /// the XML name of the event ::com::sun::star::uno::Sequence< /// the values for the event ::com::sun::star::beans::PropertyValue> & rValues, - sal_Bool bUseWhitespace) = 0; /// create whitespace around elements? + bool bUseWhitespace) = 0; /// create whitespace around elements? }; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index ed7571f33ceb..7c7eef29fe12 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -143,7 +143,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< XMLImageMapExport* mpImageMapExport; XMLErrors* mpXMLErrors; - sal_Bool mbExtended; // Does document contain extens. + bool mbExtended; // Does document contain extens. const enum ::xmloff::token::XMLTokenEnum meClass; SAL_DLLPRIVATE void _InitCtor(); @@ -163,10 +163,10 @@ private: SAL_DLLPRIVATE void ImplExportMeta(); // <office:meta> SAL_DLLPRIVATE void ImplExportSettings(); // <office:settings> - SAL_DLLPRIVATE void ImplExportStyles( sal_Bool bUsed ); // <office:styles> - SAL_DLLPRIVATE void ImplExportAutoStyles( sal_Bool bUsed ); + SAL_DLLPRIVATE void ImplExportStyles( bool bUsed ); // <office:styles> + SAL_DLLPRIVATE void ImplExportAutoStyles( bool bUsed ); // <office:automatic-styles> - SAL_DLLPRIVATE void ImplExportMasterStyles( sal_Bool bUsed ); + SAL_DLLPRIVATE void ImplExportMasterStyles( bool bUsed ); // <office:master-styles> SAL_DLLPRIVATE void ImplExportContent(); // <office:body> virtual void SetBodyAttributes(); @@ -210,10 +210,10 @@ protected: // This method must be overloaded to export the content of <office:body>. virtual void _ExportContent() = 0; - void SetExtended( sal_Bool bSet=sal_True ) { mbExtended = bSet; } + void SetExtended( bool bSet=true ) { mbExtended = bSet; } // save linked sections? (may be false in global documents) - sal_Bool mbSaveLinkedSections; + bool mbSaveLinkedSections; virtual XMLTextParagraphExport* CreateTextParagraphExport(); virtual XMLShapeExport* CreateShapeExport(); @@ -417,10 +417,10 @@ public: // Export the document. virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); - virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); + virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const; sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const; virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); @@ -475,24 +475,24 @@ public: OUString AddEmbeddedGraphicObject( const OUString& rGraphicObjectURL ); - sal_Bool AddEmbeddedGraphicObjectAsBase64( + bool AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObjectURL ); OUString AddEmbeddedObject( const OUString& rEmbeddedObjectURL ); - sal_Bool AddEmbeddedObjectAsBase64( + bool AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL ); OUString EncodeStyleName( const OUString& rName, sal_Bool *pEncoded=0 ) const; // save linked sections? - inline sal_Bool IsSaveLinkedSections() { return mbSaveLinkedSections; } + inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; } // get export flags sal_uInt16 getExportFlags() const { return mnExportFlags; } - sal_Bool ExportEmbeddedOwnObject( + bool ExportEmbeddedOwnObject( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rComp ); @@ -501,15 +501,15 @@ public: // methods for accessing the document handler and handling SAX errors void StartElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSOutside ); + bool bIgnWSOutside ); void StartElement(const OUString& rName, - sal_Bool bIgnWSOutside ); + bool bIgnWSOutside ); void Characters(const OUString& rChars); void EndElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSInside ); + bool bIgnWSInside ); void EndElement(const OUString& rName, - sal_Bool bIgnWSInside ); + bool bIgnWSInside ); void IgnorableWhitespace(); /** @@ -548,7 +548,7 @@ public: } // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - sal_Bool writeOutlineStyleAsNormalListStyle() const; + bool writeOutlineStyleAsNormalListStyle() const; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetTargetStorage(); @@ -572,10 +572,10 @@ public: void AddAttributesRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent> const & i_xTextContent); - sal_Bool exportTextNumberElement() const; + bool exportTextNumberElement() const; /// set null date from model to unit converter, if not already done - sal_Bool SetNullDateOnUnitConverter(); + bool SetNullDateOnUnitConverter(); }; inline UniReference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExport() @@ -656,14 +656,14 @@ class XMLOFF_DLLPUBLIC SvXMLElementExport { SvXMLExport& mrExport; OUString maElementName; - const sal_Bool mbIgnoreWhitespaceInside :1; - const sal_Bool mbDoSomething :1; + const bool mbIgnoreWhitespaceInside :1; + const bool mbDoSomething :1; SAL_DLLPRIVATE void StartElement( const sal_uInt16 nPrefix, const OUString& rName, - const sal_Bool bIgnoreWhitespaceOutside ); + const bool bIgnoreWhitespaceOutside ); public: @@ -671,21 +671,21 @@ public: // of the XMLExport instance attached. SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, const sal_Char *pName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); + bool bIgnWSOutside, bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, const OUString& rName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); + bool bIgnWSOutside, bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); + bool bIgnWSOutside, bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, const OUString& rQName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); + bool bIgnWSOutside, bool bIgnWSInside ); // Thes constructors do nothing if bDoSomething is not set - SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, + SvXMLElementExport( SvXMLExport& rExp, bool bDoSomething, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); + bool bIgnWSOutside, bool bIgnWSInside ); // The destructor prints an end tag. ~SvXMLElementExport(); diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 3ce2f34a1fbd..7a1f655e62f0 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -122,7 +122,7 @@ public: { return _Filter(rPropSet, true, bEnableFoFontFamily); } /** Compare to arrays of XMLPropertyState */ - sal_Bool Equals( const ::std::vector< XMLPropertyState >& aProperties1, + bool Equals( const ::std::vector< XMLPropertyState >& aProperties1, const ::std::vector< XMLPropertyState >& aProperties2 ) const; /** fills the given attribute list with the items in the given set */ diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 34847b6145b3..2bd7769de16f 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -332,7 +332,7 @@ sal_uInt32 ConvDicXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum /*eCl //!! block necessary in order to have SvXMLElementExport d-tor called //!! before the call to endDocument { - SvXMLElementExport aRoot( *this, XML_NAMESPACE_TCD, "text-conversion-dictionary", sal_True, sal_True ); + SvXMLElementExport aRoot( *this, XML_NAMESPACE_TCD, "text-conversion-dictionary", true, true ); _ExportContent(); } @@ -368,7 +368,7 @@ void ConvDicXMLExport::_ExportContent() AddAttribute( XML_NAMESPACE_TCD, "property-type", OUString::number( nPropertyType ) ); } SvXMLElementExport aEntryMain( *this, XML_NAMESPACE_TCD, - "entry" , sal_True, sal_True ); + "entry" , true, true ); pair< ConvMap::iterator, ConvMap::iterator > aRange = rDic.aFromLeft.equal_range( *aKeyIt ); @@ -377,7 +377,7 @@ void ConvDicXMLExport::_ExportContent() DBG_ASSERT( *aKeyIt == (*aIt).first, "key <-> entry mismatch" ); OUString aRightText( (*aIt).second ); SvXMLElementExport aEntryRightText( *this, XML_NAMESPACE_TCD, - "right-text" , sal_True, sal_False ); + "right-text" , true, false ); Characters( aRightText ); } } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 91d4ca58fbba..1b6eebbdc2d2 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -347,7 +347,7 @@ void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction) if ( _xFunction->getDeepTraversing() ) AddAttribute( XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING , XML_TRUE ); - SvXMLElementExport aFunction(*this,XML_NAMESPACE_REPORT, XML_FUNCTION, sal_True, sal_True); + SvXMLElementExport aFunction(*this,XML_NAMESPACE_REPORT, XML_FUNCTION, true, true); } void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet) @@ -355,7 +355,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR const uno::Sequence< OUString> aMasterFields = _xReportComponet->getMasterFields(); if ( aMasterFields.getLength() ) { - SvXMLElementExport aElement(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, sal_True, sal_True); + SvXMLElementExport aElement(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, true, true); const uno::Sequence< OUString> aDetailFields = _xReportComponet->getDetailFields(); OSL_ENSURE(aDetailFields.getLength() == aMasterFields.getLength(),"not equal length for master and detail fields!"); @@ -368,7 +368,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); if ( !pDetailFieldsIter->isEmpty() ) AddAttribute( XML_NAMESPACE_REPORT, XML_DETAIL , *pDetailFieldsIter ); - SvXMLElementExport aPair(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, sal_True, sal_True); + SvXMLElementExport aPair(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, true, true); } } } @@ -382,7 +382,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini if ( _xReportDefinition->getReportHeaderOn() ) { - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, true, true); exportSection(_xReportDefinition->getReportHeader()); } if ( _xReportDefinition->getPageHeaderOn() ) @@ -393,7 +393,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, true, true); exportSection(_xReportDefinition->getPageHeader(),true); } @@ -406,12 +406,12 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_FOOTER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_FOOTER, true, true); exportSection(_xReportDefinition->getPageFooter(),true); } if ( _xReportDefinition->getReportFooterOn() ) { - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, true, true); exportSection(_xReportDefinition->getReportFooter()); } } @@ -425,7 +425,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,_xReportComponent->getName()); - SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, false, false); } void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _xReportElement) @@ -443,7 +443,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x AddAttribute(XML_NAMESPACE_REPORT, XML_FORMULA,xCond->getFormula()); exportStyleName(xCond.get(),GetAttrList(),m_sCellStyle); - SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, true, true); } } catch(uno::Exception&) @@ -461,7 +461,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep if ( !_xReportElement->getPrintRepeatedValues() ) AddAttribute(XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES,XML_FALSE); - SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, true, true); if ( _xReportElement->getCount() ) { exportFormatConditions(_xReportElement); @@ -471,7 +471,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep if ( !sExpr.isEmpty() ) { exportFormula(XML_FORMULA,sExpr); - SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_True, sal_True); + SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, true, true); } // only export when parent exists @@ -728,13 +728,13 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader exportStyleName(_xSection.get(),GetAttrList(),m_sTableStyle); /// TODO export as table layout - SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, true, true); OUString sExpr = _xSection->getConditionalPrintExpression(); if ( !sExpr.isEmpty() ) { exportFormula(XML_FORMULA,sExpr); - SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_True, sal_False); + SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, true, false); } exportContainer(_xSection); @@ -742,7 +742,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader void ORptExport::exportTableColumns(const Reference< XSection>& _xSection) { - SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, sal_True, sal_True); + SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true); TGridStyleMap::iterator aColFind = m_aColumnStyleNames.find(_xSection.get()); OSL_ENSURE(aColFind != m_aColumnStyleNames.end(),"ORptExport::exportTableColumns: Section not found in m_aColumnStyleNames!"); if ( aColFind == m_aColumnStyleNames.end() ) @@ -753,7 +753,7 @@ void ORptExport::exportTableColumns(const Reference< XSection>& _xSection) for (; aColIter != aColEnd; ++aColIter) { AddAttribute( m_sTableStyle,*aColIter ); - SvXMLElementExport aColumn(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True); + SvXMLElementExport aColumn(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true); } } @@ -780,7 +780,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) for (sal_Int32 j = 0; aRowIter != aRowEnd; ++aRowIter,++j,++aHeightIter) { AddAttribute( m_sTableStyle,*aHeightIter ); - SvXMLElementExport aRow(*this,XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True); + SvXMLElementExport aRow(*this,XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); if ( aRowIter->first ) { ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin(); @@ -849,12 +849,12 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) aHelper.SetNumberFormatAttributes(nFormatKey, 0.0, false); } } - SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_False); + SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, false); if ( aColIter->xElement.is() ) { // start <text:p> - SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_True,sal_False); + SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, true, false); Reference<XServiceInfo> xElement(aColIter->xElement,uno::UNO_QUERY); Reference<XReportComponent> xReportComponent = aColIter->xElement; @@ -919,7 +919,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) //if ( !bPageSet ) { // start <report:eToken> - SvXMLElementExport aComponents(*this,XML_NAMESPACE_REPORT, eToken, sal_False, sal_False); + SvXMLElementExport aComponents(*this,XML_NAMESPACE_REPORT, eToken, false, false); if ( eToken == XML_FIXED_CONTENT ) exportParagraph(xReportElement); if ( xReportElement.is() ) @@ -929,10 +929,10 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportContainer(xSection); else if ( eToken == XML_SUB_DOCUMENT && xReportDefinition.is() ) { - SvXMLElementExport aOfficeElement( *this, XML_NAMESPACE_OFFICE, XML_BODY,sal_True, sal_True ); - SvXMLElementExport aElem( *this, sal_True, + SvXMLElementExport aOfficeElement( *this, XML_NAMESPACE_OFFICE, XML_BODY, true, true ); + SvXMLElementExport aElem( *this, true, XML_NAMESPACE_OFFICE, XML_REPORT, - sal_True, sal_True ); + true, true ); exportReportAttributes(xReportDefinition); exportReport(xReportDefinition); @@ -955,7 +955,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { for (sal_Int32 k = 0; k < nColSpan; ++k) { - SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, true, true); } } @@ -964,7 +964,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { { AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nEmptyCellColSpan) ); - SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); if ( !bShapeHandled ) { bShapeHandled = true; @@ -973,7 +973,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } for (sal_Int32 k = 0; k < nEmptyCellColSpan; ++k) { - SvXMLElementExport aCoveredCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aCoveredCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, true, true); } nEmptyCellColSpan = 0; } @@ -985,7 +985,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { { AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nEmptyCellColSpan) ); - SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); if ( !bShapeHandled ) { bShapeHandled = true; @@ -994,7 +994,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } for (sal_Int32 k = 1; k < nEmptyCellColSpan; ++k) { - SvXMLElementExport aCoveredCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aCoveredCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, true, true); } nEmptyCellColSpan = 0; } @@ -1096,14 +1096,14 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear()); - SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, sal_True, sal_True); + SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, true, true); exportFunctions(xGroup->getFunctions().get()); if ( xGroup->getHeaderOn() ) { Reference<XSection> xSection = xGroup->getHeader(); if ( xSection->getRepeatSection() ) AddAttribute(XML_NAMESPACE_REPORT, XML_REPEAT_SECTION,XML_TRUE ); - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_HEADER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_HEADER, true, true); exportSection(xSection); } exportGroup(_xReportDefinition,_nPos+1,_bExportAutoStyle); @@ -1112,7 +1112,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef Reference<XSection> xSection = xGroup->getFooter(); if ( xSection->getRepeatSection() ) AddAttribute(XML_NAMESPACE_REPORT, XML_REPEAT_SECTION,XML_TRUE ); - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_FOOTER, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_FOOTER, true, true); exportSection(xSection); } } @@ -1123,7 +1123,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef } else { - SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_DETAIL, sal_True, sal_True); + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_DETAIL, true, true); exportSection(_xReportDefinition->getDetail()); } } @@ -1410,7 +1410,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { OSL_PRECOND(_xReportElement.is(),"Element is null!"); // start <text:p> - SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_False, sal_False); + SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, false, false); if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() ) { OUString sFieldData = _xReportElement->getDataField(); @@ -1432,12 +1432,12 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { static const OUString s_sCurrent("current"); AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); - SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False); + SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, false, false); Characters(OUString("1")); } else if ( sToken == s_sPageCount ) { - SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, sal_False, sal_False); + SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, false, false); Characters(OUString("1")); } else @@ -1478,7 +1478,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa ::std::auto_ptr<SvXMLElementExport> pParagraphContent; SAL_WNODEPRECATED_DECLARATIONS_POP if ( _bAddParagraph ) - pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False)); + pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, true, false)); awt::Point aRefPoint; aRefPoint.X = rptui::getStyleProperty<sal_Int32>(_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN); @@ -1493,7 +1493,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa uno::Reference< frame::XModel> xModel(xShape->getPropertyValue("Model"),uno::UNO_QUERY); if ( xModel.is() ) // special handling for chart object { - pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); + pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, false, false)); exportMasterDetailFields(xShape.get()); exportReportElement(xShape.get()); } diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index bac0f2949e74..64543206cba6 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -77,7 +77,7 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - aName, sal_True, sal_True ); + aName, true, true ); if (!sCenter.isEmpty() && sLeft.isEmpty() && sRight.isEmpty()) exportHeaderFooterContent( xCenter, false, false ); else @@ -85,19 +85,19 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref if (!sLeft.isEmpty()) { SvXMLElementExport aSubElem( GetExport(), XML_NAMESPACE_STYLE, - XML_REGION_LEFT, sal_True, sal_True ); + XML_REGION_LEFT, true, true ); exportHeaderFooterContent( xLeft, false, false ); } if (!sCenter.isEmpty()) { SvXMLElementExport aSubElem( GetExport(), XML_NAMESPACE_STYLE, - XML_REGION_CENTER, sal_True, sal_True ); + XML_REGION_CENTER, true, true ); exportHeaderFooterContent( xCenter, false, false ); } if (!sRight.isEmpty()) { SvXMLElementExport aSubElem( GetExport(), XML_NAMESPACE_STYLE, - XML_REGION_RIGHT, sal_True, sal_True ); + XML_REGION_RIGHT, true, true ); exportHeaderFooterContent( xRight, false, false ); } } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8799b5887a9d..a944b45cf5c1 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3994,7 +3994,7 @@ void ScXMLExport::WriteScenario() AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr); if (!sComment.isEmpty()) AddAttribute(XML_NAMESPACE_TABLE, XML_COMMENT, sComment); - SvXMLElementExport aElem(*this, XML_NAMESPACE_TABLE, XML_SCENARIO, sal_True, sal_True); + SvXMLElementExport aElem(*this, XML_NAMESPACE_TABLE, XML_SCENARIO, true, true); } } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index baec1f43d44e..7011ed90f700 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -543,7 +543,7 @@ void ScXMLCellExportPropertyMapper::handleElementItem( sal_uInt32 nPropIndex = rProperty.mnIndex; sal_uInt16 nPrefix = getPropertySetMapper()->GetEntryNameSpace( nPropIndex ); OUString sLocalName = getPropertySetMapper()->GetEntryXMLName( nPropIndex ); - SvXMLElementExport aElem( rExport, nPrefix, sLocalName, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, nPrefix, sLocalName, true, true ); } } @@ -729,7 +729,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress, xSheetCondition->getSourcePosition(), pDoc, FormulaGrammar::CONV_OOO ); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_BASE_CELL_ADDRESS, sOUBaseAddress); - SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True); + SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, true, true); } else { @@ -782,7 +782,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress, xSheetCondition->getSourcePosition(), rScXMLExport.GetDocument(), FormulaGrammar::CONV_OOO ); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_BASE_CELL_ADDRESS, sOUBaseAddress); - SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True); + SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, true, true); } } } diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 08e94f600232..a24b3fc33b74 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -579,13 +579,13 @@ void SmXMLExport::_ExportContent() // text mode, the default display="inline" value will be used. AddAttribute(XML_NAMESPACE_MATH, XML_DISPLAY, XML_BLOCK); } - SvXMLElementExport aEquation(*this, XML_NAMESPACE_MATH, XML_MATH, sal_True, sal_True); + SvXMLElementExport aEquation(*this, XML_NAMESPACE_MATH, XML_MATH, true, true); SvXMLElementExport *pSemantics=0; if (!aText.isEmpty()) { pSemantics = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_SEMANTICS, sal_True, sal_True); + XML_SEMANTICS, true, true); } ExportNodes(pTree, 0); @@ -607,7 +607,7 @@ void SmXMLExport::_ExportContent() AddAttribute(XML_NAMESPACE_MATH, XML_ENCODING, OUString("StarMath 5.0")); SvXMLElementExport aAnnotation(*this, XML_NAMESPACE_MATH, - XML_ANNOTATION, sal_True, sal_False); + XML_ANNOTATION, true, false); GetDocHandler()->characters( aText ); } delete pSemantics; @@ -709,7 +709,7 @@ void SmXMLExport::ExportBinaryHorizontal(const SmNode *pNode, int nLevel) sal_uLong nGroup = pNode->GetToken().nGroup; SvXMLElementExport* pRow = new SvXMLElementExport(*this, - XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True); + XML_NAMESPACE_MATH, XML_MROW, true, true); // Unfold the binary tree structure as long as the nodes are SmBinHorNode // with the same nGroup. This will reduce the number of nested <mrow> @@ -753,7 +753,7 @@ void SmXMLExport::ExportExpression(const SmNode *pNode, int nLevel, // #i115443: nodes of type expression always need to be grouped with mrow statement if (!bNoMrowContainer && (nSize > 1 || pNode->GetType() == NEXPRESSION)) - pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True); + pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW, true, true); for (sal_uInt16 i = 0; i < nSize; i++) if (const SmNode *pTemp = pNode->GetSubNode(i)) @@ -781,7 +781,7 @@ void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel) AddAttribute(XML_NAMESPACE_MATH, XML_DENOMALIGN, pDenom->GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT); } - SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, sal_True, sal_True); + SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, true, true); ExportNodes(pNum, nLevel); ExportNodes(pDenom, nLevel); } @@ -796,7 +796,7 @@ void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel) // export the node as <mfrac bevelled="true"> AddAttribute(XML_NAMESPACE_MATH, XML_BEVELLED, XML_TRUE); SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, - sal_True, sal_True); + true, true); ExportNodes(pNode->GetSubNode(0), nLevel); ExportNodes(pNode->GetSubNode(1), nLevel); } @@ -805,13 +805,13 @@ void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel) // widebslash // We can not use <mfrac> to a backslash, so just use <mo>\</mo> SvXMLElementExport *pRow = new SvXMLElementExport(*this, - XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True); + XML_NAMESPACE_MATH, XML_MROW, true, true); ExportNodes(pNode->GetSubNode(0), nLevel); { // Scoping for <mo> creation SvXMLElementExport aMo(*this, XML_NAMESPACE_MATH, XML_MO, - sal_True,sal_True); + true, true); sal_Unicode nArse[2] = {MS_BACKSLASH,0x00}; GetDocHandler()->characters(nArse); } @@ -844,7 +844,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel) // try to avoid creating a mtable element when the formula consists only // of a single output line if (nLevel || (nSize >1)) - pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True); + pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, true, true); for (sal_uInt16 i = 0; i < nSize; i++) if (const SmNode *pTemp = pNode->GetSubNode(i)) @@ -853,7 +853,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel) SvXMLElementExport *pCell=0; if (pTable) { - pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTR, sal_True, sal_True); + pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTR, true, true); SmTokenType eAlign = TALIGNC; if (pTemp->GetType() == NALIGN) { @@ -879,7 +879,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel) AddAttribute(XML_NAMESPACE_MATH, XML_COLUMNALIGN, eAlign == TALIGNL ? XML_LEFT : XML_RIGHT); } - pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTD, sal_True, sal_True); + pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTD, true, true); } ExportNodes(pTemp, nLevel+1); delete pCell; @@ -897,7 +897,7 @@ void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/) if (pNode->GetType() == NMATH || pNode->GetType() == NGLYPH_SPECIAL) { // Export NMATH and NGLYPH_SPECIAL symbols as <mo> elements - pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MO, sal_True, sal_False); + pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MO, true, false); } else { @@ -910,7 +910,7 @@ void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/) // placeholders but they won't be visible in most MathML rendering // engines so let's use an empty square for NPLACE instead. AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_NORMAL); - pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, sal_True, sal_False); + pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, true, false); } sal_Unicode nArse[2]; nArse[0] = pTemp->GetText()[0]; @@ -940,14 +940,14 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/) AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_ITALIC); else if ((pTemp->GetText().getLength() == 1) && !bIsItalic) AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_NORMAL); - pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI,sal_True,sal_False); + pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI, true, false); break; } case TNUMBER: - pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MN,sal_True,sal_False); + pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MN, true, false); break; case TTEXT: - pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTEXT,sal_True,sal_False); + pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTEXT, true, false); break; } GetDocHandler()->characters(pTemp->GetText()); @@ -975,7 +975,7 @@ void SmXMLExport::ExportBlank(const SmNode *pNode, int /*nLevel*/) SvXMLElementExport *pText; pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSPACE, - sal_True, sal_False); + true, false); GetDocHandler()->characters( OUString() ); delete pText; @@ -1001,24 +1001,24 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) if (pLSub || pLSup) { SvXMLElementExport aMultiScripts(*this, XML_NAMESPACE_MATH, - XML_MMULTISCRIPTS, sal_True, sal_True); + XML_MMULTISCRIPTS, true, true); if (NULL != (pCSub = pNode->GetSubNode(CSUB+1)) && NULL != (pCSup = pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MUNDEROVER, sal_True,sal_True); + XML_MUNDEROVER, true, true); } else if (NULL != (pCSub = pNode->GetSubNode(CSUB+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MUNDER, sal_True,sal_True); + XML_MUNDER, true, true); } else if (NULL != (pCSup = pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MOVER, sal_True,sal_True); + XML_MOVER, true, true); } ExportNodes(pNode->GetSubNode(0), nLevel+1); //Main Term @@ -1037,20 +1037,20 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) ExportNodes(pSub, nLevel+1); else { - SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE,sal_True,sal_True); + SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE, true, true); } if (pSup) ExportNodes(pSup, nLevel+1); else { - SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE,sal_True,sal_True); + SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE, true, true); } } //Separator element between suffix and prefix sub/sup pairs { SvXMLElementExport aPrescripts(*this, XML_NAMESPACE_MATH, - XML_MPRESCRIPTS, sal_True,sal_True); + XML_MPRESCRIPTS, true, true); } if (pLSub) @@ -1058,7 +1058,7 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) else { SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE, - sal_True,sal_True); + true, true); } if (pLSup) @@ -1066,7 +1066,7 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) else { SvXMLElementExport aNone(*this, XML_NAMESPACE_MATH, XML_NONE, - sal_True,sal_True); + true, true); } } @@ -1076,34 +1076,34 @@ void SmXMLExport::ExportSubSupScript(const SmNode *pNode, int nLevel) NULL != (pSup = pNode->GetSubNode(RSUP+1))) { pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MSUBSUP, sal_True,sal_True); + XML_MSUBSUP, true, true); } else if (NULL != (pSub = pNode->GetSubNode(RSUB+1))) { pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUB, - sal_True,sal_True); + true, true); } else if (NULL != (pSup = pNode->GetSubNode(RSUP+1))) { pThing = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSUP, - sal_True,sal_True); + true, true); } if (NULL != (pCSub = pNode->GetSubNode(CSUB+1)) && NULL != (pCSup=pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MUNDEROVER, sal_True,sal_True); + XML_MUNDEROVER, true, true); } else if (NULL != (pCSub = pNode->GetSubNode(CSUB+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MUNDER, sal_True,sal_True); + XML_MUNDER, true, true); } else if (NULL != (pCSup = pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MOVER, sal_True,sal_True); + XML_MOVER, true, true); } ExportNodes(pNode->GetSubNode(0), nLevel+1); //Main Term @@ -1138,7 +1138,7 @@ void SmXMLExport::ExportBrace(const SmNode *pNode, int nLevel) // <mrow> pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW, - sal_True, sal_True); + true, true); // <mo fence="true"> opening-fence </mo> if (pLeft && (pLeft->GetToken().eType != TNONE)) @@ -1155,7 +1155,7 @@ void SmXMLExport::ExportBrace(const SmNode *pNode, int nLevel) { // <mrow> SvXMLElementExport aRow(*this, XML_NAMESPACE_MATH, XML_MROW, - sal_True, sal_True); + true, true); ExportNodes(pTemp, nLevel+1); // </mrow> } @@ -1179,15 +1179,15 @@ void SmXMLExport::ExportRoot(const SmNode *pNode, int nLevel) { if (pNode->GetSubNode(0)) { - SvXMLElementExport aRoot(*this, XML_NAMESPACE_MATH, XML_MROOT,sal_True, - sal_True); + SvXMLElementExport aRoot(*this, XML_NAMESPACE_MATH, XML_MROOT, true, + true); ExportNodes(pNode->GetSubNode(2), nLevel+1); ExportNodes(pNode->GetSubNode(0), nLevel+1); } else { - SvXMLElementExport aSqrt(*this, XML_NAMESPACE_MATH, XML_MSQRT,sal_True, - sal_True); + SvXMLElementExport aSqrt(*this, XML_NAMESPACE_MATH, XML_MSQRT, true, + true); ExportNodes(pNode->GetSubNode(2), nLevel+1); } } @@ -1197,7 +1197,7 @@ void SmXMLExport::ExportOperator(const SmNode *pNode, int nLevel) /*we need to either use content or font and size attributes *here*/ SvXMLElementExport aRow(*this, XML_NAMESPACE_MATH, XML_MROW, - sal_True, sal_True); + true, true); ExportNodes(pNode->GetSubNode(0), nLevel+1); ExportNodes(pNode->GetSubNode(1), nLevel+1); } @@ -1211,21 +1211,21 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel) AddAttribute(XML_NAMESPACE_MATH, XML_ACCENTUNDER, XML_TRUE); pElement = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MUNDER, - sal_True,sal_True); + true, true); } else if (pNode->GetToken().eType == TOVERSTRIKE) { // export as <menclose notation="horizontalstrike"> AddAttribute(XML_NAMESPACE_MATH, XML_NOTATION, XML_HORIZONTALSTRIKE); pElement = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, - XML_MENCLOSE, sal_True, sal_True); + XML_MENCLOSE, true, true); } else { AddAttribute(XML_NAMESPACE_MATH, XML_ACCENT, XML_TRUE); pElement = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MOVER, - sal_True,sal_True); + true, true); } ExportNodes(pNode->GetSubNode(1), nLevel+1); @@ -1235,7 +1235,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel) { //proper entity support required SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, - sal_True,sal_True); + true, true); sal_Unicode nArse[2] = {0xAF,0x00}; GetDocHandler()->characters(nArse); } @@ -1244,7 +1244,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode, int nLevel) { //proper entity support required SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, - sal_True,sal_True); + true, true); sal_Unicode nArse[2] = {0x0332,0x00}; GetDocHandler()->characters(nArse); } @@ -1443,7 +1443,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) // <mrow> element. See #fdo 66283. SvXMLElementExport aElement(*this, XML_NAMESPACE_MATH, pNode->GetToken().eType == TPHANTOM ? XML_MPHANTOM : XML_MSTYLE, - sal_True, sal_True); + true, true); ExportExpression(pNode, nLevel, true); } } @@ -1476,12 +1476,12 @@ void SmXMLExport::ExportVerticalBrace(const SmNode *pNode, int nLevel) } OSL_ENSURE(pNode->GetNumSubNodes()==3,"Bad Vertical Brace"); - SvXMLElementExport aOver1(*this, XML_NAMESPACE_MATH,which, sal_True, sal_True); + SvXMLElementExport aOver1(*this, XML_NAMESPACE_MATH,which, true, true); {//Scoping // using accents will draw the over-/underbraces too close to the base // see http://www.w3.org/TR/MathML2/chapter3.html#id.3.4.5.2 // also XML_ACCENT is illegal with XML_MUNDER. Thus no XML_ACCENT attribut here! - SvXMLElementExport aOver2(*this, XML_NAMESPACE_MATH,which, sal_True, sal_True); + SvXMLElementExport aOver2(*this, XML_NAMESPACE_MATH,which, true, true); ExportNodes(pNode->GetSubNode(0), nLevel); AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_TRUE); ExportNodes(pNode->GetSubNode(1), nLevel); @@ -1491,12 +1491,12 @@ void SmXMLExport::ExportVerticalBrace(const SmNode *pNode, int nLevel) void SmXMLExport::ExportMatrix(const SmNode *pNode, int nLevel) { - SvXMLElementExport aTable(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True); + SvXMLElementExport aTable(*this, XML_NAMESPACE_MATH, XML_MTABLE, true, true); const SmMatrixNode *pMatrix = static_cast<const SmMatrixNode *>(pNode); sal_uInt16 i=0; for (sal_uLong y = 0; y < pMatrix->GetNumRows(); y++) { - SvXMLElementExport aRow(*this, XML_NAMESPACE_MATH, XML_MTR, sal_True, sal_True); + SvXMLElementExport aRow(*this, XML_NAMESPACE_MATH, XML_MTR, true, true); for (sal_uLong x = 0; x < pMatrix->GetNumCols(); x++) if (const SmNode *pTemp = pNode->GetSubNode(i++)) { @@ -1509,7 +1509,7 @@ void SmXMLExport::ExportMatrix(const SmNode *pNode, int nLevel) pTemp->GetToken().eType == TALIGNL ? XML_LEFT : XML_RIGHT); } - SvXMLElementExport aCell(*this, XML_NAMESPACE_MATH, XML_MTD, sal_True, sal_True); + SvXMLElementExport aCell(*this, XML_NAMESPACE_MATH, XML_MTD, true, true); ExportNodes(pTemp, nLevel+1); } } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 062907373149..cd36fb985006 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -394,7 +394,7 @@ bool SvxXMLXTableExportComponent::exportTable() throw() break; } - SvXMLElementExport aElem( *this, XML_NAMESPACE_OOO, pEleName, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_OOO, pEleName, true, true ); Sequence< OUString > aNames = mxTable->getElementNames(); const sal_Int32 nCount = aNames.getLength(); @@ -456,7 +456,7 @@ void SvxXMLColorEntryExporter::exportEntry( const OUString& rStrName, const Any& ::sax::Converter::convertColor( aOut, nColor ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, aOut.makeStringAndClear() ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_COLOR, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_COLOR, true, true ); } diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index 93131a4db2f2..a599d8a2c53d 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -53,7 +53,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) XML_LIST_NAME, OUString (rBlockList.GetName())); { - SvXMLElementExport pRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, sal_True, sal_True); + SvXMLElementExport pRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true); sal_uInt16 nBlocks= rBlockList.GetCount(); for ( sal_uInt16 i = 0; i < nBlocks; i++) { @@ -70,7 +70,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) XML_UNFORMATTED_TEXT, rBlockList.IsOnlyTextBlock(i) ? XML_TRUE : XML_FALSE ); - SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, sal_True, sal_True); + SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, true, true); } } GetDocHandler()->endDocument(); @@ -116,15 +116,15 @@ sal_uInt32 SwXMLTextBlockExport::exportDoc(const OUString &rText) XML_LIST_NAME, OUString (rBlockList.GetName())); { - SvXMLElementExport aDocument (*this, XML_NAMESPACE_OFFICE, XML_DOCUMENT, sal_True, sal_True); + SvXMLElementExport aDocument (*this, XML_NAMESPACE_OFFICE, XML_DOCUMENT, true, true); { - SvXMLElementExport aBody (*this, XML_NAMESPACE_OFFICE, XML_BODY, sal_True, sal_True); + SvXMLElementExport aBody (*this, XML_NAMESPACE_OFFICE, XML_BODY, true, true); { sal_Int32 nPos = 0; do { OUString sTemp ( rText.getToken( 0, '\015', nPos ) ); - SvXMLElementExport aPara (*this, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + SvXMLElementExport aPara (*this, XML_NAMESPACE_TEXT, XML_P, true, false); GetDocHandler()->characters(sTemp); } while (-1 != nPos ); } diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 84c4fcb1d420..11696dc84f79 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -229,7 +229,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem ) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, - sal_True, sal_True ); + true, true ); if( !sURL.isEmpty() ) { // optional office:binary-data diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index aa61ab751095..d37467bc0a39 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -490,7 +490,7 @@ void SwXMLExport::_ExportContent() OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nYear); AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear()); - SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True); + SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, true, true); } } diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 47d0deea5cbe..9ab0233000e2 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -308,7 +308,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, } SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, ePropToken, - sal_False, sal_False ); + false, false ); exportElementItems( rExport, rUnitConverter, rSet, nFlags, aIndexArray ); } diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index c442fb3a31eb..f2b9d9329ffa 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -126,7 +126,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) { SvXMLElementExport aElem( *this, XML_NAMESPACE_STYLE, XML_STYLE, - sal_True, sal_True ); + true, true ); SvXMLItemMapEntriesRef xItemMap; XMLTokenEnum ePropToken = XML_TABLE_PROPERTIES; diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 57cb3c046d4d..1ce91e992b13 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -517,8 +517,8 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, XML_TABLE_COLUMN ); { - SvXMLElementExport aElem( *this, XML_NAMESPACE_STYLE, XML_STYLE, sal_True, - sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_STYLE, XML_STYLE, true, + true ); OUStringBuffer sValue; if( rCol.GetWidthOpt() ) { @@ -538,7 +538,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) { SvXMLElementExport aElemExport( *this, XML_NAMESPACE_STYLE, XML_TABLE_COLUMN_PROPERTIES, - sal_True, sal_True ); + true, true ); } } } @@ -858,7 +858,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox, // export cell element SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, - XML_TABLE_CELL, sal_True, sal_True ); + XML_TABLE_CELL, true, true ); // export cell content GetTextParagraphExport()->exportText( xText, @@ -875,13 +875,13 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox, { // no start node -> merged cells: export subtable in cell SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, - XML_TABLE_CELL, sal_True, sal_True ); + XML_TABLE_CELL, true, true ); { AddAttribute( XML_NAMESPACE_TABLE, XML_IS_SUB_TABLE, GetXMLToken( XML_TRUE ) ); SvXMLElementExport aElemExport( *this, XML_NAMESPACE_TABLE, - XML_TABLE, sal_True, sal_True ); + XML_TABLE, true, true ); ExportTableLines( rBox.GetTabLines(), rTblInfo ); } } @@ -895,7 +895,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine, if( rLine.hasSoftPageBreak() ) { SvXMLElementExport aElem( *this, XML_NAMESPACE_TEXT, - XML_SOFT_PAGE_BREAK, sal_True, sal_True ); + XML_SOFT_PAGE_BREAK, true, true ); } const SwFrmFmt *pFrmFmt = rLine.GetFrmFmt(); if( pFrmFmt ) @@ -909,7 +909,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine, { SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, - XML_TABLE_ROW, sal_True, sal_True ); + XML_TABLE_ROW, true, true ); const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); sal_uInt16 nBoxes = rBoxes.size(); @@ -924,8 +924,8 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine, if( nRowSpan < 1 ) { SvXMLElementExport aElem2( *this, XML_NAMESPACE_TABLE, - XML_COVERED_TABLE_CELL, sal_True, - sal_False ); + XML_COVERED_TABLE_CELL, true, + false ); } if( nBox < nBoxes-1U ) @@ -957,8 +957,8 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine, for( sal_uInt16 i=nOldCol; i<nCol; i++ ) { SvXMLElementExport aElemExport( *this, XML_NAMESPACE_TABLE, - XML_COVERED_TABLE_CELL, sal_True, - sal_False ); + XML_COVERED_TABLE_CELL, true, + false ); } nCol++; @@ -1033,7 +1033,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines, { SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, - XML_TABLE_COLUMN, sal_True, sal_True ); + XML_TABLE_COLUMN, true, true ); } nColRep = 1U; @@ -1047,7 +1047,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines, if( nHeaderRows > 0 ) { SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, - XML_TABLE_HEADER_ROWS, sal_True, sal_True ); + XML_TABLE_HEADER_ROWS, true, true ); OSL_ENSURE( nHeaderRows <= nLines, "more headers then lines?" ); for( sal_uInt16 nLine = 0U; nLine < nHeaderRows; nLine++ ) @@ -1098,7 +1098,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) { SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_TABLE, - sal_True, sal_True ); + true, true ); // export DDE source (if this is a DDE table) if ( rTbl.ISA(SwDDETable) ) @@ -1129,7 +1129,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) // DDE source element (always empty) SvXMLElementExport aSource(*this, XML_NAMESPACE_OFFICE, - XML_DDE_SOURCE, sal_True, sal_False); + XML_DDE_SOURCE, true, false); } SwXMLTableInfo_Impl aTblInfo( &rTbl ); diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index baee89959802..2e0934459f89 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -168,7 +168,7 @@ void SwXMLTextParagraphExport::exportStyleContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, aString ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_MAP, sal_True, sal_True ); + XML_MAP, true, true ); } } } @@ -458,7 +458,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( addTextFrameAttributes( rPropSet, false ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, - XML_FRAME, sal_False, sal_True ); + XML_FRAME, false, true ); switch (nType) { @@ -625,7 +625,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { SvXMLElementExport aElementExport( rXMLExport, XML_NAMESPACE_DRAW, eElementName, - sal_False, sal_True ); + false, true ); switch( nType ) { case SV_EMBEDDED_OWN: @@ -669,7 +669,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( aProp.Value >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name ); rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); - SvXMLElementExport aElementExport2( rXMLExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); + SvXMLElementExport aElementExport2( rXMLExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ); } } } @@ -695,7 +695,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( aProp.Value >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name ); rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); - SvXMLElementExport aElementExport2( rXMLExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); + SvXMLElementExport aElementExport2( rXMLExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ); } } } @@ -716,7 +716,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( } SvXMLElementExport aElementExport( GetExport(), XML_NAMESPACE_DRAW, - XML_IMAGE, sal_False, sal_True ); + XML_IMAGE, false, true ); if( (rXMLExport.getExportFlags() & EXPORT_EMBEDDED) != 0 ) GetExport().AddEmbeddedObjectAsBase64( sURL ); diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx index cef00247ecc1..2e968374683f 100644 --- a/xmloff/inc/XMLScriptExportHandler.hxx +++ b/xmloff/inc/XMLScriptExportHandler.hxx @@ -45,7 +45,7 @@ public: const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, - sal_Bool bUseWhitespace) SAL_OVERRIDE; + bool bUseWhitespace) SAL_OVERRIDE; }; #endif diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx index 97c47dfea81a..ef0caf2d7f49 100644 --- a/xmloff/inc/XMLStarBasicExportHandler.hxx +++ b/xmloff/inc/XMLStarBasicExportHandler.hxx @@ -49,7 +49,7 @@ public: const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, - sal_Bool bUseWhitespace) SAL_OVERRIDE; + bool bUseWhitespace) SAL_OVERRIDE; }; #endif diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 6b0ab11f983e..4359a812ad28 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -301,7 +301,7 @@ void XMLChartExportPropertyMapper::handleElementItem( SvXMLElementExport aElem( mrExport, getPropertySetMapper()->GetEntryNameSpace( nPropIndex ), getPropertySetMapper()->GetEntryXMLName( nPropIndex ), - sal_True, sal_True ); + true, true ); // export as Base64 embedded graphic // if embedding is on @@ -322,7 +322,7 @@ void XMLChartExportPropertyMapper::handleElementItem( SvXMLElementExport aElem( mrExport, getPropertySetMapper()->GetEntryNameSpace( nPropIndex ), getPropertySetMapper()->GetEntryXMLName( nPropIndex ), - sal_True, sal_True ); + true, true ); SchXMLTools::exportText( mrExport, aSeparator, true ); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 500a80eae493..859e4a5e6f5b 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -977,7 +977,7 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen if( rFirstRangeForThisDomainIndex.isEmpty() || !aRange.equals(rFirstRangeForThisDomainIndex) ) { rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aRange); - SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, sal_True, sal_True ); + SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, true, true ); bDomainExported = true; } @@ -1204,12 +1204,12 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& if ( bIncludeTable && (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 ) ) { - SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True ); + SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, true, true ); { OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aNullDate, 0); mrExport.AddAttribute( XML_NAMESPACE_TABLE,XML_DATE_VALUE,sBuffer.makeStringAndClear()); - SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True ); + SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true ); } } @@ -1287,7 +1287,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& AddAutoStyleAttribute( aPropertyStates ); //element - pElChart = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, sal_True, sal_True ); + pElChart = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, true, true ); } else // autostyles { @@ -1316,7 +1316,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& AddAutoStyleAttribute( aPropertyStates ); // element - SvXMLElementExport aElTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True ); + SvXMLElementExport aElTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, true, true ); // content (text:p) Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); @@ -1358,7 +1358,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& AddAutoStyleAttribute( aPropertyStates ); // element (has no subelements) - SvXMLElementExport aElSubTitle( mrExport, XML_NAMESPACE_CHART, XML_SUBTITLE, sal_True, sal_True ); + SvXMLElementExport aElSubTitle( mrExport, XML_NAMESPACE_CHART, XML_SUBTITLE, true, true ); // content (text:p) Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); @@ -1447,7 +1447,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& AddAutoStyleAttribute( aPropertyStates ); // element - SvXMLElementExport aLegend( mrExport, XML_NAMESPACE_CHART, XML_LEGEND, sal_True, sal_True ); + SvXMLElementExport aLegend( mrExport, XML_NAMESPACE_CHART, XML_LEGEND, true, true ); } else // autostyles { @@ -1555,10 +1555,10 @@ static void lcl_exportComplexLabel( const Sequence< uno::Any >& rComplexLabel, S sal_Int32 nLength = rComplexLabel.getLength(); if( nLength<=1 ) return; - SvXMLElementExport aTextList( rExport, XML_NAMESPACE_TEXT, XML_LIST, sal_True, sal_True ); + SvXMLElementExport aTextList( rExport, XML_NAMESPACE_TEXT, XML_LIST, true, true ); for(sal_Int32 nN=0; nN<nLength; nN++) { - SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, sal_True, sal_True ); + SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, true, true ); OUString aString; if( !(rComplexLabel[nN]>>=aString) ) { @@ -1587,7 +1587,7 @@ void SchXMLExportHelper_Impl::exportTable() { } - SvXMLElementExport aTable( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True ); + SvXMLElementExport aTable( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true ); bool bHasOwnData = false; Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY ); @@ -1619,11 +1619,11 @@ void SchXMLExportHelper_Impl::exportTable() // declare columns { - SvXMLElementExport aHeaderColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, sal_True, sal_True ); - SvXMLElementExport aHeaderColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True ); + SvXMLElementExport aHeaderColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, true, true ); + SvXMLElementExport aHeaderColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); } { - SvXMLElementExport aColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, sal_True, sal_True ); + SvXMLElementExport aColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true ); sal_Int32 nNextIndex = 0; for( size_t nN=0; nN< aData.aHiddenColumns.size(); nN++ ) @@ -1636,10 +1636,10 @@ void SchXMLExportHelper_Impl::exportTable() if(nRepeat>1) mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, OUString::number( nRepeat )); - SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True ); + SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); } mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_VISIBILITY, GetXMLToken( XML_COLLAPSE ) ); - SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True ); + SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); nNextIndex = nHiddenIndex+1; } @@ -1650,20 +1650,20 @@ void SchXMLExportHelper_Impl::exportTable() if(nRepeat>1) mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, OUString::number( nRepeat )); - SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True ); + SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); } } // export rows with content //export header row { - SvXMLElementExport aHeaderRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, sal_True, sal_True ); - SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True ); + SvXMLElementExport aHeaderRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, true, true ); + SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true ); //first one empty cell for the row descriptions { - SvXMLElementExport aEmptyCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True ); - SvXMLElementExport aEmptyParagraph( mrExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_True ); + SvXMLElementExport aEmptyCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true ); + SvXMLElementExport aEmptyParagraph( mrExport, XML_NAMESPACE_TEXT, XML_P, true, true ); } //export column descriptions @@ -1700,7 +1700,7 @@ void SchXMLExportHelper_Impl::exportTable() mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING ); } - SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True ); + SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true ); exportText( *aIt ); if( nC < nComplexCount ) lcl_exportComplexLabel( rComplexColumnDescriptions[nC], mrExport ); @@ -1717,7 +1717,7 @@ void SchXMLExportHelper_Impl::exportTable() // export value rows { - SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, sal_True, sal_True ); + SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, true, true ); tStringVector::const_iterator aRowDescriptionsIter( aData.aRowDescriptions.begin()); const Sequence< Sequence< uno::Any > >& rComplexRowDescriptions = aData.aComplexRowDescriptions; sal_Int32 nComplexCount = rComplexRowDescriptions.getLength(); @@ -1727,7 +1727,7 @@ void SchXMLExportHelper_Impl::exportTable() ; aRowIt != aData.aDataInRows.end() ; ++aRowIt, ++nC ) { - SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True ); + SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true ); //export row descriptions { @@ -1754,7 +1754,7 @@ void SchXMLExportHelper_Impl::exportTable() mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING ); } - SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True ); + SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true ); if( aRowDescriptionsIter != aData.aRowDescriptions.end()) { exportText( *aRowDescriptionsIter ); @@ -1778,7 +1778,7 @@ void SchXMLExportHelper_Impl::exportTable() msString = msStringBuffer.makeStringAndClear(); mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT ); mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString ); - SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True ); + SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true ); exportText( msString, false ); // do not convert tabs and lfs if( ( !bHasOwnData && aDataRangeIter != aDataRangeEndIter ) && ( mbRowSourceColumns || (aColIt == aRowIt->begin()) ) ) @@ -1960,7 +1960,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( } // plot-area element - pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, sal_True, sal_True ); + pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, true, true ); //inner position rectangle element exportCoordinateRegion( xDiagram ); @@ -2004,7 +2004,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( { AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, sal_True, sal_True ); + SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, true, true ); } else { @@ -2026,7 +2026,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( { AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, sal_True, sal_True ); + SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, true, true ); } else { @@ -2048,7 +2048,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( { AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, sal_True, sal_True ); + SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, true, true ); } else { @@ -2080,7 +2080,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( // add style name attribute AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aWall( mrExport, XML_NAMESPACE_CHART, XML_WALL, sal_True, sal_True ); + SvXMLElementExport aWall( mrExport, XML_NAMESPACE_CHART, XML_WALL, true, true ); } else // autostyles { @@ -2106,7 +2106,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( // add style name attribute AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aFloor( mrExport, XML_NAMESPACE_CHART, XML_FLOOR, sal_True, sal_True ); + SvXMLElementExport aFloor( mrExport, XML_NAMESPACE_CHART, XML_FLOOR, true, true ); } else // autostyles { @@ -2135,7 +2135,7 @@ void SchXMLExportHelper_Impl::exportCoordinateRegion( const uno::Reference< char addPosition( awt::Point(aRect.X,aRect.Y) ); addSize( awt::Size(aRect.Width,aRect.Height) ); - SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, sal_True, sal_True );//#i100778# todo: change to chart namespace in future - dependent on fileformat + SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, true, true );//#i100778# todo: change to chart namespace in future - dependent on fileformat } namespace @@ -2185,7 +2185,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_UNIT, lcl_getTimeUnitToken( aInterval.TimeUnit ) ); } - SvXMLElementExport aDateScale( mrExport, XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, sal_True, sal_True );//#i25706#todo: change namespace for next ODF version + SvXMLElementExport aDateScale( mrExport, XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, true, true );//#i25706#todo: change namespace for next ODF version } } @@ -2206,7 +2206,7 @@ void SchXMLExportHelper_Impl::exportAxisTitle( const Reference< beans::XProperty addPosition( xShape ); AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True ); + SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, true, true ); // paragraph containing title exportText( aText ); @@ -2227,7 +2227,7 @@ void SchXMLExportHelper_Impl::exportGrid( const Reference< beans::XPropertySet > { AddAutoStyleAttribute( aPropertyStates ); mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, bMajor ? XML_MAJOR : XML_MINOR ); - SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True ); + SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, true, true ); } else { @@ -2309,7 +2309,7 @@ void SchXMLExportHelper_Impl::exportAxis( bExportDateScale = lcl_exportAxisType( xChart2Axis, mrExport ); // open axis element - pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True ); + pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, true, true ); } else { @@ -2339,7 +2339,7 @@ void SchXMLExportHelper_Impl::exportAxis( if( bExportContent && !rCategoriesRange.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, rCategoriesRange ); - SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, sal_True, sal_True ); + SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, true, true ); } // grid @@ -2737,7 +2737,7 @@ void SchXMLExportHelper_Impl::exportSeries( XML_NAMESPACE_CHART, GetXMLToken( eCTToken ))); // open series element until end of for loop - pSeries = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True ); + pSeries = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); } else // autostyles { @@ -2831,7 +2831,7 @@ void SchXMLExportHelper_Impl::exportSeries( // add style name attribute AddAutoStyleAttribute( aPropertyStates ); - SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_MEAN_VALUE, sal_True, sal_True ); + SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_MEAN_VALUE, true, true ); } else // autostyles { @@ -2890,7 +2890,7 @@ void SchXMLExportHelper_Impl::exportPropertyMapping( lcl_ConvertRange( xValues->getSourceRangeRepresentation(), xNewDoc )); - SvXMLElementExport( mrExport, XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, sal_True, sal_True ); + SvXMLElementExport( mrExport, XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, true, true ); // register range for data table export m_aDataSequencesToExport.push_back( tLabelValuesDataPair( @@ -2984,7 +2984,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( AddAutoStyleAttribute( aPropertyStates ); } - SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, sal_True, sal_True ); + SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, true, true ); if( bExportEquation ) { mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, (bShowEquation ? XML_TRUE : XML_FALSE) ); @@ -3007,7 +3007,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( AddAutoStyleAttribute( aEquationPropertyStates ); } - SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, sal_True, sal_True ); + SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, true, true ); } } else // autostyles @@ -3096,7 +3096,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe if( nCurrentVersion >= SvtSaveOptions::ODFVER_012 ) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, bYError ? XML_Y : XML_X );//#i114149# - SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, sal_True, sal_True ); + SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, true, true ); } else // autostyles { @@ -3151,7 +3151,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y ); else mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); - SvXMLElementExport aOpenSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True ); + SvXMLElementExport aOpenSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); } @@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y ); else mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); - SvXMLElementExport aLowSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True ); + SvXMLElementExport aLowSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); } @@ -3185,7 +3185,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y ); else mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); - SvXMLElementExport aHighSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True ); + SvXMLElementExport aHighSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); } @@ -3202,7 +3202,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y ); else mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); - SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True ); + SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); } @@ -3437,7 +3437,7 @@ void SchXMLExportHelper_Impl::exportDataPoints( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED, OUString::number( ( aLastPoint.mnRepeat ) )); - SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True ); + SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true ); } aLastPoint = aPoint; } @@ -3451,7 +3451,7 @@ void SchXMLExportHelper_Impl::exportDataPoints( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED, OUString::number( ( aLastPoint.mnRepeat ) )); - SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True ); + SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true ); } } } diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 06efa57c82f1..8e86b91a1fc0 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -530,7 +530,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL { SvXMLElementExport aPara( rExport, XML_NAMESPACE_TEXT, ::xmloff::token::GetXMLToken( ::xmloff::token::XML_P ), - sal_True, sal_False ); + true, false ); if( bConvertTabsLFs ) { @@ -551,7 +551,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL SvXMLElementExport aElem( rExport, XML_NAMESPACE_TEXT, ::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP ), - sal_False, sal_False ); + false, false ); } break; @@ -563,7 +563,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL SvXMLElementExport aElem( rExport, XML_NAMESPACE_TEXT, ::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK ), - sal_False, sal_False ); + false, false ); } break; } @@ -598,10 +598,10 @@ void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue ) SvXMLElementExport aEmptyShapeGroup( rExport, XML_NAMESPACE_DRAW, ::xmloff::token::GetXMLToken( ::xmloff::token::XML_G ), - sal_True, sal_False ); + true, false ); SvXMLElementExport aDescription( rExport, XML_NAMESPACE_SVG, ::xmloff::token::GetXMLToken( ::xmloff::token::XML_DESC ), - sal_True, sal_False ); + true, false ); rExport.GetDocHandler()->characters( rValue ); } diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 78879f9afad9..87cc9393952e 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -256,12 +256,12 @@ void DomExport::element( const Reference<XElement>& xElement ) } // write name - mrExport.StartElement( qualifiedName( xElement ), sal_False ); + mrExport.StartElement( qualifiedName( xElement ), false ); } void DomExport::endElement( const Reference<XElement>& xElement ) { - mrExport.EndElement( qualifiedName( xElement ), sal_False ); + mrExport.EndElement( qualifiedName( xElement ), false ); popNamespace(); } diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index 7a5a2c29834c..3daf5efa29c3 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -72,8 +72,7 @@ sal_Bool XMLBase64Export::exportElement( sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eName ) { - SvXMLElementExport aElem( GetExport(), nNamespace, eName, sal_True, - sal_True ); + SvXMLElementExport aElem( GetExport(), nNamespace, eName, true, true ); return exportXML( rIn ); } diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx index 9e5796a5092c..c8b40f80dded 100644 --- a/xmloff/source/core/xmlcnimp.cxx +++ b/xmloff/source/core/xmlcnimp.cxx @@ -41,13 +41,13 @@ bool SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) c return ( *(rCmp.pimpl) == *(pimpl) ); } -sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName, +bool SvXMLAttrContainerData::AddAttr( const OUString& rLName, const OUString& rValue ) { return pimpl->AddAttr(rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, +bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, const OUString& rValue ) @@ -55,21 +55,21 @@ sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, return pimpl->AddAttr(rPrefix, rNamespace, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, +bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, const OUString& rLName, const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::SetAt( size_t i, +bool SvXMLAttrContainerData::SetAt( size_t i, const OUString& rLName, const OUString& rValue ) { return pimpl->SetAt(i, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::SetAt( size_t i, +bool SvXMLAttrContainerData::SetAt( size_t i, const OUString& rPrefix, const OUString& rNamespace, const OUString& rLName, @@ -78,7 +78,7 @@ sal_Bool SvXMLAttrContainerData::SetAt( size_t i, return pimpl->SetAt(i, rPrefix, rNamespace, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::SetAt( size_t i, +bool SvXMLAttrContainerData::SetAt( size_t i, const OUString& rPrefix, const OUString& rLName, const OUString& rValue ) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index b71b96d3fd66..da03b1859e33 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -243,11 +243,11 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory; - OUString msPackageURI; - OUString msPackageURIScheme; + OUString msPackageURI; + OUString msPackageURIScheme; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - sal_Bool mbOutlineStyleAsNormalListStyle; - sal_Bool mbSaveBackwardCompatibleODF; + bool mbOutlineStyleAsNormalListStyle; + bool mbSaveBackwardCompatibleODF; uno::Reference< embed::XStorage > mxTargetStorage; @@ -267,8 +267,8 @@ public: ::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper; - sal_Bool mbExportTextNumberElement; - sal_Bool mbNullDateInitialized; + bool mbExportTextNumberElement; + bool mbNullDateInitialized; void SetSchemeOf( const OUString& rOrigFileName ) { @@ -281,13 +281,13 @@ public: SvXMLExport_Impl::SvXMLExport_Impl() // Written OpenDocument file format doesn't fit to the created text document (#i69627#) : mbOutlineStyleAsNormalListStyle( false ) - ,mbSaveBackwardCompatibleODF( sal_True ) + ,mbSaveBackwardCompatibleODF( true ) ,mStreamName() ,mNamespaceMaps() ,mDepth(0) ,mpRDFaHelper() // lazy - ,mbExportTextNumberElement( sal_False ) - ,mbNullDateInitialized( sal_False ) + ,mbExportTextNumberElement( false ) + ,mbNullDateInitialized( false ) { mxUriReferenceFactory = uri::UriReferenceFactory::create( comphelper::getProcessComponentContext() ); } @@ -445,12 +445,12 @@ SvXMLExport::SvXMLExport( mpEventExport( NULL ), mpImageMapExport( NULL ), mpXMLErrors( NULL ), - mbExtended( sal_False ), + mbExtended( false ), meClass( eClass ), mnExportFlags( nExportFlags ), mnErrorFlags( ERROR_NO ), msWS( GetXMLToken(XML_WS) ), - mbSaveLinkedSections(sal_True) + mbSaveLinkedSections(true) { SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" ); _InitCtor(); @@ -476,12 +476,12 @@ SvXMLExport::SvXMLExport( mpEventExport( NULL ), mpImageMapExport( NULL ), mpXMLErrors( NULL ), - mbExtended( sal_False ), + mbExtended( false ), meClass( XML_TOKEN_INVALID ), mnExportFlags( 0 ), mnErrorFlags( ERROR_NO ), msWS( GetXMLToken(XML_WS) ), - mbSaveLinkedSections(sal_True) + mbSaveLinkedSections(true) { SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" ); mpImpl->SetSchemeOf( msOrigFileName ); @@ -515,12 +515,12 @@ SvXMLExport::SvXMLExport( mpEventExport( NULL ), mpImageMapExport( NULL ), mpXMLErrors( NULL ), - mbExtended( sal_False ), + mbExtended( false ), meClass( XML_TOKEN_INVALID ), mnExportFlags( 0 ), mnErrorFlags( ERROR_NO ), msWS( GetXMLToken(XML_WS) ), - mbSaveLinkedSections(sal_True) + mbSaveLinkedSections(true) { SAL_WARN_IF(!xContext.is(), "xmloff.core", "got no service manager" ); mpImpl->SetSchemeOf( msOrigFileName ); @@ -1142,7 +1142,7 @@ void SvXMLExport::ImplExportSettings() SvXMLElementExport aElem( *this, nSettingsCount != 0, XML_NAMESPACE_OFFICE, XML_SETTINGS, - sal_True, sal_True ); + true, true ); SettingsExportFacade aSettingsExportContext( *this ); XMLSettingsExportHelper aSettingsExportHelper( aSettingsExportContext ); @@ -1162,14 +1162,14 @@ void SvXMLExport::ImplExportSettings() } } -void SvXMLExport::ImplExportStyles( sal_Bool ) +void SvXMLExport::ImplExportStyles( bool ) { CheckAttrList(); { // <style:styles> SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_STYLES, - sal_True, sal_True ); + true, true ); _ExportStyles( false ); } @@ -1192,7 +1192,7 @@ void SvXMLExport::ImplExportStyles( sal_Bool ) } } -void SvXMLExport::ImplExportAutoStyles( sal_Bool ) +void SvXMLExport::ImplExportAutoStyles( bool ) { // transfer style names (+ families) FROM other components (if appropriate) OUString sStyleNames( "StyleNames" ); @@ -1212,18 +1212,18 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool ) { // <style:automatic-styles> SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, - XML_AUTOMATIC_STYLES, sal_True, sal_True ); + XML_AUTOMATIC_STYLES, true, true ); _ExportAutoStyles(); } } -void SvXMLExport::ImplExportMasterStyles( sal_Bool ) +void SvXMLExport::ImplExportMasterStyles( bool ) { { // <style:master-styles> SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, - sal_True, sal_True ); + true, true ); _ExportMasterStyles(); } @@ -1238,7 +1238,7 @@ void SvXMLExport::ImplExportContent() { SvXMLElementExport aElemrnt( *this, XML_NAMESPACE_OFFICE, XML_BODY, - sal_True, sal_True ); + true, true ); { XMLTokenEnum eClass = meClass; if( XML_TEXT_GLOBAL == eClass ) @@ -1253,7 +1253,7 @@ void SvXMLExport::ImplExportContent() SetBodyAttributes(); SvXMLElementExport aElem( *this, meClass != XML_TOKEN_INVALID, XML_NAMESPACE_OFFICE, eClass, - sal_True, sal_True ); + true, true ); _ExportContent(); } @@ -1453,7 +1453,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) } } - SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, true, true ); // meta information if( mnExportFlags & EXPORT_META ) @@ -1473,15 +1473,15 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) // styles if( mnExportFlags & EXPORT_STYLES ) - ImplExportStyles( sal_False ); + ImplExportStyles( false ); // autostyles if( mnExportFlags & EXPORT_AUTOSTYLES ) - ImplExportAutoStyles( sal_False ); + ImplExportAutoStyles( false ); // masterstyles if( mnExportFlags & EXPORT_MASTERSTYLES ) - ImplExportMasterStyles( sal_False ); + ImplExportMasterStyles( false ); // contnt if( mnExportFlags & EXPORT_CONTENT ) @@ -1527,12 +1527,12 @@ void SvXMLExport::_ExportMeta() } else { // office:meta SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_META, - sal_True, sal_True ); + true, true ); { // BM: #i60323# export generator even if xInfoProp is empty (which is the // case for charts). The generator does not depend on xInfoProp SvXMLElementExport anElem( *this, XML_NAMESPACE_META, XML_GENERATOR, - sal_True, sal_True ); + true, true ); Characters(generator); } } @@ -1540,7 +1540,7 @@ void SvXMLExport::_ExportMeta() void SvXMLExport::_ExportScripts() { - SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, sal_True, sal_True ); + SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, true, true ); // export Basic macros (only for FlatXML) if ( mnExportFlags & EXPORT_EMBEDDED ) @@ -1549,7 +1549,7 @@ void SvXMLExport::_ExportScripts() aValue += ":Basic"; AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue ); - SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, true, true ); // initialize Basic if ( mxModel.is() ) @@ -1873,7 +1873,7 @@ sal_Int32 SvXMLExport::GetDocumentSpecificSettings( ::std::list< SettingsGroup > return 0; } -void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ ) +void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, bool /*bTimeFormat*/ ) { if(mpNumExport) mpNumExport->SetUsed(nNumberFormat); @@ -1894,7 +1894,7 @@ void SvXMLExport::exportAutoDataStyles() mxFormExport->exportAutoControlNumberStyles(); } -OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ ) const +OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, bool /*bTimeFormat*/ ) const { OUString sTemp; if(mpNumExport) @@ -1929,9 +1929,9 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR return sRet; } -sal_Bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObjectURL ) +bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObjectURL ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( (getExportFlags() & EXPORT_EMBEDDED) != 0 && rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) && @@ -1970,9 +1970,9 @@ OUString SvXMLExport::AddEmbeddedObject( const OUString& rEmbeddedObjectURL ) return sRet; } -sal_Bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL ) +bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( (rEmbeddedObjectURL.startsWith( msEmbeddedObjectProtocol ) || rEmbeddedObjectURL.startsWith( msGraphicObjectProtocol ) ) && mxEmbeddedResolver.is() ) @@ -2115,7 +2115,7 @@ sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& r return 0; } -sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) +bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) { OUString sFilterService; @@ -2142,7 +2142,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) SAL_WARN_IF( !sFilterService.getLength(), "xmloff.core", "no export filter for own object" ); if( sFilterService.isEmpty() ) - return sal_False; + return false; Reference < XDocumentHandler > xHdl = new XMLEmbeddedObjectExportFilter( mxHandler ); @@ -2155,7 +2155,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) UNO_QUERY); SAL_WARN_IF( !xExporter.is(), "xmloff.core", "can't instantiate export filter component for own object" ); if( !xExporter.is() ) - return sal_False; + return false; xExporter->setSourceDocument( rComp ); @@ -2202,14 +2202,14 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue) void SvXMLExport::StartElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSOutside ) + bool bIgnWSOutside ) { StartElement(_GetNamespaceMap().GetQNameByKey( nPrefix, GetXMLToken(eName) ), bIgnWSOutside); } void SvXMLExport::StartElement(const OUString& rName, - sal_Bool bIgnWSOutside ) + bool bIgnWSOutside ) { if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING) { @@ -2263,14 +2263,14 @@ void SvXMLExport::Characters(const OUString& rChars) void SvXMLExport::EndElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - sal_Bool bIgnWSInside ) + bool bIgnWSInside ) { EndElement(_GetNamespaceMap().GetQNameByKey( nPrefix, GetXMLToken(eName) ), bIgnWSInside); } void SvXMLExport::EndElement(const OUString& rName, - sal_Bool bIgnWSInside ) + bool bIgnWSInside ) { // decrement nesting depth counter & (maybe) restore namespace map --mpImpl->mDepth; @@ -2375,7 +2375,7 @@ void SvXMLExport::DisposingModel() } // Written OpenDocument file format doesn't fit to the created text document (#i69627#) -sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const +bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const { return mpImpl->mbOutlineStyleAsNormalListStyle; } @@ -2491,12 +2491,12 @@ SvXMLExport::AddAttributesRDFa( mpImpl->mpRDFaHelper->AddRDFa(xMeta); } -sal_Bool SvXMLExport::exportTextNumberElement() const +bool SvXMLExport::exportTextNumberElement() const { return mpImpl->mbExportTextNumberElement; } -sal_Bool SvXMLExport::SetNullDateOnUnitConverter() +bool SvXMLExport::SetNullDateOnUnitConverter() { // if the null date has already been set, don't set it again (performance) if (!mpImpl->mbNullDateInitialized) @@ -2510,7 +2510,7 @@ sal_Bool SvXMLExport::SetNullDateOnUnitConverter() void SvXMLElementExport::StartElement( const sal_uInt16 nPrefixKey, const OUString& rLName, - const sal_Bool bIgnoreWhitespaceOutside ) + const bool bIgnoreWhitespaceOutside ) { maElementName = mrExport.GetNamespaceMap().GetQNameByKey(nPrefixKey, rLName); mrExport.StartElement(maElementName, bIgnoreWhitespaceOutside); @@ -2520,12 +2520,12 @@ SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefixKey, const sal_Char *pLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) + bool bIWSOutside, + bool bIWSInside ) : mrExport( rExp ) , maElementName() , mbIgnoreWhitespaceInside( bIWSInside ) - , mbDoSomething( sal_True ) + , mbDoSomething( true ) { const OUString sLName( OUString::createFromAscii( pLName ) ); StartElement( nPrefixKey, sLName, bIWSOutside ); @@ -2535,12 +2535,12 @@ SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefixKey, const OUString& rLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) + bool bIWSOutside, + bool bIWSInside ) : mrExport( rExp ) , maElementName() , mbIgnoreWhitespaceInside( bIWSInside ) - , mbDoSomething( sal_True ) + , mbDoSomething( true ) { StartElement( nPrefixKey, rLName, bIWSOutside ); } @@ -2549,23 +2549,23 @@ SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefixKey, enum XMLTokenEnum eLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) + bool bIWSOutside, + bool bIWSInside ) : mrExport( rExp ) , maElementName() , mbIgnoreWhitespaceInside( bIWSInside ) - , mbDoSomething( sal_True ) + , mbDoSomething( true ) { StartElement( nPrefixKey, GetXMLToken(eLName), bIWSOutside ); } SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, + bool bDoSth, sal_uInt16 nPrefixKey, enum XMLTokenEnum eLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) + bool bIWSOutside, + bool bIWSInside ) : mrExport( rExp ) , maElementName() , mbIgnoreWhitespaceInside( bIWSInside ) @@ -2578,12 +2578,12 @@ SvXMLElementExport::SvXMLElementExport( SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, const OUString& rQName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) + bool bIWSOutside, + bool bIWSInside ) : mrExport( rExp ) , maElementName() , mbIgnoreWhitespaceInside( bIWSInside ) - , mbDoSomething( sal_True ) + , mbDoSomething( true ) { maElementName = rQName; rExp.StartElement( rQName, bIWSOutside ); diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 2a0bfbae72fd..73336d34fca5 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -240,7 +240,7 @@ void XMLImageMapExport::ExportMapEntry( rPropertySet->getPropertyValue(msTitle) >>= sTitle; if(!sTitle.isEmpty()) { - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, mbWhiteSpace, sal_False); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, mbWhiteSpace, false); mrExport.Characters(sTitle); } @@ -249,7 +249,7 @@ void XMLImageMapExport::ExportMapEntry( rPropertySet->getPropertyValue(msDescription) >>= sDescription; if (!sDescription.isEmpty()) { - SvXMLElementExport aDesc(mrExport, XML_NAMESPACE_SVG, XML_DESC, mbWhiteSpace, sal_False); + SvXMLElementExport aDesc(mrExport, XML_NAMESPACE_SVG, XML_DESC, mbWhiteSpace, false); mrExport.Characters(sDescription); } diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 15f0160b4edc..f88d09fa438c 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -329,7 +329,7 @@ static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumb rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TEXTUAL, XML_TRUE ); } - SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.meNumberStyle, sal_True, sal_False ); + SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.meNumberStyle, true, false ); if( rElement.mpText ) { OUString sAttrValue( OUString::createFromAscii( rElement.mpText ) ); @@ -353,7 +353,7 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_AUTOMATIC_ORDER, XML_TRUE ); } - SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? XML_DATE_STYLE : XML_TIME_STYLE, sal_True, sal_True ); + SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? XML_DATE_STYLE : XML_TIME_STYLE, true, true ); do { diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 2fbcf17cc032..4284637f58f5 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -593,7 +593,7 @@ void AnimationsExporterImpl::exportTransitionNode() convertTiming( sTmp, Any( aEvent ) ); mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() ); - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, sal_True, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, true, true ); if( nTransition != 0 ) { @@ -627,13 +627,13 @@ void AnimationsExporterImpl::exportTransitionNode() ::sax::Converter::convertColor( sTmp, nFadeColor ); mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() ); } - SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, sal_True, sal_True ); + SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true ); } if( bStopSound ) { mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO ); - SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, sal_True, sal_True ); + SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true ); } else if( !sSoundURL.isEmpty()) { @@ -644,7 +644,7 @@ void AnimationsExporterImpl::exportTransitionNode() if( bLoopSound ) mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE ); - SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, sal_True, sal_True ); + SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true ); } } } @@ -1075,7 +1075,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(), invalid TimeContainerType!" ); return; } - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, sal_True, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true ); if( nContainerNodeType == EffectNodeType::TIMING_ROOT ) exportTransitionNode(); @@ -1347,7 +1347,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat break; } - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, sal_True, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true ); } catch (const Exception&) @@ -1379,7 +1379,7 @@ void AnimationsExporterImpl::exportAudio( const Reference< XAudio >& xAudio ) if( nEndAfterSlide != 0 ) mrExport.AddAttribute( ); */ - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, sal_True, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true ); } catch (const Exception&) @@ -1406,7 +1406,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman // todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0; - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, sal_True, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true ); } catch (const Exception&) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 83aff726378b..14b50ad03b5e 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -438,7 +438,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) if( aIter != aEnd ) { - SvXMLElementExport aElement( rExport, XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, sal_True, sal_True ); + SvXMLElementExport aElement( rExport, XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, true, true ); do { @@ -455,7 +455,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) ::sax::Converter::convertColor( sTmp, rEffect.maDimColor ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, sTmp.makeStringAndClear() ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, true, true ); } else if( rEffect.meKind == XMLE_PLAY ) { @@ -465,7 +465,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, sTmp.makeStringAndClear() ); } - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, true, true ); } else { @@ -515,7 +515,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) eLocalName = XML_HIDE_SHAPE; } - SvXMLElementExport aEle( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True ); + SvXMLElementExport aEle( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, true, true ); if( !rEffect.maSoundURL.isEmpty() ) { rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(rEffect.maSoundURL) ); @@ -525,7 +525,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport ) if( rEffect.mbPlayFull ) rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE ); - SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true ); } } diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 0231395e9484..e1a3727f97f0 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -59,7 +59,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) OUString sTmp; - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER_SET, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER_SET, true, true ); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -70,13 +70,13 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) if(!sTmp.isEmpty()) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, sTmp ); - SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True ); + SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, true, true ); // title property (as <svg:title> element) xLayer->getPropertyValue(strTitle) >>= sTmp; if(!sTmp.isEmpty()) { - SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False); + SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SVG, XML_TITLE, true, false); rExport.Characters(sTmp); } @@ -84,7 +84,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) xLayer->getPropertyValue(strDescription) >>= sTmp; if(!sTmp.isEmpty()) { - SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False); + SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, true, false); rExport.Characters(sTmp); } } diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 9a400972ed4b..28fdee7dc4be 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1736,7 +1736,7 @@ void XMLPageExportPropertyMapper::handleElementItem( mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true ); } } break; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index cd00dd42a5e8..cd6b4581e246 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -831,7 +831,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, pInfo->GetLayoutName()); // write draw-style attributes - SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, sal_True, sal_True); + SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, true, true); // write presentation placeholders switch(pInfo->GetLayoutType()) @@ -1250,7 +1250,7 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // write presentation-placeholder - SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, sal_True, sal_True); + SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, true, true); } ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< XDrawPage > xMasterPage ) @@ -1348,7 +1348,7 @@ void SdXMLExport::ImpWritePageMasterInfos() AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sString); // write page-layout - SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, sal_True, sal_True); + SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, true, true); // prepare style:properties inside page-master GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, @@ -1387,7 +1387,7 @@ void SdXMLExport::ImpWritePageMasterInfos() AddAttribute(XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_LANDSCAPE); // write style:properties - SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT_PROPERTIES, sal_True, sal_True); + SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT_PROPERTIES, true, true); } } } @@ -1561,7 +1561,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() sBuffer.append( nIndex ); AddAttribute(XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear()); - SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_HEADER_DECL, sal_True, sal_True); + SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_HEADER_DECL, true, true); Characters((*aIter)); } } @@ -1578,7 +1578,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() sBuffer.append( nIndex ); AddAttribute(XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear()); - SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_FOOTER_DECL, sal_False, sal_False); + SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_FOOTER_DECL, false, false); Characters((*aIter)); } } @@ -1602,7 +1602,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() if( !rDecl.mbFixed ) AddAttribute( XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, getDataStyleName( rDecl.mnFormat ) ); - SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_DATE_TIME_DECL, sal_False, sal_False); + SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_DATE_TIME_DECL, false, false); if( rDecl.mbFixed ) Characters(rDecl.maStrText); } @@ -1890,7 +1890,7 @@ void SdXMLExport::_ExportContent() } // write page - SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, sal_True, sal_True); + SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, true, true); // write optional office:forms exportFormsElement( xDrawPage ); @@ -1934,7 +1934,7 @@ void SdXMLExport::_ExportContent() ImplExportHeaderFooterDeclAttributes( maDrawNotesPagesHeaderFooterSettings[nPageInd] ); // write presentation notes - SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True); + SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, true, true); // write optional office:forms exportFormsElement( xNotesPage ); @@ -2092,7 +2092,7 @@ void SdXMLExport::exportPresentationSettings() if( bHasAttr || nShowCount != 0 ) { - SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, XML_SETTINGS, sal_True, sal_True); + SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, XML_SETTINGS, true, true); if( nShowCount == 0 ) return; @@ -2128,7 +2128,7 @@ void SdXMLExport::exportPresentationSettings() if( !sTmp.isEmpty() ) AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAGES, sTmp.makeStringAndClear() ); - SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, sal_True, sal_True); + SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, true, true); } } } @@ -2405,7 +2405,7 @@ void SdXMLExport::_ExportMasterStyles() ImplExportHeaderFooterDeclAttributes( maHandoutPageHeaderFooterSettings ); // write masterpage - SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_HANDOUT_MASTER, sal_True, sal_True); + SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_HANDOUT_MASTER, true, true); // write graphic objects on this master page (if any) Reference< drawing::XShapes > xShapes(xHandoutPage, UNO_QUERY); @@ -2449,7 +2449,7 @@ void SdXMLExport::_ExportMasterStyles() maMasterPagesStyleNames[nMPageId]); // write masterpage - SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_MASTER_PAGE, sal_True, sal_True); + SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_MASTER_PAGE, true, true); // write optional office:forms exportFormsElement( xMasterPage ); @@ -2479,7 +2479,7 @@ void SdXMLExport::_ExportMasterStyles() } // write presentation notes - SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True); + SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, true, true); // write optional office:forms exportFormsElement( xNotesPage ); @@ -2554,7 +2554,7 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& } } -void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) +void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat ) { sal_Int32 nFormat = nNumberFormat; if( (nNumberFormat > 1) && (nNumberFormat <= 0x0f) ) @@ -2594,7 +2594,7 @@ void SdXMLExport::exportAutoDataStyles() GetFormExport()->exportAutoControlNumberStyles(); } -OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) const +OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat ) const { if( bTimeFormat ) { @@ -2702,13 +2702,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) } // annotation element + content - SvXMLElementExport aElem(*this, XML_NAMESPACE_OFFICE_EXT, XML_ANNOTATION, sal_False, sal_True); + SvXMLElementExport aElem(*this, XML_NAMESPACE_OFFICE_EXT, XML_ANNOTATION, false, true); // author OUString aAuthor( xAnnotation->getAuthor() ); if( !aAuthor.isEmpty() ) { - SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, XML_CREATOR, sal_True, sal_False ); + SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, XML_CREATOR, true, false ); this->Characters(aAuthor); } @@ -2716,7 +2716,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) // date time com::sun::star::util::DateTime aDate( xAnnotation->getDateTime() ); ::sax::Converter::convertDateTime(sStringBuffer, aDate, 0, true); - SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, sal_True, sal_False ); + SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, false ); Characters(sStringBuffer.makeStringAndClear()); } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 93ba7251f306..581fdcbd93bc 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -193,10 +193,10 @@ public: sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; } - virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) SAL_OVERRIDE; + virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) SAL_OVERRIDE; virtual void exportDataStyles() SAL_OVERRIDE; virtual void exportAutoDataStyles() SAL_OVERRIDE; - virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const SAL_OVERRIDE; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const SAL_OVERRIDE; }; #endif // _SDXMLEXP_HXX diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d43da5c4c9ee..78666097ecf1 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -581,7 +581,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); - mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, sal_True, sal_True) ); + mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) ); } } } @@ -1215,7 +1215,7 @@ void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ESCAPE_DIRECTION, msBuffer.makeStringAndClear() ); } - SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_DRAW, XML_GLUE_POINT, sal_True, sal_True); + SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_DRAW, XML_GLUE_POINT, true, true); } } } @@ -1586,7 +1586,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( ((nFound & FOUND_CLICKACTION) == 0) || (eClickAction == presentation::ClickAction_NONE) ) return; - SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True); + SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true); enum XMLTokenEnum eStrAction; @@ -1676,7 +1676,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear()); } - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, true, true); if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND ) { @@ -1689,7 +1689,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( nFound & FOUND_PLAYFULL && bPlayFull ) mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true ); } } } @@ -1697,7 +1697,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x { if( nFound & FOUND_MACRO ) { - SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True); + SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey( @@ -1722,14 +1722,14 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro ); } - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, true, true); } } else if( aClickEventType == msScript ) { if( nFound & FOUND_MACRO ) { - SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True); + SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true); if ( nFound & FOUND_MACRO ) { mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey( @@ -1740,7 +1740,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro ); - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, true, true); } } } @@ -1760,13 +1760,13 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape if(!aTitle.isEmpty()) { - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, true, false); mrExport.Characters( aTitle ); } if(!aDescription.isEmpty()) { - SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False ); + SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_DESC, true, false ); mrExport.Characters( aDescription ); } } @@ -1782,8 +1782,8 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape if(xShapes.is() && xShapes->getCount()) { // write group shape - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -1880,9 +1880,9 @@ void XMLShapeExport::ImpExportTextBoxShape( if(bIsPresShape) bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr ); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); // evtl. corner radius? sal_Int32 nCornerRadius(0L); @@ -1897,7 +1897,7 @@ void XMLShapeExport::ImpExportTextBoxShape( { // write text-box - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, true, true); if(!bIsEmptyPresObj) ImpExportText( xShape ); } @@ -1930,8 +1930,8 @@ void XMLShapeExport::ImpExportRectangleShape( } // write rectangle - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_RECT, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_RECT, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2042,8 +2042,8 @@ void XMLShapeExport::ImpExportLineShape( mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); // write line - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_LINE, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_LINE, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2094,12 +2094,12 @@ void XMLShapeExport::ImpExportEllipseShape( mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_ANGLE, sStringBuffer.makeStringAndClear() ); } - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# // write ellipse or circle SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, bCircle ? XML_CIRCLE : XML_ELLIPSE, - bCreateNewline, sal_True); + bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2207,7 +2207,7 @@ void XMLShapeExport::ImpExportPolygonShape( XML_NAMESPACE_DRAW, eName, bCreateNewline, - sal_True); + true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2234,9 +2234,9 @@ void XMLShapeExport::ImpExportGraphicObjectShape( if(eShapeType == XmlShapeTypePresGraphicObjectShape) bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_GRAPHIC) ); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ); @@ -2301,7 +2301,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( } { - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true); if( !sImageURL.isEmpty() ) { @@ -2332,7 +2332,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // xlink:href for replacement, only written for Svg content - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true); // optional office:binary-data mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl); @@ -2381,8 +2381,8 @@ void XMLShapeExport::ImpExportControlShape( } } - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONTROL, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONTROL, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# } @@ -2596,8 +2596,8 @@ void XMLShapeExport::ImpExportConnectorShape( mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString()); // write connector shape. Add Export later. - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2690,8 +2690,8 @@ void XMLShapeExport::ImpExportMeasureShape( mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); // write measure shape - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_MEASURE, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_MEASURE, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2726,11 +2726,11 @@ void XMLShapeExport::ImpExportOLE2Shape( else if(eShapeType == XmlShapeTypePresSheetShape) bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) ); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# sal_Bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); OUString sPersistName; SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ); @@ -2807,7 +2807,7 @@ void XMLShapeExport::ImpExportOLE2Shape( } enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : XML_OBJECT_OLE ; - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, sal_True, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, true, true ); if(bExportEmbedded && !bIsEmptyPresObj) { @@ -2847,7 +2847,7 @@ void XMLShapeExport::ImpExportOLE2Shape( } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, - XML_IMAGE, sal_False, sal_True ); + XML_IMAGE, false, true ); if( bExportEmbedded ) GetExport().AddEmbeddedObjectAsBase64( sURL ); @@ -2890,8 +2890,8 @@ void XMLShapeExport::ImpExportPageShape( } // write Page shape - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, bCreateNewline, sal_True); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, bCreateNewline, true); } } @@ -2927,14 +2927,14 @@ void XMLShapeExport::ImpExportCaptionShape( mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_Y, msBuffer.makeStringAndClear() ); // write Caption shape. Add export later. - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); SvXMLElementExport aObj( mrExport, (bAnnotation ? XML_NAMESPACE_OFFICE : XML_NAMESPACE_DRAW), (bAnnotation ? XML_ANNOTATION : XML_CAPTION), - bCreateNewline, sal_True ); + bCreateNewline, true ); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -2955,9 +2955,9 @@ void XMLShapeExport::ImpExportFrameShape( // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); // export frame url OUString aStr; @@ -2974,7 +2974,7 @@ void XMLShapeExport::ImpExportFrameShape( // write floating frame { - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, true, true); } } } @@ -2989,9 +2989,9 @@ void XMLShapeExport::ImpExportAppletShape( // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); // export frame url OUString aStr; @@ -3017,7 +3017,7 @@ void XMLShapeExport::ImpExportAppletShape( { // write applet - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_APPLET, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_APPLET, true, true); // export parameters uno::Sequence< beans::PropertyValue > aCommands; @@ -3028,7 +3028,7 @@ void XMLShapeExport::ImpExportAppletShape( aCommands[nIndex].Value >>= aStr; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ); } } } @@ -3044,9 +3044,9 @@ void XMLShapeExport::ImpExportPluginShape( // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); // export plugin url OUString aStr; @@ -3063,7 +3063,7 @@ void XMLShapeExport::ImpExportPluginShape( { // write plugin - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, true, true); // export parameters uno::Sequence< beans::PropertyValue > aCommands; @@ -3074,7 +3074,7 @@ void XMLShapeExport::ImpExportPluginShape( aCommands[nIndex].Value >>= aStr; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); - SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ); + SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ); } } } @@ -3168,9 +3168,9 @@ void XMLShapeExport::ImpExportMediaShape( if(eShapeType == XmlShapeTypePresMediaShape) ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) ); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, - XML_FRAME, bCreateNewline, sal_True ); + XML_FRAME, bCreateNewline, true ); // export media url OUString aMediaURL; @@ -3186,7 +3186,7 @@ void XMLShapeExport::ImpExportMediaShape( mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, OUString( "application/vnd.sun.star.media" ) ); // write plugin - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), true); // export parameters const OUString aFalseStr( "false" ), aTrueStr( "true" ); @@ -3196,21 +3196,21 @@ void XMLShapeExport::ImpExportMediaShape( xPropSet->getPropertyValue( aLoopStr ) >>= bLoop; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr ); - delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); + delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); sal_Bool bMute = false; const OUString aMuteStr( "Mute" ); xPropSet->getPropertyValue( aMuteStr ) >>= bMute; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bMute ? aTrueStr : aFalseStr ); - delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); + delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); sal_Int16 nVolumeDB = 0; const OUString aVolumeDBStr( "VolumeDB" ); xPropSet->getPropertyValue("VolumeDB") >>= nVolumeDB; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::number( nVolumeDB ) ); - delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); + delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); media::ZoomLevel eZoom; const OUString aZoomStr( "Zoom" ); @@ -3235,7 +3235,7 @@ void XMLShapeExport::ImpExportMediaShape( { mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aZoomStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aZoomValue ); - delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); + delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); } } } @@ -3257,7 +3257,7 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap // write 3DScene shape sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, sal_True); + SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); @@ -3340,7 +3340,7 @@ void XMLShapeExport::ImpExport3DShape( // write 3DCube shape // #i123542# Do this *after* the attributes are added, else these will be lost since opening // the scope will clear the global attribute list at the exporter - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, true, true); break; } @@ -3377,7 +3377,7 @@ void XMLShapeExport::ImpExport3DShape( // write 3DSphere shape // #i123542# Do this *after* the attributes are added, else these will be lost since opening // the scope will clear the global attribute list at the exporter - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, true, true); break; } @@ -3427,12 +3427,12 @@ void XMLShapeExport::ImpExport3DShape( if(eShapeType == XmlShapeTypeDraw3DLatheObject) { // write 3DLathe shape - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_ROTATE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_ROTATE, true, true); } else { // write 3DExtrude shape - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_EXTRUDE, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_EXTRUDE, true, true); } break; } @@ -3611,7 +3611,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s nLamp == 1 ? XML_TRUE : XML_FALSE); // write light entry - SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_LIGHT, sal_True, sal_True); + SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_LIGHT, true, true); } } @@ -3704,7 +3704,7 @@ void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUString >& } } while( nIndex != -1 ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FORMULA, aStr ); - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_EQUATION, sal_True, sal_True ); + SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_EQUATION, true, true ); } } @@ -3845,7 +3845,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert } } if ( bPosition ) - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, sal_True, sal_True ); + SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, true, true ); else rExport.ClearAttrList(); } @@ -4664,7 +4664,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean ImpExportEnhancedPath( rExport, aCoordinates, aSegments ); } } - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_ENHANCED_GEOMETRY, sal_True, sal_True ); + SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_ENHANCED_GEOMETRY, true, true ); if ( bEquations ) ImpExportEquations( rExport, aEquations ); if ( bHandles ) @@ -4701,8 +4701,8 @@ void XMLShapeExport::ImpExportCustomShape( mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DATA, aStr ); } } - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, bCreateNewline, sal_True ); + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, bCreateNewline, true ); ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); @@ -4731,7 +4731,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape const bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); const bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); - SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True ); + SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); // do not export in ODF 1.1 or older if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) @@ -4831,7 +4831,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, sal_False, sal_True ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true ); if( bExportEmbedded ) { diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 75c9c9bf2697..19e32e0f2586 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -142,7 +142,7 @@ namespace xmloff void OElementExport::implStartElement(const sal_Char* _pName) { - m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, sal_True, sal_True); + m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, true, true); } void OElementExport::implEndElement() @@ -418,7 +418,7 @@ namespace xmloff OAttributeMetaData::getCommonControlAttributeNamespace(CCA_LABEL), OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), *pListItems); - SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "item", sal_True, sal_True); + SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "item", true, true); } } } @@ -1352,7 +1352,7 @@ namespace xmloff ); aDefaultSelection.erase(aDefaultSelectedPos); } - SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", sal_True, sal_True); + SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", true, true); } // There may be more "selected" or "default-selected" items than there are in the lists in real, @@ -1395,7 +1395,7 @@ namespace xmloff sTrue ); } - SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", sal_True, sal_True); + SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", true, true); } } } @@ -1408,8 +1408,8 @@ namespace xmloff ? new SvXMLElementExport( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, - pOuterElementName, sal_True, - sal_True) + pOuterElementName, true, + true) : 0; // add the attributes for the inner element @@ -2069,7 +2069,7 @@ namespace xmloff sPropValue); if ( m_rContext.getGlobalContext().GetAttrList().getLength() ) { - SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, xmloff::token::XML_CONNECTION_RESOURCE, sal_True, sal_True); + SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, xmloff::token::XML_CONNECTION_RESOURCE, true, true); } } diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 8e480e295179..b13528041d49 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -114,7 +114,7 @@ namespace xmloff { addModelAttributes(_rExp); - m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, sal_True, sal_True); + m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, true, true); } OFormsRootExport::~OFormsRootExport( ) diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 3943af21cc23..79bacd97d796 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -93,7 +93,7 @@ namespace xmloff AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); SvXMLElementExport aValueTag( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, - token::XML_LIST_VALUE, sal_True, sal_False); + token::XML_LIST_VALUE, true, false); } } @@ -123,7 +123,7 @@ namespace xmloff // now that we have the first sub-tag we need the form:properties element if (!pPropertiesTag) - pPropertiesTag = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, token::XML_PROPERTIES, sal_True, sal_True); + pPropertiesTag = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, token::XML_PROPERTIES, true, true); // add the name attribute AddAttribute(XML_NAMESPACE_FORM, token::XML_PROPERTY_NAME, *aProperty); @@ -177,7 +177,7 @@ namespace xmloff SvXMLElementExport aValueTag1(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, bIsSequence ? token::XML_LIST_PROPERTY - : token::XML_PROPERTY, sal_True, sal_True); + : token::XML_PROPERTY, true, true); if (!bIsSequence) continue; diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 4cca4e84aca0..7a94fdb030e4 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -152,7 +152,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) OUString::createFromAscii(pVersion) ); SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, - sal_True, sal_True ); + true, true ); // NB: office:meta is now written by _ExportMeta _ExportMeta(); diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 773056b0c0fd..f18dbb29afaf 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -75,7 +75,7 @@ void SvXMLMetaExport::SimpleStringElement( const OUString& rText, { if ( !rText.isEmpty() ) { SvXMLElementExport aElem( mrExport, nNamespace, eElementName, - sal_True, sal_False ); + true, false ); mrExport.Characters( rText ); } } @@ -87,7 +87,7 @@ void SvXMLMetaExport::SimpleDateTimeElement( const util::DateTime & rDate, OUString sValue = GetISODateTimeString( rDate ); if ( !sValue.isEmpty() ) { SvXMLElementExport aElem( mrExport, nNamespace, eElementName, - sal_True, sal_False ); + true, false ); mrExport.Characters( sValue ); } } @@ -98,7 +98,7 @@ void SvXMLMetaExport::_MExport() // generator { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_GENERATOR, - sal_True, sal_True ); + true, true ); mrExport.Characters( ::utl::DocInfoHelper::GetGeneratorString() ); } @@ -136,7 +136,7 @@ void SvXMLMetaExport::_MExport() const uno::Sequence< OUString > keywords = mxDocProps->getKeywords(); for (sal_Int32 i = 0; i < keywords.getLength(); ++i) { SvXMLElementExport aKwElem( mrExport, XML_NAMESPACE_META, XML_KEYWORD, - sal_True, sal_False ); + true, false ); mrExport.Characters( keywords[i] ); } @@ -145,7 +145,7 @@ void SvXMLMetaExport::_MExport() OUString sValue = LanguageTag( mxDocProps->getLanguage()).getBcp47( false); if (!sValue.isEmpty()) { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DC, XML_LANGUAGE, - sal_True, sal_False ); + true, false ); mrExport.Characters( sValue ); } } @@ -154,7 +154,7 @@ void SvXMLMetaExport::_MExport() { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_CYCLES, - sal_True, sal_False ); + true, false ); mrExport.Characters( OUString::number( mxDocProps->getEditingCycles() ) ); } @@ -165,7 +165,7 @@ void SvXMLMetaExport::_MExport() sal_Int32 secs = mxDocProps->getEditingDuration(); SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_DURATION, - sal_True, sal_False ); + true, false ); OUStringBuffer buf; ::sax::Converter::convertDuration(buf, util::Duration( false, 0, 0, 0, secs/3600, (secs%3600)/60, secs%60, 0)); @@ -185,7 +185,7 @@ void SvXMLMetaExport::_MExport() SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META,XML_HYPERLINK_BEHAVIOUR, - sal_True, sal_False ); + true, false ); } // auto-reload @@ -203,7 +203,7 @@ void SvXMLMetaExport::_MExport() buf.makeStringAndClear()); SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_AUTO_RELOAD, - sal_True, sal_False ); + true, false ); } // template @@ -226,7 +226,7 @@ void SvXMLMetaExport::_MExport() GetISODateTimeString( mxDocProps->getTemplateDate() ) ); SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_TEMPLATE, - sal_True, sal_False ); + true, false ); } // user defined fields @@ -245,7 +245,7 @@ void SvXMLMetaExport::_MExport() mrExport.AddAttribute( XML_NAMESPACE_META, XML_VALUE_TYPE, sType.makeStringAndClear() ); SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, - XML_USER_DEFINED, sal_True, sal_False ); + XML_USER_DEFINED, true, false ); mrExport.Characters( sValueBuffer.makeStringAndClear() ); } @@ -291,7 +291,7 @@ void SvXMLMetaExport::_MExport() } } SvXMLElementExport aElem( mrExport, - XML_NAMESPACE_META, XML_DOCUMENT_STATISTIC, sal_True, sal_True ); + XML_NAMESPACE_META, XML_DOCUMENT_STATISTIC, true, true ); } } @@ -340,7 +340,7 @@ void SvXMLMetaExport::Export() } else { // office:meta SvXMLElementExport aElem( mrExport, XML_NAMESPACE_OFFICE, XML_META, - sal_True, sal_True ); + true, true ); // fall back to using public interface of XDocumentProperties _MExport(); } @@ -457,7 +457,7 @@ SvXMLMetaExport::endElement(const OUString & i_rName) return; } DBG_ASSERT( m_level >= 0, "SvXMLMetaExport: level error" ); - mrExport.EndElement(i_rName, sal_False); + mrExport.EndElement(i_rName, false); } void SAL_CALL diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 7b346d9506df..edd693a3b764 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -71,7 +71,7 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) { // the following object will write all collected attributes in its dtor - SvXMLElementExport aRoot( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_LIST, sal_True, sal_True ); + SvXMLElementExport aRoot( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_LIST, true, true ); for ( sal_Int32 n=0; n<maVersions.getLength(); n++ ) { @@ -92,7 +92,7 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) AddAttribute( XML_NAMESPACE_DC, xmloff::token::XML_DATE_TIME, aDateStr ); // the following object will write all collected attributes in its dtor - SvXMLElementExport aEntry( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_ENTRY, sal_True, sal_True ); + SvXMLElementExport aEntry( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_ENTRY, true, true ); } } GetDocHandler()->endDocument(); diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index 3be13878d09a..ab43ab281356 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -45,7 +45,7 @@ void XMLScriptExportHandler::Export( SvXMLExport& rExport, const OUString& rEventQName, Sequence<PropertyValue> & rValues, - sal_Bool bUseWhitespace) + bool bUseWhitespace) { rExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_LANGUAGE, @@ -70,7 +70,7 @@ void XMLScriptExportHandler::Export( SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, - bUseWhitespace, sal_False); + bUseWhitespace, false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index 5127c1b6147f..3e18bbd40128 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -49,7 +49,7 @@ void XMLStarBasicExportHandler::Export( SvXMLExport& rExport, const OUString& rEventQName, Sequence<PropertyValue> & rValues, - sal_Bool bUseWhitespace) + bool bUseWhitespace) { rExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_LANGUAGE, rExport.GetNamespaceMap().GetQNameByKey( @@ -92,7 +92,7 @@ void XMLStarBasicExportHandler::Export( SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, - bUseWhitespace, sal_False); + bUseWhitespace, false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 3ba46fe8842d..efd388fb062c 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -309,7 +309,7 @@ bool XMLDashStyleExport::exportXML( // do Write SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_STROKE_DASH, - sal_True, sal_False ); + true, false ); } } return bRet; diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 2fed5d68c725..111b0dba135a 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -301,7 +301,7 @@ bool XMLGradientStyleExport::exportXML( // Do Write SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT, - sal_True, sal_False ); + true, false ); } } } diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 832d19774054..589c0e6e8b57 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -229,7 +229,7 @@ bool XMLHatchStyleExport::exportXML( // Do Write SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_HATCH, - sal_True, sal_False ); + true, false ); } } } diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 0577fc922d86..5e355ff23f53 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -88,7 +88,7 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal } // Do Write - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_FILL_IMAGE, sal_True, sal_True ); + SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_FILL_IMAGE, true, true ); if( !sImageURL.isEmpty() ) { diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index b07eb1067b35..acad58b5eb34 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -201,7 +201,7 @@ void XMLMarkerStyleExport::exportXML( rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString); // Do Write - SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False ); + SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, true, false ); } } } diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index e2964647998f..1c66c25824ac 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -300,7 +300,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML( // Do Write SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_OPACITY, - sal_True, sal_False ); + true, false ); } } } diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 25dba04d75c3..d8578becd020 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -154,7 +154,7 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL, } { - SvXMLElementExport aElem( GetExport(), nPrefix, rLocalName, sal_True, sal_True ); + SvXMLElementExport aElem( GetExport(), nPrefix, rLocalName, true, true ); if( !sURL.isEmpty() && GraphicLocation_NONE != ePos ) { // optional office:binary-data diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index b83bf9cd4cc6..ff95ad6143e5 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -222,7 +222,7 @@ void XMLFontAutoStylePool::exportXML() { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, - sal_True, sal_True ); + true, true ); Any aAny; OUString sTmp; XMLFontFamilyNamePropHdl aFamilyNameHdl; @@ -268,7 +268,7 @@ void XMLFontAutoStylePool::exportXML() SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, XML_FONT_FACE, - sal_True, sal_True ); + true, true ); if( tryToEmbedFonts ) { diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 3dbfd9c82600..5404963d799c 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -179,7 +179,7 @@ void XMLFootnoteSeparatorExport::exportXML( // line-style SvXMLElementExport aElem(rExport, XML_NAMESPACE_STYLE, - XML_FOOTNOTE_SEP, sal_True, sal_True); + XML_FOOTNOTE_SEP, true, true); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 7335548eebda..973d648d9c73 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -141,7 +141,7 @@ bool XMLPageExport::exportStyle( } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_MASTER_PAGE, sal_True, sal_True ); + XML_MASTER_PAGE, true, true ); exportMasterPageContent( xPropSet, false ); } @@ -162,7 +162,7 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) : xPageMasterPropSetMapper, rExp); rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, OUString( XML_STYLE_FAMILY_PAGE_MASTER_NAME ), - xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), sal_False ); + xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), false ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetExport().GetModel(), UNO_QUERY ); @@ -252,7 +252,7 @@ void XMLPageExport::exportDefaultStyle() //<style:default-page-layout> SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_DEFAULT_PAGE_LAYOUT, - sal_True, sal_True ); + true, true ); xPageMasterExportPropMapper->exportXML( GetExport(), xPropStates, XML_EXPORT_FLAG_IGN_WS ); diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index c02315fa013d..2d954aa048c7 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -716,7 +716,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, sName, - sal_True, sal_True ); + true, true ); sal_Int32 nStart(-1); sal_Int32 nEnd(-1); diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 5af7c127907c..e37ba3288c51 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -312,7 +312,7 @@ bool XMLStyleExport::exportStyle( { // <style:style> SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_STYLE, - sal_True, sal_True ); + true, true ); rPropMapper->SetStyleName( sName ); @@ -352,7 +352,7 @@ bool XMLStyleExport::exportDefaultStyle( // <style:style> SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_DEFAULT_STYLE, - sal_True, sal_True ); + true, true ); // <style:properties> ::std::vector< XMLPropertyState > xPropStates = rPropMapper->FilterDefaults( xPropSet ); diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 944caa0634bc..667643a5312d 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -240,7 +240,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_HEADER_STYLE, - sal_True, sal_True ); + true, true ); rPropExp.exportXML( GetExport(), rProperties, @@ -251,7 +251,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_FOOTER_STYLE, - sal_True, sal_True ); + true, true ); rPropExp.exportXML( GetExport(), rProperties, @@ -281,7 +281,7 @@ void SvXMLAutoStylePoolP::AddFamily( const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, - sal_Bool bAsFamily ) + bool bAsFamily ) { UniReference <SvXMLExportPropertyMapper> xTmp = pMapper; AddFamily( nFamily, rStrName, xTmp, aStrPrefix, bAsFamily ); @@ -292,7 +292,7 @@ void SvXMLAutoStylePoolP::AddFamily( const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, const OUString& rStrPrefix, - sal_Bool bAsFamily ) + bool bAsFamily ) { pImpl->AddFamily( nFamily, rStrName, rMapper, rStrPrefix, bAsFamily ); } @@ -350,12 +350,12 @@ OUString SvXMLAutoStylePoolP::Add( sal_Int32 nFamily, return sName; } -sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) +bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) { return pImpl->Add(rName, nFamily, rParent, rProperties); } -sal_Bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, +bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) { diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 8c482294032d..b1a62832e66c 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -666,11 +666,11 @@ void SvXMLExportPropertyMapper::ContextFilter( // 1.Number of elements equal ? // 2.Index of each element equal ? (So I know whether the propertynames are the same) // 3.Value of each element equal ? -sal_Bool SvXMLExportPropertyMapper::Equals( +bool SvXMLExportPropertyMapper::Equals( const vector< XMLPropertyState >& aProperties1, const vector< XMLPropertyState >& aProperties2 ) const { - sal_Bool bRet = sal_True; + bool bRet = true; sal_uInt32 nCount = aProperties1.size(); if( nCount == aProperties2.size() ) @@ -699,13 +699,13 @@ sal_Bool SvXMLExportPropertyMapper::Equals( } } else - bRet = sal_False; + bRet = false; nIndex++; } } else - bRet = sal_False; + bRet = false; return bRet; } @@ -769,7 +769,7 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, aPropTokens[i].eToken, (nFlags & XML_EXPORT_FLAG_IGN_WS) != 0, - sal_False ); + false ); exportElementItems( rExport, rProperties, nFlags, aIndexArray ); } diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index eb90abc706a0..b3f21ecfcb72 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -351,7 +351,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem, - sal_True, sal_True ); + true, true ); OUStringBuffer sBuffer; if ( ePosAndSpaceMode == PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION ) @@ -469,7 +469,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, { SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, - XML_LIST_LEVEL_PROPERTIES, sal_True, sal_True ); + XML_LIST_LEVEL_PROPERTIES, true, true ); /* Check, if properties for position-and-space-mode LABEL_ALIGNMENT are allowed to be exported. (#i89178#) @@ -519,7 +519,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, SvXMLElementExport aLabelAlignmentElement( GetExport(), XML_NAMESPACE_STYLE, XML_LIST_LEVEL_LABEL_ALIGNMENT, - sal_True, sal_True ); + true, true ); } } @@ -605,7 +605,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, if( GetExport().GetAttrList().getLength() > 0 ) { SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, - XML_TEXT_PROPERTIES, sal_True, sal_True ); + XML_TEXT_PROPERTIES, true, true ); } if( NumberingType::BITMAP == eType && !sImageURL.isEmpty() ) { @@ -691,7 +691,7 @@ void SvxXMLNumRuleExport::exportNumberingRule( { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_LIST_STYLE , - sal_True, sal_True ); + true, true ); exportLevelStyles( rNumRule ); } } @@ -784,7 +784,7 @@ void SvxXMLNumRuleExport::exportOutline() } } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_OUTLINE_STYLE, sal_True, sal_True ); + XML_OUTLINE_STYLE, true, true ); exportLevelStyles( xNumRule, sal_True ); } } diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 318d93bd8d05..7ea94fae4bbb 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -343,7 +343,7 @@ void SvXMLNumFmtExport::FinishTextElement_Impl() if ( !sTextContent.isEmpty() ) { SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT, - sal_True, sal_False ); + true, false ); rExport.Characters( sTextContent.makeStringAndClear() ); } } @@ -358,7 +358,7 @@ void SvXMLNumFmtExport::WriteColorElement_Impl( const Color& rColor ) aColStr.makeStringAndClear() ); SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_TEXT_PROPERTIES, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString, @@ -379,7 +379,7 @@ void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString, SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_CURRENCY_SYMBOL, - sal_True, sal_False ); + true, false ); rExport.Characters( rString ); } @@ -388,7 +388,7 @@ void SvXMLNumFmtExport::WriteBooleanElement_Impl() FinishTextElement_Impl(); SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_BOOLEAN, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteTextContentElement_Impl() @@ -396,7 +396,7 @@ void SvXMLNumFmtExport::WriteTextContentElement_Impl() FinishTextElement_Impl(); SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT_CONTENT, - sal_True, sal_False ); + true, false ); } // date elements @@ -409,7 +409,7 @@ void SvXMLNumFmtExport::WriteDayElement_Impl( const OUString& rCalendar, sal_Boo AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText ) @@ -421,7 +421,7 @@ void SvXMLNumFmtExport::WriteMonthElement_Impl( const OUString& rCalendar, sal_B AddTextualAttr_Impl( bText ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MONTH, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong ) @@ -432,7 +432,7 @@ void SvXMLNumFmtExport::WriteYearElement_Impl( const OUString& rCalendar, sal_Bo AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_YEAR, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong ) @@ -443,7 +443,7 @@ void SvXMLNumFmtExport::WriteEraElement_Impl( const OUString& rCalendar, sal_Boo AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_ERA, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong ) @@ -454,7 +454,7 @@ void SvXMLNumFmtExport::WriteDayOfWeekElement_Impl( const OUString& rCalendar, s AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY_OF_WEEK, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteWeekElement_Impl( const OUString& rCalendar ) @@ -464,7 +464,7 @@ void SvXMLNumFmtExport::WriteWeekElement_Impl( const OUString& rCalendar ) AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_WEEK_OF_YEAR, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong ) @@ -475,7 +475,7 @@ void SvXMLNumFmtExport::WriteQuarterElement_Impl( const OUString& rCalendar, sal AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_QUARTER, - sal_True, sal_False ); + true, false ); } // time elements @@ -487,7 +487,7 @@ void SvXMLNumFmtExport::WriteHoursElement_Impl( sal_Bool bLong ) AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_HOURS, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong ) @@ -497,14 +497,14 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong ) AddStyleAttr_Impl( bLong ); // adds to pAttrList SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MINUTES, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar ) { FinishTextElement_Impl(); SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, - sal_True, sal_False ); + true, false ); rExport.Characters( OUString( nChar ) ); } @@ -520,7 +520,7 @@ void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDe } SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_SECONDS, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteAMPMElement_Impl() @@ -528,7 +528,7 @@ void SvXMLNumFmtExport::WriteAMPMElement_Impl() FinishTextElement_Impl(); SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_AM_PM, - sal_True, sal_False ); + true, false ); } // numbers @@ -581,7 +581,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( } SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_NUMBER, - sal_True, sal_True ); + true, true ); // number:embedded-text as child elements @@ -594,7 +594,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_POSITION, OUString::number( pObj->nFormatPos ) ); SvXMLElementExport aChildElem( rExport, XML_NAMESPACE_NUMBER, XML_EMBEDDED_TEXT, - sal_True, sal_False ); + true, false ); // text as element content OUString aContent( pObj->aText ); @@ -645,7 +645,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl( SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER, - sal_True, sal_False ); + true, false ); } void SvXMLNumFmtExport::WriteFractionElement_Impl( @@ -688,7 +688,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl( } SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FRACTION, - sal_True, sal_False ); + true, false ); } // mapping (condition) @@ -727,7 +727,7 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, sPrefix ) ) ); SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_MAP, - sal_True, sal_False ); + true, false ); } } @@ -1090,7 +1090,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // The element SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, eType, - sal_True, sal_True ); + true, true ); // color (properties element) @@ -1565,7 +1565,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt { // for an empty format, write an empty text element SvXMLElementExport aTElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT, - sal_True, sal_False ); + true, false ); } // mapping (conditions) must be last elements diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 6700aa6bcd7d..5c16c9d8b9b1 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -85,7 +85,7 @@ void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop* } SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOP, - sal_True, sal_True ); + true, true ); } @@ -112,7 +112,7 @@ void SvxXMLTabStopExport::Export( const uno::Any& rAny ) const sal_Int32 nTabs = aSeq.getLength(); SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOPS, - sal_True, sal_True ); + true, true ); for( sal_Int32 nIndex = 0; nIndex < nTabs; nIndex++ ) { diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 966970290335..8a27e0576224 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -305,7 +305,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) const sal_Int32 rowCount = xIndexAccess->getCount(); const sal_Int32 columnCount = xIndexAccessCols->getCount(); - SvXMLElementExport tableElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True ); + SvXMLElementExport tableElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true ); // export table columns ExportTableColumns( xIndexAccessCols, pTableInfo ); @@ -332,7 +332,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) } // write row element - SvXMLElementExport tableRowElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True ); + SvXMLElementExport tableRowElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true ); for ( sal_Int32 columnIndex = 0; columnIndex < columnCount; columnIndex++ ) { @@ -375,7 +375,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // TODO: All columns first have to be checked if some ones // have identical properties. If yes, attr table:number-columns-repeated // has to be written. - SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True ); + SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); } } } @@ -425,7 +425,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, OUString::number( nRowSpan ) ); // <table:table-cell> or <table:covered-table-cell> - SvXMLElementExport tableCellElement( mrExport, XML_NAMESPACE_TABLE, bIsMerged ? XML_COVERED_TABLE_CELL : XML_TABLE_CELL, sal_True, sal_True ); + SvXMLElementExport tableCellElement( mrExport, XML_NAMESPACE_TABLE, bIsMerged ? XML_COVERED_TABLE_CELL : XML_TABLE_CELL, true, true ); // export cells text content ImpExportText( xCell ); @@ -507,7 +507,7 @@ void XMLTableExport::exportTableTemplates() Reference< XNameAccess > xStyleNames( xTableStyle, UNO_QUERY_THROW ); mrExport.AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) ); - SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, sal_True, sal_True ); + SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true ); const TableStyleElement* pElements = getTableStyleMap(); while( pElements->meElement != XML_TOKEN_END ) @@ -518,7 +518,7 @@ void XMLTableExport::exportTableTemplates() if( xStyle.is() ) { mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) ); - SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, sal_True, sal_True ); + SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true ); } } catch(const Exception&) diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index dd60e4a33aa5..957ce88f3c0b 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -147,7 +147,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) // container element SvXMLElementExport aContainerElement( *this, XML_NAMESPACE_OOO, XML_AUTO_TEXT_EVENTS, - sal_True, sal_True); + true, true); exportEvents(); } diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index 9283037ae606..620b1d731249 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -161,7 +161,7 @@ void XMLIndexMarkExport::ExportIndexMark( SvXMLElementExport aElem(rExport, XML_NAMESPACE_TEXT, pElements[nElementNo], - sal_False, sal_False); + false, false); } } } diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 58fc320efbbd..7e89f1c62b1b 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -172,7 +172,7 @@ void XMLLineNumberingExport::Export() SvXMLElementExport aConfigElem(rExport, XML_NAMESPACE_TEXT, XML_LINENUMBERING_CONFIGURATION, - sal_True, sal_True); + true, true); // line separator aAny = xLineNumbering->getPropertyValue(sSeparatorText); @@ -192,7 +192,7 @@ void XMLLineNumberingExport::Export() SvXMLElementExport aSeparatorElem(rExport, XML_NAMESPACE_TEXT, XML_LINENUMBERING_SEPARATOR, - sal_True, sal_False); + true, false); rExport.Characters(sSeparator); } } diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 4f87c3b1a30c..0c8f817ad80b 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -160,7 +160,7 @@ void XMLRedlineExport::ExportChangesList( // changes container element SvXMLElementExport aChanges(rExport, XML_NAMESPACE_TEXT, XML_TRACKED_CHANGES, - sal_True, sal_True); + true, true); // iterate over changes list for( ChangesListType::iterator aIter = pChangesList->begin(); @@ -234,7 +234,7 @@ void XMLRedlineExport::ExportChangesListElements() // changes container element SvXMLElementExport aChanges(rExport, XML_NAMESPACE_TEXT, XML_TRACKED_CHANGES, - sal_True, sal_True); + true, true); // get enumeration and iterate over elements Reference<XEnumeration> aEnum = aEnumAccess->createEnumeration(); @@ -355,7 +355,7 @@ void XMLRedlineExport::ExportChangeInline( // export the element (no whitespace because we're in the text body) SvXMLElementExport aChangeElem(rExport, XML_NAMESPACE_TEXT, - eElement, sal_False, sal_False); + eElement, false, false); } } @@ -374,7 +374,7 @@ void XMLRedlineExport::ExportChangedRegion( // export change region element SvXMLElementExport aChangedRegion(rExport, XML_NAMESPACE_TEXT, - XML_CHANGED_REGION, sal_True, sal_True); + XML_CHANGED_REGION, true, true); // scope for (first) change element @@ -383,7 +383,7 @@ void XMLRedlineExport::ExportChangedRegion( OUString sType; aAny >>= sType; SvXMLElementExport aChange(rExport, XML_NAMESPACE_TEXT, - ConvertTypeName(sType), sal_True, sal_True); + ConvertTypeName(sType), true, true); ExportChangeInfo(rPropSet); @@ -416,7 +416,7 @@ void XMLRedlineExport::ExportChangedRegion( // ExportChangeInfo(Sequence<PropertyValue>&). SvXMLElementExport aSecondChangeElem( rExport, XML_NAMESPACE_TEXT, XML_INSERTION, - sal_True, sal_True); + true, true); ExportChangeInfo(aSuccessorData); } @@ -466,7 +466,7 @@ void XMLRedlineExport::ExportChangeInfo( { SvXMLElementExport aChangeInfo(rExport, XML_NAMESPACE_OFFICE, - XML_CHANGE_INFO, sal_True, sal_True); + XML_CHANGE_INFO, true, true); Any aAny = rPropSet->getPropertyValue(sRedlineAuthor); OUString sTmp; @@ -474,8 +474,8 @@ void XMLRedlineExport::ExportChangeInfo( if (!sTmp.isEmpty()) { SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, - XML_CREATOR, sal_True, - sal_False ); + XML_CREATOR, true, + false ); rExport.Characters(sTmp); } @@ -486,8 +486,8 @@ void XMLRedlineExport::ExportChangeInfo( OUStringBuffer sBuf; ::sax::Converter::convertDateTime(sBuf, aDateTime, 0); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, - XML_DATE, sal_True, - sal_False ); + XML_DATE, true, + false ); rExport.Characters(sBuf.makeStringAndClear()); } @@ -542,7 +542,7 @@ void XMLRedlineExport::ExportChangeInfo( // finally write element SvXMLElementExport aChangeInfo(rExport, XML_NAMESPACE_OFFICE, - XML_CHANGE_INFO, sal_True, sal_True); + XML_CHANGE_INFO, true, true); WriteComment( sComment ); } @@ -610,7 +610,7 @@ void XMLRedlineExport::ExportStartOrEndRedline( rExport, XML_NAMESPACE_TEXT, bIsCollapsed ? XML_CHANGE : ( bIsStart ? XML_CHANGE_START : XML_CHANGE_END ), - sal_True, sal_True); + true, true); } } @@ -655,7 +655,7 @@ void XMLRedlineExport::WriteComment(const OUString& rComment) while (aEnumerator.getNextToken(aSubString)) { SvXMLElementExport aParagraph( - rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + rExport, XML_NAMESPACE_TEXT, XML_P, true, false); rExport.Characters(aSubString); } } diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 604edec14c67..034e12eb5468 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -261,7 +261,7 @@ void XMLSectionExport::ExportSectionEnd( { // index end: close index body element GetExport().EndElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, - sal_True ); + true ); GetExport().IgnorableWhitespace(); switch (MapSectionType(xIndex->getServiceName())) @@ -316,7 +316,7 @@ void XMLSectionExport::ExportSectionEnd( GetExport().CheckAttrList(); // element surrounded by whitespace - GetExport().EndElement( XML_NAMESPACE_TEXT, eElement, sal_True); + GetExport().EndElement( XML_NAMESPACE_TEXT, eElement, true); GetExport().IgnorableWhitespace(); } else @@ -378,7 +378,7 @@ void XMLSectionExport::ExportIndexHeaderStart( GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xName->getName()); // format already handled -> export only start element - GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_TITLE, sal_True ); + GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_TITLE, true ); GetExport().IgnorableWhitespace(); } @@ -472,7 +472,7 @@ void XMLSectionExport::ExportRegularSectionStart( // export element GetExport().IgnorableWhitespace(); - GetExport().StartElement( XML_NAMESPACE_TEXT, XML_SECTION, sal_True ); + GetExport().StartElement( XML_NAMESPACE_TEXT, XML_SECTION, true ); // data source // unfortunately, we have to test all relevant strings for non-zero length @@ -508,7 +508,7 @@ void XMLSectionExport::ExportRegularSectionStart( SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT, XML_SECTION_SOURCE, - sal_True, sal_True); + true, true); } else { @@ -548,7 +548,7 @@ void XMLSectionExport::ExportRegularSectionStart( SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_OFFICE, - XML_DDE_SOURCE, sal_True, sal_True); + XML_DDE_SOURCE, true, true); } // else: no DDE data source } @@ -789,7 +789,7 @@ void XMLSectionExport::ExportBaseIndexStart( // index Element start GetExport().IgnorableWhitespace(); - GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, sal_False ); + GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, false ); } static const XMLTokenEnum aTypeSourceElementNameMap[] = @@ -840,7 +840,7 @@ void XMLSectionExport::ExportBaseIndexSource( GetXMLToken( aTypeSourceElementNameMap[ eType - TEXT_SECTION_TYPE_TOC]), - sal_True, sal_True); + true, true); // scope for title template (all indices) { @@ -856,7 +856,7 @@ void XMLSectionExport::ExportBaseIndexSource( SvXMLElementExport aHeaderTemplate(GetExport(), XML_NAMESPACE_TEXT, XML_INDEX_TITLE_TEMPLATE, - sal_True, sal_False); + true, false); // title as element content aAny = rPropertySet->getPropertyValue(sTitle); @@ -919,7 +919,7 @@ void XMLSectionExport::ExportBaseIndexBody( // start surrounded by whitespace GetExport().IgnorableWhitespace(); - GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, sal_True ); + GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, true ); } void XMLSectionExport::ExportTableAndIllustrationIndexSourceAttributes( @@ -1097,7 +1097,7 @@ sal_Bool XMLSectionExport::ExportIndexTemplate( SvXMLElementExport aLevelTemplate(GetExport(), XML_NAMESPACE_TEXT, GetXMLToken(eElementName), - sal_True, sal_True); + true, true); // export sequence sal_Int32 nTemplateCount = rValues.getLength(); @@ -1536,7 +1536,7 @@ void XMLSectionExport::ExportIndexTemplateElement( // export template SvXMLElementExport aTemplateElement(GetExport(), XML_NAMESPACE_TEXT, GetXMLToken(eElement), - sal_True, sal_False) + true, false) ; // entry text or span element: write text @@ -1574,7 +1574,7 @@ void XMLSectionExport::ExportLevelParagraphStyles( SvXMLElementExport aParaStyles(GetExport(), XML_NAMESPACE_TEXT, XML_INDEX_SOURCE_STYLES, - sal_True, sal_True); + true, true); // iterate over styles in this level for(sal_Int32 nName = 0; nName < nNamesCount; nName++) @@ -1588,7 +1588,7 @@ void XMLSectionExport::ExportLevelParagraphStyles( SvXMLElementExport aParaStyle(GetExport(), XML_NAMESPACE_TEXT, XML_INDEX_SOURCE_STYLE, - sal_True, sal_False); + true, false); } } } @@ -1695,7 +1695,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport) // configuration element SvXMLElementExport aElement(rExport, XML_NAMESPACE_TEXT, XML_BIBLIOGRAPHY_CONFIGURATION, - sal_True, sal_True); + true, true); // sort keys aAny = xPropSet->getPropertyValue(sSortKeys); @@ -1736,7 +1736,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport) SvXMLElementExport aKeyElem(rExport, XML_NAMESPACE_TEXT, XML_SORT_KEY, - sal_True, sal_True); + true, true); } } } @@ -1890,7 +1890,7 @@ void XMLSectionExport::ExportMasterDocHeadingDummies() GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_LEVEL, sTmp.makeStringAndClear() ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_H, - sal_True, sal_False ); + true, false ); } } diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 4f5713a416a1..b025115f58d8 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -181,7 +181,7 @@ void XMLSectionFootnoteConfigExport::exportXML( // and finally, the element SvXMLElementExport rElem(rExport, XML_NAMESPACE_TEXT, XML_NOTES_CONFIGURATION, - sal_True, sal_True); + true, true); } } diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index 802fe5a1e05f..5792496b07de 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -58,7 +58,7 @@ XMLTextCharStyleNamesElementExport::XMLTextCharStyleNamesElementExport( { rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, rExport.EncodeStyleName( *pName ) ); - rExport.StartElement( aName, sal_False ); + rExport.StartElement( aName, false ); ++pName; } } @@ -72,7 +72,7 @@ XMLTextCharStyleNamesElementExport::~XMLTextCharStyleNamesElementExport() { sal_Int32 i = nCount; while( --i ) - rExport.EndElement( aName, sal_False ); + rExport.EndElement( aName, false ); } } diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index eea85b9e0006..1ced191e3ad2 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -87,7 +87,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMNS, - sal_True, sal_True ); + true, true ); if( xPropSet.is() ) { @@ -159,7 +159,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) // style:column-sep SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMN_SEP, - sal_True, sal_True ); + true, true ); } } @@ -185,7 +185,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) // style:column SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMN, - sal_True, sal_True ); + true, true ); pColumns++; } } diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 116cc6bd326b..2fdec0c4aac9 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -148,7 +148,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_HEADER, sal_True, sal_True ); + XML_HEADER, true, true ); exportHeaderFooterContent( xHeaderText, false ); } @@ -158,7 +158,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_HEADER_FIRST, sal_True, sal_True ); + XML_HEADER_FIRST, true, true ); exportHeaderFooterContent( xHeaderTextFirst, false ); } @@ -168,7 +168,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_HEADER_LEFT, sal_True, sal_True ); + XML_HEADER_LEFT, true, true ); exportHeaderFooterContent( xHeaderTextLeft, false ); } @@ -196,7 +196,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_FOOTER, sal_True, sal_True ); + XML_FOOTER, true, true ); exportHeaderFooterContent( xFooterText, false ); } @@ -206,7 +206,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_FOOTER_FIRST, sal_True, sal_True ); + XML_FOOTER_FIRST, true, true ); exportHeaderFooterContent( xFooterTextFirst, false ); } @@ -216,7 +216,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, - XML_FOOTER_LEFT, sal_True, sal_True ); + XML_FOOTER_LEFT, true, true ); exportHeaderFooterContent( xFooterTextLeft, false ); } } diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 7fd49fb1c69f..48fbda969a3b 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -87,7 +87,7 @@ void XMLTextDropCapExport::exportXML( const Any& rAny, } SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_DROP_CAP, - sal_False, sal_False ); + false, false ); } diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index a18f0e2e14ce..e5c3505f4fc1 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1012,7 +1012,7 @@ void XMLTextFieldExport::ExportField( } SvXMLElementExport aHyperlink( GetExport(), bHasHyperlink, XML_NAMESPACE_TEXT, XML_A, - sal_False, sal_False ); + false, false ); if( bHasHyperlink ) { @@ -1045,7 +1045,7 @@ void XMLTextFieldExport::ExportField( } SvXMLElementExport aSpan( GetExport(), bHasStyle, XML_NAMESPACE_TEXT, XML_SPAN, - sal_False, sal_False); + false, false); // finally, export the field itself ExportFieldHelper( rTextField, xPropSet, xRangePropSet, nToken, @@ -1685,7 +1685,7 @@ void XMLTextFieldExport::ExportFieldHelper( sal_True, XML_NAMESPACE_OFFICE); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); SvXMLElementExport aUrlField(rExport, XML_NAMESPACE_TEXT, XML_A, - sal_False, sal_False); + false, false); GetExport().Characters(sPresentation); break; } @@ -1729,15 +1729,15 @@ void XMLTextFieldExport::ExportFieldHelper( if (!aName.isEmpty()) GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName); SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_OFFICE, - XML_ANNOTATION, sal_False, sal_True); + XML_ANNOTATION, false, true); // author OUString aAuthor( GetStringProperty(sPropertyAuthor, rPropSet) ); if( !aAuthor.isEmpty() ) { SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_DC, - XML_CREATOR, sal_True, - sal_False ); + XML_CREATOR, true, + false ); GetExport().Characters(aAuthor); } @@ -1747,8 +1747,8 @@ void XMLTextFieldExport::ExportFieldHelper( OUStringBuffer aBuffer; ::sax::Converter::convertDateTime(aBuffer, aDate, 0, true); SvXMLElementExport aDateElem( GetExport(), XML_NAMESPACE_DC, - XML_DATE, sal_True, - sal_False ); + XML_DATE, true, + false ); GetExport().Characters(aBuffer.makeStringAndClear()); } @@ -1759,8 +1759,8 @@ void XMLTextFieldExport::ExportFieldHelper( if( !aInitials.isEmpty() ) { SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_LO_EXT, - XML_SENDER_INITIALS, sal_True, - sal_False ); + XML_SENDER_INITIALS, true, + false ); GetExport().Characters(aInitials); } } @@ -1826,7 +1826,7 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(sPropertyTooltip, rPropSet), true); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_DROPDOWN, - sal_False, sal_False ); + false, false ); ProcessStringSequence (GetStringSequenceProperty( sPropertyItems, rPropSet ), GetStringProperty( sPropertySelectedItem, rPropSet ) ); @@ -1837,19 +1837,19 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_DRAW_HEADER: { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_HEADER, sal_False, sal_False ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_HEADER, false, false ); } break; case FIELD_ID_DRAW_FOOTER: { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_FOOTER, sal_False, sal_False ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_FOOTER, false, false ); } break; case FIELD_ID_DRAW_DATE_TIME: { - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, sal_False, sal_False ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, false, false ); } break; @@ -1989,7 +1989,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS, - sal_True, sal_True ); + true, true ); for (vector<OUString>::iterator aVarIter = aVarName.begin(); aVarIter != aVarName.end(); @@ -2048,7 +2048,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS, - sal_True, sal_True ); + true, true ); for (vector<OUString>::iterator aSeqIter = aSeqName.begin(); aSeqIter != aSeqName.end(); @@ -2090,7 +2090,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, - sal_True, sal_True ); + true, true ); for (vector<OUString>::iterator aUserIter = aUserName.begin(); aUserIter != aUserName.end(); @@ -2141,7 +2141,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_DDE_CONNECTION_DECLS, - sal_True, sal_True ); + true, true ); for (vector<OUString>::iterator aDdeIter = aDdeName.begin(); aDdeIter != aDdeName.end(); @@ -2275,7 +2275,7 @@ void XMLTextFieldExport::ExportMacro( // the element SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_EXECUTE_MACRO, sal_False, sal_False ); + XML_EXECUTE_MACRO, false, false ); // the <office:events>-macro: @@ -2347,7 +2347,7 @@ void XMLTextFieldExport::ExportMetaField( } SvXMLElementExport aElem( GetExport(), doExport, - XML_NAMESPACE_TEXT, XML_META_FIELD, sal_False, sal_False ); + XML_NAMESPACE_TEXT, XML_META_FIELD, false, false ); // recurse to export content GetExport().GetTextParagraphExport()-> @@ -2562,7 +2562,7 @@ void XMLTextFieldExport::ProcessParagraphSequence( while (aEnumerator.getNextToken(aSubString)) { SvXMLElementExport aParagraph( - GetExport(), XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); + GetExport(), XML_NAMESPACE_TEXT, XML_P, true, false); GetExport().Characters(aSubString); } } @@ -2824,7 +2824,7 @@ void XMLTextFieldExport::ProcessStringSequence( XML_CURRENT_SELECTED, XML_TRUE ); rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_VALUE, pSequence[i] ); SvXMLElementExport aElement( rExport, XML_NAMESPACE_TEXT, XML_LABEL, - sal_False, sal_False ); + false, false ); } } @@ -2860,7 +2860,7 @@ void XMLTextFieldExport::ExportDataBaseElement( sDataBaseName ); SvXMLElementExport aDataBaseElement( GetExport(), XML_NAMESPACE_TEXT, eElementName, - sal_False, sal_False ); + false, false ); // write URL as children if( !sDataBaseURL.isEmpty() ) @@ -2868,7 +2868,7 @@ void XMLTextFieldExport::ExportDataBaseElement( rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sDataBaseURL ); SvXMLElementExport aDataSourceElement( GetExport(), XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, - sal_False, sal_False ); + false, false ); } // write presentation diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 888efd782052..6637dd204702 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -110,7 +110,7 @@ void XMLTextParagraphExport::exportTextFootnote( } SvXMLElementExport aHyperlink( GetExport(), bHasHyperlink, XML_NAMESPACE_TEXT, XML_A, - sal_False, sal_False ); + false, false ); if( bHasHyperlink ) { @@ -136,7 +136,7 @@ void XMLTextParagraphExport::exportTextFootnote( GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( sStyle ) ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_SPAN, sal_False, sal_False ); + XML_SPAN, false, false ); exportTextFootnoteHelper(xFootnote, xText, rText, bAutoStyles, bIsEndnote, bIsProgress ); } @@ -179,7 +179,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper( : XML_FOOTNOTE ) ); SvXMLElementExport aNote(GetExport(), XML_NAMESPACE_TEXT, - XML_NOTE, sal_False, sal_False); + XML_NOTE, false, false); { // handle label vs. automatic numbering OUString sLabel = rFootnote->getLabel(); @@ -191,13 +191,13 @@ void XMLTextParagraphExport::exportTextFootnoteHelper( // else: automatic numbering -> no attribute SvXMLElementExport aCite(GetExport(), XML_NAMESPACE_TEXT, - XML_NOTE_CITATION, sal_False, sal_False); + XML_NOTE_CITATION, false, false); GetExport().Characters(rTextString); } { SvXMLElementExport aBody(GetExport(), XML_NAMESPACE_TEXT, - XML_NOTE_BODY, sal_False, sal_False); + XML_NOTE_BODY, false, false); exportText(rText, bAutoStyles, bIsProgress, true ); } } @@ -345,7 +345,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( SvXMLElementExport aFootnoteConfigElement( GetExport(), XML_NAMESPACE_TEXT, XML_NOTES_CONFIGURATION, - sal_True, sal_True); + true, true); // two element for footnote content if (!bIsEndnote) @@ -360,7 +360,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( { SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT, XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD, - sal_True, sal_False); + true, false); GetExport().Characters(sTmp); } @@ -372,7 +372,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( { SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT, XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD, - sal_True, sal_False); + true, false); GetExport().Characters(sTmp); } } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 09c6b260cc09..7af9677ce874 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -440,8 +440,8 @@ void FieldParamExporter::ExportParameter(const OUString& sKey, const OUString& s { m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, sKey); m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, sValue); - m_pExport->StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False); - m_pExport->EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False); + m_pExport->StartElement(XML_NAMESPACE_FIELD, XML_PARAM, false); + m_pExport->EndElement(XML_NAMESPACE_FIELD, XML_PARAM, false); } void XMLTextParagraphExport::Add( sal_uInt16 nFamily, @@ -833,7 +833,7 @@ void XMLTextParagraphExport::exportListChange( { OUString aElem(pListElements->back()); pListElements->pop_back(); - GetExport().EndElement(aElem, sal_True); + GetExport().EndElement(aElem, true); } // remove closed list from list stack @@ -999,7 +999,7 @@ void XMLTextParagraphExport::exportListChange( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); - GetExport().StartElement(aElem, sal_False); + GetExport().StartElement(aElem, false); if(!pListElements) pListElements = new std::vector<OUString>; @@ -1039,7 +1039,7 @@ void XMLTextParagraphExport::exportListChange( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); - GetExport().StartElement(aElem, sal_False); + GetExport().StartElement(aElem, false); pListElements->push_back(aElem); // export of <text:number> element for last opened <text:list-item>, if requested @@ -1052,9 +1052,9 @@ void XMLTextParagraphExport::exportListChange( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); GetExport().IgnorableWhitespace(); - GetExport().StartElement( aTextNumberElem, sal_False ); + GetExport().StartElement( aTextNumberElem, false ); GetExport().Characters( rNextInfo.ListLabelString() ); - GetExport().EndElement( aTextNumberElem, sal_True ); + GetExport().EndElement( aTextNumberElem, true ); } --nListLevelsToBeOpened; } while ( nListLevelsToBeOpened > 0 ); @@ -1075,7 +1075,7 @@ void XMLTextParagraphExport::exportListChange( if (bEndElement) { // close previous list-item - GetExport().EndElement(pListElements->back(), sal_True ); + GetExport().EndElement(pListElements->back(), true ); pListElements->pop_back(); // Only for sub lists (#i103745#) @@ -1083,9 +1083,9 @@ void XMLTextParagraphExport::exportListChange( rNextInfo.GetLevel() != 1 ) { // start new sub list respectively list on same list level - GetExport().EndElement(pListElements->back(), sal_True ); + GetExport().EndElement(pListElements->back(), true ); GetExport().IgnorableWhitespace(); - GetExport().StartElement(pListElements->back(), sal_False); + GetExport().StartElement(pListElements->back(), false); } // open new list-item @@ -1121,7 +1121,7 @@ void XMLTextParagraphExport::exportListChange( XML_NAMESPACE_TEXT, GetXMLToken(XML_LIST_ITEM) ) ); GetExport().IgnorableWhitespace(); - GetExport().StartElement(aElem, sal_False ); + GetExport().StartElement(aElem, false ); pListElements->push_back(aElem); // export of <text:number> element for <text:list-item>, if requested @@ -1133,9 +1133,9 @@ void XMLTextParagraphExport::exportListChange( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); GetExport().IgnorableWhitespace(); - GetExport().StartElement( aTextNumberElem, sal_False ); + GetExport().StartElement( aTextNumberElem, false ); GetExport().Characters( rNextInfo.ListLabelString() ); - GetExport().EndElement( aTextNumberElem, sal_True ); + GetExport().EndElement( aTextNumberElem, true ); } } } @@ -2168,7 +2168,7 @@ void XMLTextParagraphExport::exportParagraph( enum XMLTokenEnum eElem = 0 < nOutlineLevel ? XML_H : XML_P; SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem, - sal_True, sal_False ); + true, false ); if( bHasContentEnum ) bPrevCharIsSpace = !exportTextContentEnumeration( xContentEnum, bAutoStyles, xSection, @@ -2228,7 +2228,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, rName); } - SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, sal_False, sal_False ); + SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false ); } else if( sType.equals( sFrame ) ) { @@ -2304,12 +2304,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType()); } - GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False); + GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, false); if (xFormField.is()) { FieldParamExporter(&GetExport(), xFormField->getParameters()).Export(); } - GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False); + GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, false); } /* The OpenDocument standard does not include support for TextMarks for now, so use bookmarks instead. */ else @@ -2333,7 +2333,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( sName); SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_TEXT, XML_BOOKMARK_START, - sal_False, sal_False ); + false, false ); const OUString sFieldType = xFormField->getFieldType(); if (sFieldType == ODF_FORMTEXT) { @@ -2358,7 +2358,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_FIELD, XML_FIELDMARK_END, - sal_False, sal_False ); + false, false ); } else { @@ -2381,7 +2381,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( sName); SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_TEXT, XML_BOOKMARK_END, - sal_False, sal_False ); + false, false ); } } } @@ -2399,12 +2399,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType()); } - GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False); + GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, false); if (xFormField.is()) { FieldParamExporter(&GetExport(), xFormField->getParameters()).Export(); } - GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False); + GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, false); } else { @@ -2414,7 +2414,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName()); SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_TEXT, XML_BOOKMARK, - sal_False, sal_False ); + false, false ); } } } @@ -2495,8 +2495,8 @@ void XMLTextParagraphExport::exportSoftPageBreak( bool ) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_SOFT_PAGE_BREAK, sal_False, - sal_False ); + XML_SOFT_PAGE_BREAK, false, + false ); } void XMLTextParagraphExport::exportTextMark( @@ -2545,7 +2545,7 @@ void XMLTextParagraphExport::exportTextMark( DBG_ASSERT(nElement <= 2, "illegal element number"); SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT, pElements[nElement], - sal_False, sal_False); + false, false); } // else: no styles. (see above) } @@ -2854,13 +2854,13 @@ void XMLTextParagraphExport::exportAnyTextFrame( GetExport().EncodeStyleName( sStyle ) ); { SvXMLElementExport aElem( GetExport(), !sStyle.isEmpty(), - XML_NAMESPACE_TEXT, XML_SPAN, sal_False, sal_False ); + XML_NAMESPACE_TEXT, XML_SPAN, false, false ); { SvXMLElementExport aElement( GetExport(), FT_SHAPE != eType && addHyperlinkAttributes( xPropSet, xPropState,xPropSetInfo ), - XML_NAMESPACE_DRAW, XML_A, sal_False, sal_False ); + XML_NAMESPACE_DRAW, XML_A, false, false ); switch( eType ) { case FT_TEXT: @@ -2912,7 +2912,7 @@ void XMLTextParagraphExport::_exportTextFrame( addTextFrameAttributes(rPropSet, false, &aMinHeightValue, &sMinWidthValue); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, - XML_FRAME, sal_False, sal_True ); + XML_FRAME, false, true ); if( !aMinHeightValue.isEmpty() ) GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_HEIGHT, @@ -2936,7 +2936,7 @@ void XMLTextParagraphExport::_exportTextFrame( { SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_DRAW, - XML_TEXT_BOX, sal_True, sal_True ); + XML_TEXT_BOX, true, true ); // frame bound frames exportFramesBoundToFrame( xTxtFrame, bIsProgress ); @@ -3051,7 +3051,7 @@ void XMLTextParagraphExport::exportContour( // write object now SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, eElem, - sal_True, sal_True ); + true, true ); } void XMLTextParagraphExport::_exportTextGraphic( @@ -3086,7 +3086,7 @@ void XMLTextParagraphExport::_exportTextGraphic( } // original content - SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, sal_False, sal_True); + SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, false, true); // replacement graphic for backwards compatibility, but // only for SVG currently @@ -3118,7 +3118,7 @@ void XMLTextParagraphExport::_exportTextGraphic( { SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_DRAW, - XML_IMAGE, sal_False, sal_True ); + XML_IMAGE, false, true ); // optional office:binary-data GetExport().AddEmbeddedGraphicObjectAsBase64( sOrigURL ); @@ -3139,7 +3139,7 @@ void XMLTextParagraphExport::_exportTextGraphic( GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD); // xlink:href for replacement, only written for Svg content - SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, sal_False, sal_True); + SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true); // optional office:binary-data GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementURL); @@ -3199,7 +3199,7 @@ void XMLTextParagraphExport::exportTitleAndDescription( if( !sObjTitle.isEmpty() ) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG, - XML_TITLE, sal_True, sal_False ); + XML_TITLE, true, false ); GetExport().Characters( sObjTitle ); } } @@ -3212,7 +3212,7 @@ void XMLTextParagraphExport::exportTitleAndDescription( if( !sObjDesc.isEmpty() ) { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG, - XML_DESC, sal_True, sal_False ); + XML_DESC, true, false ); GetExport().Characters( sObjDesc ); } } @@ -3349,11 +3349,11 @@ void XMLTextParagraphExport::exportTextRangeSpan( GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( sStyle ) ); } { - SvXMLElementExport aElement( GetExport(), !sStyle.isEmpty(), XML_NAMESPACE_TEXT, XML_SPAN, sal_False, sal_False ); + SvXMLElementExport aElement( GetExport(), !sStyle.isEmpty(), XML_NAMESPACE_TEXT, XML_SPAN, false, false ); const OUString aText( rTextRange->getString() ); SvXMLElementExport aElem2( GetExport(), TEXT == openFieldMark, XML_NAMESPACE_TEXT, XML_TEXT_INPUT, - sal_False, sal_False ); + false, false ); exportText( aText, rPrevCharIsSpace ); openFieldMark = NONE; } @@ -3389,7 +3389,7 @@ void XMLTextParagraphExport::exportTextRange( if ( bHyperlink && bHyperlinkAttrsAdded ) { - SvXMLElementExport aElem( GetExport(), sal_True, XML_NAMESPACE_TEXT, XML_A, sal_False, sal_False ); + SvXMLElementExport aElem( GetExport(), true, XML_NAMESPACE_TEXT, XML_A, false, false ); // export events (if supported) OUString sHyperLinkEvents( @@ -3480,7 +3480,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText, } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_S, sal_False, sal_False ); + XML_S, false, false ); nSpaceChars = 0; } @@ -3494,15 +3494,15 @@ void XMLTextParagraphExport::exportText( const OUString& rText, case 0x0009: // Tab { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_TAB, sal_False, - sal_False ); + XML_TAB, false, + false ); } break; case 0x000A: // LF { SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, - XML_LINE_BREAK, sal_False, - sal_False ); + XML_LINE_BREAK, false, + false ); } break; } @@ -3543,7 +3543,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText, } SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_S, - sal_False, sal_False ); + false, false ); } } @@ -3570,7 +3570,7 @@ void XMLTextParagraphExport::exportTextDeclarations() SvXMLElementExport aAutoMarkElement( GetExport(), XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, - sal_True, sal_True ); + true, true ); } } } @@ -3686,10 +3686,10 @@ void XMLTextParagraphExport::exportRuby( XML_STYLE_NAME, sStyleName); // export <text:ruby> and <text:ruby-base> start elements - GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False); + GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY, false); GetExport().ClearAttrList(); GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE, - sal_False ); + false ); bOpenRuby = true; } else @@ -3703,7 +3703,7 @@ void XMLTextParagraphExport::exportRuby( // close <text:ruby-base> GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY_BASE, - sal_False); + false); // write the ruby text (with char style) { @@ -3714,13 +3714,13 @@ void XMLTextParagraphExport::exportRuby( SvXMLElementExport aRubyElement( GetExport(), XML_NAMESPACE_TEXT, XML_RUBY_TEXT, - sal_False, sal_False); + false, false); GetExport().Characters(sOpenRubyText); } // and finally, close the ruby - GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, sal_False); + GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, false); bOpenRuby = false; } } @@ -3758,7 +3758,7 @@ void XMLTextParagraphExport::exportMeta( } SvXMLElementExport aElem( GetExport(), doExport, - XML_NAMESPACE_TEXT, XML_META, sal_False, sal_False ); + XML_NAMESPACE_TEXT, XML_META, false, false ); // recurse to export content exportTextRangeEnumeration( xTextEnum, i_bAutoStyles, i_isProgress ); diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 7e0004768b61..1954b640a622 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -169,7 +169,7 @@ void exportXFormsModel( SvXMLExport& rExport, lcl_export( xModelPropSet, rExport, aXFormsModelTable ); SvXMLElementExport aModelElement( rExport, XML_NAMESPACE_XFORMS, XML_MODEL, - sal_True, sal_True ); + true, true ); // instances Reference<XIndexAccess> xInstances( xModel->getInstances(), @@ -241,7 +241,7 @@ void exportXFormsInstance( SvXMLExport& rExport, rExport.AddAttribute( XML_NAMESPACE_NONE, XML_SRC, sURL ); SvXMLElementExport aElem( rExport, XML_NAMESPACE_XFORMS, XML_INSTANCE, - sal_True, sal_True ); + true, true ); rExport.IgnorableWhitespace(); if( xDoc.is() ) { @@ -360,7 +360,7 @@ void exportXFormsBinding( SvXMLExport& rExport, } SvXMLElementExport aElement( rExport, XML_NAMESPACE_XFORMS, XML_BIND, - sal_True, sal_True ); + true, true ); } @@ -393,7 +393,7 @@ void exportXFormsSubmission( SvXMLExport& rExport, { lcl_export( xSubmission, rExport, aXFormsSubmissionTable ); SvXMLElementExport aElement( rExport, XML_NAMESPACE_XFORMS, XML_SUBMISSION, - sal_True, sal_True ); + true, true ); } @@ -458,7 +458,7 @@ static void lcl_exportDataTypeFacets( SvXMLExport& rExport, rExport, pCurrent->nNamespace, static_cast<XMLTokenEnum>( pCurrent->nToken ), - sal_True, sal_True ); + true, true ); } } } @@ -542,7 +542,7 @@ static void lcl_exportDataType( SvXMLExport& rExport, rExport.AddAttribute( XML_NAMESPACE_NONE, XML_NAME, sName ); SvXMLElementExport aSimpleType( rExport, XML_NAMESPACE_XSD, XML_SIMPLETYPE, - sal_True, sal_True ); + true, true ); // <xsd:restriction base="xsd:..."> rExport.AddAttribute( XML_NAMESPACE_NONE, XML_BASE, @@ -550,7 +550,7 @@ static void lcl_exportDataType( SvXMLExport& rExport, SvXMLElementExport aRestriction( rExport, XML_NAMESPACE_XSD, XML_RESTRICTION, - sal_True, sal_True ); + true, true ); // export facets lcl_exportDataTypeFacets( rExport, @@ -564,7 +564,7 @@ void exportXFormsSchemas( SvXMLExport& rExport, // TODO: for now, we'll fake this... { SvXMLElementExport aSchemaElem( rExport, XML_NAMESPACE_XSD, XML_SCHEMA, - sal_True, sal_True ); + true, true ); // now get data type repositry, and export Reference<XEnumerationAccess> xTypes( xModel->getDataTypeRepository(), |