sd/source/filter/eppt/epptso.cxx | 3 +++
sd/source/ui/unoidl/unomodel.cxx | 3 ++-
writerfilter/source/dmapper/PropertyMap.cxx | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2a4161f7098b9bcb76eadbc82212038bbaebed2b
Author: Andre Fischer <a...@apache.org>
Date: Thu Aug 30 07:28:53 2012 +0000
#i119592# Fixed column widths.
Reported by: xiao ting xiao
Patch by: wujinlong@...
Reviewed by: Andre Fischer
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8f19057..9e22551 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -543,7 +543,7 @@ uno::Reference< text::XTextColumns >
SectionPropertyMap::ApplyColumnProperties(
uno::Reference< beans::XPropertySet > xColumnPropSet( xColumns,
uno::UNO_QUERY_THROW );
if( !m_bEvenlySpaced &&
(sal_Int32(m_aColWidth.size()) == (m_nColumnCount + 1 )) &&
- (sal_Int32(m_aColDistance.size()) == m_nColumnCount))
+ ((sal_Int32(m_aColDistance.size()) == m_nColumnCount) ||
(sal_Int32(m_aColDistance.size()) == m_nColumnCount + 1)) )
{
//the column width in word is an absolute value, in OOo it's
relative
//the distances are both absolute
commit 40ca6b3a9f805e4a1c12a9ed2c487282fff1c08b
Author: Armin Le Grand <a...@apache.org>
Date: Wed Jun 20 12:52:26 2012 +0000
#119459# Corrected export of connectors to PPT format, Patch by: Sun Ying,
Review by: alg
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 106bb74..f543cde 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2664,6 +2664,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout,
EscherSolverContainer& a
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
ImplCreateShape( nSpType, nSpFlags, aSolverContainer );
+
+ // #119459# for connector shape, the start point and end point
is fixed, and should not be rotated.
+ mnAngle = 0;
}
else if ( mType == "drawing.Measure" )
{
commit 69b0688589fe611d873d2c8d2556dd1279c764a0
Author: Zhe Wang <wangz...@apache.org>
Date: Fri Sep 7 02:11:47 2012 +0000
Fix issue #i119524#: [From Symphony]Can not open the sample ppt file which
contain vb controls in the slide master.
* subversion/main/sd/source/ui/unoidl/unomodel.cxx
[]Before initializeDocument,should check whether it is in loading process
Patch by: Yin Bing <steve.yin....@gmail.com>
Suggested by:Wang Zhe <kingwise...@gmail.com>
Found by: Du Jing <jbjduj...@gmail.com>
Review by: Wang Zhe <kingwise...@gmail.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 037a2cd..32249c1 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -736,7 +736,8 @@ uno::Reference< drawing::XDrawPages > SAL_CALL
SdXImpressDocument::getMasterPage
if( !xMasterPages.is() )
{
- initializeDocument();
+ if ( !hasControllersLocked() )
+ initializeDocument();
mxMasterPagesAccess = xMasterPages = new SdMasterPagesAccess(*this);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
