diff options
Diffstat (limited to 'svx/source/svdraw/svdotxln.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdotxln.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 6382ee5ca35a..ac9476f8f428 100644..100755 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -35,7 +35,7 @@ #include <ucbhelper/contentbroker.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> @@ -79,7 +79,7 @@ public: virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); - BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; ImpSdrObjTextLink::~ImpSdrObjTextLink() @@ -199,8 +199,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, void SdrTextObj::ReleaseTextLink() { ImpLinkAbmeldung(); - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0;) { nNum--; SdrObjUserData* pData=GetUserData(nNum); if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { @@ -218,11 +218,11 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) { ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); DateTime aFileDT; - BOOL bExists = FALSE, bLoad = FALSE; + sal_Bool bExists = sal_False, bLoad = sal_False; if( pBroker ) { - bExists = TRUE; + bExists = sal_True; try { @@ -238,14 +238,14 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) } catch( ... ) { - bExists = FALSE; + bExists = sal_False; } } if( bExists ) { if( bForceLoad ) - bLoad = TRUE; + bLoad = sal_True; else bLoad = ( aFileDT > pData->aFileDate0 ); @@ -264,7 +264,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) { INetURLObject aFileURL( rFileName ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -289,14 +289,14 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ cRTF[4] = 0; pIStm->Read(cRTF, 5); - BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; + sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; pIStm->Seek(0); if( !pIStm->GetError() ) { - SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); - bRet = TRUE; + SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); + bRet = sal_True; } delete pIStm; @@ -308,8 +308,8 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const { ImpSdrObjTextLinkUserData* pData=NULL; - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { nNum--; pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum); if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) { |