Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
e67d675d
Kaydet (Commit)
e67d675d
authored
Mar 14, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sfx2: sal_Bool->bool
Change-Id: I01a33e255b0dd2a0045f6eed52e6b31305750599
üst
4f9ce93e
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
59 additions
and
59 deletions
+59
-59
linkdlg.cxx
cui/source/dialogs/linkdlg.cxx
+2
-2
linkmgr.hxx
include/sfx2/linkmgr.hxx
+6
-6
lnkbase.hxx
include/sfx2/lnkbase.hxx
+17
-17
linkmgr2.cxx
sfx2/source/appl/linkmgr2.cxx
+15
-15
lnkbase2.cxx
sfx2/source/appl/lnkbase2.cxx
+14
-14
section.cxx
sw/source/core/docnode/section.cxx
+1
-1
swbaslnk.cxx
sw/source/core/docnode/swbaslnk.cxx
+2
-2
ndole.cxx
sw/source/core/ole/ndole.cxx
+1
-1
htmlbas.cxx
sw/source/filter/html/htmlbas.cxx
+1
-1
No files found.
cui/source/dialogs/linkdlg.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_F
alse
);
xLink
->
SetUseCache
(
f
alse
);
SetType
(
*
xLink
,
aPosArr
[
n
],
xLink
->
GetUpdateMode
()
);
SetType
(
*
xLink
,
aPosArr
[
n
],
xLink
->
GetUpdateMode
()
);
xLink
->
SetUseCache
(
sal_T
rue
);
xLink
->
SetUseCache
(
t
rue
);
break
;
break
;
}
}
}
}
...
...
include/sfx2/linkmgr.hxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_B
ool
InsertLink
(
SvBaseLink
*
pLink
,
sal_uInt16
nObjType
,
sal_uInt16
nUpdateType
,
b
ool
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_B
ool
Insert
(
SvBaseLink
*
pLink
);
b
ool
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_B
ool
InsertDDELink
(
SvBaseLink
*
,
b
ool
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_B
ool
InsertDDELink
(
SvBaseLink
*
);
b
ool
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_B
ool
GetGraphicFromAny
(
const
OUString
&
rMimeType
,
static
b
ool
GetGraphicFromAny
(
const
OUString
&
rMimeType
,
const
::
com
::
sun
::
star
::
uno
::
Any
&
rValue
,
const
::
com
::
sun
::
star
::
uno
::
Any
&
rValue
,
Graphic
&
rGrf
);
Graphic
&
rGrf
);
...
...
include/sfx2/lnkbase.hxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_B
ool
bVisible
:
1
;
b
ool
bVisible
:
1
;
sal_B
ool
bSynchron
:
1
;
b
ool
bSynchron
:
1
;
sal_B
ool
bUseCache
:
1
;
// for Graphics Links!
b
ool
bUseCache
:
1
;
// for Graphics Links!
sal_B
ool
bWasLastEditOK
:
1
;
b
ool
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_B
ool
m_bIsReadOnly
;
b
ool
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_T
rue
);
void
_GetRealObject
(
bool
bConnect
=
t
rue
);
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_B
ool
SetContentType
(
sal_uIntPtr
nType
);
b
ool
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_B
ool
Update
();
b
ool
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_B
ool
IsVisible
()
const
{
return
bVisible
;
}
b
ool
IsVisible
()
const
{
return
bVisible
;
}
void
SetVisible
(
sal_B
ool
bFlag
)
{
bVisible
=
bFlag
;
}
void
SetVisible
(
b
ool
bFlag
)
{
bVisible
=
bFlag
;
}
// should the Link be loaded synchronous or asynchronous?
// should the Link be loaded synchronous or asynchronous?
sal_B
ool
IsSynchron
()
const
{
return
bSynchron
;
}
b
ool
IsSynchron
()
const
{
return
bSynchron
;
}
void
SetSynchron
(
sal_B
ool
bFlag
)
{
bSynchron
=
bFlag
;
}
void
SetSynchron
(
b
ool
bFlag
)
{
bSynchron
=
bFlag
;
}
sal_B
ool
IsUseCache
()
const
{
return
bUseCache
;
}
b
ool
IsUseCache
()
const
{
return
bUseCache
;
}
void
SetUseCache
(
sal_B
ool
bFlag
)
{
bUseCache
=
bFlag
;
}
void
SetUseCache
(
b
ool
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_B
ool
bIsReadOnly
)
b
ool
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
;
};
};
...
...
sfx2/source/appl/linkmgr2.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_B
ool
LinkManager
::
Insert
(
SvBaseLink
*
pLink
)
b
ool
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_F
alse
;
// No duplicate links inserted
return
f
alse
;
// 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_T
rue
;
return
t
rue
;
}
}
sal_B
ool
LinkManager
::
InsertLink
(
SvBaseLink
*
pLink
,
b
ool
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_B
ool
LinkManager
::
InsertDDELink
(
SvBaseLink
*
pLink
,
b
ool
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_F
alse
;
return
f
alse
;
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_B
ool
LinkManager
::
InsertDDELink
(
SvBaseLink
*
pLink
)
b
ool
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_F
alse
;
return
f
alse
;
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_B
ool
LinkManager
::
InsertServer
(
SvLinkSource
*
pObj
)
b
ool
LinkManager
::
InsertServer
(
SvLinkSource
*
pObj
)
{
{
// no duplicate inserts
// no duplicate inserts
if
(
!
pObj
)
if
(
!
pObj
)
return
sal_F
alse
;
return
f
alse
;
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_B
ool
LinkManager
::
GetGraphicFromAny
(
const
OUString
&
rMimeType
,
b
ool
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_F
alse
;
bool
bRet
=
f
alse
;
::
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_T
rue
;
bRet
=
t
rue
;
}
}
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_T
rue
;
bRet
=
t
rue
;
}
}
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_T
rue
;
bRet
=
t
rue
;
}
}
break
;
break
;
}
}
...
...
sfx2/source/appl/lnkbase2.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_T
rue
;
bVisible
=
bSynchron
=
bUseCache
=
t
rue
;
bWasLastEditOK
=
sal_F
alse
;
bWasLastEditOK
=
f
alse
;
}
}
...
@@ -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_T
rue
;
bVisible
=
bSynchron
=
bUseCache
=
t
rue
;
bWasLastEditOK
=
sal_F
alse
;
bWasLastEditOK
=
f
alse
;
// 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_T
rue
;
bVisible
=
bSynchron
=
bUseCache
=
t
rue
;
bWasLastEditOK
=
sal_F
alse
;
bWasLastEditOK
=
f
alse
;
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_B
ool
SvBaseLink
::
Update
()
b
ool
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_T
rue
;
return
t
rue
;
// 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_F
alse
;
return
f
alse
;
}
}
...
@@ -350,7 +350,7 @@ sal_uInt16 SvBaseLink::GetUpdateMode() const
...
@@ -350,7 +350,7 @@ sal_uInt16 SvBaseLink::GetUpdateMode() const
}
}
void
SvBaseLink
::
_GetRealObject
(
sal_B
ool
bConnect
)
void
SvBaseLink
::
_GetRealObject
(
b
ool
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_B
ool
SvBaseLink
::
SetContentType
(
sal_uIntPtr
nType
)
b
ool
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_T
rue
;
return
t
rue
;
}
}
return
sal_F
alse
;
return
f
alse
;
}
}
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_F
alse
;
bWasLastEditOK
=
f
alse
;
if
(
pImpl
->
m_aEndEditLink
.
IsSet
()
)
if
(
pImpl
->
m_aEndEditLink
.
IsSet
()
)
pImpl
->
m_aEndEditLink
.
Call
(
this
);
pImpl
->
m_aEndEditLink
.
Call
(
this
);
}
}
...
...
sw/source/core/docnode/section.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_T
rue
);
pBLnk
->
SetVisible
(
t
rue
);
}
}
}
}
}
}
...
...
sw/source/core/docnode/swbaslnk.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_T
rue
);
SetSynchron
(
t
rue
);
bRes
=
Update
();
bRes
=
Update
();
SetSynchron
(
sal_F
alse
);
SetSynchron
(
f
alse
);
}
}
else
else
bRes
=
Update
();
bRes
=
Update
();
...
...
sw/source/core/ole/ndole.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_F
alse
);
SetSynchron
(
f
alse
);
}
}
SwEmbedObjectLink
::~
SwEmbedObjectLink
()
SwEmbedObjectLink
::~
SwEmbedObjectLink
()
...
...
sw/source/filter/html/htmlbas.cxx
Dosyayı görüntüle @
e67d675d
...
@@ -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_T
rue
);
SvxMacro
*
pMacro
=
SfxEventConfiguration
::
ConvertToMacro
(
xEvents
->
getByName
(
OUString
::
createFromAscii
(
aEventNames
[
i
])
),
pDocSh
,
t
rue
);
if
(
pMacro
)
if
(
pMacro
)
{
{
aDocTable
.
Insert
(
aBodyEventTable
[
i
].
nEvent
,
*
pMacro
);
aDocTable
.
Insert
(
aBodyEventTable
[
i
].
nEvent
,
*
pMacro
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment