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
51a61bd4
Kaydet (Commit)
51a61bd4
authored
Ara 06, 2013
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
DOCX import: fix relativeFrom=page, align=right handling
Change-Id: I9c1df594457a8ccbbebf4ede61cc3a637ecc7023
üst
4c810119
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
ooxmlimport.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+2
-0
GraphicImport.cxx
writerfilter/source/dmapper/GraphicImport.cxx
+9
-0
No files found.
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Dosyayı görüntüle @
51a61bd4
...
...
@@ -1561,6 +1561,8 @@ DECLARE_OOXMLIMPORT_TEST(testWpgNested, "wpg-nested.docx")
uno
::
Reference
<
drawing
::
XShapeDescriptor
>
xShapeDescriptor
(
xGroup
->
getByIndex
(
0
),
uno
::
UNO_QUERY
);
// This was a com.sun.star.drawing.CustomShape, due to lack of handling of groupshapes inside groupshapes.
CPPUNIT_ASSERT_EQUAL
(
OUString
(
"com.sun.star.drawing.GroupShape"
),
xShapeDescriptor
->
getShapeType
());
// This was text::RelOrientation::PAGE_FRAME, effectively placing the group shape on the left side of the page instead of the right one.
CPPUNIT_ASSERT_EQUAL
(
text
::
RelOrientation
::
PAGE_RIGHT
,
getProperty
<
sal_Int16
>
(
xGroup
,
"HoriOrientRelation"
));
}
DECLARE_OOXMLIMPORT_TEST
(
textboxWpgOnly
,
"textbox-wpg-only.docx"
)
...
...
writerfilter/source/dmapper/GraphicImport.cxx
Dosyayı görüntüle @
51a61bd4
...
...
@@ -1303,6 +1303,15 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
m_pImpl
->
nHoriRelation
=
pHandler
->
relation
();
m_pImpl
->
nHoriOrient
=
pHandler
->
orientation
();
m_pImpl
->
nLeftPosition
=
pHandler
->
position
();
if
(
m_pImpl
->
nHoriRelation
==
text
::
RelOrientation
::
PAGE_FRAME
&&
m_pImpl
->
nHoriOrient
==
text
::
HoriOrientation
::
RIGHT
)
{
// If the shape is relative from page and aligned to
// right, then set the relation to right and clear the
// orientation, that provides the same visual result as
// Word.
m_pImpl
->
nHoriRelation
=
text
::
RelOrientation
::
PAGE_RIGHT
;
m_pImpl
->
nHoriOrient
=
text
::
HoriOrientation
::
NONE
;
}
}
}
}
...
...
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