mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool to bool

Browse Source 
Change-Id: Ib19ecab287396dc6d6cf4a77dcf7072c5c4c84f8
This commit is contained in:
Matteo Casalin 2014-03-10 22:48:41 +01:00
parent 58f0208479
commit 684baef506
20 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/basdoc.cxx
View File

@ -70,7 +70,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr )
pPrinter.reset(pPr); pPrinter.reset(pPr);
} }
void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, sal_Bool bTemplate) const void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const
{ {
(void)bTemplate; (void)bTemplate;
DBG_ASSERT( !bTemplate, "No template for Basic" ); DBG_ASSERT( !bTemplate, "No template for Basic" );

2
basctl/source/basicide/basdoc.hxx
View File

@ -45,7 +45,7 @@ protected:
OUString * pFullTypeName, OUString * pFullTypeName,
OUString * pShortTypeName, OUString * pShortTypeName,
sal_Int32 nVersion, sal_Int32 nVersion,
sal_Bool bTemplate = false ) const; bool bTemplate = false ) const;
public: public:
TYPEINFO(); TYPEINFO();

4
include/sfx2/objsh.hxx
View File

@ -532,7 +532,7 @@ public:
*/ */
void SetupStorage( void SetupStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
sal_Int32 nVersion, sal_Bool bTemplate, bool bChart = false ) const; sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage(); ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
@ -583,7 +583,7 @@ public:
OUString * pFullTypeName, OUString * pFullTypeName,
OUString * pShortTypeName, OUString * pShortTypeName,
sal_Int32 nVersion, sal_Int32 nVersion,
sal_Bool bTemplate = sal_False) const = 0; bool bTemplate = false) const = 0;
// change recording and respective passwword protection for Writer and Calc // change recording and respective passwword protection for Writer and Calc
// slots available for Writer: FN_REDLINE_ON, FN_REDLINE_ON // slots available for Writer: FN_REDLINE_ON, FN_REDLINE_ON

2
sc/source/ui/docshell/docsh.cxx
View File

@ -189,7 +189,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
OUString* pFullTypeName, OUString* pFullTypeName,
OUString* pShortTypeName, OUString* pShortTypeName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
if ( nFileFormat == SOFFICE_FILEFORMAT_60 ) if ( nFileFormat == SOFFICE_FILEFORMAT_60 )
{ {

2
sc/source/ui/inc/docsh.hxx
View File

@ -199,7 +199,7 @@ public:
OUString * pFullTypeName, OUString * pFullTypeName,
OUString * pShortTypeName, OUString * pShortTypeName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const; bool bTemplate = false ) const;
virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
virtual sal_Bool Load( SfxMedium& rMedium ); virtual sal_Bool Load( SfxMedium& rMedium );

2
sd/source/ui/app/sdxfer.cxx
View File

@ -610,7 +610,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE ); ::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE );
// write document storage // write document storage
pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false );
// mba: no relative ULRs for clipboard! // mba: no relative ULRs for clipboard!
SfxMedium aMedium( xWorkStore, OUString() ); SfxMedium aMedium( xWorkStore, OUString() );
bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );

2
sd/source/ui/docshell/docshel4.cxx
View File

@ -1134,7 +1134,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
OUString* pFullTypeName, OUString* pFullTypeName,
OUString* pShortTypeName, OUString* pShortTypeName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
if (nFileFormat == SOFFICE_FILEFORMAT_60) if (nFileFormat == SOFFICE_FILEFORMAT_60)
{ {

2
sd/source/ui/inc/DrawDocShell.hxx
View File

@ -95,7 +95,7 @@ public:
virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); virtual void OnDocumentPrinterChanged(Printer* pNewPrinter);
virtual SfxStyleSheetBasePool* GetStyleSheetPool(); virtual SfxStyleSheetBasePool* GetStyleSheetPool();
virtual Size GetFirstPageSize(); virtual Size GetFirstPageSize();
virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const;
virtual void SetModified( sal_Bool = sal_True ); virtual void SetModified( sal_Bool = sal_True );
virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent,
const SfxItemSet &rSet ); const SfxItemSet &rSet );

11
sfx2/source/doc/objstor.cxx
View File

@ -338,7 +338,7 @@ sal_uInt32 GetChartVersion( sal_Int32 nVersion, bool bTemplate )
void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage, void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage,
sal_Int32 nVersion, sal_Bool bTemplate, bool bChart ) const sal_Int32 nVersion, bool bTemplate, bool bChart ) const
{ {
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY );
@ -455,7 +455,7 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage
return sal_False; return sal_False;
} }
SetupStorage( xStorage, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); SetupStorage( xStorage, SOFFICE_FILEFORMAT_CURRENT, false, false );
} }
} }
catch ( uno::Exception& ) catch ( uno::Exception& )
@ -1917,7 +1917,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
{ {
SAL_WARN( "sfx.doc", "The mediatype must be set already!" ); SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, false, false );
} }
pImp->bIsSaving = sal_False; pImp->bIsSaving = sal_False;
@ -3090,7 +3090,8 @@ sal_Bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
sal_Int32 nVersion = rMedium.GetFilter()->GetVersion(); sal_Int32 nVersion = rMedium.GetFilter()->GetVersion();
// OASIS templates have own mediatypes ( SO7 also actually, but it is to late to use them here ) // OASIS templates have own mediatypes ( SO7 also actually, but it is to late to use them here )
sal_Bool bTemplate = ( rMedium.GetFilter()->IsOwnTemplateFormat() && nVersion > SOFFICE_FILEFORMAT_60 ); const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat()
&& nVersion > SOFFICE_FILEFORMAT_60;
const SfxFilter* pFilter = rMedium.GetFilter(); const SfxFilter* pFilter = rMedium.GetFilter();
bool bChart = false; bool bChart = false;
@ -3123,7 +3124,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage()
pImp->m_xDocStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); pImp->m_xDocStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
OSL_ENSURE( pImp->m_xDocStorage.is(), "The method must either return storage or throw an exception!" ); OSL_ENSURE( pImp->m_xDocStorage.is(), "The method must either return storage or throw an exception!" );
SetupStorage( pImp->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); SetupStorage( pImp->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, false, false );
pImp->m_bCreateTempStor = sal_False; pImp->m_bCreateTempStor = sal_False;
SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_STORAGECHANGED, GlobalEventConfig::GetEventName(STR_EVENT_STORAGECHANGED), this ) ); SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_STORAGECHANGED, GlobalEventConfig::GetEventName(STR_EVENT_STORAGECHANGED), this ) );
} }

2
sfx2/source/doc/sfxbasemodel.cxx
View File

@ -3803,7 +3803,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >&
{ {
// TODO/LATER: if the provided storage has some data inside the storing might fail, probably the storage must be truncated // TODO/LATER: if the provided storage has some data inside the storing might fail, probably the storage must be truncated
// TODO/LATER: is it possible to have a template here? // TODO/LATER: is it possible to have a template here?
m_pData->m_pObjectShell->SetupStorage( xStorage, nVersion, sal_False, false ); m_pData->m_pObjectShell->SetupStorage( xStorage, nVersion, false, false );
// BaseURL is part of the ItemSet // BaseURL is part of the ItemSet
SfxMedium aMedium( xStorage, OUString(), &aSet ); SfxMedium aMedium( xStorage, OUString(), &aSet );

2
starmath/inc/document.hxx
View File

@ -128,7 +128,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
OUString* pFullTypeName, OUString* pFullTypeName,
OUString* pShortTypeName, OUString* pShortTypeName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const; bool bTemplate = false ) const;
virtual sal_Bool SetData( const OUString& rData ); virtual sal_Bool SetData( const OUString& rData );
virtual sal_uLong GetMiscStatus() const; virtual sal_uLong GetMiscStatus() const;

2
starmath/source/document.cxx
View File

@ -1393,7 +1393,7 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
OUString* pFullTypeName, OUString* pFullTypeName,
OUString* pShortTypeName, OUString* pShortTypeName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
SAL_INFO( "starmath", "SmDocShell::FillClass" ); SAL_INFO( "starmath", "SmDocShell::FillClass" );

2
sw/inc/docsh.hxx
View File

@ -229,7 +229,7 @@ public:
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const; bool bTemplate = false ) const;
virtual void LoadStyles( SfxObjectShell& rSource ); virtual void LoadStyles( SfxObjectShell& rSource );

2
sw/inc/globdoc.hxx
View File

@ -38,7 +38,7 @@ public:
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const; bool bTemplate = false ) const;
}; };
#endif #endif

2
sw/inc/wdocsh.hxx
View File

@ -44,7 +44,7 @@ public:
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nFileFormat, sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const; bool bTemplate = false ) const;
sal_uInt16 GetSourcePara()const sal_uInt16 GetSourcePara()const
{return nSourcePara;} {return nSourcePara;}
void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;} void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;}

2
sw/source/core/uibase/app/docsh.cxx
View File

@ -451,7 +451,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
SfxObjectShellLock xDocSh = SfxObjectShellLock xDocSh =
new SwGlobalDocShell( SFX_CREATE_MODE_INTERNAL ); new SwGlobalDocShell( SFX_CREATE_MODE_INTERNAL );
// the global document can not be a template // the global document can not be a template
xDocSh->SetupStorage( xStor, SotStorage::GetVersion( xStor ), sal_False ); xDocSh->SetupStorage( xStor, SotStorage::GetVersion( xStor ), false );
xDocSh->DoClose(); xDocSh->DoClose();
} }

2
sw/source/core/uibase/app/docsh2.cxx
View File

@ -1195,7 +1195,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nVersion, sal_Int32 nVersion,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
if (nVersion == SOFFICE_FILEFORMAT_60) if (nVersion == SOFFICE_FILEFORMAT_60)
{ {

2
sw/source/core/uibase/dochdl/swdtflvr.cxx
View File

@ -658,7 +658,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE ); ::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE );
// write document storage // write document storage
pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false );
// mba: no BaseURL for clipboard // mba: no BaseURL for clipboard
SfxMedium aMedium( xWorkStore, OUString() ); SfxMedium aMedium( xWorkStore, OUString() );
bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );

4
sw/source/core/uibase/globdoc/globdoc.cxx
View File

@ -49,10 +49,10 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nVersion, sal_Int32 nVersion,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
(void)bTemplate; (void)bTemplate;
OSL_ENSURE( bTemplate == sal_False, "No template for Writer Global" ); OSL_ENSURE( !bTemplate, "No template for Writer Global" );
if (nVersion == SOFFICE_FILEFORMAT_60) if (nVersion == SOFFICE_FILEFORMAT_60)
{ {

4
sw/source/core/uibase/web/wdocsh.cxx
View File

@ -63,10 +63,10 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
OUString * pLongUserName, OUString * pLongUserName,
OUString * pUserName, OUString * pUserName,
sal_Int32 nVersion, sal_Int32 nVersion,
sal_Bool bTemplate /* = sal_False */) const bool bTemplate /* = false */) const
{ {
(void)bTemplate; (void)bTemplate;
OSL_ENSURE( bTemplate == sal_False, "No template for Writer Web" ); OSL_ENSURE( !bTemplate, "No template for Writer Web" );
if (nVersion == SOFFICE_FILEFORMAT_60) if (nVersion == SOFFICE_FILEFORMAT_60)
{ {