[Libreoffice-commits] .: Branch 'feature/ooxmlmathimport' - 3 commits - starmath/inc starmath/sdi starmath/source sw/inc sw/source writerfilter/source

[Lubos Lunak]

 sw/inc/unoprnms.hxx                               |    8 ++++----
 sw/source/core/unocore/unoframe.cxx               |    5 ++---
 sw/source/core/unocore/unoprnms.cxx               |    6 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit da9219f89036e3da7ff5af12ea2a6dfb494fdc9f
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Nov 25 18:55:53 2011 +0100

    EMBEDDED_OBJECT UNO property now works, remove hack

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8579f4a..e93c9a3 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2289,7 +2289,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                         pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt2, sName);
                 }
             }
-            else if( pStreamName && false )
+            else if( pStreamName )
             {
                 ::rtl::OUString sStreamName;
                 (*pStreamName) >>= sStreamName;
@@ -2305,8 +2305,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
             else if( pEmbeddedObject || pStreamName )
             {
                 uno::Reference< embed::XEmbeddedObject > obj;
-//                (*pEmbeddedObject) >>= obj;
-                (*pStreamName) >>= obj;
+                (*pEmbeddedObject) >>= obj;
                 svt::EmbeddedObjectRef xObj;
                 xObj.Assign( obj, embed::Aspects::MSOLE_CONTENT );
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4174964..1ce2b53 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1101,7 +1101,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val )
             uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW );
             uno::Reference< beans::XPropertySet > xStarMathProperties(xStarMath, uno::UNO_QUERY_THROW);
 
-            xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_STREAM_NAME ),
+            xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBEDDED_OBJECT ),
                 val.getAny());
 
             uno::Reference< uno::XInterface > xInterface( formula->getComponent(), uno::UNO_QUERY );
commit b0c5ead89be1465f7f650f321dae7e4e9d31e55c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Nov 25 18:52:24 2011 +0100

    fix unoprms content mismatch (gee, it even had a FIXME comment)

diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 3a92a6f..8df75ee 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -799,16 +799,16 @@ enum SwPropNameIds
 /* 0736 */  UNO_NAME_OUTLINE_LEVEL,
 
 /* 0737 */  UNO_NAME_DESCRIPTION,
-/* 0740 */  UNO_NAME_EMBEDDED_OBJECT,
-
-// FIXME: these number comments cannot be right post merge - fix them up ...
 /* 0738 */  UNO_NAME_META,
 /* 0739 */  UNO_NAME_IS_TEMPLATE,
 /* 0740 */  UNO_NAME_VBA_DOCOBJ,
 /* 0741 */  UNO_NAME_NESTED_TEXT_CONTENT,
 /* 0742 */  UNO_NAME_SEPARATOR_LINE_STYLE,
 /* 0743 */  UNO_NAME_FOOTNOTE_LINE_STYLE,
-/* 0744 */  SW_PROPNAME_END
+/* 0744 */  UNO_NAME_EMBEDDED_OBJECT,
+/* 0745 */  SW_PROPNAME_END
+
+// new items in this array must match SwPropNameTab aPropNameTab
 };
 
 struct SwPropNameLen
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 77e88d2..e96aab8 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -777,14 +777,14 @@ const SwPropNameTab aPropNameTab = {
 /* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
 /* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
 /* 0738 UNO_NAME_META */        {MAP_CHAR_LEN("InContentMetadata")},
-// FIXME: these numbers are not correct post merge ...
 /* 0739 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
-/* 0740 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},
 /* 0740 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
-
 /* 0741 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")},
 /* 0742 UNO_NAME_SEPARATOR_LINE_STYLE */ {MAP_CHAR_LEN("SeparatorLineStyle")},
 /* 0743 UNO_NAME_FOOTNOTE_LINE_STYLE */ {MAP_CHAR_LEN("FootnoteLineStyle")},
+/* 0744 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},
+
+// new items in this array must match enum SwPropNameIds
 };
 
 const SwPropNameLen& SwGetPropName( sal_uInt16 nId )
commit ecf16203ec5ba3d58c9f1180e7bafa66627c3b4f
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Nov 25 17:12:54 2011 +0100

    remove executable bit from source files

diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
old mode 100755
new mode 100644
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
old mode 100755
new mode 100644
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
old mode 100755
new mode 100644
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
old mode 100755
new mode 100644
diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc
old mode 100755
new mode 100644