desktop/source/app/app.cxx | 2 -
i18npool/inc/numberformatcode.hxx | 2 -
i18npool/source/numberformatcode/numberformatcode.cxx | 6 ++---
oox/inc/oox/drawingml/textspacing.hxx | 6 ++---
oox/source/drawingml/textspacingcontext.cxx | 2 -
padmin/source/pamain.cxx | 2 -
sax/source/expatwrap/sax_expat.cxx | 20 +++++++++---------
sdext/source/minimizer/pagecollector.cxx | 4 +--
sdext/source/minimizer/pagecollector.hxx | 2 -
vcl/inc/svdata.hxx | 2 -
vcl/inc/vcl/svapp.hxx | 2 -
vcl/source/app/svapp.cxx | 4 +--
vcl/source/app/svdata.cxx | 12 +++++-----
xmlhelp/source/cxxhelp/provider/content.hxx | 5 ----
14 files changed, 34 insertions(+), 37 deletions(-)
New commits:
commit 85b660a618780479a466e65a83ab844358631fa4
Author: Noel Power <noel.po...@suse.com>
Date: Wed Sep 26 10:31:58 2012 +0100
followup patch to recent changes for sal_Bool -> bool
Change-Id: I867934b4d0589d4e395fee471e1cfab236c0540f
diff --git a/sdext/source/minimizer/pagecollector.hxx
b/sdext/source/minimizer/pagecollector.hxx
index e0b9e47..fe75486 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -31,7 +31,7 @@ class PageCollector
struct MasterPageEntity
{
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >
xMasterPage;
- sal_Bool bUsed;
+ bool bUsed;
};
static void CollectCustomShowPages( const com::sun::star::uno::Reference<
com::sun::star::frame::XModel >&, const rtl::OUString& rCustomShow,
std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage
> >& );
static void CollectNonCustomShowPages( const
com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const
rtl::OUString& rCustomShow, std::vector< com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > >& );
commit 3bdc99fe19c1922d6683ad076a49f080d1a33b05
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 14:45:23 2012 +0200
remove unused fields
Change-Id: Ia2b2fd7623351377df9a0c76ad27cb6b738bc124
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx
b/xmlhelp/source/cxxhelp/provider/content.hxx
index cd6d113..4616a46 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -51,11 +51,8 @@ namespace chelp
{
OUString aTitle; // Title
OUString aContentType; // ContentType
- sal_Bool bIsDocument; // IsDocument
- sal_Bool bIsFolder; // IsFolder
- ContentProperties()
- : bIsDocument( sal_True ), bIsFolder( sal_False ) {}
+ ContentProperties() {}
};
//=========================================================================
commit 4b415950b30fa063e669717cfce2591845f26c16
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 14:41:27 2012 +0200
sal_Bool -> bool
Change-Id: I3a7cdd6fd488af20b15a205515fc6ee593371f0a
diff --git a/sdext/source/minimizer/pagecollector.cxx
b/sdext/source/minimizer/pagecollector.cxx
index 668ce5f..3ca80c2 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -145,7 +145,7 @@ void PageCollector::CollectMasterPages( const Reference<
XModel >& rxModel, std:
{
MasterPageEntity aMasterPageEntity;
aMasterPageEntity.xMasterPage = xMasterPage;
- aMasterPageEntity.bUsed = sal_False;
+ aMasterPageEntity.bUsed = false;
rMasterPageList.push_back( aMasterPageEntity );
}
}
@@ -163,7 +163,7 @@ void PageCollector::CollectMasterPages( const Reference<
XModel >& rxModel, std:
{
if ( aIter->xMasterPage == xMasterPage )
{
- aIter->bUsed = sal_True;
+ aIter->bUsed = true;
break;
}
++aIter;
commit 1cb0443ccd3d8d0281bf7b00d3efdbf5cd550bd4
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 14:39:01 2012 +0200
sal_Bool -> bool
Change-Id: I92e5f4f52ab19b607b5ed0314ee0d6c2334998c6
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 33707c4..db17402 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -122,8 +122,8 @@ OUString XmlChar2OUString( const XML_Char *p )
) );\
}\
catch( const com::sun::star::uno::RuntimeException &e ) {\
- pThis->bExceptionWasThrown = sal_True; \
- pThis->bRTExceptionWasThrown = sal_True; \
+ pThis->bExceptionWasThrown = true; \
+ pThis->bRTExceptionWasThrown = true; \
pImpl->rtexception = e; \
}\
}\
@@ -249,8 +249,8 @@ public: // module scope
// therefor the exception must be saved somewhere.
SAXParseException exception;
RuntimeException rtexception;
- sal_Bool bExceptionWasThrown;
- sal_Bool bRTExceptionWasThrown;
+ bool bExceptionWasThrown;
+ bool bRTExceptionWasThrown;
Locale locale;
@@ -443,8 +443,8 @@ SaxExpatParser::SaxExpatParser( )
m_pImpl->pAttrList = new AttributeList;
m_pImpl->rAttrList = Reference< XAttributeList > ( m_pImpl->pAttrList );
- m_pImpl->bExceptionWasThrown = sal_False;
- m_pImpl->bRTExceptionWasThrown = sal_False;
+ m_pImpl->bExceptionWasThrown = false;
+ m_pImpl->bRTExceptionWasThrown = false;
}
SaxExpatParser::~SaxExpatParser()
@@ -862,7 +862,7 @@ void SaxExpatParser_Impl::callbackEntityDecl(
pImpl->rDocumentLocator->getSystemId(),
pImpl->rDocumentLocator->getLineNumber(),
pImpl->rDocumentLocator->getColumnNumber() );
- pImpl->bExceptionWasThrown = sal_True;
+ pImpl->bExceptionWasThrown = true;
} else {
if( pImpl->rDTDHandler.is() ) {
CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
@@ -1008,12 +1008,12 @@ void SaxExpatParser_Impl::callErrorHandler(
SaxExpatParser_Impl *pImpl ,
}
else {
pImpl->exception = e;
- pImpl->bExceptionWasThrown = sal_True;
+ pImpl->bExceptionWasThrown = true;
}
}
catch( const SAXParseException & ex ) {
pImpl->exception = ex;
- pImpl->bExceptionWasThrown = sal_True;
+ pImpl->bExceptionWasThrown = true;
}
catch( const SAXException & ex ) {
pImpl->exception = SAXParseException(
@@ -1025,7 +1025,7 @@ void SaxExpatParser_Impl::callErrorHandler(
SaxExpatParser_Impl *pImpl ,
pImpl->rDocumentLocator->getLineNumber(),
pImpl->rDocumentLocator->getColumnNumber()
);
- pImpl->bExceptionWasThrown = sal_True;
+ pImpl->bExceptionWasThrown = true;
}
}
commit 0b7e226ee59f5f18a24a366f5f93e85d13e454df
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 14:01:55 2012 +0200
sal_Bool -> bool, convert InitAccessBridge and friends
Change-Id: I08b5a76c68c67c3837427ad74106e170c64cdaaa
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0e6ec43..48c2e0c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1465,7 +1465,7 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
if(
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
- sal_Bool bQuitApp;
+ bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 4eb997a..6f6e2e3 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -117,7 +117,7 @@ int MyApp::Main()
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
- sal_Bool bQuitApp;
+ bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
return EXIT_FAILURE;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 0ad3905..76c4650 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -381,7 +381,7 @@ extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
VCL_PLUGIN_PUBLIC void ImplHideSplash();
-bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled );
+bool ImplInitAccessBridge( bool bAllowCancel, bool &rCancelled );
FieldUnitStringList* ImplGetFieldUnits();
FieldUnitStringList* ImplGetCleanedFieldUnits();
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 24b22a5..2083250 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -554,7 +554,7 @@ VCL_DLLPUBLIC Application* GetpApp();
VCL_DLLPUBLIC sal_Bool InitVCL( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & );
VCL_DLLPUBLIC void DeInitVCL();
-VCL_DLLPUBLIC sal_Bool InitAccessBridge( sal_Bool bAllowCancel, sal_Bool
&rCancelled );
+VCL_DLLPUBLIC bool InitAccessBridge( bool bAllowCancel, bool &rCancelled );
// only allowed to call, if no thread is running. You must call
JoinMainLoopThread to free all memory.
VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void *
pThreadData );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 97c987a..df5dc73 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1763,9 +1763,9 @@ void Application::AddToRecentDocumentList(const
rtl::OUString& rFileUrl, const r
pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
}
-sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
+bool InitAccessBridge( bool bShowCancel, bool &rCancelled )
{
- sal_Bool bRet = true;
+ bool bRet = true;
// Disable Java bridge on UNIX
#if defined UNX
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 909626f..a3851c7 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -327,9 +327,9 @@ com::sun::star::uno::Any
AccessBridgeCurrentContext::getValueByName( const rtl::
}
-bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
+bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
{
- rCancelled = sal_False;
+ rCancelled = false;
bool bErrorMessage = true;
@@ -411,7 +411,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
&rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -434,7 +434,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
&rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -457,7 +457,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
&rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
@@ -480,7 +480,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool
&rCancelled)
// Do not change the setting in case the user chooses to cancel
if( SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL == ret )
- rCancelled = sal_True;
+ rCancelled = true;
}
return false;
commit 04eee686fc6b8cd95f7210fe0426316e7fc7aac0
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 13:02:59 2012 +0200
sal_Bool -> bool
Change-Id: I6356c71e236e89c54081a852b3b55eb87b95bce8
diff --git a/oox/inc/oox/drawingml/textspacing.hxx
b/oox/inc/oox/drawingml/textspacing.hxx
index c960d7a..c859362 100644
--- a/oox/inc/oox/drawingml/textspacing.hxx
+++ b/oox/inc/oox/drawingml/textspacing.hxx
@@ -37,10 +37,10 @@ namespace oox { namespace drawingml {
PERCENT
};
TextSpacing()
- : nUnit( POINTS ), nValue( 0 ), bHasValue( sal_False )
+ : nUnit( POINTS ), nValue( 0 ), bHasValue( false )
{
}
- TextSpacing( sal_Int32 nPoints ) : nUnit( POINTS ), nValue( nPoints ),
bHasValue( sal_True ){};
+ TextSpacing( sal_Int32 nPoints ) : nUnit( POINTS ), nValue( nPoints ),
bHasValue( true ){};
::com::sun::star::style::LineSpacing toLineSpacing() const
{
::com::sun::star::style::LineSpacing aSpacing;
@@ -59,7 +59,7 @@ namespace oox { namespace drawingml {
}
sal_Int32 nUnit;
sal_Int32 nValue;
- sal_Bool bHasValue;
+ bool bHasValue;
};
} }
diff --git a/oox/source/drawingml/textspacingcontext.cxx
b/oox/source/drawingml/textspacingcontext.cxx
index 9e7da4c..a4d7101 100644
--- a/oox/source/drawingml/textspacingcontext.cxx
+++ b/oox/source/drawingml/textspacingcontext.cxx
@@ -32,7 +32,7 @@ namespace oox { namespace drawingml {
: ContextHandler( rParent )
, maSpacing( aSpacing )
{
- maSpacing.bHasValue = sal_True;
+ maSpacing.bHasValue = true;
}
void TextSpacingContext::endFastElement( sal_Int32 /*nElement*/ )
commit f8752a760f18a54f6e5907f3d7567be7af69b584
Author: Noel Grandin <n...@peralex.com>
Date: Tue Sep 25 12:59:13 2012 +0200
sal_Bool -> bool
Change-Id: Idacea435ecf403770083f5c1e75c3ad1992ec14a
diff --git a/i18npool/inc/numberformatcode.hxx
b/i18npool/inc/numberformatcode.hxx
index 9433b11..f89cbfe 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -58,7 +58,7 @@ private:
::com::sun::star::uno::Reference <
::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >
aFormatSeq;
::com::sun::star::uno::Reference < ::com::sun::star::i18n::XLocaleData4 >
mxLocaleData;
- sal_Bool bFormatsValid;
+ bool bFormatsValid;
void setupLocale( const ::com::sun::star::lang::Locale& rLocale );
void getFormats( const ::com::sun::star::lang::Locale& rLocale );
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx
b/i18npool/source/numberformatcode/numberformatcode.cxx
index 6ec2379..9995821 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -31,7 +31,7 @@ NumberFormatCodeMapper::NumberFormatCodeMapper(
::com::sun::star::uno::XComponentContext >& rxContext )
:
mxContext( rxContext ),
- bFormatsValid( sal_False )
+ bFormatsValid( false )
{
}
@@ -154,7 +154,7 @@ void NumberFormatCodeMapper::setupLocale( const
::com::sun::star::lang::Locale&
|| aLocale.Language != rLocale.Language
|| aLocale.Variant != rLocale.Variant )
{
- bFormatsValid = sal_False;
+ bFormatsValid = false;
aLocale = rLocale;
}
}
@@ -170,7 +170,7 @@ void NumberFormatCodeMapper::getFormats( const
::com::sun::star::lang::Locale& r
aFormatSeq = ::com::sun::star::uno::Sequence<
::com::sun::star::i18n::FormatElement > (0);
else
aFormatSeq = mxLocaleData->getAllFormats( aLocale );
- bFormatsValid = sal_True;
+ bFormatsValid = true;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
