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
bcee1962
Kaydet (Commit)
bcee1962
authored
Tem 27, 2012
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SvxMSDffManager::CheckTxBxStoryChain: translate comments
Change-Id: I24643236d0beda0e91576119ed42d296d7dfdd71
üst
ce66ded6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
12 deletions
+9
-12
msdffimp.cxx
filter/source/msfilter/msdffimp.cxx
+9
-12
No files found.
filter/source/msfilter/msdffimp.cxx
Dosyayı görüntüle @
bcee1962
...
@@ -5903,8 +5903,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
...
@@ -5903,8 +5903,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
void
SvxMSDffManager
::
CheckTxBxStoryChain
()
void
SvxMSDffManager
::
CheckTxBxStoryChain
()
{
{
m_pShapeInfosById
.
reset
(
new
SvxMSDffShapeInfos_ById
);
m_pShapeInfosById
.
reset
(
new
SvxMSDffShapeInfos_ById
);
// altes Info-Array ueberarbeiten
// mangle old Info array, sorted by nTxBxComp
// (ist sortiert nach nTxBxComp)
sal_uLong
nChain
=
ULONG_MAX
;
sal_uLong
nChain
=
ULONG_MAX
;
sal_Bool
bSetReplaceFALSE
=
sal_False
;
sal_Bool
bSetReplaceFALSE
=
sal_False
;
for
(
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
iter
=
for
(
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
iter
=
...
@@ -5916,21 +5915,21 @@ void SvxMSDffManager::CheckTxBxStoryChain()
...
@@ -5916,21 +5915,21 @@ void SvxMSDffManager::CheckTxBxStoryChain()
if
(
pObj
->
nTxBxComp
)
if
(
pObj
->
nTxBxComp
)
{
{
pObj
->
bLastBoxInChain
=
sal_False
;
pObj
->
bLastBoxInChain
=
sal_False
;
//
Gruppenwechsel
?
//
group change
?
// #156763#
// #156763#
// the text id also contains an internal drawing container id
// the text id also contains an internal drawing container id
// to distinguish between text id of drawing objects in different
// to distinguish between text id of drawing objects in different
// drawing containers.
// drawing containers.
if
(
nChain
!=
pObj
->
nTxBxComp
)
if
(
nChain
!=
pObj
->
nTxBxComp
)
{
{
//
voriger war letzter seiner Gruppe
//
previous was last of its group
if
(
iter
!=
m_pShapeInfosByTxBxComp
->
begin
())
if
(
iter
!=
m_pShapeInfosByTxBxComp
->
begin
())
{
{
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
prev
(
iter
);
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
prev
(
iter
);
--
prev
;
--
prev
;
(
*
prev
)
->
bLastBoxInChain
=
true
;
(
*
prev
)
->
bLastBoxInChain
=
true
;
}
}
//
Merker und Hilfs-Flag zuruecksetzen
//
reset mark and helper flag
mark
=
iter
;
mark
=
iter
;
nChain
=
pObj
->
nTxBxComp
;
nChain
=
pObj
->
nTxBxComp
;
bSetReplaceFALSE
=
!
pObj
->
bReplaceByFly
;
bSetReplaceFALSE
=
!
pObj
->
bReplaceByFly
;
...
@@ -5938,10 +5937,9 @@ void SvxMSDffManager::CheckTxBxStoryChain()
...
@@ -5938,10 +5937,9 @@ void SvxMSDffManager::CheckTxBxStoryChain()
else
else
if
(
!
pObj
->
bReplaceByFly
)
if
(
!
pObj
->
bReplaceByFly
)
{
{
// Objekt, das NICHT durch Rahmen ersetzt werden darf ?
// object that must NOT be replaced by frame?
// Hilfs-Flag setzen
bSetReplaceFALSE
=
sal_True
;
bSetReplaceFALSE
=
sal_True
;
//
ggfs Flag in Anfang der Gruppe austragen
//
maybe reset flags in start of group
for
(
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
itemp
=
mark
;
for
(
SvxMSDffShapeInfos_ByTxBxComp
::
iterator
itemp
=
mark
;
itemp
!=
iter
;
++
itemp
)
itemp
!=
iter
;
++
itemp
)
{
{
...
@@ -5954,17 +5952,16 @@ void SvxMSDffManager::CheckTxBxStoryChain()
...
@@ -5954,17 +5952,16 @@ void SvxMSDffManager::CheckTxBxStoryChain()
pObj
->
bReplaceByFly
=
sal_False
;
pObj
->
bReplaceByFly
=
sal_False
;
}
}
}
}
// alle Shape-Info-Objekte in pShapeInfos umkopieren
// copy all Shape Info objects to m_pShapeInfosById, sorted by nShapeId
// (aber nach nShapeId sortieren)
pObj
->
nTxBxComp
=
pObj
->
nTxBxComp
&
0xFFFF0000
;
pObj
->
nTxBxComp
=
pObj
->
nTxBxComp
&
0xFFFF0000
;
m_pShapeInfosById
->
insert
(
pObj
);
m_pShapeInfosById
->
insert
(
pObj
);
}
}
//
voriger war letzter seiner Gruppe
//
last one was last of its group
if
(
!
m_pShapeInfosByTxBxComp
->
empty
())
if
(
!
m_pShapeInfosByTxBxComp
->
empty
())
{
{
(
*
m_pShapeInfosByTxBxComp
->
rbegin
())
->
bLastBoxInChain
=
true
;
(
*
m_pShapeInfosByTxBxComp
->
rbegin
())
->
bLastBoxInChain
=
true
;
}
}
//
urspruengliches Array freigeben, ohne Objekte zu zerstoeren
//
free original array but don't free its elements
m_pShapeInfosByTxBxComp
.
reset
();
m_pShapeInfosByTxBxComp
.
reset
();
}
}
...
...
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