real 6.0 file format

9 files changed, 78 insertions, 38 deletions

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index a5ec95828181..8a67a14a088f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.src,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kz $ $Date: 2001-02-02 16:40:49 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1610,7 +1610,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_40
     Text[ turkish ] = "%PRODUCTNAME 4.0 metni";
 };
 
-String STR_WRITER_DOCUMENT_FULLTYPE
+String STR_WRITER_DOCUMENT_FULLTYPE_50
 {
     Text = "%PRODUCTNAME 5.0 Text" ;
     Text [ English ] = "StarOffice 5.0 Text" ;
@@ -1636,6 +1636,11 @@ String STR_WRITER_DOCUMENT_FULLTYPE
     Text[ turkish ] = "%PRODUCTNAME 5.0 metni";
     Text[ language_user1 ] = " ";
 };
+String STR_WRITER_DOCUMENT_FULLTYPE
+{
+    Text = "%PRODUCTNAME 6.0 Text" ;
+    Text [ English ] = "StarOffice 6.0 Text" ;
+};
 
 
 String STR_CANTOPEN
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index eae4ebf031de..3a183565e82d 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docsh.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mib $ $Date: 2001-02-01 14:30:12 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -282,7 +282,7 @@ class SwTmpPersist : public SvPersist
                             String * pAppName,
                             String * pLongUserName,
                             String * pUserName,
-                            long nFileFormat=SOFFICE_FILEFORMAT_NOW ) const;
+                            long nFileFormat=SOFFICE_FILEFORMAT_CURRENT ) const;
     virtual BOOL Save();
     virtual BOOL SaveCompleted( SvStorage * );
 public:
@@ -516,7 +516,7 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium )
 
 BOOL SwDocShell::Save()
 {
-    sal_Bool bXML = pIo->GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_XML;
+    sal_Bool bXML = pIo->GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60;
 
     SwWait aWait( *this, TRUE );
     ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE;
@@ -596,7 +596,7 @@ BOOL SwDocShell::Save()
 
 BOOL SwDocShell::SaveAs( SvStorage * pStor )
 {
-    sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_XML;
+    sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_60;
 
     SwWait aWait( *this, TRUE );
 
@@ -1479,6 +1479,9 @@ BOOL SwTmpPersist::SaveCompleted( SvStorage * pStor )
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.7  2001/02/01 14:30:12  mib
+    XML files now can be loaded/saved as own format
+
     Revision 1.6  2001/01/19 09:40:12  jp
     Method SvLinkManager::PrepareReload removed
 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index a13bf08b05b3..b9236646a70c 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docsh2.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: jp $ $Date: 2001-02-05 18:44:42 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1358,17 +1358,15 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
         pAppName->AssignAscii( "StarWriter 4.0" );
         *pLongUserName  = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE_40);
     }
-    else if (nVersion == SOFFICE_FILEFORMAT_XML)
+    else if (nVersion == SOFFICE_FILEFORMAT_50)
     {
-        *pClassName     = SvGlobalName( SO3_SW_CLASSID_60 );
-
-        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITER_60;
-        *pLongUserName  = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
+        *pClassName     = SvGlobalName( SO3_SW_CLASSID_50 );
+        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITER_50;
+        *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE_50);
     }
-    else if (nVersion == SOFFICE_FILEFORMAT_NOW ||
-             nVersion == SOFFICE_FILEFORMAT_50)
+    else if (nVersion == SOFFICE_FILEFORMAT_60)
     {
-        *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
+        *pClassName     = SvGlobalName( SO3_SW_CLASSID_60 );
     }
     *pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME);
 }
@@ -1700,6 +1698,9 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL,
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.12  2001/02/05 18:44:42  jp
+    Bug #83467#: LoadStylesFrom - initialise the reader variable
+
     Revision 1.11  2001/02/01 14:30:13  mib
     XML files now can be loaded/saved as own format
 
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 5cc1fa5e06c8..719517f7e339 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docshini.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mib $ $Date: 2001-02-01 14:30:13 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:41:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -512,7 +512,7 @@ void SwDocShell::RemoveLink()
 sal_Bool  SwDocShell::Load(SvStorage* pStor)
 {
     sal_Bool bRet = sal_False;
-    sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_XML;
+    sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_60;
     if( SfxInPlaceObject::Load( pStor ))
     {
         if( pDoc )              // fuer Letzte Version !!
@@ -800,6 +800,9 @@ void SwDocShell::SubInitNew()
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.9  2001/02/01 14:30:13  mib
+    XML files now can be loaded/saved as own format
+
     Revision 1.8  2000/11/20 09:12:09  jp
     should change: use LocaleDataWrapper
 
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 12c2eb8872d4..b6abb139b5b7 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uinums.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2000-11-15 09:13:34 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:45:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -664,7 +664,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
     for( USHORT n = aItems.Count(); n; )
     {
         SfxPoolItem* pItem = aItems[ --n ];
-        USHORT nIVers = pItem->GetVersion( SOFFICE_FILEFORMAT_NOW );
+        USHORT nIVers = pItem->GetVersion( SOFFICE_FILEFORMAT_50 );
         ASSERT( nIVers != USHRT_MAX,
                 "Was'n das: Item-Version USHRT_MAX in der aktuellen Version" );
         rStream << pItem->Which()
@@ -684,13 +684,13 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
 
         if( aFmt.GetGrfBrush() )
         {
-            USHORT nVersion = aFmt.GetGrfBrush()->GetVersion( SOFFICE_FILEFORMAT_NOW );
+            USHORT nVersion = aFmt.GetGrfBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
             rStream << nVersion;
             aFmt.GetGrfBrush()->Store( rStream, nVersion );
         }
         if( aFmt.GetGrfOrient() )
         {
-            USHORT nVersion = aFmt.GetGrfOrient()->GetVersion( SOFFICE_FILEFORMAT_NOW );
+            USHORT nVersion = aFmt.GetGrfOrient()->GetVersion( SOFFICE_FILEFORMAT_50 );
             rStream << nVersion;
             aFmt.GetGrfOrient()->Store( rStream, nVersion );
         }
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx
index e128b7e33abd..a14b83882899 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/ui/globdoc/globdoc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globdoc.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:43:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,16 +137,26 @@ void __EXPORT SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
 
         *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE_40);
     }
-    else if (nVersion == SOFFICE_FILEFORMAT_NOW)
+    else if (nVersion == SOFFICE_FILEFORMAT_50)
+    {
+        *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_50 );
+        *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_50;
+        *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE_50);
+    }
+    else if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
     }
+
     *pUserName = SW_RESSTR(STR_HUMAN_SWGLOBDOC_NAME);
 }
 
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:38  hr
+    initial import
+
     Revision 1.9  2000/09/18 16:05:35  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src
index cec492281e75..9b6ae83f4984 100644
--- a/sw/source/ui/globdoc/globdoc.src
+++ b/sw/source/ui/globdoc/globdoc.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: globdoc.src,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:43:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,7 +90,11 @@ String STR_WRITER_GLOBALDOC_FULLTYPE_40
 {
     Text = "StarOffice 4.0 Global Document" ;
 };
-String STR_WRITER_GLOBALDOC_FULLTYPE
+String STR_WRITER_GLOBALDOC_FULLTYPE_50
 {
     Text = "StarOffice 5.0 Global Document" ;
 };
+String STR_WRITER_GLOBALDOC_FULLTYPE
+{
+    Text = "StarOffice 6.0 Global Document" ;
+};
diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx
index 5131747e57de..78e1152b96f6 100644
--- a/sw/source/ui/web/wdocsh.cxx
+++ b/sw/source/ui/web/wdocsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wdocsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:51 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:42:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,7 +180,13 @@ void __EXPORT SwWebDocShell::FillClass( SvGlobalName * pClassName,
 
         *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE_40);
     }
-    else if (nVersion == SOFFICE_FILEFORMAT_NOW)
+    else if ( nVersion == SOFFICE_FILEFORMAT_50)
+    {
+        *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_50 );
+        *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_50;
+        *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE_50);
+    }
+    else if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE);
     }
@@ -190,6 +196,9 @@ void __EXPORT SwWebDocShell::FillClass( SvGlobalName * pClassName,
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:51  hr
+    initial import
+
     Revision 1.22  2000/09/18 16:06:20  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 42638246a901..73180e518aba 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: web.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2000-12-06 15:07:33 $
+ *  last change: $Author: mib $ $Date: 2001-02-06 15:42:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,7 +131,7 @@ String STR_WRITER_WEBDOC_FULLTYPE_40
     Text[ turkish ] = "%PRODUCTNAME 4.0 HTML";
     Text[ language_user1 ] = " ";
 };
-String STR_WRITER_WEBDOC_FULLTYPE
+String STR_WRITER_WEBDOC_FULLTYPE_50
 {
     Text = "%PRODUCTNAME 5.0 HTML" ;
     Text [ English ] = "StarOffice 5.0 HTML" ;
@@ -157,6 +157,11 @@ String STR_WRITER_WEBDOC_FULLTYPE
     Text[ turkish ] = "%PRODUCTNAME 5.0 HTML";
     Text[ language_user1 ] = " ";
 };
+String STR_WRITER_WEBDOC_FULLTYPE
+{
+    Text = "%PRODUCTNAME 6.0 HTML" ;
+    Text [ English ] = "StarOffice 6.0 HTML" ;
+};
 String STR_SHELLNAME_WEBTEXT
 {
     Text = "Text/Web" ;