SwDocShell: re-store embedded data source def only when location changes

Change-Id: Ic667491026e9e88a72253aa079c77b8079cac588

sw/qa/extras/uiwriter/uiwriter.cxx

@@ -1091,6 +1091,11 @@ void SwUiWriterTest::testEmbeddedDataSource()
     mxComponent->dispose();
     mxComponent.clear();
     CPPUNIT_ASSERT(!xDatabaseContext->hasByName("calc-data-source"));
+
+    // Now open again the saved result, and instead of 'save as', just 'save'.
+    mxComponent = loadFromDesktop(maTempFile.GetURL(), "com.sun.star.text.TextDocument");
+    uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
+    xStorable->store();
 }
 
 void SwUiWriterTest::testUnoCursorPointer()

sw/source/uibase/app/docsh.cxx

@@ -420,7 +420,8 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
 
     CalcLayoutForOLEObjects();  // format for OLE objets
 
-    if (!m_pDoc->GetDBManager()->getEmbeddedName().isEmpty())
+    bool bURLChanged = !GetMedium() || GetMedium()->GetURLObject() != rMedium.GetURLObject();
+    if (!m_pDoc->GetDBManager()->getEmbeddedName().isEmpty() && bURLChanged)
     {
         // We have an embedded data source definition, need to re-store it,
         // otherwise relative references will break when the new file is in a