Kaydet (Commit) 3f60a32a authored tarafından Noel Grandin's avatar Noel Grandin

xmloff: sal_Bool->bool

Change-Id: If694d16088ae0dcdc8b99797eed575c90d646fe5
üst 55ee8a75
...@@ -36,23 +36,23 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper ...@@ -36,23 +36,23 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
sal_Int32 nRange; sal_Int32 nRange;
sal_Int32 nReference; sal_Int32 nReference;
sal_Int32 nValue; sal_Int32 nValue;
sal_Bool bStrict; bool bStrict;
// #96469#; if the value goes over the Range the progressbar starts again // #96469#; if the value goes over the Range the progressbar starts again
sal_Bool bRepeat; bool bRepeat;
#ifdef DBG_UTIL #ifdef DBG_UTIL
sal_Bool bFailure; bool bFailure;
#endif #endif
public: public:
ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator, ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator,
const sal_Bool bStrict); const bool bStrict);
~ProgressBarHelper(); ~ProgressBarHelper();
void SetText(OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } void SetText(OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); }
void SetRange(sal_Int32 nVal) { nRange = nVal; } void SetRange(sal_Int32 nVal) { nRange = nVal; }
void SetReference(sal_Int32 nVal) { nReference = nVal; } void SetReference(sal_Int32 nVal) { nReference = nVal; }
void SetValue(sal_Int32 nValue); void SetValue(sal_Int32 nValue);
void SetRepeat(sal_Bool bValue) { bRepeat = bValue; } void SetRepeat(bool bValue) { bRepeat = bValue; }
inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); } inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); }
void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); } void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); }
...@@ -62,7 +62,7 @@ public: ...@@ -62,7 +62,7 @@ public:
sal_Int32 GetReference() { return nReference; } sal_Int32 GetReference() { return nReference; }
sal_Int32 GetValue() { return nValue; } sal_Int32 GetValue() { return nValue; }
sal_Bool GetRepeat() { return bRepeat; } bool GetRepeat() { return bRepeat; }
}; };
#endif #endif
......
...@@ -59,7 +59,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper ...@@ -59,7 +59,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
void CallTypeFunction(const com::sun::star::uno::Any& rAny, void CallTypeFunction(const com::sun::star::uno::Any& rAny,
const OUString& rName) const; const OUString& rName) const;
void exportBool(const sal_Bool bValue, const OUString& rName) const; void exportBool(const bool bValue, const OUString& rName) const;
void exportByte(const sal_Int8 nValue, const OUString& rName) const; void exportByte(const sal_Int8 nValue, const OUString& rName) const;
void exportShort(const sal_Int16 nValue, const OUString& rName) const; void exportShort(const sal_Int16 nValue, const OUString& rName) const;
void exportInt(const sal_Int32 nValue, const OUString& rName) const; void exportInt(const sal_Int32 nValue, const OUString& rName) const;
...@@ -75,7 +75,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper ...@@ -75,7 +75,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper
const OUString& rName) const; const OUString& rName) const;
void exportMapEntry(const com::sun::star::uno::Any& rAny, void exportMapEntry(const com::sun::star::uno::Any& rAny,
const OUString& rName, const OUString& rName,
const sal_Bool bNameAccess) const; const bool bNameAccess) const;
void exportNameAccess( void exportNameAccess(
const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& aNamed, const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& aNamed,
const OUString& rName) const; const OUString& rName) const;
......
...@@ -39,13 +39,13 @@ public: ...@@ -39,13 +39,13 @@ public:
inline SinglePropertySetInfoCache( const OUString& rName ); inline SinglePropertySetInfoCache( const OUString& rName );
~SinglePropertySetInfoCache() {}; ~SinglePropertySetInfoCache() {};
sal_Bool hasProperty( bool hasProperty(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& rPropSet, ::com::sun::star::beans::XPropertySet >& rPropSet,
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo >& rPropSetInfo ); ::com::sun::star::beans::XPropertySetInfo >& rPropSetInfo );
inline sal_Bool hasProperty( inline bool hasProperty(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>& rPropSet ); ::com::sun::star::beans::XPropertySet>& rPropSet );
}; };
...@@ -56,7 +56,7 @@ inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( ...@@ -56,7 +56,7 @@ inline SinglePropertySetInfoCache::SinglePropertySetInfoCache(
{ {
} }
inline sal_Bool SinglePropertySetInfoCache::hasProperty( inline bool SinglePropertySetInfoCache::hasProperty(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>& rPropSet ) ::com::sun::star::beans::XPropertySet>& rPropSet )
{ {
......
...@@ -28,15 +28,15 @@ using namespace ::com::sun::star; ...@@ -28,15 +28,15 @@ using namespace ::com::sun::star;
static const sal_Int32 nDefaultProgressBarRange = 1000000; static const sal_Int32 nDefaultProgressBarRange = 1000000;
ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator, ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator,
const sal_Bool bTempStrict) const bool bTempStrict)
: xStatusIndicator(xTempStatusIndicator) : xStatusIndicator(xTempStatusIndicator)
, nRange(nDefaultProgressBarRange) , nRange(nDefaultProgressBarRange)
, nReference(100) , nReference(100)
, nValue(0) , nValue(0)
, bStrict(bTempStrict) , bStrict(bTempStrict)
, bRepeat(sal_True) , bRepeat(true)
#ifdef DBG_UTIL #ifdef DBG_UTIL
, bFailure(sal_False) , bFailure(false)
#endif #endif
{ {
} }
...@@ -101,7 +101,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue) ...@@ -101,7 +101,7 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
else if (!bFailure) else if (!bFailure)
{ {
OSL_FAIL("tried to set a wrong value on the progressbar"); OSL_FAIL("tried to set a wrong value on the progressbar");
bFailure = sal_True; bFailure = true;
} }
#endif #endif
} }
......
...@@ -180,7 +180,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, ...@@ -180,7 +180,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
} }
} }
void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const OUString& rName) const void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rName) const
{ {
DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_NAME, rName );
...@@ -360,7 +360,7 @@ void XMLSettingsExportHelper::exportbase64Binary( ...@@ -360,7 +360,7 @@ void XMLSettingsExportHelper::exportbase64Binary(
void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny,
const OUString& rName, const OUString& rName,
const sal_Bool bNameAccess) const const bool bNameAccess) const
{ {
DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name"); DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name");
uno::Sequence<beans::PropertyValue> aProps; uno::Sequence<beans::PropertyValue> aProps;
...@@ -390,7 +390,7 @@ void XMLSettingsExportHelper::exportNameAccess( ...@@ -390,7 +390,7 @@ void XMLSettingsExportHelper::exportNameAccess(
m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True ); m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True );
uno::Sequence< OUString > aNames(aNamed->getElementNames()); uno::Sequence< OUString > aNames(aNamed->getElementNames());
for (sal_Int32 i = 0; i < aNames.getLength(); i++) for (sal_Int32 i = 0; i < aNames.getLength(); i++)
exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], sal_True); exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], true);
m_rContext.EndElement( sal_True ); m_rContext.EndElement( sal_True );
} }
} }
...@@ -410,7 +410,7 @@ void XMLSettingsExportHelper::exportIndexAccess( ...@@ -410,7 +410,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
sal_Int32 nCount = aIndexed->getCount(); sal_Int32 nCount = aIndexed->getCount();
for (sal_Int32 i = 0; i < nCount; i++) for (sal_Int32 i = 0; i < nCount; i++)
{ {
exportMapEntry(aIndexed->getByIndex(i), sEmpty, sal_False); exportMapEntry(aIndexed->getByIndex(i), sEmpty, false);
} }
m_rContext.EndElement( sal_True ); m_rContext.EndElement( sal_True );
} }
......
...@@ -2005,7 +2005,7 @@ ProgressBarHelper* SvXMLExport::GetProgressBarHelper() ...@@ -2005,7 +2005,7 @@ ProgressBarHelper* SvXMLExport::GetProgressBarHelper()
{ {
if (!mpProgressBarHelper) if (!mpProgressBarHelper)
{ {
mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, sal_True); mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, true);
if (mxExportInfo.is()) if (mxExportInfo.is())
{ {
......
...@@ -829,7 +829,7 @@ void SAL_CALL SvXMLImport::unknown( const OUString& ) ...@@ -829,7 +829,7 @@ void SAL_CALL SvXMLImport::unknown( const OUString& )
void SvXMLImport::SetStatistics(const uno::Sequence< beans::NamedValue> &) void SvXMLImport::SetStatistics(const uno::Sequence< beans::NamedValue> &)
{ {
GetProgressBarHelper()->SetRepeat(sal_False); GetProgressBarHelper()->SetRepeat(false);
GetProgressBarHelper()->SetReference(0); GetProgressBarHelper()->SetReference(0);
} }
...@@ -1398,7 +1398,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper() ...@@ -1398,7 +1398,7 @@ ProgressBarHelper* SvXMLImport::GetProgressBarHelper()
{ {
if (!mpProgressBarHelper) if (!mpProgressBarHelper)
{ {
mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, sal_False); mpProgressBarHelper = new ProgressBarHelper(mxStatusIndicator, false);
if (mxImportInfo.is()) if (mxImportInfo.is())
{ {
......
...@@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; ...@@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno;
using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::beans::XPropertySetInfo;
sal_Bool SinglePropertySetInfoCache::hasProperty( bool SinglePropertySetInfoCache::hasProperty(
const Reference< XPropertySet >& rPropSet, const Reference< XPropertySet >& rPropSet,
Reference< XPropertySetInfo >& rPropSetInfo ) Reference< XPropertySetInfo >& rPropSetInfo )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment