[Libreoffice-commits] core.git: 2 commits - extensions/source include/oox oox/source

[Noel Grandin]

 extensions/source/bibliography/datman.cxx |    4 ----
 extensions/source/bibliography/datman.hxx |    1 -
 include/oox/core/recordparser.hxx         |    1 -
 oox/source/core/recordparser.cxx          |    2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit c1a204e71e5c9d7391469fd1dd9d79948df6eef9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 26 16:44:22 2017 +0200

    readonly maPublicId in RecordInputSource
    
    since
        commit 3381981e76873304b171f7df900561dac681d2af
        Date:   Thu Jan 17 07:06:10 2008 +0000
        #i10000# Bring module to HEAD.
    
    Change-Id: I2ea7e1e3c284c03be369fc7cb29fa70b3d671009
    Reviewed-on: https://gerrit.libreoffice.org/42834
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index 637890aa0361..e0069a6ebe9f 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -44,7 +44,6 @@ namespace prv {
 struct RecordInputSource
 {
     BinaryInputStreamRef mxInStream;
-    OUString     maPublicId;
     OUString     maSystemId;
 };
 
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 0f6e463d693d..e0d7858e211e 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -80,7 +80,7 @@ sal_Int32 SAL_CALL Locator::getLineNumber()
 OUString SAL_CALL Locator::getPublicId()
 {
     checkDispose();
-    return mpParser->getInputSource().maPublicId;
+    return OUString();
 }
 
 OUString SAL_CALL Locator::getSystemId()
commit 290507945df40b3890396835ef99185e6ed70f31
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 26 16:37:28 2017 +0200

    readonly xBibCursor in BibDataManager
    
    since
        commit 95117e7fefa9ae82431dcdffd1e58495730f6f54
        Date:   Mon Sep 18 15:18:56 2000 +0000
        initial import
    
    Change-Id: Ia7e57f1e0e2b19c6eb5b66ada9cc062f202b453a
    Reviewed-on: https://gerrit.libreoffice.org/42833
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 22d4e8fae122..161b24048040 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1422,10 +1422,6 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt)
             }
             else
                 aUID = evt.NewValue;
-
-            Reference< XRowLocate > xLocate(xBibCursor, UNO_QUERY);
-            DBG_ASSERT(xLocate.is(), "BibDataManager::propertyChange : invalid cursor !");
-            xLocate->moveToBookmark(aUID);
         }
     }
     catch (const Exception&)
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index d24e20170781..f988e29f9fad 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -92,7 +92,6 @@ private:
         OUString                     aDataSourceURL;
         OUString                     aQuoteChar;
         css::uno::Any                aUID;
-        css::uno::Reference< css::sdbc::XResultSet >                  xBibCursor;
 
         ::comphelper::OInterfaceContainerHelper2   m_aLoadListeners;