mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement RtfAttributeOutput::PlaceholderField

Browse Source 
Change-Id: Ib6fd380736c5567a98317ec117969d8c76a31f02
This commit is contained in:
Miklos Vajna
2013-03-29 12:30:52 +01:00
parent 3f4d1e1778
commit 71ccb4b031
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/rtfexport/data/placeholder.odt Normal file
View File

Binary file not shown.

11
sw/qa/extras/rtfexport/rtfexport.cxx
View File

@@ -72,6 +72,7 @@ public:
void testFdo52286();
void testFdo61507();
void testFdo30983();
void testPlaceholder();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -118,6 +119,7 @@ void Test::run()
{"fdo52286.odt", &Test::testFdo52286},
{"fdo61507.rtf", &Test::testFdo61507},
{"fdo30983.rtf", &Test::testFdo30983},
{"placeholder.odt", &Test::testPlaceholder},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -495,6 +497,15 @@ void Test::testFdo30983()
CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xDraws->getByIndex(0), "VertOrientRelation"));
}
void Test::testPlaceholder()
{
// Only the field text was exported, make sure we still have a field with the correct Hint text.
uno::Reference<text::XTextRange> xRun(getRun(getParagraph(1), 2));
CPPUNIT_ASSERT_EQUAL(OUString("TextField"), getProperty<OUString>(xRun, "TextPortionType"));
uno::Reference<beans::XPropertySet> xField = getProperty< uno::Reference<beans::XPropertySet> >(xRun, "TextField");
CPPUNIT_ASSERT_EQUAL(OUString("place holder"), getProperty<OUString>(xField, "Hint"));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();

7
sw/source/filter/ww8/rtfattributeoutput.cxx
View File

@@ -3074,9 +3074,12 @@ bool RtfAttributeOutput::DropdownField( const SwField* /*pFld*/ )
return true;
}
bool RtfAttributeOutput::PlaceholderField( const SwField* )
bool RtfAttributeOutput::PlaceholderField( const SwField* pField)
{
return true; // expand to text?
m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST " MACROBUTTON None ");
RunText(pField->GetPar1());
m_aRunText->append("}}");
return false; // do not expand
}
RtfAttributeOutput::RtfAttributeOutput( RtfExport &rExport )