Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1351665 -
 /incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx
Date: Tue, 19 Jun 2012 12:09:14 -0000
To: ooo-commits@incubator.apache.org
From: af@apache.org
Message-Id: <20120619120914.9F6732388DBE@eris.apache.org>

Author: af
Date: Tue Jun 19 12:09:14 2012
New Revision: 1351665

URL: http://svn.apache.org/viewvc?rev=1351665&view=rev
Log:
#i119492# Moved patch to the right place.

Modified:
    incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx

Modified: incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx?rev=1351665&r1=1351664&r2=1351665&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/doc/objstor.cxx Tue Jun 19 12:09:14 2012
@@ -2351,29 +2351,7 @@ sal_Bool SfxObjectShell::InsertFrom( Sfx
         aArgs[nEnd-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InsertMode" ) );
         aArgs[nEnd-1].Value <<= (sal_Bool) sal_True;
 
-//-> #i119492
-//        return xLoader->filter( aArgs );
-// During loading, some OLE objects like chart will be set modified flag, so needs to reset the flag to false after loading
-        sal_Bool bRtn = xLoader->filter( aArgs );
-        uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames();
-        for ( sal_Int32 n = 0; n < aNames.getLength(); n++ )
-        {
-            ::rtl::OUString	aName = aNames[n];
-            uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
-            OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
-            if ( xObj.is() )
-            {
-                sal_Int32 nState = xObj->getCurrentState();
-                if ( nState == embed::EmbedStates::LOADED || nState == embed::EmbedStates::RUNNING )	// means that the object is not active
-                {
-                    uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
-                    if ( xModifiable.is() )
-                        xModifiable->setModified(sal_False);
-                }
-            }
-        }
-        return bRtn;
-//<- #i119492
+        return xLoader->filter( aArgs );
         }catch(const uno::Exception&)
         {}
     }
@@ -2464,7 +2442,29 @@ sal_Bool SfxObjectShell::ImportFrom( Sfx
             aArgs[nEnd-1].Value <<= rMedium.GetBaseURL();
         }
 
-        return xLoader->filter( aArgs );
+//-> #i119492
+//        return xLoader->filter( aArgs );
+// During loading, some OLE objects like chart will be set modified flag, so needs to reset the flag to false after loading
+        sal_Bool bRtn = xLoader->filter( aArgs );
+        uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames();
+        for ( sal_Int32 n = 0; n < aNames.getLength(); n++ )
+        {
+            ::rtl::OUString	aName = aNames[n];
+            uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
+            OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+            if ( xObj.is() )
+            {
+                sal_Int32 nState = xObj->getCurrentState();
+                if ( nState == embed::EmbedStates::LOADED || nState == embed::EmbedStates::RUNNING )	// means that the object is not active
+                {
+                    uno::Reference< util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
+                    if ( xModifiable.is() )
+                        xModifiable->setModified(sal_False);
+                }
+            }
+        }
+        return bRtn;
+//<- #i119492
         }catch(const uno::Exception&)
         {}
     }