[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/dde-reconnect-on-load-svx.diff |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit c8bba9eb7247d4dcaa5ea521bb720cce924ed755
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Jul 9 11:53:19 2010 -0400

    Translate file paths to platform independent URL format.
    
    Without the translation the code would not work on Windows.
    
    * patches/dev300/dde-reconnect-on-load-svx.diff:

diff --git a/patches/dev300/dde-reconnect-on-load-svx.diff b/patches/dev300/dde-reconnect-on-load-svx.diff
index 278381e..5f7e618 100644
--- a/patches/dev300/dde-reconnect-on-load-svx.diff
+++ b/patches/dev300/dde-reconnect-on-load-svx.diff
@@ -20,7 +20,7 @@ index b614aba..1b3142a 100644
      virtual BOOL GetDisplayNames( const sfx2::SvBaseLink*,
                                      String* pType,
 diff --git svx/source/svxlink/linkmgr.cxx svx/source/svxlink/linkmgr.cxx
-index 0e2415f..03459c5 100644
+index 0e2415f..86d9e97 100644
 --- svx/source/svxlink/linkmgr.cxx
 +++ svx/source/svxlink/linkmgr.cxx
 @@ -57,6 +57,9 @@
@@ -33,7 +33,7 @@ index 0e2415f..03459c5 100644
  class SvxInternalLink : public sfx2::SvLinkSource
  {
  public:
-@@ -107,6 +110,49 @@ BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
+@@ -107,6 +110,51 @@ BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
                                      sfx2::LINKUPDATE_ONCALL, &sCmd );
  }
  
@@ -54,12 +54,14 @@ index 0e2415f..03459c5 100644
 +            continue;
 +
 +        if (!aType.EqualsAscii("soffice"))
++            // DDE connections between OOo apps are always named 'soffice'.
 +            continue;
 +
-+        OUStringBuffer aBuf;
-+        aBuf.appendAscii("file://");
-+        aBuf.append(aFile);
-+        if (!aBuf.makeStringAndClear().equalsIgnoreAsciiCase(pMed->GetName()))
++        String aTmp;
++        utl::LocalFileHelper::ConvertPhysicalNameToURL(aFile, aTmp);
++        OUString aURL = aTmp;
++
++        if (!aURL.equalsIgnoreAsciiCase(pMed->GetName()))
 +            // This DDE link is not associated with this server shell...  Skip it.
 +            continue;
 +
@@ -83,7 +85,7 @@ index 0e2415f..03459c5 100644
  BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
  {
      if( OBJECT_CLIENT_FILE == ( OBJECT_CLIENT_FILE & rLink.GetObjType() ))
-@@ -338,7 +384,23 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+@@ -338,7 +386,23 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
      if( !sTopic.Len() )
          return FALSE;
  
@@ -108,7 +110,7 @@ index 0e2415f..03459c5 100644
      {
          // dann versuche die Datei zu laden:
          INetURLObject aURL( sTopic );
-@@ -353,7 +415,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+@@ -353,7 +417,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
              SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
              SfxStringItem aReferer( SID_REFERER, sReferer );
              SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
@@ -117,7 +119,7 @@ index 0e2415f..03459c5 100644
  
              // #i14200# (DDE-link crashes wordprocessor)
              SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-@@ -365,28 +427,13 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+@@ -365,28 +429,13 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
              aArgs.Put(aUpdate);
              aArgs.Put(aReadOnly);
              pFndShell = SfxObjectShell::CreateAndLoadObject( aArgs );
@@ -131,10 +133,10 @@ index 0e2415f..03459c5 100644
 -        if( pNewSrc )
 -        {
 -            bRet = TRUE;
- 
+-
 -            ::com::sun::star::datatransfer::DataFlavor aFl;
 -            SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl );
--
+ 
 -            pLink->SetObj( pNewSrc );
 -            pNewSrc->AddDataAdvise( pLink, aFl.MimeType,
 -                                sfx2::LINKUPDATE_ONCALL == pLink->GetUpdateMode()