summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 09:21:53 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:11:34 +0000
commit538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch)
treeefbfb952f3236a6f56540ddae6a896c8c73774a0 /xmloff
parentf12e483589888f87843026ceff5ae3c1e615ca02 (diff)
Formatting changes across all modules
+ Removed comment cruft + Tab formatting in number of files + Some commented out code removed + Tab characters replaced with spaces + Newline cleanup in quite a few files + Tweak header guard #endifs Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc Reviewed-on: https://gerrit.libreoffice.org/22221 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx10
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx8
-rw-r--r--xmloff/source/core/XMLBase64Export.cxx2
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx4
-rw-r--r--xmloff/source/draw/animexp.cxx2
-rw-r--r--xmloff/source/text/txtprmap.cxx8
6 files changed, 17 insertions, 17 deletions
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 4cce86b80ba6..59917ab77a06 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -525,7 +525,7 @@ void XMLConfigItemContext::Characters( const OUString& rChars )
sChars = sTrimmedChars;
}
uno::Sequence<sal_Int8> aBuffer((sChars.getLength() / 4) * 3 );
- sal_Int32 const nCharsDecoded =
+ sal_Int32 const nCharsDecoded =
::sax::Converter::decodeBase64SomeChars( aBuffer, sChars );
sal_uInt32 nStartPos(maDecoded.getLength());
sal_uInt32 nCount(aBuffer.getLength());
@@ -556,19 +556,19 @@ void XMLConfigItemContext::EndElement()
else if (IsXMLToken(msType, XML_BYTE))
{
sal_Int32 nValue(0);
- ::sax::Converter::convertNumber(nValue, msValue);
+ ::sax::Converter::convertNumber(nValue, msValue);
mrAny <<= static_cast<sal_Int8>(nValue);
}
else if (IsXMLToken(msType, XML_SHORT))
{
sal_Int32 nValue(0);
- ::sax::Converter::convertNumber(nValue, msValue);
+ ::sax::Converter::convertNumber(nValue, msValue);
mrAny <<= static_cast<sal_Int16>(nValue);
}
else if (IsXMLToken(msType, XML_INT))
{
sal_Int32 nValue(0);
- ::sax::Converter::convertNumber(nValue, msValue);
+ ::sax::Converter::convertNumber(nValue, msValue);
mrAny <<= nValue;
}
else if (IsXMLToken(msType, XML_LONG))
@@ -579,7 +579,7 @@ void XMLConfigItemContext::EndElement()
else if (IsXMLToken(msType, XML_DOUBLE))
{
double fValue(0.0);
- ::sax::Converter::convertDouble(fValue, msValue);
+ ::sax::Converter::convertDouble(fValue, msValue);
mrAny <<= fValue;
}
else if (IsXMLToken(msType, XML_STRING))
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 8b775aa8dd53..a89b9d86a97e 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -210,7 +210,7 @@ void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString
m_rContext.AddAttribute( XML_TYPE, XML_SHORT );
m_rContext.StartElement( XML_CONFIG_ITEM, true );
OUStringBuffer sBuffer;
- ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue));
+ ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue));
m_rContext.Characters( sBuffer.makeStringAndClear() );
m_rContext.EndElement( false );
}
@@ -222,7 +222,7 @@ void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString&
m_rContext.AddAttribute( XML_TYPE, XML_INT );
m_rContext.StartElement( XML_CONFIG_ITEM, true );
OUStringBuffer sBuffer;
- ::sax::Converter::convertNumber(sBuffer, nValue);
+ ::sax::Converter::convertNumber(sBuffer, nValue);
m_rContext.Characters( sBuffer.makeStringAndClear() );
m_rContext.EndElement( false );
}
@@ -245,7 +245,7 @@ void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString&
m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE );
m_rContext.StartElement( XML_CONFIG_ITEM, true );
OUStringBuffer sBuffer;
- ::sax::Converter::convertDouble(sBuffer, fValue);
+ ::sax::Converter::convertDouble(sBuffer, fValue);
m_rContext.Characters( sBuffer.makeStringAndClear() );
m_rContext.EndElement( false );
}
@@ -352,7 +352,7 @@ void XMLSettingsExportHelper::exportbase64Binary(
if(nLength)
{
OUStringBuffer sBuffer;
- ::sax::Converter::encodeBase64(sBuffer, aProps);
+ ::sax::Converter::encodeBase64(sBuffer, aProps);
m_rContext.Characters( sBuffer.makeStringAndClear() );
}
m_rContext.EndElement( false );
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index c33eea156d72..c178ce6ddc6a 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -51,7 +51,7 @@ bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn )
nRead = rIn->readBytes( aInBuff, INPUT_BUFFER_SIZE );
if( nRead > 0 )
{
- ::sax::Converter::encodeBase64( aOutBuff, aInBuff );
+ ::sax::Converter::encodeBase64( aOutBuff, aInBuff );
GetExport().Characters( aOutBuff.makeStringAndClear() );
if( nRead == INPUT_BUFFER_SIZE )
GetExport().IgnorableWhitespace();
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index ac659f0df18c..c44ddd907d3d 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -64,8 +64,8 @@ void XMLBase64ImportContext::Characters( const OUString& rChars )
sChars = sTrimmedChars;
}
Sequence< sal_Int8 > aBuffer( (sChars.getLength() / 4) * 3 );
- sal_Int32 const nCharsDecoded =
- ::sax::Converter::decodeBase64SomeChars( aBuffer, sChars );
+ sal_Int32 const nCharsDecoded =
+ ::sax::Converter::decodeBase64SomeChars( aBuffer, sChars );
xOut->writeBytes( aBuffer );
if( nCharsDecoded != sChars.getLength() )
sBase64CharsLeft = sChars.copy( nCharsDecoded );
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index bf4d60fa6dab..0a14ef19b93b 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -205,7 +205,7 @@ struct XMLEffectHint
sal_Int16 mnStartScale;
AnimationSpeed meSpeed;
- sal_Int32 maDimColor;
+ sal_Int32 maDimColor;
OUString maSoundURL;
bool mbPlayFull;
sal_Int32 mnPresId;
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 2d2728228ae4..8736dc683070 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -174,9 +174,9 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
MT_E( "CharUnderlineHasColor", STYLE, TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, CTF_UNDERLINE_HASCOLOR ),
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
- // RES_CHRATR_RSID
+ // RES_CHRATR_RSID
{ "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
- // RES_PARATR_RSID
+ // RES_PARATR_RSID
{ "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -517,9 +517,9 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
MT_E( "CharUnderlineHasColor", STYLE, TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, CTF_UNDERLINE_HASCOLOR ),
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
- // RES_CHRATR_RSID
+ // RES_CHRATR_RSID
{ "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
- // RES_PARATR_RSID
+ // RES_PARATR_RSID
{ "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),