diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-12 12:52:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-12 12:52:51 +0000 |
| commit | d6b3e99927528cd5ad313b36835abd287996519e (patch) | |
| tree | d1c098a75db04ab9164c319b88130241eb43a907 /starmath | |
| parent | 24adb0c2f754fe71d0eb7f7e0aeec325cf9edd2a (diff) | |
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
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/document.hxx | 5 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 7 |
2 files changed, 7 insertions, 5 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)); } |