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

sfx2: sal_Bool->bool

Change-Id: I01a33e255b0dd2a0045f6eed52e6b31305750599
üst 4f9ce93e
...@@ -296,9 +296,9 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) ...@@ -296,9 +296,9 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
for( size_t i = 0; i < pLinkMgr->GetLinks().size(); ++i ) for( size_t i = 0; i < pLinkMgr->GetLinks().size(); ++i )
if( &xLink == *pLinkMgr->GetLinks()[ i ] ) if( &xLink == *pLinkMgr->GetLinks()[ i ] )
{ {
xLink->SetUseCache( sal_False ); xLink->SetUseCache( false );
SetType( *xLink, aPosArr[ n ], xLink->GetUpdateMode() ); SetType( *xLink, aPosArr[ n ], xLink->GetUpdateMode() );
xLink->SetUseCache( sal_True ); xLink->SetUseCache( true );
break; break;
} }
} }
......
...@@ -61,7 +61,7 @@ class SFX2_DLLPUBLIC LinkManager ...@@ -61,7 +61,7 @@ class SFX2_DLLPUBLIC LinkManager
SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell
protected: protected:
sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
const OUString* pName = 0 ); const OUString* pName = 0 );
public: public:
...@@ -90,16 +90,16 @@ public: ...@@ -90,16 +90,16 @@ public:
void Remove( SvBaseLink *pLink ); void Remove( SvBaseLink *pLink );
void Remove( size_t nPos, size_t nCnt = 1 ); void Remove( size_t nPos, size_t nCnt = 1 );
sal_Bool Insert( SvBaseLink* pLink ); bool Insert( SvBaseLink* pLink );
// the links connect to a SvLinkSource and adds to the list // the links connect to a SvLinkSource and adds to the list
sal_Bool InsertDDELink( SvBaseLink*, bool InsertDDELink( SvBaseLink*,
const OUString& rServer, const OUString& rServer,
const OUString& rTopic, const OUString& rTopic,
const OUString& rItem ); const OUString& rItem );
// if everything is already set at the link! // if everything is already set at the link!
sal_Bool InsertDDELink( SvBaseLink* ); bool InsertDDELink( SvBaseLink* );
// Connect the links to a pseudo-object and add to the list // Connect the links to a pseudo-object and add to the list
bool InsertFileLink( sfx2::SvBaseLink&, bool InsertFileLink( sfx2::SvBaseLink&,
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
// Call with list of links to server // Call with list of links to server
const SvLinkSources& GetServers() const { return aServerTbl; } const SvLinkSources& GetServers() const { return aServerTbl; }
// Link register/delete // Link register/delete
sal_Bool InsertServer( SvLinkSource* rObj ); bool InsertServer( SvLinkSource* rObj );
void RemoveServer( SvLinkSource* rObj ); void RemoveServer( SvLinkSource* rObj );
// A transfer is aborted, so cancel all download media // A transfer is aborted, so cancel all download media
...@@ -157,7 +157,7 @@ public: ...@@ -157,7 +157,7 @@ public:
// if the mimetype says graphic/bitmap/gdimetafile then get the // if the mimetype says graphic/bitmap/gdimetafile then get the
// graphic from the Any. Return says no errors // graphic from the Any. Return says no errors
static sal_Bool GetGraphicFromAny( const OUString& rMimeType, static bool GetGraphicFromAny( const OUString& rMimeType,
const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Any & rValue,
Graphic& rGrf ); Graphic& rGrf );
......
...@@ -73,11 +73,11 @@ private: ...@@ -73,11 +73,11 @@ private:
SvLinkSourceRef xObj; SvLinkSourceRef xObj;
OUString aLinkName; OUString aLinkName;
BaseLink_Impl* pImpl; BaseLink_Impl* pImpl;
sal_uInt16 nObjType; sal_uInt16 nObjType;
sal_Bool bVisible : 1; bool bVisible : 1;
sal_Bool bSynchron : 1; bool bSynchron : 1;
sal_Bool bUseCache : 1; // for Graphics Links! bool bUseCache : 1; // for Graphics Links!
sal_Bool bWasLastEditOK : 1; bool bWasLastEditOK : 1;
DECL_LINK( EndEditHdl, OUString* ); DECL_LINK( EndEditHdl, OUString* );
...@@ -91,7 +91,7 @@ protected: ...@@ -91,7 +91,7 @@ protected:
ImplBaseLinkData* pImplData; ImplBaseLinkData* pImplData;
sal_Bool m_bIsReadOnly; bool m_bIsReadOnly;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
m_xInputStreamToLoadFrom; m_xInputStreamToLoadFrom;
...@@ -99,7 +99,7 @@ protected: ...@@ -99,7 +99,7 @@ protected:
SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING ); SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING );
virtual ~SvBaseLink(); virtual ~SvBaseLink();
void _GetRealObject( sal_Bool bConnect = sal_True ); void _GetRealObject( bool bConnect = true );
SvLinkSource* GetRealObject() SvLinkSource* GetRealObject()
{ {
...@@ -134,37 +134,37 @@ public: ...@@ -134,37 +134,37 @@ public:
void SetUpdateMode( sal_uInt16 ); void SetUpdateMode( sal_uInt16 );
sal_uInt16 GetUpdateMode() const; sal_uInt16 GetUpdateMode() const;
sal_uIntPtr GetContentType() const; sal_uIntPtr GetContentType() const;
sal_Bool SetContentType( sal_uIntPtr nType ); bool SetContentType( sal_uIntPtr nType );
LinkManager* GetLinkManager(); LinkManager* GetLinkManager();
const LinkManager* GetLinkManager() const; const LinkManager* GetLinkManager() const;
void SetLinkManager( LinkManager* _pMgr ); void SetLinkManager( LinkManager* _pMgr );
sal_Bool Update(); bool Update();
void Disconnect(); void Disconnect();
// Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
virtual void Edit( Window*, const Link& rEndEditHdl ); virtual void Edit( Window*, const Link& rEndEditHdl );
// should the link appear in the dialog? (to the left in the link in the...) // should the link appear in the dialog? (to the left in the link in the...)
sal_Bool IsVisible() const { return bVisible; } bool IsVisible() const { return bVisible; }
void SetVisible( sal_Bool bFlag ) { bVisible = bFlag; } void SetVisible( bool bFlag ) { bVisible = bFlag; }
// should the Link be loaded synchronous or asynchronous? // should the Link be loaded synchronous or asynchronous?
sal_Bool IsSynchron() const { return bSynchron; } bool IsSynchron() const { return bSynchron; }
void SetSynchron( sal_Bool bFlag ) { bSynchron = bFlag; } void SetSynchron( bool bFlag ) { bSynchron = bFlag; }
sal_Bool IsUseCache() const { return bUseCache; } bool IsUseCache() const { return bUseCache; }
void SetUseCache( sal_Bool bFlag ) { bUseCache = bFlag; } void SetUseCache( bool bFlag ) { bUseCache = bFlag; }
void setStreamToLoadFrom( void setStreamToLoadFrom(
const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
sal_Bool bIsReadOnly ) bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream; { m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; } m_bIsReadOnly = bIsReadOnly; }
// #i88291# // #i88291#
void clearStreamToLoadFrom(); void clearStreamToLoadFrom();
inline sal_Bool WasLastEditOK() const { return bWasLastEditOK; } inline bool WasLastEditOK() const { return bWasLastEditOK; }
FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const; FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const;
}; };
......
...@@ -156,7 +156,7 @@ void LinkManager::Remove( size_t nPos, size_t nCnt ) ...@@ -156,7 +156,7 @@ void LinkManager::Remove( size_t nPos, size_t nCnt )
} }
sal_Bool LinkManager::Insert( SvBaseLink* pLink ) bool LinkManager::Insert( SvBaseLink* pLink )
{ {
for( size_t n = 0; n < aLinkTbl.size(); ++n ) for( size_t n = 0; n < aLinkTbl.size(); ++n )
{ {
...@@ -167,17 +167,17 @@ sal_Bool LinkManager::Insert( SvBaseLink* pLink ) ...@@ -167,17 +167,17 @@ sal_Bool LinkManager::Insert( SvBaseLink* pLink )
aLinkTbl.erase( aLinkTbl.begin() + n-- ); aLinkTbl.erase( aLinkTbl.begin() + n-- );
} }
else if( pLink == *pTmp ) else if( pLink == *pTmp )
return sal_False; // No duplicate links inserted return false; // No duplicate links inserted
} }
SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink ); SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink );
pLink->SetLinkManager( this ); pLink->SetLinkManager( this );
aLinkTbl.push_back( pTmp ); aLinkTbl.push_back( pTmp );
return sal_True; return true;
} }
sal_Bool LinkManager::InsertLink( SvBaseLink * pLink, bool LinkManager::InsertLink( SvBaseLink * pLink,
sal_uInt16 nObjType, sal_uInt16 nObjType,
sal_uInt16 nUpdateMode, sal_uInt16 nUpdateMode,
const OUString* pName ) const OUString* pName )
...@@ -191,13 +191,13 @@ sal_Bool LinkManager::InsertLink( SvBaseLink * pLink, ...@@ -191,13 +191,13 @@ sal_Bool LinkManager::InsertLink( SvBaseLink * pLink,
} }
sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink, bool LinkManager::InsertDDELink( SvBaseLink * pLink,
const OUString& rServer, const OUString& rServer,
const OUString& rTopic, const OUString& rTopic,
const OUString& rItem ) const OUString& rItem )
{ {
if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) ) if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
return sal_False; return false;
OUString sCmd; OUString sCmd;
::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem ); ::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem );
...@@ -208,11 +208,11 @@ sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink, ...@@ -208,11 +208,11 @@ sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink,
} }
sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink ) bool LinkManager::InsertDDELink( SvBaseLink * pLink )
{ {
DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" ); DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) ) if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
return sal_False; return false;
if( pLink->GetObjType() == OBJECT_CLIENT_SO ) if( pLink->GetObjType() == OBJECT_CLIENT_SO )
pLink->SetObjType( OBJECT_CLIENT_DDE ); pLink->SetObjType( OBJECT_CLIENT_DDE );
...@@ -357,11 +357,11 @@ SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink ) ...@@ -357,11 +357,11 @@ SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
} }
} }
sal_Bool LinkManager::InsertServer( SvLinkSource* pObj ) bool LinkManager::InsertServer( SvLinkSource* pObj )
{ {
// no duplicate inserts // no duplicate inserts
if( !pObj ) if( !pObj )
return sal_False; return false;
return aServerTbl.insert( pObj ).second; return aServerTbl.insert( pObj ).second;
} }
...@@ -505,11 +505,11 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId() ...@@ -505,11 +505,11 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId()
sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Any & rValue,
Graphic& rGrf ) Graphic& rGrf )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
::com::sun::star::uno::Sequence< sal_Int8 > aSeq; ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
if( rValue.hasValue() && ( rValue >>= aSeq ) ) if( rValue.hasValue() && ( rValue >>= aSeq ) )
{ {
...@@ -522,7 +522,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, ...@@ -522,7 +522,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
case SOT_FORMATSTR_ID_SVXB: case SOT_FORMATSTR_ID_SVXB:
{ {
ReadGraphic( aMemStm, rGrf ); ReadGraphic( aMemStm, rGrf );
bRet = sal_True; bRet = true;
} }
break; break;
case FORMAT_GDIMETAFILE: case FORMAT_GDIMETAFILE:
...@@ -530,7 +530,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, ...@@ -530,7 +530,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
GDIMetaFile aMtf; GDIMetaFile aMtf;
aMtf.Read( aMemStm ); aMtf.Read( aMemStm );
rGrf = aMtf; rGrf = aMtf;
bRet = sal_True; bRet = true;
} }
break; break;
case FORMAT_BITMAP: case FORMAT_BITMAP:
...@@ -538,7 +538,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, ...@@ -538,7 +538,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
Bitmap aBmp; Bitmap aBmp;
ReadDIB(aBmp, aMemStm, true); ReadDIB(aBmp, aMemStm, true);
rGrf = aBmp; rGrf = aBmp;
bRet = sal_True; bRet = true;
} }
break; break;
} }
......
...@@ -129,8 +129,8 @@ SvBaseLink::SvBaseLink() ...@@ -129,8 +129,8 @@ SvBaseLink::SvBaseLink()
pImpl = new BaseLink_Impl(); pImpl = new BaseLink_Impl();
nObjType = OBJECT_CLIENT_SO; nObjType = OBJECT_CLIENT_SO;
pImplData = new ImplBaseLinkData; pImplData = new ImplBaseLinkData;
bVisible = bSynchron = bUseCache = sal_True; bVisible = bSynchron = bUseCache = true;
bWasLastEditOK = sal_False; bWasLastEditOK = false;
} }
...@@ -141,8 +141,8 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType ) ...@@ -141,8 +141,8 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
pImpl = new BaseLink_Impl(); pImpl = new BaseLink_Impl();
nObjType = OBJECT_CLIENT_SO; nObjType = OBJECT_CLIENT_SO;
pImplData = new ImplBaseLinkData; pImplData = new ImplBaseLinkData;
bVisible = bSynchron = bUseCache = sal_True; bVisible = bSynchron = bUseCache = true;
bWasLastEditOK = sal_False; bWasLastEditOK = false;
// It it going to be a Ole-Link, // It it going to be a Ole-Link,
pImplData->ClientType.nUpdateMode = nUpdateMode; pImplData->ClientType.nUpdateMode = nUpdateMode;
...@@ -156,8 +156,8 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLin ...@@ -156,8 +156,8 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLin
: pImpl(0) : pImpl(0)
, m_bIsReadOnly(false) , m_bIsReadOnly(false)
{ {
bVisible = bSynchron = bUseCache = sal_True; bVisible = bSynchron = bUseCache = true;
bWasLastEditOK = sal_False; bWasLastEditOK = false;
aLinkName = rLinkName; aLinkName = rLinkName;
pImplData = new ImplBaseLinkData; pImplData = new ImplBaseLinkData;
nObjType = nObjectType; nObjType = nObjectType;
...@@ -299,7 +299,7 @@ void SvBaseLink::clearStreamToLoadFrom() ...@@ -299,7 +299,7 @@ void SvBaseLink::clearStreamToLoadFrom()
} }
} }
sal_Bool SvBaseLink::Update() bool SvBaseLink::Update()
{ {
if( OBJECT_CLIENT_SO & nObjType ) if( OBJECT_CLIENT_SO & nObjType )
{ {
...@@ -329,7 +329,7 @@ sal_Bool SvBaseLink::Update() ...@@ -329,7 +329,7 @@ sal_Bool SvBaseLink::Update()
{ {
// should be asynschron? // should be asynschron?
if( xObj->IsPending() ) if( xObj->IsPending() )
return sal_True; return true;
// we do not need the object anymore // we do not need the object anymore
AddNextRef(); AddNextRef();
...@@ -338,7 +338,7 @@ sal_Bool SvBaseLink::Update() ...@@ -338,7 +338,7 @@ sal_Bool SvBaseLink::Update()
} }
} }
} }
return sal_False; return false;
} }
...@@ -350,7 +350,7 @@ sal_uInt16 SvBaseLink::GetUpdateMode() const ...@@ -350,7 +350,7 @@ sal_uInt16 SvBaseLink::GetUpdateMode() const
} }
void SvBaseLink::_GetRealObject( sal_Bool bConnect) void SvBaseLink::_GetRealObject( bool bConnect)
{ {
if( !pImpl->m_pLinkMgr ) if( !pImpl->m_pLinkMgr )
return; return;
...@@ -392,14 +392,14 @@ sal_uIntPtr SvBaseLink::GetContentType() const ...@@ -392,14 +392,14 @@ sal_uIntPtr SvBaseLink::GetContentType() const
} }
sal_Bool SvBaseLink::SetContentType( sal_uIntPtr nType ) bool SvBaseLink::SetContentType( sal_uIntPtr nType )
{ {
if( OBJECT_CLIENT_SO & nObjType ) if( OBJECT_CLIENT_SO & nObjType )
{ {
pImplData->ClientType.nCntntType = nType; pImplData->ClientType.nCntntType = nType;
return sal_True; return true;
} }
return sal_False; return false;
} }
LinkManager* SvBaseLink::GetLinkManager() LinkManager* SvBaseLink::GetLinkManager()
...@@ -471,7 +471,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl ) ...@@ -471,7 +471,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
if ( !bAsync ) if ( !bAsync )
{ {
ExecuteEdit( OUString() ); ExecuteEdit( OUString() );
bWasLastEditOK = sal_False; bWasLastEditOK = false;
if ( pImpl->m_aEndEditLink.IsSet() ) if ( pImpl->m_aEndEditLink.IsSet() )
pImpl->m_aEndEditLink.Call( this ); pImpl->m_aEndEditLink.Call( this );
} }
......
...@@ -620,7 +620,7 @@ void SwSection::MakeChildLinksVisible( const SwSectionNode& rSectNd ) ...@@ -620,7 +620,7 @@ void SwSection::MakeChildLinksVisible( const SwSectionNode& rSectNd )
// It's within a normal Section, so show again // It's within a normal Section, so show again
if( !pParent ) if( !pParent )
pBLnk->SetVisible( sal_True ); pBLnk->SetVisible( true );
} }
} }
} }
......
...@@ -416,9 +416,9 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat ) ...@@ -416,9 +416,9 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
} }
else if( !IsSynchron() && bWaitForData ) else if( !IsSynchron() && bWaitForData )
{ {
SetSynchron( sal_True ); SetSynchron( true );
bRes = Update(); bRes = Update();
SetSynchron( sal_False ); SetSynchron( false );
} }
else else
bRes = Update(); bRes = Update();
......
...@@ -169,7 +169,7 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode): ...@@ -169,7 +169,7 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode):
::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
pOleNode(pNode) pOleNode(pNode)
{ {
SetSynchron( sal_False ); SetSynchron( false );
} }
SwEmbedObjectLink::~SwEmbedObjectLink() SwEmbedObjectLink::~SwEmbedObjectLink()
......
...@@ -325,7 +325,7 @@ void SwHTMLWriter::OutBasicBodyEvents() ...@@ -325,7 +325,7 @@ void SwHTMLWriter::OutBasicBodyEvents()
uno::Reference < container::XNameReplace > xEvents = xSup->getEvents(); uno::Reference < container::XNameReplace > xEvents = xSup->getEvents();
for ( sal_Int32 i=0; i<4; i++ ) for ( sal_Int32 i=0; i<4; i++ )
{ {
SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True ); SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh, true );
if ( pMacro ) if ( pMacro )
{ {
aDocTable.Insert( aBodyEventTable[i].nEvent, *pMacro ); aDocTable.Insert( aBodyEventTable[i].nEvent, *pMacro );
......
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