summaryrefslogtreecommitdiff
path: root/package/source/manifest
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-17 13:40:46 +0200
committerNoel Grandin <noel@peralex.com>2014-04-22 09:53:14 +0200
commit5df6dcf747a36989a3891c855737fe9bdb206a36 (patch)
treecb6ab57cf4f275860df7be2ec16a2fbd45f2692d /package/source/manifest
parente4107bb8b7230c039e7fc76951bfb3634fe4b9e0 (diff)
package: sal_Bool->bool
Change-Id: I05dd5070d0618ef7539b26c7edcaf01b0a84732c
Diffstat (limited to 'package/source/manifest')
-rw-r--r--package/source/manifest/ManifestExport.cxx12
-rw-r--r--package/source/manifest/ManifestImport.cxx12
-rw-r--r--package/source/manifest/ManifestImport.hxx2
3 files changed, 13 insertions, 13 deletions
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 0572cf73f0bc..ddfe008381b5 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -132,9 +132,9 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
}
}
- sal_Bool bProvideDTD = sal_False;
- sal_Bool bAcceptNonemptyVersion = sal_False;
- sal_Bool bStoreStartKeyGeneration = sal_False;
+ bool bProvideDTD = false;
+ bool bAcceptNonemptyVersion = false;
+ bool bStoreStartKeyGeneration = false;
if ( !aDocMediaType.isEmpty() )
{
if ( aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII
@@ -158,11 +158,11 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
pRootAttrList->AddAttribute ( ATTRIBUTE_XMLNS,
sCdataAttribute,
MANIFEST_OASIS_NAMESPACE );
- bAcceptNonemptyVersion = sal_True;
+ bAcceptNonemptyVersion = true;
if ( aDocVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
{
// this is ODF12 generation, let encrypted streams contain start-key-generation entry
- bStoreStartKeyGeneration = sal_True;
+ bStoreStartKeyGeneration = true;
pRootAttrList->AddAttribute ( sVersionAttribute, sCdataAttribute, aDocVersion );
}
}
@@ -174,7 +174,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
sCdataAttribute,
MANIFEST_NAMESPACE );
- bProvideDTD = sal_True;
+ bProvideDTD = true;
}
}
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index c20bb1eaa008..6c2511534686 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star;
using namespace std;
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
-: bIgnoreEncryptData ( sal_False )
+: bIgnoreEncryptData ( false )
, nDerivedKeySize( 0 )
, rManVector ( rNewManVector )
@@ -152,7 +152,7 @@ void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_DIGESTALG].Value <<= xml::crypto::DigestID::SHA256_1K;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
if ( !bIgnoreEncryptData )
{
@@ -198,7 +198,7 @@ void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs)
nDerivedKeySize = 16;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
if ( !bIgnoreEncryptData )
{
@@ -245,7 +245,7 @@ void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_DERKEYSIZE].Value <<= nDerivedKeySize;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
}
}
@@ -264,7 +264,7 @@ void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
aSequence[PKG_MNFST_STARTALG].Value <<= xml::crypto::DigestID::SHA1;
}
else
- bIgnoreEncryptData = sal_True;
+ bIgnoreEncryptData = true;
}
void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
@@ -349,7 +349,7 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName )
aSequence.erase(std::remove_if(aSequence.begin(), aSequence.end(),
isEmpty), aSequence.end());
- bIgnoreEncryptData = sal_False;
+ bIgnoreEncryptData = false;
rManVector.push_back ( aSequence.getAsConstList() );
aSequence.clear();
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 55e80df9d6fa..4f2815d9bc34 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -57,7 +57,7 @@ class ManifestImport : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::
protected:
comphelper::SequenceAsVector< com::sun::star::beans::PropertyValue > aSequence;
ManifestStack aStack;
- sal_Bool bIgnoreEncryptData;
+ bool bIgnoreEncryptData;
sal_Int32 nDerivedKeySize;
::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector;