CWS-TOOLING: integrate CWS fwk92

2008-12-04 14:43:28 +0100 oc  r264844 : #i96788#
2008-12-03 02:15:17 +0100 fredrikh  r264734 : i96817
2008-12-02 16:42:46 +0100 tbo  r264720 : #i96763# changes to password dialog for framework, math, global
2008-11-26 16:26:28 +0100 mav  r264418 : #i93617# fix typo
2008-11-26 16:13:03 +0100 mav  r264411 : #i93617# fix the linux scenario
2008-11-25 17:58:01 +0100 mav  r264323 : #i93617# fix the windows problems
2008-11-25 17:51:33 +0100 mav  r264321 : #i93617# fix the windows problems
2008-11-21 16:01:18 +0100 mav  r264145 : #i78753# integrate the patch
2008-11-21 14:08:32 +0100 mav  r264136 : #i93617# integrate the patch
2008-11-21 13:01:56 +0100 mav  r264127 : #i82947# integrate the patch
2008-11-20 18:14:19 +0100 mav  r264092 : #i95793# look for import filter
2008-11-18 15:23:44 +0100 pb  r263776 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:21:39 +0100 pb  r263774 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:18:54 +0100 pb  r263772 : fix: #i92583# SvxSearchPage::InitControls_Impl() added
2008-11-18 15:16:07 +0100 pb  r263771 : fix: #i92579# columns calculated newly
2008-11-18 11:09:28 +0100 mav  r263751 : #i21923# small fixes
2008-11-17 17:22:04 +0100 mav  r263730 : #i21923# integrate the patch
2008-11-17 14:29:02 +0100 mav  r263723 : #i21923# integrate the patch
2008-11-13 16:46:08 +0100 mav  r263653 : #i88127# integrate the patch
2008-11-13 14:46:56 +0100 mav  r263645 : #i54638# integrate the patch
2008-11-11 13:11:03 +0100 pb  r263554 : fix: #i93142# disable maRecommReadOnlyCB on read-only documents
2008-11-10 13:30:58 +0100 pb  r263516 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 13:29:10 +0100 pb  r263515 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 06:10:11 +0100 pb  r263505 : fix: #i94937# now .uno.ExtendedHelp without image
2008-11-04 20:52:50 +0100 mav  r263337 : migrate cws fwk92 to svn

3 files changed, 16 insertions, 7 deletions

diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 21b63b73712b..781d60332376 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docsh2.cxx,v $
- * $Revision: 1.105 $
+ * $Revision: 1.103.144.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1517,7 +1517,8 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
                                    String * /*pAppName*/,
                                    String * pLongUserName,
                                    String * pUserName,
-                                   sal_Int32 nVersion ) const
+                                   sal_Int32 nVersion,
+                                   sal_Bool bTemplate /* = sal_False */) const
 {
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
@@ -1528,7 +1529,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
     else if (nVersion == SOFFICE_FILEFORMAT_8)
     {
         *pClassName     = SvGlobalName( SO3_SW_CLASSID_60 );
-        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITER_8;
+        *pClipFormat    = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8;
         *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
     }
 
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/ui/globdoc/globdoc.cxx
index 027315222688..ae2c98507bbe 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/ui/globdoc/globdoc.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: globdoc.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.146.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,8 +68,12 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
                                    String * /*pAppName*/,
                                    String * pLongUserName,
                                    String * pUserName,
-                                   sal_Int32 nVersion ) const
+                                   sal_Int32 nVersion,
+                                   sal_Bool bTemplate /* = sal_False */) const
 {
+    (void)bTemplate;
+    DBG_ASSERT( bTemplate == sal_False, "No template for Writer Global" );
+
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx
index aafe6527c996..9f7eff770172 100644
--- a/sw/source/ui/web/wdocsh.cxx
+++ b/sw/source/ui/web/wdocsh.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: wdocsh.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.146.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -92,8 +92,12 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
                                    String * /*pAppName*/,
                                    String * pLongUserName,
                                    String * pUserName,
-                                   sal_Int32 nVersion ) const
+                                   sal_Int32 nVersion,
+                                   sal_Bool bTemplate /* = sal_False */) const
 {
+    (void)bTemplate;
+    DBG_ASSERT( bTemplate == sal_False, "No template for Writer Web" );
+
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 );