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
5cbe4bcc
Kaydet (Commit)
5cbe4bcc
authored
Ara 02, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tdf#94043 RTF filter: implement column separator handling
Change-Id: I9d74642156d7bb79577671bae24346c75178c5c7
üst
34cf91de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
0 deletions
+32
-0
tdf94043.rtf
sw/qa/extras/rtfexport/data/tdf94043.rtf
+17
-0
rtfexport.cxx
sw/qa/extras/rtfexport/rtfexport.cxx
+9
-0
rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.cxx
+3
-0
rtfdocumentimpl.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
+3
-0
No files found.
sw/qa/extras/rtfexport/data/tdf94043.rtf
0 → 100644
Dosyayı görüntüle @
5cbe4bcc
{\rtf1
\pard\plain
{AAA}
\par \sect\sectd\cols2\linebetcol\colsx0\ltrsect\sbknone\pard\plain
{\rtlch \ltrch\loch
Section 1, first column, this has a separator.}
\par \pard\plain
{Section 1, second column.}
\par \sect\sectd\sbknone\pard\plain
{BBB}
\par \sect\sectd\cols2\colsx0\ltrsect\sbknone\pard\plain
{Section 2, first column, this has no separator.}
\par \pard\plain
{Section 2, second column.}
\par \sect\sectd\sbknone\pard\plain
{CCC}
\par }
sw/qa/extras/rtfexport/rtfexport.cxx
Dosyayı görüntüle @
5cbe4bcc
...
...
@@ -28,6 +28,7 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/view/XViewSettingsSupplier.hpp>
#include <com/sun/star/text/RubyAdjust.hpp>
#include <com/sun/star/text/XTextColumns.hpp>
#include <vcl/svapp.hxx>
...
...
@@ -943,6 +944,14 @@ DECLARE_RTFEXPORT_TEST(testTdf92521, "tdf92521.odt")
CPPUNIT_ASSERT_EQUAL
(
2
,
getPages
());
}
DECLARE_RTFEXPORT_TEST
(
testTdf94043
,
"tdf94043.rtf"
)
{
auto
xTextSection
=
getProperty
<
uno
::
Reference
<
beans
::
XPropertySet
>
>
(
getParagraph
(
2
),
"TextSection"
);
auto
xTextColumns
=
getProperty
<
uno
::
Reference
<
text
::
XTextColumns
>
>
(
xTextSection
,
"TextColumns"
);
// This was 0, the separator line was not visible due to 0 width.
CPPUNIT_ASSERT_EQUAL
(
static_cast
<
sal_Int32
>
(
2
),
getProperty
<
sal_Int32
>
(
xTextColumns
,
"SeparatorLineWidth"
));
}
CPPUNIT_PLUGIN_IMPLEMENT
();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/filter/ww8/rtfattributeoutput.cxx
Dosyayı görüntüle @
5cbe4bcc
...
...
@@ -3330,6 +3330,9 @@ void RtfAttributeOutput::FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol&
m_rExport
.
Strm
().
WriteCharPtr
(
OOO_STRING_SVTOOLS_RTF_COLS
);
m_rExport
.
OutLong
(
nCols
);
if
(
rCol
.
GetLineAdj
()
!=
COLADJ_NONE
)
m_rExport
.
Strm
().
WriteCharPtr
(
OOO_STRING_SVTOOLS_RTF_LINEBETCOL
);
if
(
bEven
)
{
m_rExport
.
Strm
().
WriteCharPtr
(
OOO_STRING_SVTOOLS_RTF_COLSX
);
...
...
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Dosyayı görüntüle @
5cbe4bcc
...
...
@@ -3530,6 +3530,9 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case
RTF_WIDOWCTRL
:
m_aSettingsTableSprms
.
set
(
NS_ooxml
::
LN_CT_Settings_widowControl
,
std
::
make_shared
<
RTFValue
>
(
1
));
break
;
case
RTF_LINEBETCOL
:
lcl_putNestedAttribute
(
m_aStates
.
top
().
aSectionSprms
,
NS_ooxml
::
LN_EG_SectPrContents_cols
,
NS_ooxml
::
LN_CT_Columns_sep
,
std
::
make_shared
<
RTFValue
>
(
1
));
break
;
default
:
{
SAL_INFO
(
"writerfilter"
,
"TODO handle flag '"
<<
lcl_RtfToString
(
nKeyword
)
<<
"'"
);
...
...
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