[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - cui/source officecfg/registry sw/source

[Michael Stahl]

 cui/source/tabpages/paragrph.cxx                            |    2 +-
 officecfg/registry/data/org/openoffice/Office/Embedding.xcu |    4 +++-
 sw/source/ui/utlui/uitool.cxx                               |    5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit d3269c49fc685c342b3baa128667c77dd782e81b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 27 23:38:38 2014 +0100

    fdo#70861: cui: fix crash in SvxExtParagraphTabPage
    
    SvxExtParagraphTabPage::Reset() must not request a pool default for
    SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
    backed by a member of SwPageDesc in Writer.
    
    (cherry picked from commit 9c1a1b98776ca2216d82af303394a09f2bac0471)
    
    Conflicts:
    	cui/source/tabpages/paragrph.cxx
    
    Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index f8e7db1..5d564c1 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1562,7 +1562,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
 
     _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
 
-    if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE )
+    if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_SET )
     {
         const sal_uInt16 nPageNum =
             ( (const SfxUInt16Item&)rSet.Get( _nWhich ) ).GetValue();
commit a8408afb3856a57f6ba7ab49b699c13343d22c90
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Nov 28 08:36:15 2014 +0100

    Revert "fdo#70861 SwToSfxPageDescAttr: fix call to SvxExtParagraphTabPage"
    
    This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.

diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 512d0bd..e0c4a36 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -642,10 +642,9 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
         bPut = false;
     }
 
-    // TODO for now always pass a page number to cui, it can't make a
-    // difference between 0 and no page number at the moment.
+    if (oNumOffset)
     {
-        SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? oNumOffset.get() : 0 );
+        SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
         rCoreSet.Put( aPageNum );
     }
 
commit acba3681deaedc3be6ae8bd416b4d308451e84ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 26 15:42:46 2014 +0000

    Resolves: fdo#75408 go back to the old way of doing things
    
    Revert "Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be resized"
    
    This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9.
    
    Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898
    (cherry picked from commit 51221bbf0c7cca0a329393dac2059818006ab338)
    (cherry picked from commit 2babe1baf46dcad936703d12cbd847393f5e467b)

diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 44031e8..e39af5d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -236,7 +236,9 @@
       <prop oor:name="ObjectDocumentServiceName">
         <value>com.sun.star.formula.FormulaProperties</value>
       </prop>
-      <prop oor:name="ObjectMiscStatus"/>
+      <prop oor:name="ObjectMiscStatus">
+        <value>8589934592</value>
+      </prop>
       <prop oor:name="ObjectVerbs">
         <value>PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS</value>
       </prop>