[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - configure.in editeng/source sfx2/source svx/source xmloff/source

[Armin Le Grand]

 configure.in                           |   13 +------------
 editeng/source/outliner/outlvw.cxx     |    2 +-
 sfx2/source/sidebar/Panel.cxx          |    7 -------
 svx/source/engine3d/float3d.cxx        |    1 +
 xmloff/source/draw/ximpcustomshape.cxx |   21 ++++++++++++++++++---
 5 files changed, 21 insertions(+), 23 deletions(-)

New commits:
commit 924bd9b9227bcd1fb820fb922b3a2e84bcc73f20
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 29 13:35:49 2013 +0000

    i122374 added initialisation for initial selection

diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 695317d..c1d7764 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -537,6 +537,7 @@ void Svx3DWin::Reset()
 
     // Nichts selektieren, um Fehler beim erstselektieren zu vermeiden
     aCtlLightPreview.GetSvx3DLightControl().SelectLight(0);
+    aCtlLightPreview.CheckSelection();
 }
 
 bool Svx3DWin::GetUILightState( ImageButton& aBtn ) const
commit 4cc8ffba79ad8cfdb5361dad8fd58f3ba94559b7
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed May 29 13:26:44 2013 +0000

    #i122208# remove configure check for hash_map in system STL
    
    a standard compliant STL does NOT have these obsoleted STL headers

diff --git a/configure.in b/configure.in
index 4f799fa..4365235 100644
--- a/configure.in
+++ b/configure.in
@@ -2916,20 +2916,9 @@ dnl ===================================================================
 dnl system stl sanity tests
 dnl ===================================================================
 if test "$USE_SYSTEM_STL" = "YES"; then
-   AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
+   AC_MSG_CHECKING([system stl sanity])
    AC_LANG_PUSH([C++])
 
-   AC_TRY_COMPILE([#include <ext/hash_map>
-using namespace __gnu_cxx;
-],[hash_map<int, int> t; return 0;],
-  ac_cv_cxx_have_ext_hash_map=yes, ac_cv_cxx_have_ext_hash_map=no)
-
-   if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      AC_MSG_ERROR([Can't find hash_map. Try with --with-stlport])
-   else
-      AC_MSG_RESULT([$ac_cv_cxx_have_ext_hash_map])
-   fi
-
    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
       AC_MSG_CHECKING([if STL headers are visibility safe])
       AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
commit 3464c3499e708370359a9c0864bd4edc76d3a4c0
Author: Andre Fischer <af at apache.org>
Date:   Wed May 29 13:19:17 2013 +0000

    122405: Sidebar panels no longer dispose XUIElement's inner objects.

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index da30757..c0dd60f 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -91,13 +91,6 @@ void Panel::Dispose (void)
 {
     mxPanelComponent = NULL;
 
-    if (mxElement.is())
-    {
-        Reference<lang::XComponent> xComponent (mxElement->getRealInterface(), UNO_QUERY);
-        if (xComponent.is())
-            xComponent->dispose();
-    }
-
     {
         Reference<lang::XComponent> xComponent (mxElement, UNO_QUERY);
         mxElement = NULL;
commit c9e446d6f79908ed4af06e7940788e91b924b793
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 29 13:10:27 2013 +0000

    i121507 Added commata to whitespace list

diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 7855efd..3c65884 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -410,9 +410,24 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
         }
     }
     if ( bValid )
-    {   // skipping white spaces
-        while( ( nIndex < rParaString.getLength() ) && rParaString[ nIndex ] == (sal_Unicode)' ' )
-            nIndex++;
+    {
+        // skipping white spaces and commatas (#121507#)
+        const sal_Unicode aSpace(sal_Unicode(' '));
+        const sal_Unicode aCommata(sal_Unicode(','));
+
+        while(nIndex < rParaString.getLength())
+        {
+            const sal_Unicode aCandidate(rParaString[nIndex]);
+
+            if(aSpace == aCandidate || aCommata == aCandidate)
+            {
+                nIndex++;
+            }
+            else
+            {
+                break;
+            }
+        }
     }
     return bValid;
 }
commit bf4a58aa2185e1acb98e101625a96547417eba40
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 29 12:29:12 2013 +0000

    added missing include

diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index a64ae6f..5fbb2eb 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -52,7 +52,7 @@
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editstat.hxx>
-
+#include <svl/itempool.hxx>
 
 // Breite der Randzonen innerhalb derer beim D&D gescrollt wird
 #define OL_SCROLL_LRBORDERWIDTHPIX  10