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
4f347517
Kaydet (Commit)
4f347517
authored
Eki 13, 2010
tarafından
Sebastian Spaeth
Kaydeden (comit)
Caolán McNamara
Eki 13, 2010
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
translate comments
üst
ee3f3d93
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
23 deletions
+17
-23
ww8graf.cxx
sw/source/filter/ww8/ww8graf.cxx
+17
-23
No files found.
sw/source/filter/ww8/ww8graf.cxx
Dosyayı görüntüle @
4f347517
...
@@ -3004,18 +3004,15 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
...
@@ -3004,18 +3004,15 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
long
nStartCp
;
long
nStartCp
;
long
nEndCp
;
long
nEndCp
;
//
Pruefen, ob in dieser Textbox-Kette denn Text enthalten ist. (
//
Check if this textbox chain contains text as conversion of an empty
//
Umwandeln einer leeren Kette in Rahmen waere Unsinn. )
//
chain would not make sense.
if
(
TxbxChainContainsRealText
(
pRecord
->
aTextId
.
nTxBxS
,
nStartCp
,
nEndCp
)
)
if
(
TxbxChainContainsRealText
(
pRecord
->
aTextId
.
nTxBxS
,
nStartCp
,
nEndCp
)
)
{
{
// Der Text wird nicht in das SdrTextObj eingelesen! Stattdessen wird
// The Text is not read into SdrTextObj! Rather insert a frame and
// ein Rahmen eingefuegt und der Text von nStartCp bis nEndCp dort
// insert the text from nStartCp to nEndCp.
// hinein gelesen.
//
//
// Vorteil: im Rahmen sind viel mehr Attribute moeglich als in der
// More attributes can be used in a frame compared to the
// Edit-Enging, und es koennen auch Felder, OLEs oder Grafiken darin
// Edit-Enging, and it can contain field, OLEs or graphics...
// sein...
Rectangle
aInnerDist
(
pRecord
->
nDxTextLeft
,
pRecord
->
nDyTextTop
,
Rectangle
aInnerDist
(
pRecord
->
nDxTextLeft
,
pRecord
->
nDyTextTop
,
pRecord
->
nDxTextRight
,
pRecord
->
nDyTextBottom
);
pRecord
->
nDxTextRight
,
pRecord
->
nDyTextBottom
);
...
@@ -3035,18 +3032,17 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
...
@@ -3035,18 +3032,17 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
ASSERT
(
pRetFrmFmt
->
GetAnchor
().
GetAnchorId
()
==
eAnchor
,
ASSERT
(
pRetFrmFmt
->
GetAnchor
().
GetAnchorId
()
==
eAnchor
,
"Not the anchor type requested!"
);
"Not the anchor type requested!"
);
//
falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
//
if everything is OK, find pointer on new object and correct
//
entsprechend korrigieren (oder Eintrag loeschen
)
//
Z-order list (oder delete entry
)
rpOurNewObject
=
CreateContactObject
(
pRetFrmFmt
);
rpOurNewObject
=
CreateContactObject
(
pRetFrmFmt
);
//
altes Objekt aus der Z-Order-Liste entfernen
//
remove old object from the Z-Order list
pMSDffManager
->
RemoveFromShapeOrder
(
rpObject
);
pMSDffManager
->
RemoveFromShapeOrder
(
rpObject
);
//
und das Objekt loeschen
//
and delete the object
SdrObject
::
Free
(
rpObject
);
SdrObject
::
Free
(
rpObject
);
/*
/*
Achtung: ab jetzt nur noch pOrgShapeObject
NB: only query pOrgShapeObject starting here!
abfragen!
*/
*/
if
(
rpOurNewObject
)
if
(
rpOurNewObject
)
...
@@ -3067,23 +3063,21 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
...
@@ -3067,23 +3063,21 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
(((
ULONG
)
pRecord
->
aTextId
.
nTxBxS
)
<<
16
)
+
(((
ULONG
)
pRecord
->
aTextId
.
nTxBxS
)
<<
16
)
+
pRecord
->
aTextId
.
nSequence
,
0
,
pRetFrmFmt
);
pRecord
->
aTextId
.
nSequence
,
0
,
pRetFrmFmt
);
// Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit
// The Kontakt object has to be inserted into the draw page, so
// in SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden
// SwWW8ImplReader::LoadDoc1() can determine the z-order.
// kann !!!
if
(
!
rpOurNewObject
->
IsInserted
())
if
(
!
rpOurNewObject
->
IsInserted
())
{
{
//
--> OD
2004-12-13 #117915# - pass information, if object
// 2004-12-13 #117915# - pass information, if object
// is in page header|footer to method.
// is in page header|footer to method.
pWWZOrder
->
InsertEscherObject
(
rpOurNewObject
,
pF
->
nSpId
,
pWWZOrder
->
InsertEscherObject
(
rpOurNewObject
,
pF
->
nSpId
,
bIsHeader
||
bIsFooter
);
bIsHeader
||
bIsFooter
);
// <--
}
}
}
}
// Box-0
erhaelt den Text fuer die ganze Kette
!
// Box-0
receives the text for the whole chain
!
if
(
!
pRecord
->
aTextId
.
nSequence
)
if
(
!
pRecord
->
aTextId
.
nSequence
)
{
{
//
rette Flags u.ae. und setze sie zurueck
//
save flags etc and reset them
WW8ReaderSave
aSave
(
this
);
WW8ReaderSave
aSave
(
this
);
MoveInsideFly
(
pRetFrmFmt
);
MoveInsideFly
(
pRetFrmFmt
);
...
@@ -3092,7 +3086,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
...
@@ -3092,7 +3086,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
pWWZOrder
->
InsideEscher
(
pF
->
nSpId
);
pWWZOrder
->
InsideEscher
(
pF
->
nSpId
);
//
lies den Text ein
//
read in the text
bTxbxFlySection
=
true
;
bTxbxFlySection
=
true
;
bool
bJoined
=
ReadText
(
nStartCp
,
(
nEndCp
-
nStartCp
),
bool
bJoined
=
ReadText
(
nStartCp
,
(
nEndCp
-
nStartCp
),
MAN_MAINTEXT
==
pPlcxMan
->
GetManType
()
?
MAN_MAINTEXT
==
pPlcxMan
->
GetManType
()
?
...
...
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