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
78766aaa
Kaydet (Commit)
78766aaa
authored
Eki 02, 2014
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
DOCX import: handle <w:tcPr> directly under <w:style>
Change-Id: I10dfb947bbd9e792c98932608acb2f0987fd8605
üst
dc358107
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
table-style-cell-back-color.docx
.../extras/ooxmlexport/data/table-style-cell-back-color.docx
+0
-0
ooxmlexport.cxx
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+11
-0
StyleSheetTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
+3
-0
No files found.
sw/qa/extras/ooxmlexport/data/table-style-cell-back-color.docx
0 → 100644
Dosyayı görüntüle @
78766aaa
File added
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Dosyayı görüntüle @
78766aaa
...
@@ -367,6 +367,17 @@ DECLARE_OOXMLEXPORT_TEST(testWpsCharColor, "wps-char-color.docx")
...
@@ -367,6 +367,17 @@ DECLARE_OOXMLEXPORT_TEST(testWpsCharColor, "wps-char-color.docx")
CPPUNIT_ASSERT_EQUAL
(
sal_Int32
(
0xffffff
),
getProperty
<
sal_Int32
>
(
xShape
->
getStart
(),
"CharColor"
));
CPPUNIT_ASSERT_EQUAL
(
sal_Int32
(
0xffffff
),
getProperty
<
sal_Int32
>
(
xShape
->
getStart
(),
"CharColor"
));
}
}
DECLARE_OOXMLEXPORT_TEST
(
testTableStyleCellBackColor
,
"table-style-cell-back-color.docx"
)
{
// The problem was that cell background was white, not green.
uno
::
Reference
<
text
::
XTextTablesSupplier
>
xTextTablesSupplier
(
mxComponent
,
uno
::
UNO_QUERY
);
uno
::
Reference
<
container
::
XIndexAccess
>
xTables
(
xTextTablesSupplier
->
getTextTables
(),
uno
::
UNO_QUERY
);
uno
::
Reference
<
text
::
XTextTable
>
xTable
(
xTables
->
getByIndex
(
0
),
uno
::
UNO_QUERY
);
uno
::
Reference
<
table
::
XCell
>
xCell
=
xTable
->
getCellByName
(
"A1"
);
// This was 0xffffff.
CPPUNIT_ASSERT_EQUAL
(
sal_Int32
(
0x00ff00
),
getProperty
<
sal_Int32
>
(
xCell
,
"BackColor"
));
}
CPPUNIT_PLUGIN_IMPLEMENT
();
CPPUNIT_PLUGIN_IMPLEMENT
();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
writerfilter/source/dmapper/StyleSheetTable.cxx
Dosyayı görüntüle @
78766aaa
...
@@ -574,6 +574,9 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
...
@@ -574,6 +574,9 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
StyleSheetEntry
*
pEntry
=
m_pImpl
->
m_pCurrentEntry
.
get
();
StyleSheetEntry
*
pEntry
=
m_pImpl
->
m_pCurrentEntry
.
get
();
TableStyleSheetEntry
&
rTableEntry
=
dynamic_cast
<
TableStyleSheetEntry
&>
(
*
pEntry
);
TableStyleSheetEntry
&
rTableEntry
=
dynamic_cast
<
TableStyleSheetEntry
&>
(
*
pEntry
);
rTableEntry
.
AppendInteropGrabBag
(
pTblStylePrHandler
->
getInteropGrabBag
(
"tcPr"
));
rTableEntry
.
AppendInteropGrabBag
(
pTblStylePrHandler
->
getInteropGrabBag
(
"tcPr"
));
// This is a <w:tcPr> directly under <w:style>, so it affects the whole table.
rTableEntry
.
pProperties
->
InsertProps
(
pTblStylePrHandler
->
getProperties
());
}
}
}
}
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