summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--starmath/inc/document.hxx5
-rw-r--r--starmath/source/document.cxx7
-rw-r--r--sw/inc/docsh.hxx5
-rw-r--r--sw/inc/globdoc.hxx5
-rw-r--r--sw/inc/wdocsh.hxx5
-rw-r--r--sw/source/ui/app/docsh2.cxx7
-rw-r--r--sw/source/ui/globdoc/globdoc.cxx8
-rw-r--r--sw/source/ui/web/wdocsh.cxx8
8 files changed, 32 insertions, 18 deletions
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index b5d273ec729c..fac4f1b0faa4 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: document.hxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.35.26.1 $
*
* This file is part of OpenOffice.org.
*
@@ -142,7 +142,8 @@ class SmDocShell : public SfxObjectShell, public SfxListener
String* pAppName,
String* pFullTypeName,
String* pShortTypeName,
- sal_Int32 nFileFormat ) const;
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate = sal_False ) const;
virtual BOOL SetData( const String& rData );
virtual ULONG GetMiscStatus() const;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 4a4bd42c6097..6cca4efff8ca 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: document.cxx,v $
- * $Revision: 1.94 $
+ * $Revision: 1.94.26.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1359,7 +1359,8 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
String* /*pAppName*/,
String* pFullTypeName,
String* pShortTypeName,
- sal_Int32 nFileFormat ) const
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate /* = sal_False */) const
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::FillClass" );
@@ -1373,7 +1374,7 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
else if (nFileFormat == SOFFICE_FILEFORMAT_8 )
{
*pClassName = SvGlobalName(SO3_SM_CLASSID_60);
- *pFormat = SOT_FORMATSTR_ID_STARMATH_8;
+ *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8;
*pFullTypeName = String(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
*pShortTypeName = String(SmResId(RID_DOCUMENTSTR));
}
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 14fb9d33106d..8f5a04658e6c 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: docsh.hxx,v $
- * $Revision: 1.49 $
+ * $Revision: 1.48.72.2 $
*
* This file is part of OpenOffice.org.
*
@@ -240,7 +240,8 @@ public:
String * pAppName,
String * pLongUserName,
String * pUserName,
- sal_Int32 nFileFormat ) const;
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate = sal_False ) const;
virtual void LoadStyles( SfxObjectShell& rSource );
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 14d21716f10d..23f92c473453 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: globdoc.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.146.1 $
*
* This file is part of OpenOffice.org.
*
@@ -48,7 +48,8 @@ public:
String * pAppName,
String * pLongUserName,
String * pUserName,
- sal_Int32 nFileFormat ) const;
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate = sal_False ) const;
};
#endif
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index df777fcd3895..caf192545a82 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: wdocsh.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.146.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,8 @@ public:
String * pAppName,
String * pLongUserName,
String * pUserName,
- sal_Int32 nFileFormat ) const;
+ sal_Int32 nFileFormat,
+ sal_Bool bTemplate = sal_False ) const;
USHORT GetSourcePara()const
{return nSourcePara;}
void SetSourcePara(USHORT nSet) {nSourcePara = nSet;}
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 );
generated by cgit (git 2.34.1) at 2024-05-21 03:32:41 +0000