CWS-TOOLING: integrate CWS mav44

2009-01-18 22:39:43 +0100 mav  r266467 : #i97073# the soffice file should be a shell script, adjust the plugin
2009-01-18 22:35:15 +0100 mav  r266466 : #i97073# the soffice file should be a shell script, integrate fix from hro41 cws
2009-01-16 15:32:10 +0100 mav  r266426 : #i96456# fix link resolving
2009-01-16 12:21:39 +0100 mav  r266413 : #i97073# the soffice file is no more a shell script
2009-01-16 09:58:05 +0100 mav  r266402 : #i95409# add complex test using unicode names
2009-01-15 20:27:03 +0100 mav  r266392 : #i95408# fix include list
2009-01-15 20:09:28 +0100 mav  r266390 : #i95408# deliver new header
2009-01-15 16:16:33 +0100 mav  r266382 : #i95408# rebase to m38
2009-01-15 16:11:16 +0100 mav  r266380 : #i95408# rebase to m38
2009-01-15 15:38:16 +0100 mav  r266376 : CWS-TOOLING: rebase CWS mav44 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 13:23:55 +0100 mav  r266294 : #i97073# let the presentation slideshow be started in window mode in plugin
2009-01-13 17:27:52 +0100 mav  r266241 : #i95409#,#i95408# support UTF8 encoding for entry names, check the validity of the entries
2009-01-13 16:35:39 +0100 mav  r266236 : #i95408# function to check whether a zip entry name is acceptable
2009-01-13 12:00:18 +0100 mav  r266205 : #i94003# a readonly document can not be modified
2009-01-09 13:24:49 +0100 mav  r266078 : #i95951# let the title be changed
2009-01-09 11:34:49 +0100 mav  r266068 : #i80862# close the link only if was closed by the container, othewise leave it open
2009-01-08 11:30:13 +0100 mav  r265989 : #i97071# disable Toolbars during window-based slide show in ActiveX control
2009-01-08 08:23:23 +0100 mav  r265983 : #i97071# setVisible does not trigger layout in case there is not MenuBar
2009-01-06 12:39:39 +0100 mav  r265908 : #i96185# let the MediaDescriptor get the target URL
2009-01-05 08:46:45 +0100 mav  r265856 : #i93473# integrate the patch
2009-01-02 17:45:17 +0100 mav  r265845 : #i94468#,#i96456# try to follow links
2009-01-02 16:53:41 +0100 mav  r265841 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file
2009-01-02 16:51:24 +0100 mav  r265839 : #i94468#,#i96456# use the same parsing mechanics in sharing control file and document lock file

2 files changed, 15 insertions, 1 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index cfbcb87f75..c74072b901 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2765,6 +2765,17 @@ void SfxMedium::Init_Impl()
         DBG_ERROR( "Unexpected Output stream parameter!\n" );
     }
 
+    if ( aLogicName.Len() )
+    {
+        // if the logic name is set it should be set in MediaDescriptor as well
+        SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        if ( !pFileNameItem )
+        {
+            // let the ItemSet be created if necessary
+            GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, INetURLObject( aLogicName ).GetMainURL( INetURLObject::NO_DECODE ) ) );
+        }
+    }
+
     SetIsRemote_Impl();
 }
 
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index c3ef886929..6d843892f4 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -61,6 +61,7 @@
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/container/XChild.hpp>
 
@@ -336,9 +337,11 @@ sal_Bool SfxObjectShell::IsModified()
     if ( pImp->m_bIsModified )
         return sal_True;
 
-    if ( !pImp->m_xDocStorage.is() )
+    if ( !pImp->m_xDocStorage.is() || IsReadOnly() )
     {
         // if the document still has no storage and is not set to be modified explicitly it is not modified
+        // a readonly document is also not modified
+
         return sal_False;
     }