Review Request 109370: Support same style names in different families

[Thorsten Zachmann]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/109370/
-----------------------------------------------------------

Review request for Calligra and Matus Uzak.


Description
-------

When testing roundtrip for headers/footers in words it happens that the header/footers are no longer shown after roundtrip. Problem is that the style used for the page style gets it's name change but is expected to be standard.
This patch adds the possibility to have same style names if the family is different.

This also fixes an import problem for doc files when the char and paragrpah style has the same name then the wrong style was used.


Diffs
-----

  filters/libmso/ODrawToOdf.cpp ac589a9 
  filters/libmsooxml/MsooXmlUtils.cpp d45089a 
  filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp a4e2b5f 
  filters/words/docx/DocxXmlDocumentReader.h 97916ee 
  filters/words/docx/DocxXmlDocumentReader.cpp df81026 
  filters/words/msword-odf/paragraph.cpp 3308d8d 
  filters/words/msword-odf/tablehandler.cpp 285f4f7 
  filters/words/msword-odf/texthandler.cpp 4473736 
  libs/koreport/renderer/odtframe/KoOdtFrameReportDocument.cpp 51c5958 
  libs/kotext/styles/KoStyleManager.cpp c2a64e9 
  libs/odf/KoGenStyle.cpp 11b1888 
  libs/odf/KoGenStyles.h 8041441 
  libs/odf/KoGenStyles.cpp 7a92453 
  libs/odf/tests/TestKoGenStyles.cpp 5818091 

Diff: http://git.reviewboard.kde.org/r/109370/diff/


Testing
-------

cstester and roundtrip testing 


Thanks,

Thorsten Zachmann

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20130309/c3f55f0c/attachment.htm>