[Libreoffice-commits] .: 2 commits - sw/source sysui/desktop

[Caolán McNamara]

 sw/source/core/crsr/crsrsh.cxx     |    3 ++-
 sysui/desktop/share/create_tree.sh |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 188696a20a4bd480db79135551a4307e63f745a5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 14 16:27:22 2011 +0100

    don't crash

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 7339aba..6278e62 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -614,7 +614,8 @@ SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
     SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
     if( pCNd )
     {
-        pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False )->GetUpper();
+        SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False );
+        pFrm = pCntFrm ? pCntFrm->GetUpper() : NULL;
         while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
             pFrm = pFrm->IsFlyFrm() ? ((SwFlyFrm*)pFrm)->AnchorFrm()
                                     : pFrm->GetUpper();
commit b7912ec63cdb4757b53a37661a56b600fcc96d87
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 14 16:26:26 2011 +0100

    don't quote ???x???

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 8f74787..da2a205 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -3,7 +3,7 @@ umask 022
 
 if [ "${KDEMAINDIR}" ]; then
   echo "Copying icons..."
-  for i in `cd "${ICON_SOURCE_DIR}"; find "${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor}" -name "*.png"`
+  for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor} -name "*.png"`
   do
     targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname ${i}`
     mkdir -p "${targetdir}"