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
5db69fcd
Kaydet (Commit)
5db69fcd
authored
Mar 31, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: prefix members of SwOleClient
Change-Id: I60fe718c489fc47d667534560241a8b3eb5f20a6
üst
41b72ada
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
swcli.hxx
sw/inc/swcli.hxx
+4
-4
swcli.cxx
sw/source/uibase/uiview/swcli.cxx
+5
-4
No files found.
sw/inc/swcli.hxx
Dosyayı görüntüle @
5db69fcd
...
@@ -29,8 +29,8 @@ class SwEditWin;
...
@@ -29,8 +29,8 @@ class SwEditWin;
class
SwOleClient
:
public
SfxInPlaceClient
class
SwOleClient
:
public
SfxInPlaceClient
{
{
bool
b
InDoVerb
;
bool
m_Is
InDoVerb
;
bool
b
OldCheckForOLEInCaption
;
bool
m_Is
OldCheckForOLEInCaption
;
virtual
void
ObjectAreaChanged
()
SAL_OVERRIDE
;
virtual
void
ObjectAreaChanged
()
SAL_OVERRIDE
;
virtual
void
RequestNewObjectArea
(
Rectangle
&
)
SAL_OVERRIDE
;
virtual
void
RequestNewObjectArea
(
Rectangle
&
)
SAL_OVERRIDE
;
...
@@ -40,9 +40,9 @@ class SwOleClient : public SfxInPlaceClient
...
@@ -40,9 +40,9 @@ class SwOleClient : public SfxInPlaceClient
public
:
public
:
SwOleClient
(
SwView
*
pView
,
SwEditWin
*
pWin
,
const
svt
::
EmbeddedObjectRef
&
);
SwOleClient
(
SwView
*
pView
,
SwEditWin
*
pWin
,
const
svt
::
EmbeddedObjectRef
&
);
void
SetInDoVerb
(
bool
bFlag
)
{
b
InDoVerb
=
bFlag
;
}
void
SetInDoVerb
(
bool
const
bFlag
)
{
m_Is
InDoVerb
=
bFlag
;
}
bool
IsCheckForOLEInCaption
()
const
{
return
b
OldCheckForOLEInCaption
;
}
bool
IsCheckForOLEInCaption
()
const
{
return
m_Is
OldCheckForOLEInCaption
;
}
virtual
void
FormatChanged
()
SAL_OVERRIDE
;
virtual
void
FormatChanged
()
SAL_OVERRIDE
;
};
};
...
...
sw/source/uibase/uiview/swcli.cxx
Dosyayı görüntüle @
5db69fcd
...
@@ -32,9 +32,10 @@
...
@@ -32,9 +32,10 @@
using
namespace
com
::
sun
::
star
;
using
namespace
com
::
sun
::
star
;
SwOleClient
::
SwOleClient
(
SwView
*
pView
,
SwEditWin
*
pWin
,
const
svt
::
EmbeddedObjectRef
&
xObj
)
:
SwOleClient
::
SwOleClient
(
SwView
*
pView
,
SwEditWin
*
pWin
,
const
svt
::
EmbeddedObjectRef
&
xObj
)
SfxInPlaceClient
(
pView
,
pWin
,
xObj
.
GetViewAspect
()
),
bInDoVerb
(
false
),
:
SfxInPlaceClient
(
pView
,
pWin
,
xObj
.
GetViewAspect
()
)
bOldCheckForOLEInCaption
(
pView
->
GetWrtShell
().
IsCheckForOLEInCaption
()
)
,
m_IsInDoVerb
(
false
)
,
m_IsOldCheckForOLEInCaption
(
pView
->
GetWrtShell
().
IsCheckForOLEInCaption
())
{
{
SetObject
(
xObj
.
GetObject
()
);
SetObject
(
xObj
.
GetObject
()
);
}
}
...
@@ -93,7 +94,7 @@ void SwOleClient::ObjectAreaChanged()
...
@@ -93,7 +94,7 @@ void SwOleClient::ObjectAreaChanged()
void
SwOleClient
::
ViewChanged
()
void
SwOleClient
::
ViewChanged
()
{
{
if
(
bInDoVerb
)
if
(
m_IsInDoVerb
)
return
;
return
;
if
(
GetAspect
()
==
embed
::
Aspects
::
MSOLE_ICON
)
if
(
GetAspect
()
==
embed
::
Aspects
::
MSOLE_ICON
)
...
...
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