subject:"\[Libreoffice\-commits\] core.git\: 4 commits \- writerfilter\/source"

[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlsecurity/inc xmlsecurity/source

2016-02-10 Thread Miklos Vajna

 writerfilter/source/filter/WriterFilter.cxx|8 -
 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx |4 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |2 
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |2 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |6 -
 xmlsecurity/source/helper/xsecctl.cxx  |   79 -
 xmlsecurity/source/helper/xsecctl.hxx  |9 +
 xmlsecurity/source/helper/xsecsign.cxx |4 
 8 files changed, 95 insertions(+), 19 deletions(-)

New commits:
commit e6077ccc69c65156476f1855c5c9711814e8e226
Author: Miklos Vajna 
Date:   Wed Feb 10 12:23:56 2016 +0100

xmlsecurity OOXML export: write RelationshipTransform algo arguments

The usual generator/meta stream and the signatures itself are the
excluded ones. It seems everything else has to be listed explicitly.

Change-Id: Ie0f3e161aa0c2e1cb97ad3d9d012ac78078e287a

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index bc60efd..aa7f7b4 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -31,11 +31,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;
@@ -996,6 +998,21 @@ static bool lcl_isOOXMLBlacklist(const OUString& 
rStreamName)
 return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const 
OUStringLiteral& rLiteral) { return rStreamName.startsWith(rLiteral); }) != 
vBlacklist.end();
 }
 
+/// Should we intentionally not sign this relation type?
+static bool lcl_isOOXMLRelationBlacklist(const OUString& rRelationName)
+{
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
+static
+#endif
+const std::initializer_list vBlacklist =
+{
+
OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties;),
+
OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties;),
+
OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin;)
+};
+return std::find(vBlacklist.begin(), vBlacklist.end(), rRelationName) != 
vBlacklist.end();
+}
+
 void XSecController::exportOOXMLSignature(const 
uno::Reference& xRootStorage, const 
uno::Reference& xDocumentHandler, const 
SignatureInformation& rInformation)
 {
 uno::Reference 
xHierarchicalStorageAccess(xRootStorage, uno::UNO_QUERY);
@@ -,6 +1128,32 @@ void XSecController::exportOOXMLSignature(const 
uno::Reference&
 pAttributeList->AddAttribute(ATTR_ALGORITHM, 
ALGO_RELATIONSHIP);
 xDocumentHandler->startElement(TAG_TRANSFORM, 
uno::Reference(pAttributeList.get()));
 }
+
+uno::Sequence< uno::Sequence > 
aRelationsInfo = 
comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, aURI, mxCtx);
+for (const uno::Sequence& rPairs : 
aRelationsInfo)
+{
+OUString aId;
+OUString aType;
+for (const beans::StringPair& rPair : rPairs)
+{
+if (rPair.First == "Id")
+aId = rPair.Second;
+else if (rPair.First == "Type")
+aType = rPair.Second;
+}
+
+if (lcl_isOOXMLRelationBlacklist(aType))
+continue;
+
+{
+rtl::Reference pAttributeList(new 
SvXMLAttributeList());
+pAttributeList->AddAttribute(ATTR_XMLNS ":" 
NSTAG_MDSSI, NS_MDSSI);
+pAttributeList->AddAttribute(ATTR_SOURCEID, aId);
+xDocumentHandler->startElement(NSTAG_MDSSI ":" 
TAG_RELATIONSHIPREFERENCE, 
uno::Reference(pAttributeList.get()));
+}
+xDocumentHandler->endElement(NSTAG_MDSSI ":" 
TAG_RELATIONSHIPREFERENCE);
+}
+
 xDocumentHandler->endElement(TAG_TRANSFORM);
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
diff --git a/xmlsecurity/source/helper/xsecctl.hxx 
b/xmlsecurity/source/helper/xsecctl.hxx
index 8e87e1e..1bcf180 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -84,20 +84,24 @@
 #define TAG_DESCRIPTION "description"
 #define TAG_QUALIFYINGPROPERTIES "QualifyingProperties"
 #define TAG_SIGNEDPROPERTIES "SignedProperties"
+#define TAG_RELATIONSHIPREFERENCE "RelationshipReference"
 
 #define ATTR_XMLNS  "xmlns"
 #define ATTR_ALGORITHM  "Algorithm"
 #define ATTR_URI"URI"
 #define ATTR_ID "Id"
 #define ATTR_TARGET

[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlhelp/source xmloff/inc xmloff/source xmlsecurity/source

2015-11-24 Thread Noel Grandin

 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |  133 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |2 
 writerfilter/source/dmapper/FontTable.hxx  |   14 -
 writerfilter/source/dmapper/GraphicImport.cxx  |   14 -
 writerfilter/source/dmapper/SettingsTable.cxx  |   32 
 writerfilter/source/dmapper/SettingsTable.hxx  |2 
 writerfilter/source/dmapper/TDefTableHandler.hxx   |2 
 writerfilter/source/dmapper/TablePropertiesHandler.hxx |1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  |2 
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx  |2 
 xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx |2 
 xmlhelp/source/cxxhelp/provider/content.cxx|   10 -
 xmlhelp/source/cxxhelp/provider/content.hxx|9 -
 xmlhelp/source/cxxhelp/provider/databases.hxx  |1 
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx  |2 
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx  |2 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx  |3 
 xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx  |1 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx   |3 
 xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx   |1 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx   |9 -
 xmlhelp/source/cxxhelp/qe/DocGenerator.cxx |1 
 xmloff/inc/txtfldi.hxx |3 
 xmloff/source/core/xmlexp.cxx  |3 
 xmloff/source/draw/XMLImageMapContext.cxx  |2 
 xmloff/source/draw/animationimport.cxx |5 
 xmloff/source/draw/animimp.cxx |2 
 xmloff/source/draw/ximpshap.cxx|1 
 xmloff/source/draw/ximpshap.hxx|1 
 xmloff/source/draw/ximpshow.cxx|7 
 xmloff/source/text/XMLIndexTemplateContext.cxx |1 
 xmloff/source/text/XMLIndexTemplateContext.hxx |1 
 xmloff/source/xforms/xformsexport.cxx  |5 
 xmlsecurity/source/dialogs/certificateviewer.cxx   |1 
 xmlsecurity/source/helper/xsecctl.hxx  |6 
 35 files changed, 83 insertions(+), 203 deletions(-)

New commits:
commit 145a9954116b14a417fd403a13536883dbd5c96e
Author: Noel Grandin 
Date:   Tue Nov 24 09:19:25 2015 +0200

loplugin:unusedfields in xmlsecurity/

Change-Id: I11bb62b0c90de361b7cd06608e77483786750ebb

diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx 
b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 1d81da2..e6d4fef 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -331,7 +331,6 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, 
ElementSelectHdl, SvTreeListBo
 struct CertPath_UserData
 {
 css::uno::Reference< css::security::XCertificate > mxCert;
-OUStringmaStatus;
 bool mbValid;
 
 CertPath_UserData( css::uno::Reference< css::security::XCertificate > 
xCert, bool bValid):
diff --git a/xmlsecurity/source/helper/xsecctl.hxx 
b/xmlsecurity/source/helper/xsecctl.hxx
index 1eb0033..f354bbb 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -303,12 +303,6 @@ private:
 bool m_bIsSAXEventKeeperSticky;
 
 /*
- * fast property vector
- */
-std::vector< sal_Int32 > m_vFastPropertyIndexs;
-std::vector< com::sun::star::uno::Any > m_vFastPropertyValues;
-
-/*
   * error message pointer
   */
 const char *m_pErrorMessage;
commit e0bf7914b45c4236a9266295df915a9079d9ff00
Author: Noel Grandin 
Date:   Tue Nov 24 09:17:04 2015 +0200

loplugin:unusedfields in xmloff/

Change-Id: I1fb9cb1bc04fb0886d6080f62899a04e8fd4429e

diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 2baa311..e9436c4 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1389,10 +1389,7 @@ public:
 
 class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
 {
-OUString sName;
 ::com::sun::star::uno::Any aValue;
-const OUString sPropertyName;
-const OUString sPropertyValue;
 
 public:
 
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1da587b..737e7d1 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -257,9 +257,6 @@ public:
 
 SvtSaveOptions  maSaveOptions;
 
-/// relative path of stream in package, e.g. "someobject/content.xml"
-OUString mStreamPath;
-
 /// name of stream in package, e.g., "content.xml"
 OUString mStreamName;
 
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx 
b/xmloff/source/draw/XMLImageMapContext.cxx
index 2a4dc6d..7c31337 100644
---

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2015-04-15 Thread Miklos Vajna

 writerfilter/source/dmapper/BorderHandler.hxx|2 +-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 ++--
 writerfilter/source/dmapper/NumberingManager.cxx |2 +-
 writerfilter/source/dmapper/PropertyMap.cxx  |2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx  |2 +-
 writerfilter/source/dmapper/TDefTableHandler.cxx |8 +++-
 writerfilter/source/dmapper/TDefTableHandler.hxx |4 +---
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |9 -
 writerfilter/source/dmapper/TablePropertiesHandler.hxx   |3 +--
 writerfilter/source/dmapper/TblStylePrHandler.cxx|2 +-
 10 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 6a09822d28750e23ef6514dfa831e151803c517d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 15 09:18:43 2015 +0200

writerfilter: reduce scope in ListsManager

Change-Id: Ibc2fa865614df4403acee4a2c87a3fb19279

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index ce5628e..e341ff9 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -829,7 +829,6 @@ void ListsManager::lcl_attribute( Id nName, Value rVal )
 
 void ListsManager::lcl_sprm( Sprm rSprm )
 {
-static bool bIsStartVisited = false;
 //fill the attributes of the style sheet
 sal_uInt32 nSprmId = rSprm.getId();
 if( m_pCurrentDefinition.get() ||
@@ -838,6 +837,7 @@ void ListsManager::lcl_sprm( Sprm rSprm )
 (nSprmId == NS_ooxml::LN_CT_NumPicBullet_pict  
m_pCurrentNumPicBullet.get()) ||
 nSprmId == NS_ooxml::LN_CT_Numbering_numPicBullet)
 {
+static bool bIsStartVisited = false;
 sal_Int32 nIntValue = rSprm.getValue()-getInt();
 switch( nSprmId )
 {
commit 53cf9748ccce3660ec3a5b0ad8ad402313af6143
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Apr 15 09:17:19 2015 +0200

writerfilter: TDefTableHandler's bOOXML was always true

Change-Id: I9efcb32f742aa7a0549ceb246a1b75fa3af662be

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index f10718a..a345fdd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -244,7 +244,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 writerfilter::ReferenceProperties::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get())
 {
-TDefTableHandlerPtr pTDefTableHandler( new 
TDefTableHandler(true) );
+TDefTableHandlerPtr pTDefTableHandler( new 
TDefTableHandler() );
 pProperties-resolve( *pTDefTableHandler );
 
 TablePropertyMapPtr pRowPropMap( new TablePropertyMap );
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx 
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 658bea6..18746ce 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -34,13 +34,12 @@ using namespace ::com::sun::star;
 
 
 
-TDefTableHandler::TDefTableHandler(bool bOOXML) :
+TDefTableHandler::TDefTableHandler() :
 LoggedProperties(dmapper_logger, TDefTableHandler),
 m_nLineWidth(0),
 m_nLineType(0),
 m_nLineColor(0),
-m_nLineDistance(0),
-m_bOOXML( bOOXML )
+m_nLineDistance(0)
 {
 }
 
@@ -330,8 +329,7 @@ void TDefTableHandler::localResolve(Id rName, 
writerfilter::ReferenceProperties
 }
 pProperties-resolve( *this );
 table::BorderLine2 aBorderLine;
-ConversionHelper::MakeBorderLine( m_nLineWidth,   m_nLineType, 
m_nLineColor,
-
aBorderLine, m_bOOXML );
+ConversionHelper::MakeBorderLine(m_nLineWidth, m_nLineType, 
m_nLineColor, aBorderLine, /*bIsOOXML=*/true);
 const bool rtl = false; // TODO
 switch( rName )
 {
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx 
b/writerfilter/source/dmapper/TDefTableHandler.hxx
index eb6b37b..65a6f56 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -59,8 +59,6 @@ private:
 sal_Int32   m_nLineColor;
 sal_Int32   m_nLineDistance;
 
-boolm_bOOXML;
-
 OUString m_aInteropGrabBagName;
 std::vectorcss::beans::PropertyValue m_aInteropGrabBag;
 void appendGrabBag(const OUString aKey, const OUString aValue);
@@ -72,7 +70,7 @@ private:
 virtual void lcl_sprm(Sprm  sprm) SAL_OVERRIDE;
 
 public:
-TDefTableHandler( bool bOOXML );
+TDefTableHandler();
 virtual

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2014-12-06 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |5 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 
 writerfilter/source/dmapper/GraphicHelpers.cxx   |1 
 writerfilter/source/dmapper/GraphicHelpers.hxx   |4 
 writerfilter/source/dmapper/TableData.hxx|   65 ++-
 writerfilter/source/dmapper/TableManager.cxx |4 
 writerfilter/source/dmapper/TableManager.hxx |   19 +---
 7 files changed, 45 insertions(+), 56 deletions(-)

New commits:
commit 29ef1b0aa20a5d1354b071884d830d0eec224053
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Dec 6 11:44:36 2014 +0100

writerfilter: unneeded include in GraphicHelpers.hxx

Change-Id: I720db5fd2fb1a5c1e89e7d375541af035ebbd97f

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 237421e..aca4c1f 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -18,6 +18,7 @@
  */
 #include ConversionHelper.hxx
 #include GraphicHelpers.hxx
+#include PropertyIds.hxx
 
 #include ooxml/resourceids.hxx
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx 
b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 53c2b6f..946c37f 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX
 
-#include PropertyMap.hxx
-
 #include resourcemodel/LoggedResources.hxx
 
 #include boost/shared_ptr.hpp
 
+#include map
+
 namespace writerfilter {
 namespace dmapper
 {
commit 5123bb6194f6c3b94abc2494768dd676de38ad3e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Dec 6 11:44:13 2014 +0100

No need to have TableDataHandler as a template

Change-Id: If19feb011db4027bae6f0c59b48967657c36b7a8

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index bd71674..f02ec96 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -28,8 +28,7 @@
 namespace writerfilter {
 namespace dmapper {
 
-typedef ::com::sun::star::text::XTextRange TextRange_t;
-typedef ::com::sun::star::uno::Reference TextRange_t  Handle_t;
+typedef css::uno::Reference css::text::XTextRange  Handle_t;
 typedef ::com::sun::star::uno::Sequence Handle_t CellSequence_t;
 typedef boost::shared_ptrCellSequence_t CellSequencePointer_t;
 typedef ::com::sun::star::uno::Sequence CellSequence_t  RowSequence_t;
@@ -66,7 +65,7 @@ struct HorizontallyMergedCell
 }
 };
 
-class DomainMapperTableHandler : public TableDataHandlerHandle_t , 
TablePropertyMapPtr 
+class DomainMapperTableHandler : public TableDataHandler
 {
 TextReference_t m_xText;
 DomainMapper_Impl  m_rDMapper_Impl;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 01e7577..11e58cd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -309,7 +309,6 @@ class DomainMapper;
 class DomainMapper_Impl
 {
 public:
-typedef TableDataHandler ::com::sun::star::uno::Reference 
::com::sun::star::text::XTextRange , TablePropertyMapPtr  TableDataHandler_t;
 typedef std::map  OUString, BookmarkInsertPosition  BookmarkMap_t;
 
 private:
@@ -359,7 +358,7 @@ private:
 
 // TableManagers are stacked: one for each stream to avoid any confusion
 std::stack boost::shared_ptr DomainMapperTableManager   
m_aTableManagers;
-TableDataHandler_t::Pointer_t m_pTableHandler;
+TableDataHandler::Pointer_t m_pTableHandler;
 
 //each context needs a stack of currently used attributes
 PropertyStack   m_aPropertyStacks[NUMBER_OF_CONTEXTS];
diff --git a/writerfilter/source/dmapper/TableManager.cxx 
b/writerfilter/source/dmapper/TableManager.cxx
index a7b7275..dff29f8 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -433,7 +433,7 @@ void TableManager::handle(const 
css::uno::Referencecss::text::XTextRange rHan
 setHandle(rHandle);
 }
 
-void 
TableManager::setHandler(TableDataHandlercss::uno::Referencecss::text::XTextRange,
 TablePropertyMapPtr::Pointer_t pTableDataHandler)
+void TableManager::setHandler(TableDataHandler::Pointer_t pTableDataHandler)
 {
 mpTableDataHandler = pTableDataHandler;
 }
diff --git a/writerfilter/source/dmapper/TableManager.hxx 
b/writerfilter/source/dmapper/TableManager.hxx
index b635a25..59f2d7b 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -41,7 +41,6 @@ namespace dmapper
 /**
Class to handle events generated by

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2014-09-03 Thread Miklos Vajna

 writerfilter/source/ooxml/model.xml |   35 ---
 1 file changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 333e6446a8472c5e4681aa6eee38e824255e7c7a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Sep 3 16:14:29 2014 +0200

Clean up remaining duplicated xmlns namespace alias definitions

Change-Id: I0a8550f8f80d017c6c7578f14382d2704d800c46

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 8dd15d4..cc826d5 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -26,6 +26,8 @@
   xmlns:v=urn:schemas-microsoft-com:vml
   xmlns:w14=http://schemas.microsoft.com/office/word/2010/wordml;
   
xmlns:wp14=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing;
+  xmlns:wpg=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup;
+  xmlns:wps=http://schemas.microsoft.com/office/word/2010/wordprocessingShape;
   xmlns:xml=http://www.w3.org/XML/1998/namespace;
   token tokenid=ooxml:shape/
   token tokenid=ooxml:token/
@@ -8367,7 +8369,7 @@
 /element
   /define
   define name=wsp
-element 
xmlns:wps=http://schemas.microsoft.com/office/word/2010/wordprocessingShape; 
name=wps:wsp
+element name=wps:wsp
   ref name=CT_WordprocessingShape/
 /element
   /define
@@ -8380,7 +8382,7 @@
 /element
   /define
   define name=wgp
-element 
xmlns:wpg=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup; 
name=wpg:wgp
+element name=wpg:wgp
   ref name=CT_WordprocessingGroup/
 /element
   /define
@@ -8419,19 +8421,19 @@
 resource name=chart resource=Shape
   element name=c:chart tokenid=ooxml:c_chart/
 /resource
-resource 
xmlns:wps=http://schemas.microsoft.com/office/word/2010/wordprocessingShape; 
name=CT_WordprocessingShape resource=Shape
+resource name=CT_WordprocessingShape resource=Shape
   element name=wps:cNvSpPr 
tokenid=ooxml:CT_WordprocessingShape_cNvSpPr/
   element name=wps:spPr tokenid=ooxml:CT_WordprocessingShape_spPr/
 /resource
 resource name=wsp resource=Shape
-  element 
xmlns:wps=http://schemas.microsoft.com/office/word/2010/wordprocessingShape; 
name=wps:wsp tokenid=ooxml:wps_wsp/
+  element name=wps:wsp tokenid=ooxml:wps_wsp/
 /resource
-resource 
xmlns:wpg=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup; 
name=CT_WordprocessingGroup resource=Shape
+resource name=CT_WordprocessingGroup resource=Shape
   element name=wpg:cNvGrpSpPr 
tokenid=ooxml:CT_WordprocessingGroup_cNvGrpSpPr/
   element name=wpg:grpSpPr 
tokenid=ooxml:CT_WordprocessingGroup_grpSpPr/
 /resource
 resource name=wgp resource=Shape
-  element 
xmlns:wpg=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup; 
name=wpg:wgp tokenid=ooxml:wpg_wgp/
+  element name=wpg:wgp tokenid=ooxml:wpg_wgp/
 /resource
 
   /namespace
commit 1a32b23ed82b13a51b2509eb7af1b6d54c2d40b8
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Sep 3 16:11:42 2014 +0200

Clean up duplicated xmlns:wp14 definitions

Change-Id: I4fb7dfb3a8c401aa34ded7d5d93a1b7b88e7278e

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 2f5363a..8dd15d4 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -25,6 +25,7 @@
   xmlns:rng=http://relaxng.org/ns/structure/1.0;
   xmlns:v=urn:schemas-microsoft-com:vml
   xmlns:w14=http://schemas.microsoft.com/office/word/2010/wordml;
+  
xmlns:wp14=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing;
   xmlns:xml=http://www.w3.org/XML/1998/namespace;
   token tokenid=ooxml:shape/
   token tokenid=ooxml:token/
@@ -6674,7 +6675,7 @@
   namespace name=dml-wordprocessingDrawing 
file=dml-wordprocessingDrawing.rng
 start name=inline/
 start name=anchor/
-grammar 
xmlns:wp14=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing;
 xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing;
+grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing;
   !-- ISO RELAX NG Schema --
   include href=dml-graphicalObject.rng/
   include href=dml-documentProperties.rng/
@@ -7024,7 +7025,7 @@
   attribute name=b tokenid=ooxml:CT_EffectExtent_b/
 /resource
 resource name=ST_WrapDistance resource=Integer/
-resource 
xmlns:wp14=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing;
 name=CT_Inline resource=Properties
+resource name=CT_Inline resource=Properties
   element name=extent tokenid=ooxml:CT_Inline_extent/
   element name=effectExtent tokenid=ooxml:CT_Inline_effectExtent/
   element name=docPr tokenid=ooxml:CT_Inline_docPr/
@@ -7122,7 +7123,7 @@

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2014-08-10 Thread Miklos Vajna

 writerfilter/source/ooxml/model.xml | 1814 
 1 file changed, 854 insertions(+), 960 deletions(-)

New commits:
commit 19ccb678d28dffea57c5d7c3ea623412f7fed236
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Aug 10 11:10:35 2014 +0200

Remove unused group elements

Change-Id: I6ea77279a002179f2dd30bc835bb810c91ee51c4

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 225628b..6fbec28 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -151,7 +151,6 @@
   /element
   /define
   define name=CT_OfficeStyleSheet
-group
   element name=themeElements
 ref name=CT_BaseStyles/
   /element
@@ -167,7 +166,6 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
   attribute name=name
 data type=string/
   /attribute
@@ -486,7 +484,6 @@
   /choice
   /define
   define name=CT_Shape3D
-group
 element name=bevelT
   ref name=CT_Bevel/
 /element
@@ -502,7 +499,6 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
   attribute name=z
 ref name=ST_Coordinate/
   /attribute
@@ -809,7 +805,6 @@
   /choice
   /define
   define name=CT_ColorScheme
-group
   element name=dk1
 ref name=CT_Color/
   /element
@@ -849,7 +844,6 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
 attribute name=name
   data type=string
   /data
@@ -905,7 +899,6 @@
   /element
   /define
   define name=CT_FontScheme
-group
   element name=majorFont
 ref name=CT_FontCollection/
   /element
@@ -915,7 +908,6 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
 attribute name=name
   data type=string/
 /attribute
@@ -937,7 +929,6 @@
   ref name=EG_FillProperties/
   /define
   define name=CT_StyleMatrix
-group
   element name=fillStyleLst
 ref name=CT_FillStyleList/
   /element
@@ -950,7 +941,6 @@
   element name=bgFillStyleLst
 ref name=CT_BackgroundFillStyleList/
   /element
-/group
   attribute name=name
 data type=string/
   /attribute
@@ -1166,7 +1156,6 @@
   /choice
   /define
   define name=CT_TextCharacterProperties
-group
 element name=ln
   ref name=CT_LineProperties/
 /element
@@ -1198,7 +1187,6 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
   attribute name=kumimoji
 data type=boolean/
   /attribute
@@ -1347,14 +1335,12 @@
   /attribute
   /define
   define name=CT_ColorChangeEffect
-group
   element name=clrFrom
 ref name=CT_Color/
   /element
   element name=clrTo
 ref name=CT_Color/
   /element
-/group
   attribute name=useA
 data type=boolean/
   /attribute
@@ -1642,7 +1628,6 @@
   /element
   /define
   define name=CT_GradientFillProperties
-group
 element name=gsLst
   ref name=CT_GradientStopList/
 /element
@@ -1650,7 +1635,6 @@
 element name=tileRect
   ref name=CT_RelativeRect/
 /element
-/group
   attribute name=flip
 ref name=ST_TileFlipMode/
   /attribute
@@ -1708,7 +1692,6 @@
   /choice
   /define
   define name=CT_Blip
-group
 choice
   element name=alphaBiLevel
 ref name=CT_AlphaBiLevelEffect/
@@ -1765,14 +1748,12 @@
 element name=extLst
   ref name=CT_OfficeArtExtensionList/
 /element
-/group
 ref name=AG_Blob/
   attribute name=cstate
 ref name=ST_BlipCompression/
   /attribute
   /define
   define name=CT_BlipFillProperties
-group
 element name=blip
   ref name=CT_Blip/
 /element
@@ -1780,7 +1761,6 @@
   ref name=CT_RelativeRect/
 /element
 ref name=EG_FillModeProperties/
-/group
   attribute name=dpi
 data type=unsignedInt/
   /attribute
@@ -1901,14 +1881,12 @@
   /choice
   /define
   define name=CT_PatternFillProperties
-group
 element name=fgClr

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2014-03-29 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |2 ++
 writerfilter/source/dmapper/StyleSheetTable.cxx|9 ++---
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 8736c5222a8e83a1310713a92492e63198749467
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:13:21 2014 +0100

coverity#1194911 Unchecked dynamic_cast

Change-Id: I1e7f4bcd8f54219d86ad7a003469d5a486090f47

diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx 
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index ed9..e5e4172 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -98,7 +98,7 @@ namespace dmapper {
 
 DomainMapperTableManager* pManager = 
dynamic_castDomainMapperTableManager*(m_pTableManager);
 // In case any of the cells has the btLr cell direction, 
then an explicit minimal size will just hide the whole row, don't do that.
-if (pMeasureHandler-GetRowHeightSizeType() != 
text::SizeType::MIN || !pManager-HasBtlrCell())
+if (pMeasureHandler-GetRowHeightSizeType() != 
text::SizeType::MIN || !pManager || !pManager-HasBtlrCell())
 {
 // In case a cell already wanted fixed size, we should 
not overwrite it here.
 if (!pManager || !pManager-IsRowSizeTypeInserted())
commit f19318697c9b15a464285d5dec2a8f923e955f24
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:09:09 2014 +0100

coverity#705071 Unchecked dynamic_cast

Change-Id: Ic7b120daf4d5456ed882ffa3724c53d1246e7b4d

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index ef56822..955fc3e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -675,7 +675,8 @@ void StyleSheetTable::lcl_sprm(Sprm  rSprm)
 uno::makeAny( ConversionHelper::convertTableJustification( 
nIntValue )));
 break;
 case NS_ooxml::LN_CT_TrPrBase_jc: //table alignment - row 
properties!
-dynamic_cast StyleSheetPropertyMap* ( 
m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TrPrBase_jc(nIntValue);
+if (StyleSheetPropertyMap* pMap = dynamic_cast 
StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() ))
+pMap-SetCT_TrPrBase_jc(nIntValue);
 break;
 case NS_ooxml::LN_CT_TblPrBase_tblBorders: //table borders, might be 
defined in table style
 {
commit e50a0b6b1fd84694db1768a768570cdb8c614513
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:06:38 2014 +0100

coverity#705070 Unchecked dynamic_cast

Change-Id: Ibb4cf1e8bd002d4c36030f5567e1a16f86ea1668

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 42dd33e..ef56822 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -465,10 +465,12 @@ void StyleSheetTable::lcl_attribute(Id Name, Value  val)
 }
 break;
 case NS_ooxml::LN_CT_TblWidth_w:
-dynamic_cast StyleSheetPropertyMap* ( 
m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TblWidth_w( nIntValue );
+if (StyleSheetPropertyMap* pMap = dynamic_cast 
StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() ))
+pMap-SetCT_TblWidth_w( nIntValue );
 break;
 case NS_ooxml::LN_CT_TblWidth_type:
-dynamic_cast StyleSheetPropertyMap* ( 
m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TblWidth_type( nIntValue );
+if (StyleSheetPropertyMap* pMap = dynamic_cast 
StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() ))
+pMap-SetCT_TblWidth_type( nIntValue );
 break;
 case NS_ooxml::LN_CT_LatentStyles_defQFormat:
 m_pImpl-AppendLatentStyleProperty(defQFormat, val);
commit e9509e54b45fc429a93975917dca2ec343e5f48d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:04:27 2014 +0100

coverity#736004 Unchecked dynamic_cast

Change-Id: Icca4946543409adb0ac6f7bf78915f8ef5b0fa40

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0df4a54..2177596 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -746,6 +746,8 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
 pFrameProperties[15].Name = 
rPropNameSupplier.GetName(PROP_BACK_COLOR_TRANSPARENCY);
 
 const ParagraphProperties* pStyleProperties = 
dynamic_castconst ParagraphProperties*(

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2014-03-29 Thread Miklos Vajna

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 ++
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx |   14 --
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 6812606517e9a6299fcd5fde59fd4cf414d0d493
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:41:52 2014 +0100

coverity#736006 Unchecked dynamic_cast

Change-Id: Id4b0f5e6e4369a850bc159992540e024a4c37c3c

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 776f1de..cf7b0d6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4633,7 +4633,8 @@ int RTFDocumentImpl::popState()
 // to RTLD_GLOBAL, so most probably a gcc bug.
 oox::FormulaImportBase* pImport = 
dynamic_castoox::FormulaImportBase*(dynamic_castSfxBaseModel*(xComponent.get()));
 assert( pImport != NULL );
-pImport-readFormulaOoxml(m_aMathBuffer);
+if (pImport)
+pImport-readFormulaOoxml(m_aMathBuffer);
 RTFValue::Pointer_t pValue(new RTFValue(xObject));
 RTFSprms aMathAttributes;
 aMathAttributes.set(NS_ooxml::LN_starmath, pValue);
commit b4107c79fb680c1906a7a4978c0c2eb5c118a41c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:39:54 2014 +0100

coverity#705083 Unchecked dynamic_cast

Change-Id: I58e7be8d7b78ba83356e169290c289f246e93057

diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index c66178f..494011f 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -455,9 +455,10 @@ OOXMLStream::Pointer_t
 OOXMLDocumentFactory::createStream
 (OOXMLStream::Pointer_t pStream, const OUString  rId)
 {
-return OOXMLStream::Pointer_t
-(new OOXMLStreamImpl(*dynamic_castOOXMLStreamImpl *(pStream.get()),
- rId));
+OOXMLStream::Pointer_t pRet;
+if (OOXMLStreamImpl* pImpl = dynamic_castOOXMLStreamImpl 
*(pStream.get()))
+pRet.reset(new OOXMLStreamImpl(*pImpl, rId));
+return pRet;
 }
 
 }}
commit 7030c700bfeab64a65947d52daa24b5ffefb81ae
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:38:11 2014 +0100

coverity#705082 Unchecked dynamic_cast

Change-Id: Ic4665f2cbd2bfc4b65a0f3d9d746e344d4f3bef8

diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 284d369..c66178f 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -445,9 +445,10 @@ OOXMLStream::Pointer_t
 OOXMLDocumentFactory::createStream
 (OOXMLStream::Pointer_t pStream,  OOXMLStream::StreamType_t nStreamType)
 {
-return OOXMLStream::Pointer_t
-(new OOXMLStreamImpl(*dynamic_castOOXMLStreamImpl *(pStream.get()),
- nStreamType));
+OOXMLStream::Pointer_t pRet;
+if (OOXMLStreamImpl* pImpl = dynamic_castOOXMLStreamImpl 
*(pStream.get()))
+pRet.reset(new OOXMLStreamImpl(*pImpl, nStreamType));
+return pRet;
 }
 
 OOXMLStream::Pointer_t
commit 8d5efb49c37c4e78ef233570e0ead9fedc32d80e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 29 21:34:10 2014 +0100

coverity#736005 Unchecked dynamic_cast

Change-Id: Ieca4f06f3ca4fecb8a0e87e7528f8583a549013c

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 14e0c3c..4f73da5 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2570,6 +2570,8 @@ void OOXMLFastContextHandlerMath::process()
 // to RTLD_GLOBAL, so most probably a gcc bug.
 oox::FormulaImportBase* import = dynamic_cast oox::FormulaImportBase* ( 
dynamic_cast SfxBaseModel* (component.get()));
 assert( import != NULL );
+if (!import)
+return;
 import-readFormulaOoxml( buffer );
 if (isForwardEvents())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2013-12-29 Thread Miklos Vajna

 writerfilter/source/dmapper/ConversionHelper.cxx |4 
 writerfilter/source/dmapper/ConversionHelper.hxx |2 
 writerfilter/source/dmapper/DomainMapper.cxx |6 
 writerfilter/source/dmapper/NumberingManager.cxx |   12 -
 writerfilter/source/dmapper/NumberingManager.hxx |4 
 writerfilter/source/doctok/resources.xmi |  190 ---
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx  |   12 -
 writerfilter/source/ooxml/model.xml  |   12 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   22 +-
 9 files changed, 37 insertions(+), 227 deletions(-)

New commits:
commit 4b710225818e66917ef19ebf68d5e08223a13c2f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Dec 29 14:26:51 2013 +0100

writerfilter: remove unused NFC in doctok

Change-Id: I224d6192d3e98172b76311a870c48493928ff900

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index e6eadf3..102e5c8 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -270,10 +270,10 @@ sal_Int16 convertTableJustification( sal_Int32 nIntValue )
 return nOrient;
 }
 
-sal_Int16 ConvertNumberingType(sal_Int32 nNFC)
+sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
 {
 sal_Int16 nRet;
-switch(nNFC)
+switch(nFmt)
 {
 case NS_ooxml::LN_Value_ST_NumberFormat_decimal:
 case 0:
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx 
b/writerfilter/source/dmapper/ConversionHelper.hxx
index b23872b..352d29f 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -48,7 +48,7 @@ namespace ConversionHelper{
 sal_Int32 convertEMUToMM100(sal_Int32 _t);
 sal_Int32 ConvertColor(sal_Int32 nWordColor );
 sal_Int16 convertTableJustification( sal_Int32 nIntValue );
-sal_Int16 ConvertNumberingType(sal_Int32 nNFC);
+sal_Int16 ConvertNumberingType(sal_Int32 nFmt);
 
 } // namespace ConversionHelper
 } //namespace dmapper
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1f3017a..f3151e7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -321,7 +321,7 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_CT_Lvl_start:
 break;
-case NS_rtf::LN_NFC:
+case NS_ooxml::LN_CT_Lvl_numFmt:
 break;
 case NS_rtf::LN_FLEGAL:
 break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index e74fc99..a8ef3ad 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -112,7 +112,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
 case NS_ooxml::LN_CT_Lvl_start:
 m_nIStartAt = nValue;
 break;
-case NS_rtf::LN_NFC:
+case NS_ooxml::LN_CT_Lvl_numFmt:
 m_nNFC = nValue;
 break;
 case NS_rtf::LN_JC:
@@ -772,7 +772,7 @@ void ListsManager::lcl_attribute( Id nName, Value rVal )
 }
 break;
 case NS_ooxml::LN_CT_Lvl_start:
-case NS_rtf::LN_NFC:
+case NS_ooxml::LN_CT_Lvl_numFmt:
 case NS_rtf::LN_JC:
 case NS_rtf::LN_FLEGAL:
 case NS_rtf::LN_FNORESTART:
@@ -991,7 +991,7 @@ void ListsManager::lcl_sprm( Sprm rSprm )
 break;
 case NS_rtf::LN_RGBXCHNUMS: break;
 case NS_ooxml::LN_CT_Lvl_start:
-case NS_rtf::LN_NFC:
+case NS_ooxml::LN_CT_Lvl_numFmt:
 case NS_rtf::LN_JC:
 case NS_rtf::LN_FLEGAL:
 case NS_rtf::LN_FNORESTART:
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx 
b/writerfilter/source/dmapper/NumberingManager.hxx
index b3dcf96..d4bc418 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -43,7 +43,7 @@ class StyleSheetEntry;
 class ListLevel : public PropertyMap
 {
 sal_Int32 m_nIStartAt;   
//LN_CT_Lvl_start
-sal_Int32 m_nNFC;//LN_NFC
+sal_Int32 m_nNFC;
//LN_CT_Lvl_numFmt
 sal_Int32 m_nJC; //LN_JC
 sal_Int32 m_nFLegal; 
//LN_FLEGAL
 sal_Int32 m_nFNoRestart; 
//LN_FNORESTART
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 233db08..ad50f51 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -560,64 +560,6 @@
 /UML:TaggedValue

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2013-12-29 Thread Miklos Vajna

 writerfilter/source/dmapper/GraphicImport.cxx |   17 --
 writerfilter/source/doctok/resources.xmi  |  194 --
 2 files changed, 211 deletions(-)

New commits:
commit c0b2debe6c82cddd681d7874b95237f0669cd36c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Dec 29 20:56:20 2013 +0100

writerfilter: unused NS_rtf::LN_shpvalue

Change-Id: I908ab52770aaabc3e2049e2b6d3ab7f7acf25643

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index c7b1272..501a6be 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -633,12 +633,6 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 break;
 case NS_rtf::LN_shpname:
 break;
-case NS_rtf::LN_shpvalue:
-{
-if( NS_dff::LN_shpwzDescription == 
sal::static_int_castId(m_pImpl-nShapeOptionType) )
-ProcessShapeOptions( val );
-}
-break;
 
 //BLIP store entry
 case NS_rtf::LN_shpbtWin32:
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 555a244..c2a2610 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26368,28 +26368,6 @@
 /UML:Operation
   /UML:Classifier.feature
   UML:Classifier.feature
-UML:Operation name=value
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  
UML:TaggedValue.dataValuertf:shpvalue/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=opid/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:BehavioralFeature.parameter
-UML:Parameter kind=return name=return
-  UML:Parameter.type
-UML:Class xmi.idref=Value/
-  /UML:Parameter.type
-/UML:Parameter
-  /UML:BehavioralFeature.parameter
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=attribute/
-  /UML:ModelElement.stereotype
-/UML:Operation
-  /UML:Classifier.feature
-  UML:Classifier.feature
 UML:Operation name=stringValue
   UML:ModelElement.taggedValue
 UML:TaggedValue
commit 7f5494f3c4bf14209a119c6b21c02e10075503ae
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Dec 29 20:54:12 2013 +0100

writerfilter: unused NS_rtf::LN_shppid

Change-Id: Idf63d7a4659a96bb6e2050194ba595a321696313

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6fa2eef..c7b1272 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -627,9 +627,6 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 break;// Shape has a shape type property
 case NS_rtf::LN_shptypename:
 break;// shape type name
-case NS_rtf::LN_shppid:
-m_pImpl-nShapeOptionType = nIntValue;
-break; //type of shape option
 case NS_rtf::LN_shpfBid:
 break; //ignored
 case NS_rtf::LN_shpfComplex:
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index e62f7c5..555a244 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26230,64 +26230,6 @@
 /UML:TaggedValue
   /UML:ModelElement.taggedValue
   UML:Classifier.feature
-UML:Attribute name=pid
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValueProperty 
ID/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=comment/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0x0/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=offset/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue14/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=bits/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2013-12-27 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx   |   37 
 writerfilter/source/doctok/resourceids.xsl |   25 ---
 writerfilter/source/doctok/resources.xmi   |  194 -
 writerfilter/source/ooxml/model.xml|6 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 -
 5 files changed, 12 insertions(+), 258 deletions(-)

New commits:
commit 6a59fbefbfbc90d6febd43e689773f88deaf36b3
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Dec 27 18:04:49 2013 +0100

writerfilter: remove unused STYLESHEET in doctok

Change-Id: I9160730029cf2272172b50726168390ac6093daf

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 97ae897..48278e3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -413,22 +413,6 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 break;
 case NS_rtf::LN_FHIDDEN:
 break;
-case NS_rtf::LN_CSTD:
-break;
-case NS_rtf::LN_CBSTDBASEINFILE:
-break;
-case NS_rtf::LN_FSTDSTYLENAMESWRITTEN:
-break;
-case NS_rtf::LN_UNUSED4_2:
-break;
-case NS_rtf::LN_STIMAXWHENSAVED:
-break;
-case NS_rtf::LN_ISTDMAXFIXEDWHENSAVED:
-break;
-case NS_rtf::LN_NVERBUILTINNAMESWHENSAVED:
-break;
-case NS_rtf::LN_RGFTCSTANDARDCHPSTSH:
-break;
 case NS_rtf::LN_WIDENT:
 
 case NS_rtf::LN_NFIB:
@@ -826,7 +810,7 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_FONTTABLE:
 break;
-case NS_rtf::LN_STYLESHEET:
+case NS_ooxml::LN_STYLESHEET:
 break;
 
 case NS_rtf::LN_fcEastAsianLayout:
@@ -4096,7 +4080,7 @@ void DomainMapper::lcl_table(Id name, 
writerfilter::ReferenceTable::Pointer_t
 // each entry call inserts a new font entry
 ref-resolve( *m_pImpl-GetFontTable() );
 break;
-case NS_rtf::LN_STYLESHEET:
+case NS_ooxml::LN_STYLESHEET:
 //same as above to import style sheets
 m_pImpl-SetStyleSheetImport( true );
 ref-resolve( *m_pImpl-GetStyleSheetTable() );
diff --git a/writerfilter/source/doctok/resourceids.xsl 
b/writerfilter/source/doctok/resourceids.xsl
index ff5ce87..305d193 100644
--- a/writerfilter/source/doctok/resourceids.xsl
+++ b/writerfilter/source/doctok/resourceids.xsl
@@ -106,31 +106,6 @@ const Id /xsl:text
   /xsl:for-each
 /xsl:for-each
 xsl:text
-
-/* Classes *//xsl:text
-xsl:for-each select='.//UML:Class[@name!=reserved]'
-  xsl:variable name=pos select=position()/
-  xsl:for-each 
select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref=classid]'
-xsl:choose
-  xsl:when test='.//UML:Stereotype[@xmi.idref=noqname]'/
-  xsl:when test='generate-id(UML:TaggedValue.dataValue) != 
generate-id(key(same-valued-tagged-data, UML:TaggedValue.dataValue)[1])'/
-  xsl:otherwise
-xsl:text
-const Id /xsl:text
-xsl:call-template name='idtoqname'
-  xsl:with-param name='id'xsl:value-of 
select='.//UML:TaggedValue.dataValue'//xsl:with-param
-/xsl:call-template
-xsl:text = /xsl:text
-xsl:value-of select='3 + $pos'/
-xsl:text; // 0x/xsl:text
-xsl:call-template name=dectohex
-  xsl:with-param name=number select=3 + position()/
-/xsl:call-template
-  /xsl:otherwise
-/xsl:choose
-  /xsl:for-each
-/xsl:for-each
-xsl:text
 }
 
 namespace NS_dff
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index a79033c..4928196 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -3971,114 +3971,6 @@
   /UML:Classifier.feature
 /UML:Class
 !--Class Style--
-!--Class StyleSheet--
-UML:Class xmi.id=StyleSheet name=StyleSheet
-  UML:Classifier.feature
-UML:Attribute name=cstd
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  
UML:TaggedValue.dataValuertf:CSTD/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=attrid/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-/UML:Attribute
-  /UML:Classifier.feature
-  UML:Classifier.feature
-UML:Attribute name=cbSTDBaseInFile
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  
UML:TaggedValue.dataValuertf:CBSTDBASEINFILE/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=attrid/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-/UML:Attribute
-

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

2013-10-24 Thread Miklos Vajna

 writerfilter/source/dmapper/MeasureHandler.cxx |   35 +++
 writerfilter/source/dmapper/MeasureHandler.hxx |6 +
 writerfilter/source/dmapper/StyleSheetTable.cxx|   52 -
 writerfilter/source/dmapper/StyleSheetTable.hxx|5 +
 writerfilter/source/dmapper/TablePropertiesHandler.cxx |   10 +++
 writerfilter/source/dmapper/TablePropertiesHandler.hxx |3 
 writerfilter/source/dmapper/TblStylePrHandler.cxx  |   15 
 writerfilter/source/dmapper/TblStylePrHandler.hxx  |2 
 8 files changed, 127 insertions(+), 1 deletion(-)

New commits:
commit 5a50bb1701b44c6c765acd80aa38dc13e7ab9eed
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 24 13:05:21 2013 +0200

writerfilter: implement MeasureHandler::getInteropGrabBag()

This allows e.g. storing a table style's w:tblPr - w:tblInd - w:type.

Change-Id: I653edc8912ce4e61c703bfffc6e3dcf322295b6f

diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx 
b/writerfilter/source/dmapper/MeasureHandler.cxx
index 783ebdc..57ffec5 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -53,9 +53,25 @@ void MeasureHandler::lcl_attribute(Id rName, Value  rVal)
 {
 case NS_rtf::LN_unit:
 case NS_ooxml::LN_CT_TblWidth_type:// = 90668;
+{
 //can be: NS_ooxml::LN_Value_ST_TblWidth_nil, 
NS_ooxml::LN_Value_ST_TblWidth_pct,
 //NS_ooxml::LN_Value_ST_TblWidth_dxa, 
NS_ooxml::LN_Value_ST_TblWidth_auto;
 m_nUnit = nIntValue;
+
+if (!m_aInteropGrabBagName.isEmpty())
+{
+beans::PropertyValue aValue;
+aValue.Name = type;
+switch (nIntValue)
+{
+case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value = 
uno::makeAny(OUString(nil)); break;
+case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value = 
uno::makeAny(OUString(pct)); break;
+case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value = 
uno::makeAny(OUString(dxa)); break;
+case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value = 
uno::makeAny(OUString(auto)); break;
+}
+m_aInteropGrabBag.push_back(aValue);
+}
+}
 break;
 case NS_ooxml::LN_CT_Height_hRule: // 90666;
 {
@@ -105,6 +121,25 @@ sal_Int32 MeasureHandler::getMeasureValue() const
 return nRet;
 }
 
+void MeasureHandler::enableInteropGrabBag(OUString aName)
+{
+m_aInteropGrabBagName = aName;
+}
+
+beans::PropertyValue MeasureHandler::getInteropGrabBag()
+{
+beans::PropertyValue aRet;
+aRet.Name = m_aInteropGrabBagName;
+
+uno::Sequencebeans::PropertyValue aSeq(m_aInteropGrabBag.size());
+beans::PropertyValue* pSeq = aSeq.getArray();
+for (std::vectorbeans::PropertyValue::iterator i = 
m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i)
+*pSeq++ = *i;
+
+aRet.Value = uno::makeAny(aSeq);
+return aRet;
+}
+
 } //namespace dmapper
 } //namespace writerfilter
 
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx 
b/writerfilter/source/dmapper/MeasureHandler.hxx
index 0155614..b1e7c57 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -22,6 +22,7 @@
 #include WriterFilterDllApi.hxx
 #include resourcemodel/LoggedResources.hxx
 #include boost/shared_ptr.hpp
+#include com/sun/star/beans/PropertyValue.hpp
 
 namespace writerfilter {
 namespace dmapper
@@ -36,6 +37,9 @@ class WRITERFILTER_DLLPRIVATE MeasureHandler : public 
LoggedProperties
 sal_Int32 m_nUnit;
 sal_Int16 m_nRowHeightSizeType; //table row height type
 
+OUString m_aInteropGrabBagName;
+std::vectorbeans::PropertyValue m_aInteropGrabBag;
+
 // Properties
 virtual void lcl_attribute(Id Name, Value  val);
 virtual void lcl_sprm(Sprm  sprm);
@@ -50,6 +54,8 @@ public:
 sal_Int32 getUnit() const { return m_nUnit; }
 
 sal_Int16 GetRowHeightSizeType() const { return m_nRowHeightSizeType;}
+void enableInteropGrabBag(OUString aName);
+beans::PropertyValue getInteropGrabBag();
 };
 typedef boost::shared_ptr
  MeasureHandler   MeasureHandlerPtr;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx 
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 9168fa6e..cf3a15a 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -262,13 +262,11 @@ namespace dmapper {
if (pProperties.get())
{
MeasureHandlerPtr pHandler(new MeasureHandler);
+   if (m_pCurrentInteropGrabBag)
+   pHandler-enableInteropGrabBag(tblInd);
pProperties-resolve( *pHandler );
if

[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlsecurity/inc xmlsecurity/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlhelp/source xmloff/inc xmloff/source xmlsecurity/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

[Libreoffice-commits] core.git: 4 commits - writerfilter/source

12 matches

Site Navigation

Mail list logo

Footer information