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
e9c862e9
Kaydet (Commit)
e9c862e9
authored
Kas 02, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sw: prefix members of SwDrawFrameFormat
Change-Id: I0d00ca7727e0756030830cd732655b2a22b900d6
üst
bd63b48a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
frmfmt.hxx
sw/inc/frmfmt.hxx
+4
-4
atrfrm.cxx
sw/source/core/layout/atrfrm.cxx
+4
-4
No files found.
sw/inc/frmfmt.hxx
Dosyayı görüntüle @
e9c862e9
...
@@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
...
@@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
{
{
friend
class
SwDoc
;
friend
class
SwDoc
;
mutable
const
SdrObject
*
pSdrObj
Cached
;
mutable
const
SdrObject
*
m_pSdrObject
Cached
;
mutable
OUString
sSdrObj
CachedComment
;
mutable
OUString
m_sSdrObject
CachedComment
;
SwDrawFrameFormat
(
const
SwDrawFrameFormat
&
rCpy
)
=
delete
;
SwDrawFrameFormat
(
const
SwDrawFrameFormat
&
rCpy
)
=
delete
;
SwDrawFrameFormat
&
operator
=
(
const
SwDrawFrameFormat
&
rCpy
)
=
delete
;
SwDrawFrameFormat
&
operator
=
(
const
SwDrawFrameFormat
&
rCpy
)
=
delete
;
...
@@ -247,7 +247,7 @@ protected:
...
@@ -247,7 +247,7 @@ protected:
SwDrawFrameFormat
(
SwAttrPool
&
rPool
,
const
sal_Char
*
pFormatNm
,
SwDrawFrameFormat
(
SwAttrPool
&
rPool
,
const
sal_Char
*
pFormatNm
,
SwFrameFormat
*
pDrvdFrm
)
SwFrameFormat
*
pDrvdFrm
)
:
SwFrameFormat
(
rPool
,
pFormatNm
,
pDrvdFrm
,
RES_DRAWFRMFMT
),
:
SwFrameFormat
(
rPool
,
pFormatNm
,
pDrvdFrm
,
RES_DRAWFRMFMT
),
pSdrObj
Cached
(
NULL
),
m_pSdrObject
Cached
(
NULL
),
meLayoutDir
(
SwFrameFormat
::
HORI_L2R
),
meLayoutDir
(
SwFrameFormat
::
HORI_L2R
),
...
@@ -259,7 +259,7 @@ protected:
...
@@ -259,7 +259,7 @@ protected:
SwDrawFrameFormat
(
SwAttrPool
&
rPool
,
const
OUString
&
rFormatNm
,
SwDrawFrameFormat
(
SwAttrPool
&
rPool
,
const
OUString
&
rFormatNm
,
SwFrameFormat
*
pDrvdFrm
)
SwFrameFormat
*
pDrvdFrm
)
:
SwFrameFormat
(
rPool
,
rFormatNm
,
pDrvdFrm
,
RES_DRAWFRMFMT
),
:
SwFrameFormat
(
rPool
,
rFormatNm
,
pDrvdFrm
,
RES_DRAWFRMFMT
),
pSdrObj
Cached
(
NULL
),
m_pSdrObject
Cached
(
NULL
),
meLayoutDir
(
SwFrameFormat
::
HORI_L2R
),
meLayoutDir
(
SwFrameFormat
::
HORI_L2R
),
mnPositionLayoutDir
(
com
::
sun
::
star
::
text
::
PositionLayoutDir
::
PositionInLayoutDirOfAnchor
),
mnPositionLayoutDir
(
com
::
sun
::
star
::
text
::
PositionLayoutDir
::
PositionInLayoutDirOfAnchor
),
...
...
sw/source/core/layout/atrfrm.cxx
Dosyayı görüntüle @
e9c862e9
...
@@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const
...
@@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const
if
(
pSdrObj
)
if
(
pSdrObj
)
{
{
if
(
pSdrObj
!=
pSdrObj
Cached
)
if
(
pSdrObj
!=
m_pSdrObject
Cached
)
{
{
SdrObject
*
pSdrObjCopy
=
pSdrObj
->
Clone
();
SdrObject
*
pSdrObjCopy
=
pSdrObj
->
Clone
();
SdrUndoNewObj
*
pSdrUndo
=
new
SdrUndoNewObj
(
*
pSdrObjCopy
);
SdrUndoNewObj
*
pSdrUndo
=
new
SdrUndoNewObj
(
*
pSdrObjCopy
);
sSdrObj
CachedComment
=
pSdrUndo
->
GetComment
();
m_sSdrObject
CachedComment
=
pSdrUndo
->
GetComment
();
delete
pSdrUndo
;
delete
pSdrUndo
;
pSdrObj
Cached
=
pSdrObj
;
m_pSdrObject
Cached
=
pSdrObj
;
}
}
aResult
=
sSdrObj
CachedComment
;
aResult
=
m_sSdrObject
CachedComment
;
}
}
else
else
aResult
=
SW_RESSTR
(
STR_GRAPHIC
);
aResult
=
SW_RESSTR
(
STR_GRAPHIC
);
...
...
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