summaryrefslogtreecommitdiff
path: root/sw/source/filter/writer
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-11-13 16:30:15 +0000
committerjp <jp@openoffice.org>2000-11-13 16:30:15 +0000
commitf8990bbfbb549c7567930dda1842a5f0cd5d6da3 (patch)
treedfb84c1e5357f865004e83a90d531bf434cfe92c /sw/source/filter/writer
parent49cdab9ea5b894469083244250c842eae59c5d4a (diff)
new method PutCJKandCTLFontsInAttrPool
Diffstat (limited to 'sw/source/filter/writer')
-rw-r--r--sw/source/filter/writer/writer.cxx54
1 files changed, 35 insertions, 19 deletions
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index bd001335bb19..0b784325f334 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: writer.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jp $ $Date: 2000-11-01 19:31:51 $
+ * last change: $Author: jp $ $Date: 2000-11-13 17:26:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,10 +94,6 @@
#include <svx/eeitem.hxx>
#endif
-
-#ifndef _TOOLS_TEMPFILE_HXX
-#include <tools/tempfile.hxx>
-#endif
#ifndef _SHELLIO_HXX
#include <shellio.hxx>
#endif
@@ -503,23 +499,40 @@ void Writer::PutNumFmtFontsInAttrPool()
}
}
-void Writer::PutEditEngFontsInAttrPool()
+void Writer::PutEditEngFontsInAttrPool( BOOL bIncl_CJK_CTL )
{
- SfxItemPool& rPool = pDoc->GetAttrPool();
- if( rPool.GetSecondaryPool() )
+ SfxItemPool* pPool = pDoc->GetAttrPool().GetSecondaryPool();
+ if( pPool )
{
- USHORT nW = EE_CHAR_FONTINFO;
- const SvxFontItem* pFont = (const SvxFontItem*)&rPool.GetDefaultItem( nW );
+ _AddFontItems( *pPool, EE_CHAR_FONTINFO );
+ if( bIncl_CJK_CTL )
+ {
+ _AddFontItems( *pPool, EE_CHAR_FONTINFO_CJK );
+ _AddFontItems( *pPool, EE_CHAR_FONTINFO_CTL );
+ }
+ }
+}
+
+void Writer::PutCJKandCTLFontsInAttrPool()
+{
+ SfxItemPool& rPool = pDoc->GetAttrPool();
+ _AddFontItems( rPool, RES_CHRATR_CJK_FONT );
+ _AddFontItems( rPool, RES_CHRATR_CTL_FONT );
+}
+
+
+void Writer::_AddFontItems( SfxItemPool& rPool, USHORT nW )
+{
+ const SvxFontItem* pFont = (const SvxFontItem*)&rPool.GetDefaultItem( nW );
+ _AddFontItem( rPool, *pFont );
+
+ if( 0 != ( pFont = (const SvxFontItem*)rPool.GetPoolDefaultItem( nW )) )
_AddFontItem( rPool, *pFont );
- if( 0 != ( pFont = (const SvxFontItem*)rPool.GetPoolDefaultItem( nW )) )
+ USHORT nMaxItem = rPool.GetItemCount( nW );
+ for( USHORT nGet = 0; nGet < nMaxItem; ++nGet )
+ if( 0 != (pFont = (const SvxFontItem*)rPool.GetItem( nW, nGet )) )
_AddFontItem( rPool, *pFont );
-
- USHORT nMaxItem = rPool.GetItemCount( nW );
- for( USHORT nGet = 0; nGet < nMaxItem; ++nGet )
- if( 0 != (pFont = (const SvxFontItem*)rPool.GetItem( nW, nGet )) )
- _AddFontItem( rPool, *pFont );
- }
}
void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont )
@@ -636,11 +649,14 @@ ULONG StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const String* pFName )
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.3 2000-11-01 19:31:51 jp Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.4 2000-11-13 17:26:24 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.3 2000/11/01 19:31:51 jp
+ Writer:CopyLocalFileToINet: export of mail graphics removed and SvFileStream access removed
+
Revision 1.2 2000/10/17 15:13:50 os
Change: SfxMedium Ctor