[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source

Andrzej J.R. Hunt andrzej at ahunt.org
Wed Dec 4 11:51:06 PST 2013


 dbaccess/source/core/api/tablecontainer.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit c6e36556c14612aa1eaf976efc10db6c88e23fb0
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Sun Nov 10 18:05:07 2013 +0000

    fdo#70144 Don't reset Document's modified flag when inserting new table.
    
    It is unclear why the modified flag should ever be blindly overwritten hence
    we no longer touch the modified flag here. (This change appears to have no
    undesired side-effects.)
    
    Change-Id: I246eb7d84249794fa4d52fcd9b008d8340bbc82d
    Reviewed-on: https://gerrit.libreoffice.org/6632
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 56d4f4b7b97eaf212a3bc6bdb1da767106e7224a)

diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 32400c8..fc6e924 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -146,8 +146,7 @@ namespace
 void lcl_createDefintionObject(const OUString& _rName
                            ,const Reference< XNameContainer >& _xTableDefinitions
                            ,Reference<XPropertySet>& _xTableDefinition
-                           ,Reference<XNameAccess>& _xColumnDefinitions
-                           ,sal_Bool _bModified)
+                           ,Reference<XNameAccess>& _xColumnDefinitions)
 {
     if ( _xTableDefinitions.is() )
     {
@@ -158,7 +157,6 @@ void lcl_createDefintionObject(const OUString& _rName
             // set as folder
             _xTableDefinition.set( TableDefinition::createWithName( ::comphelper::getProcessComponentContext(), _rName ), UNO_QUERY);
             _xTableDefinitions->insertByName(_rName,makeAny(_xTableDefinition));
-            ::dbaccess::notifyDataSourceModified(_xTableDefinitions,_bModified);
         }
         Reference<XColumnsSupplier> xColumnsSupplier(_xTableDefinition,UNO_QUERY);
         if ( xColumnsSupplier.is() )
@@ -180,7 +178,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r
     {
         Reference<XPropertySet> xTableDefinition;
         Reference<XNameAccess> xColumnDefinitions;
-        lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+        lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
 
         if ( xSup.is() )
         {
@@ -311,7 +309,7 @@ ObjectType OTableContainer::appendObject( const OUString& _rForName, const Refer
 
     Reference<XPropertySet> xTableDefinition;
     Reference<XNameAccess> xColumnDefinitions;
-    lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
+    lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
     Reference<XColumnsSupplier> xSup(descriptor,UNO_QUERY);
     Reference<XDataDescriptorFactory> xFac(xColumnDefinitions,UNO_QUERY);
     Reference<XAppend> xAppend(xColumnDefinitions,UNO_QUERY);


More information about the Libreoffice-commits mailing list