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
9e83083f
Kaydet (Commit)
9e83083f
authored
Mar 24, 2015
tarafından
Bjoern Michaelsen
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
kill a typed Modify use
Change-Id: I2d526ecb0f11281ad695d6ce158fcb5a3ef739cb
üst
d6775990
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
38 deletions
+33
-38
hintids.hxx
sw/inc/hintids.hxx
+0
-1
pagedesc.hxx
sw/inc/pagedesc.hxx
+4
-0
docdesc.cxx
sw/source/core/doc/docdesc.cxx
+5
-13
docfmt.cxx
sw/source/core/doc/docfmt.cxx
+5
-13
pagefrm.hxx
sw/source/core/inc/pagefrm.hxx
+1
-0
pagechg.cxx
sw/source/core/layout/pagechg.cxx
+18
-11
No files found.
sw/inc/hintids.hxx
Dosyayı görüntüle @
9e83083f
...
@@ -306,7 +306,6 @@ RES_MSG_BEGIN = RES_FMT_END,
...
@@ -306,7 +306,6 @@ RES_MSG_BEGIN = RES_FMT_END,
RES_DEL_CHR
,
RES_DEL_CHR
,
RES_DEL_TXT
,
RES_DEL_TXT
,
RES_UPDATE_ATTR
,
RES_UPDATE_ATTR
,
RES_PAGEDESC_FTNINFO
,
RES_REFMARKFLD_UPDATE
,
RES_REFMARKFLD_UPDATE
,
RES_DOCPOS_UPDATE
,
RES_DOCPOS_UPDATE
,
RES_TABLEFML_UPDATE
,
RES_TABLEFML_UPDATE
,
...
...
sw/inc/pagedesc.hxx
Dosyayı görüntüle @
9e83083f
...
@@ -341,6 +341,10 @@ public:
...
@@ -341,6 +341,10 @@ public:
operator
SwPageDesc
()
const
;
// #i7983#
operator
SwPageDesc
()
const
;
// #i7983#
};
};
namespace
sw
{
class
PageFootnoteHint
SAL_FINAL
:
public
SfxHint
{};
}
#endif // INCLUDED_SW_INC_PAGEDESC_HXX
#endif // INCLUDED_SW_INC_PAGEDESC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/core/doc/docdesc.cxx
Dosyayı görüntüle @
9e83083f
...
@@ -509,19 +509,11 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
...
@@ -509,19 +509,11 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
if
(
!
(
rDesc
.
GetFtnInfo
()
==
rChged
.
GetFtnInfo
())
)
if
(
!
(
rDesc
.
GetFtnInfo
()
==
rChged
.
GetFtnInfo
())
)
{
{
rDesc
.
SetFtnInfo
(
rChged
.
GetFtnInfo
()
);
rDesc
.
SetFtnInfo
(
rChged
.
GetFtnInfo
()
);
SwMsgPoolItem
aInfo
(
RES_PAGEDESC_FTNINFO
);
sw
::
PageFootnoteHint
aHint
;
{
rDesc
.
GetMaster
().
CallSwClientNotify
(
aHint
);
rDesc
.
GetMaster
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
rDesc
.
GetLeft
().
CallSwClientNotify
(
aHint
);
}
rDesc
.
GetFirstMaster
().
CallSwClientNotify
(
aHint
);
{
rDesc
.
GetFirstLeft
().
CallSwClientNotify
(
aHint
);
rDesc
.
GetLeft
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
{
rDesc
.
GetFirstMaster
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
{
rDesc
.
GetFirstLeft
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
}
}
getIDocumentState
().
SetModified
();
getIDocumentState
().
SetModified
();
...
...
sw/source/core/doc/docfmt.cxx
Dosyayı görüntüle @
9e83083f
...
@@ -1507,20 +1507,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
...
@@ -1507,20 +1507,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
// If foot notes change the pages have to be triggered
// If foot notes change the pages have to be triggered
if
(
!
(
rDstDesc
.
GetFtnInfo
()
==
rSrcDesc
.
GetFtnInfo
())
)
if
(
!
(
rDstDesc
.
GetFtnInfo
()
==
rSrcDesc
.
GetFtnInfo
())
)
{
{
sw
::
PageFootnoteHint
aHint
;
rDstDesc
.
SetFtnInfo
(
rSrcDesc
.
GetFtnInfo
()
);
rDstDesc
.
SetFtnInfo
(
rSrcDesc
.
GetFtnInfo
()
);
SwMsgPoolItem
aInfo
(
RES_PAGEDESC_FTNINFO
);
rDstDesc
.
GetMaster
().
CallSwClientNotify
(
aHint
);
{
rDstDesc
.
GetLeft
().
CallSwClientNotify
(
aHint
);
rDstDesc
.
GetMaster
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
rDstDesc
.
GetFirstMaster
().
CallSwClientNotify
(
aHint
);
}
rDstDesc
.
GetFirstLeft
().
CallSwClientNotify
(
aHint
);
{
rDstDesc
.
GetLeft
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
{
rDstDesc
.
GetFirstMaster
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
{
rDstDesc
.
GetFirstLeft
().
ModifyBroadcast
(
&
aInfo
,
0
,
TYPE
(
SwFrm
)
);
}
}
}
}
}
...
...
sw/source/core/inc/pagefrm.hxx
Dosyayı görüntüle @
9e83083f
...
@@ -104,6 +104,7 @@ class SwPageFrm: public SwFtnBossFrm
...
@@ -104,6 +104,7 @@ class SwPageFrm: public SwFtnBossFrm
protected
:
protected
:
virtual
void
MakeAll
()
SAL_OVERRIDE
;
virtual
void
MakeAll
()
SAL_OVERRIDE
;
virtual
void
Modify
(
const
SfxPoolItem
*
,
const
SfxPoolItem
*
)
SAL_OVERRIDE
;
virtual
void
Modify
(
const
SfxPoolItem
*
,
const
SfxPoolItem
*
)
SAL_OVERRIDE
;
virtual
void
SwClientNotify
(
const
SwModify
&
,
const
SfxHint
&
)
SAL_OVERRIDE
;
public
:
public
:
DECL_FIXEDMEMPOOL_NEWDEL
(
SwPageFrm
)
DECL_FIXEDMEMPOOL_NEWDEL
(
SwPageFrm
)
...
...
sw/source/core/layout/pagechg.cxx
Dosyayı görüntüle @
9e83083f
...
@@ -525,6 +525,24 @@ void SwPageFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
...
@@ -525,6 +525,24 @@ void SwPageFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
}
}
}
}
void
SwPageFrm
::
SwClientNotify
(
const
SwModify
&
rModify
,
const
SfxHint
&
rHint
)
{
if
(
typeid
(
sw
::
PageFootnoteHint
)
==
typeid
(
rHint
))
{
// currently the savest way:
static_cast
<
SwRootFrm
*>
(
GetUpper
())
->
SetSuperfluous
();
SetMaxFtnHeight
(
pDesc
->
GetFtnInfo
().
GetHeight
());
if
(
!
GetMaxFtnHeight
())
SetMaxFtnHeight
(
LONG_MAX
);
SetColMaxFtnHeight
();
// here, the page might be destroyed:
static_cast
<
SwRootFrm
*>
(
GetUpper
())
->
RemoveFtns
(
0
,
false
,
true
);
}
else
SwClient
::
SwClientNotify
(
rModify
,
rHint
);
}
void
SwPageFrm
::
_UpdateAttr
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
,
void
SwPageFrm
::
_UpdateAttr
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
,
sal_uInt8
&
rInvFlags
,
sal_uInt8
&
rInvFlags
,
SwAttrSetChg
*
pOldSet
,
SwAttrSetChg
*
pNewSet
)
SwAttrSetChg
*
pOldSet
,
SwAttrSetChg
*
pNewSet
)
...
@@ -632,17 +650,6 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
...
@@ -632,17 +650,6 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
case
RES_TEXTGRID
:
case
RES_TEXTGRID
:
rInvFlags
|=
0x60
;
rInvFlags
|=
0x60
;
break
;
break
;
case
RES_PAGEDESC_FTNINFO
:
// currently the savest way:
static_cast
<
SwRootFrm
*>
(
GetUpper
())
->
SetSuperfluous
();
SetMaxFtnHeight
(
pDesc
->
GetFtnInfo
().
GetHeight
()
);
if
(
!
GetMaxFtnHeight
()
)
SetMaxFtnHeight
(
LONG_MAX
);
SetColMaxFtnHeight
();
// here, the page might be destroyed:
static_cast
<
SwRootFrm
*>
(
GetUpper
())
->
RemoveFtns
(
0
,
false
,
true
);
break
;
case
RES_FRAMEDIR
:
case
RES_FRAMEDIR
:
CheckDirChange
();
CheckDirChange
();
break
;
break
;
...
...
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