[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/oox-smartart-import.diff |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 02b3475872b995204206d7ad8e2c7dfba9dec1a0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 17:10:52 2010 +0300

    Make oox-smartart-import.diff apply again

diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff
index 6f6d755..c418157 100644
--- a/patches/dev300/oox-smartart-import.diff
+++ b/patches/dev300/oox-smartart-import.diff
@@ -2854,7 +2854,7 @@ index 8aa0fc0..113de80 100644
  }
  
  OUString Diagram::getLayoutId() const
-@@ -295,5 +497,155 @@ OUString Diagram::getLayoutId() const
+@@ -295,6 +497,156 @@ OUString Diagram::getLayoutId() const
      return sLayoutId;
  }
  
@@ -3010,12 +3010,14 @@ index 8aa0fc0..113de80 100644
 +}
  
  } }
+ 
 diff --git oox/source/drawingml/diagram/diagram.hxx oox/source/drawingml/diagram/diagram.hxx
 new file mode 100644
 index 0000000..7e5276c
 --- /dev/null
 +++ oox/source/drawingml/diagram/diagram.hxx
-@@ -0,0 +1,320 @@
+@@ -0,0 +1,323 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3336,6 +3338,8 @@ index 0000000..7e5276c
 +} }
 +
 +#endif
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git oox/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
 index b7f8889..447416e 100644
 --- oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -3401,7 +3405,7 @@ index 17f7b0b..aab46ca 100644
  
  using namespace ::oox::core;
  using namespace ::com::sun::star::xml::sax;
-@@ -131,94 +131,143 @@ DiagramLayoutFragmentHandler::createFastChildContext( ::sal_Int32 aElement,
+@@ -131,95 +131,144 @@ DiagramLayoutFragmentHandler::createFastChildContext( ::sal_Int32 aElement,
  ///////////////////////
  
  DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter,
@@ -3609,6 +3613,7 @@ index 17f7b0b..aab46ca 100644
 +}
  
  } }
+ 
 diff --git oox/source/drawingml/diagram/diagramfragmenthandler.hxx oox/source/drawingml/diagram/diagramfragmenthandler.hxx
 new file mode 100644
 index 0000000..86e9bd2
@@ -3780,7 +3785,7 @@ index 9ac3289..43a6281 100644
      mbHideLastTrans = attr.getBool( XML_hideLastTrans, false );
      mnPtType = xAttr->getOptionalValueToken( XML_ptType, 0 );
      mnSt = attr.getInteger( XML_st, 0 );
-@@ -87,55 +97,674 @@ void LayoutAtom::dump(int level)
+@@ -87,56 +97,675 @@ void LayoutAtom::dump(int level)
      OSL_TRACE( "level = %d - %s of type %s", level,
                 OUSTRING_TO_CSTR( msName ),
                 typeid(*this).name() );
@@ -4482,6 +4487,7 @@ index 9ac3289..43a6281 100644
 +}
  
  } }
+ 
 diff --git oox/source/drawingml/diagram/diagramlayoutatoms.hxx oox/source/drawingml/diagram/diagramlayoutatoms.hxx
 new file mode 100644
 index 0000000..907f527