[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/xmlsource/xmlsourcedlg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d0fac0b0fd65a28634b263a91f7ea9960facd76b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Oct 12 23:53:44 2012 -0400

    When setting a link position to a repeat element, set the range parent flag.
    
    Change-Id: I86b999297f96c4a2e55682d1da9a6c2e62f5f472

diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 4a0684d..b9d518b 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -99,6 +99,7 @@ void ScXMLSourceDlg::SetReference(const ScRange& rRange, ScDocument* pDoc)
         return;
 
     pUserData->maLinkedPos = rRange.aStart;
+    pUserData->mbRangeParent = pUserData->meType == ScOrcusXMLTreeParam::ElementRepeat;
 }
 
 void ScXMLSourceDlg::Deactivate()
commit ab267d6f7d8175e7c7873f085b46c726046a2d0d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Oct 12 23:45:50 2012 -0400

    Don't allow reference mode when the control is disabled.
    
    Change-Id: I9ba6121ee67f3f4fc0b4a1fb3b14036fce2e88e9

diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e6f39e3..4a0684d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -74,7 +74,7 @@ ScXMLSourceDlg::~ScXMLSourceDlg()
 
 sal_Bool ScXMLSourceDlg::IsRefInputMode() const
 {
-    return mpActiveEdit != NULL;
+    return mpActiveEdit != NULL && mpActiveEdit->IsEnabled();
 }
 
 void ScXMLSourceDlg::SetReference(const ScRange& rRange, ScDocument* pDoc)