[ooo-build-commit] 2 commits - patches/vba

[Noel Power]

 patches/vba/vba-currentcomponent-rework.diff |    5 +++--
 patches/vba/vba-fix-path-fullname.diff       |    6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit f7f5b16d6058f2a2eb6fb0db2aef65cd34ce0de6
Author: Noel Power <noel.power at novell.com>
Date:   Fri Jun 5 10:12:28 2009 +0100

    fix memory error
    
    * patches/vba/vba-currentcomponent-rework.diff:

diff --git a/patches/vba/vba-currentcomponent-rework.diff b/patches/vba/vba-currentcomponent-rework.diff
index a940df9..4cdc998 100644
--- a/patches/vba/vba-currentcomponent-rework.diff
+++ b/patches/vba/vba-currentcomponent-rework.diff
@@ -392,7 +392,7 @@ diff --git sfx2/source/doc/objxtor.cxx sfx2/source/doc/objxtor.cxx
 index 3421628..43c7458 100644
 --- sfx2/source/doc/objxtor.cxx
 +++ sfx2/source/doc/objxtor.cxx
-@@ -136,6 +136,32 @@ DBG_NAME(SfxObjectShell)
+@@ -136,6 +136,33 @@ DBG_NAME(SfxObjectShell)
  extern svtools::AsynchronLink* pPendingCloser;
  static WeakReference< XInterface > s_xCurrentComponent;
  
@@ -408,7 +408,8 @@ index 3421628..43c7458 100644
 +            {
 +                beans::PropertyValue aProp;
 +                xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisVBADocObj") ) ) >>= aProp;
-+                const char* pAscii = rtl::OUStringToOString( aProp.Name, RTL_TEXTENCODING_UTF8 ).getStr();
++                rtl::OString sTmp( rtl::OUStringToOString( aProp.Name, RTL_TEXTENCODING_UTF8 ) );
++                const char* pAscii = sTmp.getStr();
 +                if ( bClear )
 +                    pAppMgr->SetGlobalUNOConstant( pAscii, uno::makeAny( uno::Reference< uno::XInterface >() ) );
 +                else
commit 2dcfe30937018aaaed03fd2b78c60946295d2da9
Author: Noel Power <noel.power at novell.com>
Date:   Thu Jun 4 13:01:07 2009 +0100

    ensure that we use URL portions decoded the same way
    
    * patches/vba/vba-fix-path-fullname.diff:

diff --git a/patches/vba/vba-fix-path-fullname.diff b/patches/vba/vba-fix-path-fullname.diff
index ae87e8b..5c2e7c6 100644
--- a/patches/vba/vba-fix-path-fullname.diff
+++ b/patches/vba/vba-fix-path-fullname.diff
@@ -9,9 +9,9 @@ index e53279e..b8054cc 100644
 -	INetURLObject aURL( getModel()->getURL() );
 -	aURL.CutLastName();
 -	return aURL.GetURLPath();
-+        rtl::OUString sURL( getModel()->getURL() );
-+	INetURLObject aURL( sURL );
-+	sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() );
++       INetURLObject aURL( getModel()->getURL() );
++	rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
++	sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
 +        rtl::OUString sPath;
 +	::osl::File::getSystemPathFromFileURL( sURL, sPath );
 +	return sPath;