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

tdf#123341 XLSX: fix vertical alignment in comments

Browse Source 
Import and export of VML element TextVAlign weren't
supported by Calc, losing vertical aligment of the
comments assigned to the spreadsheet cells.

Change-Id: Ice70d3c65021902991ae869b6c60e30e4cdef8c3
Reviewed-on: https://gerrit.libreoffice.org/78816
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
Szabolcs Toth 2019-09-11 13:49:56 +02:00 committed by László Németh
parent 1ab80992b8
commit 89c0b79911
4 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sc/qa/unit/data/ods/CommentTextVAlign.ods Executable file
View File

Binary file not shown.

18
sc/qa/unit/subsequent_export-test.cxx
View File

@ -222,6 +222,7 @@ public:
void testTdf79972XLSX();
void testTdf126024XLSX();
void testTdf126177XLSX();
void testCommentTextVAlignment();
void testXltxExport();
@ -349,6 +350,7 @@ public:
CPPUNIT_TEST(testTdf79972XLSX);
CPPUNIT_TEST(testTdf126024XLSX);
CPPUNIT_TEST(testTdf126177XLSX);
CPPUNIT_TEST(testCommentTextVAlignment);
CPPUNIT_TEST(testXltxExport);
@ -4486,6 +4488,22 @@ void ScExportTest::testTdf126177XLSX()
assertXPath(pXmlRels, "/r:Relationships/r:Relationship", "TargetMode", "External");
}
void ScExportTest::testCommentTextVAlignment()
{
// Testing comment text alignments.
ScDocShellRef xShell = loadDoc("CommentTextVAlign.", FORMAT_ODS);
CPPUNIT_ASSERT(xShell.is());
std::shared_ptr<utl::TempFile> pXPathFile
= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
const xmlDocPtr pVmlDrawing
= XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/drawings/vmlDrawing1.vml");
CPPUNIT_ASSERT(pVmlDrawing);
assertXPathContent(pVmlDrawing, "/xml/v:shape/xx:ClientData/xx:TextVAlign", "Center");
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();

7
sc/source/filter/oox/commentsbuffer.cxx Normal file → Executable file
View File

@ -64,10 +64,13 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
switch( nAlign )
{
case XML_top:
case XML_Top:
return SDRTEXTVERTADJUST_TOP;
case XML_center:
case XML_Center:
return SDRTEXTVERTADJUST_CENTER;
case XML_bottom:
case XML_Bottom:
return SDRTEXTVERTADJUST_BOTTOM;
default:
return SDRTEXTVERTADJUST_BLOCK;
@ -164,6 +167,10 @@ void Comment::finalizeImport()
pNoteShape->convertFormatting( xAnnoShape );
// visibility
bVisible = pNoteShape->getTypeModel().mbVisible;
// Setting comment text alignment
const ::oox::vml::ClientData* xClientData = pNoteShape->getClientData();
aCommentPr.setProperty(PROP_TextVerticalAdjust, lcl_ToVertAlign(xClientData->mnTextVAlign));
}
xAnno->setIsVisible( bVisible );

21
sc/source/filter/xcl97/xcl97rec.cxx Normal file → Executable file
View File

@ -624,6 +624,22 @@ sal_Int32 VmlCommentExporter::StartShape()
return nId;
}
static const char* lcl_GetVertAlignFromItemSetChar( const SfxItemSet& rItemSet )
{
switch( rItemSet.Get( SDRATTR_TEXT_VERTADJUST ).GetValue() )
{
case SDRTEXTVERTADJUST_CENTER:
return "Center";
case SDRTEXTVERTADJUST_BOTTOM:
return "Bottom";
case SDRTEXTVERTADJUST_BLOCK:
return "Justify";
case SDRTEXTVERTADJUST_TOP:
default:
return "Top";
}
}
void VmlCommentExporter::EndShape( sal_Int32 nShapeElement )
{
char pAnchor[100];
@ -632,11 +648,15 @@ void VmlCommentExporter::EndShape( sal_Int32 nShapeElement )
maFrom.Left(), maFrom.Top(), maFrom.Right(), maFrom.Bottom(),
maTo.Left(), maTo.Top(), maTo.Right(), maTo.Bottom() );
// Getting comment text alignments
const char* pVertAlign = lcl_GetVertAlignFromItemSetChar(mpCaption->GetMergedItemSet());
pVmlDrawing->startElement(FSNS(XML_x, XML_ClientData), XML_ObjectType, "Note");
pVmlDrawing->singleElement(FSNS(XML_x, XML_MoveWithCells));
pVmlDrawing->singleElement(FSNS(XML_x, XML_SizeWithCells));
XclXmlUtils::WriteElement( pVmlDrawing, FSNS( XML_x, XML_Anchor ), pAnchor );
XclXmlUtils::WriteElement( pVmlDrawing, FSNS( XML_x, XML_AutoFill ), "False" );
XclXmlUtils::WriteElement( pVmlDrawing, FSNS( XML_x, XML_TextVAlign ), pVertAlign );
XclXmlUtils::WriteElement( pVmlDrawing, FSNS( XML_x, XML_Row ), maScPos.Row() );
XclXmlUtils::WriteElement( pVmlDrawing, FSNS(XML_x, XML_Column), sal_Int32(maScPos.Col()));
if(mbVisible)
@ -731,6 +751,7 @@ static sal_uInt8 lcl_GetVerAlignFromItemSet( const SfxItemSet& rItemSet )
case SDRTEXTVERTADJUST_CENTER: nVerAlign = EXC_OBJ_VER_CENTER; break;
case SDRTEXTVERTADJUST_BOTTOM: nVerAlign = EXC_OBJ_VER_BOTTOM; break;
case SDRTEXTVERTADJUST_BLOCK: nVerAlign = EXC_OBJ_VER_JUSTIFY; break;
default:;
}
return nVerAlign;
}