[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sd/source svx/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/epptso.cxx |   11 ++++++++++-
 svx/source/svdraw/svdobj.cxx     |    4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 2bb808b50151db339b88309618a75f853d9dc056
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 17 13:26:02 2012 +0100

    fix assertion
    
    Change-Id: I67bf571062c5246402979170e0395ede320dac82
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index fefe00d..f74ec47 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2937,9 +2937,9 @@ SvxShape* SdrObject::getSvxShape() const
         // retrieving the impl pointer and subsequently using it is not thread-safe, of course, so it needs to be
         // guarded by the SolarMutex
 
-#if OSL_DEBUG_LEVE > 0
+#if OSL_DEBUG_LEVEL > 0
     uno::Reference< uno::XInterface > xShape( maWeakUnoShape );
-    OSL_ENSURE( !( !xShapeGuard.is() && mpSvxShape ),
+    OSL_ENSURE( !( !xShape.is() && mpSvxShape ),
         "SdrObject::getSvxShape: still having IMPL-Pointer to dead object!" );
 #endif
 
commit 6488c424654cd5d6872f40c15dcdd72071843efd
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 17 09:59:42 2012 +0100

    fdo#49277 use correct default tab size
    
    Change-Id: If8e1936b897bfe0f3ae0d791c573267df3381954
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b216a88..201f1f1 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1310,7 +1310,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
             }
             nParaFlags >>= 16;
 
-            sal_uInt32  nDefaultTabSize = MapSize( ::com::sun::star::awt::Size( 2011, 1 ) ).Width;
+            sal_Int32 nDefaultTabSizeSrc = 2011; // I've no idea where this number came from, honestly
+            const uno::Reference< beans::XPropertySet > xPropSet( mXModel, uno::UNO_QUERY );
+            if ( xPropSet.is() )
+            {
+                ImplGetPropertyValue( xPropSet, rtl::OUString( "TabStop" ) );
+                sal_Int32 nTabStop( 0 );
+                if ( mAny >>= nTabStop )
+                    nDefaultTabSizeSrc = nTabStop;
+            }
+            const sal_uInt32 nDefaultTabSize = MapSize( awt::Size( nDefaultTabSizeSrc, 1 ) ).Width;
             sal_uInt32  nDefaultTabs = abs( maRect.GetWidth() ) / nDefaultTabSize;
             if ( nTabs )
                 nDefaultTabs -= (sal_Int32)( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );