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
8518cf42
Kaydet (Commit)
8518cf42
authored
Kas 27, 2013
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
DOCX drawingML shape import: fix position of group shapes
Change-Id: Ib5db40ecd5782d729d406b285d3399cc2626e335
üst
289e54fe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
wpg-only.docx
sw/qa/extras/ooxmlimport/data/wpg-only.docx
+0
-0
ooxmlimport.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+7
-0
GraphicImport.cxx
writerfilter/source/dmapper/GraphicImport.cxx
+5
-0
No files found.
sw/qa/extras/ooxmlimport/data/wpg-only.docx
0 → 100755
Dosyayı görüntüle @
8518cf42
File added
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Dosyayı görüntüle @
8518cf42
...
...
@@ -1548,6 +1548,13 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, "textbox-wps-only.docx")
CPPUNIT_ASSERT_EQUAL
(
sal_Int32
(
2805
),
getProperty
<
sal_Int32
>
(
xFrame
,
"VertOrientPosition"
));
}
DECLARE_OOXMLIMPORT_TEST
(
testWpgOnly
,
"wpg-only.docx"
)
{
uno
::
Reference
<
drawing
::
XShape
>
xShape
=
getShape
(
1
);
// Check position, it was nearly 0. This is a shape, so use getPosition(), not a property.
CPPUNIT_ASSERT_EQUAL
(
sal_Int32
(
EMU_TO_MM100
(
548005
)),
xShape
->
getPosition
().
X
);
}
DECLARE_OOXMLIMPORT_TEST
(
testFdo70457
,
"fdo70457.docx"
)
{
// The document contains a rotated bitmap
...
...
writerfilter/source/dmapper/GraphicImport.cxx
Dosyayı görüntüle @
8518cf42
...
...
@@ -1029,6 +1029,11 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
// For non-textframes, this is handled already in oox::drawingml::Shape::createAndInsert().
m_pImpl
->
applyPosition
(
xShapeProps
);
}
else
if
(
xServiceInfo
->
supportsService
(
"com.sun.star.drawing.GroupShape"
))
{
// Position of the groupshape should be set after children have been added.
m_xShape
->
setPosition
(
awt
::
Point
(
m_pImpl
->
nLeftPosition
,
m_pImpl
->
nTopPosition
));
}
m_pImpl
->
applyMargins
(
xShapeProps
);
bool
bOpaque
=
m_pImpl
->
bOpaque
&&
!
m_pImpl
->
rDomainMapper
.
IsInHeaderFooter
();
...
...
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