[ooo-build-commit] .: patches/dev300

Kohei Yoshida kohei at kemper.freedesktop.org
Tue Aug 3 12:30:49 PDT 2010


 patches/dev300/dde-reconnect-on-load-sc.diff |    2 +-
 patches/dev300/dde-reconnect-on-load-sw.diff |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81aac5a585d79974667e13219c08769ebba6bc59
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Aug 3 15:30:01 2010 -0400

    Fixed build breakage.
    
    SvxLinkManager is no more; it's been combined with sfx2::LinkManager.
    
    * patches/dev300/dde-reconnect-on-load-sc.diff:
    * patches/dev300/dde-reconnect-on-load-sw.diff:

diff --git a/patches/dev300/dde-reconnect-on-load-sc.diff b/patches/dev300/dde-reconnect-on-load-sc.diff
index 0a08974..8375926 100644
--- a/patches/dev300/dde-reconnect-on-load-sc.diff
+++ b/patches/dev300/dde-reconnect-on-load-sc.diff
@@ -8,7 +8,7 @@ index bb7b82f..8d9a9f0 100644
  
 +void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
 +{
-+    SvxLinkManager* pLinkManager = aDocument.GetLinkManager();
++    ::sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
 +    if (!pLinkManager)
 +        return;
 +
diff --git a/patches/dev300/dde-reconnect-on-load-sw.diff b/patches/dev300/dde-reconnect-on-load-sw.diff
index d50f460..ee386ce 100644
--- a/patches/dev300/dde-reconnect-on-load-sw.diff
+++ b/patches/dev300/dde-reconnect-on-load-sw.diff
@@ -19,7 +19,7 @@ index cea9d74..5a4a07d 100644
  #include <editeng/svxacorr.hxx>
  #include <editeng/langitem.hxx>
  #include <svx/fmshell.hxx>
-+#include <svx/linkmgr.hxx>
++#include <sfx2/linkmgr.hxx>
  
  #include <svtools/htmlcfg.hxx>
  #include <svx/ofaitem.hxx>
@@ -29,7 +29,7 @@ index cea9d74..5a4a07d 100644
  
 +void SwDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
 +{
-+    SvxLinkManager& rLinkManager = pDoc->GetLinkManager();
++    ::sfx2::LinkManager& rLinkManager = pDoc->GetLinkManager();
 +    rLinkManager.ReconnectDdeLink(rServer);
 +}
 +


More information about the ooo-build-commit mailing list