strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#80913# asian typography items

Browse source
This commit is contained in:
Niklas Nebel 2000-11-30 17:17:45 +00:00
parent 87602e4c39
commit ce5779ed59
2 changed files with 95 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
sc/inc/scitems.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: scitems.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: nn $ $Date: 2000-11-23 20:05:33 $
* last change: $Author: nn $ $Date: 2000-11-30 18:13:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -119,69 +119,72 @@
#define ATTR_CTL_FONT_LANGUAGE 119
#define ATTR_FONT_EMPHASISMARK 120
#define ATTR_FONT_TWOLINES 121
#define ATTR_HOR_JUSTIFY 122
#define ATTR_INDENT 123
#define ATTR_VER_JUSTIFY 124
#define ATTR_ORIENTATION 125
#define ATTR_ROTATE_VALUE 126
#define ATTR_ROTATE_MODE 127
#define ATTR_LINEBREAK 128
#define ATTR_MARGIN 129
#define ATTR_MERGE 130
#define ATTR_MERGE_FLAG 131
#define ATTR_VALUE_FORMAT 132
#define ATTR_LANGUAGE_FORMAT 133
#define ATTR_BACKGROUND 134
#define ATTR_PROTECTION 135
#define ATTR_BORDER 136
#define ATTR_BORDER_INNER 137 // innen, wg. Vorlagen-EditDialog
#define ATTR_SHADOW 138
#define ATTR_VALIDDATA 139
#define ATTR_CONDITIONAL 140
#define ATTR_SCRIPTSPACE 122
#define ATTR_HANGPUNCTUATION 123
#define ATTR_FORBIDDEN_RULES 124
#define ATTR_HOR_JUSTIFY 125
#define ATTR_INDENT 126
#define ATTR_VER_JUSTIFY 127
#define ATTR_ORIENTATION 128
#define ATTR_ROTATE_VALUE 129
#define ATTR_ROTATE_MODE 130
#define ATTR_LINEBREAK 131
#define ATTR_MARGIN 132
#define ATTR_MERGE 133
#define ATTR_MERGE_FLAG 134
#define ATTR_VALUE_FORMAT 135
#define ATTR_LANGUAGE_FORMAT 136
#define ATTR_BACKGROUND 137
#define ATTR_PROTECTION 138
#define ATTR_BORDER 139
#define ATTR_BORDER_INNER 140 // innen, wg. Vorlagen-EditDialog
#define ATTR_SHADOW 141
#define ATTR_VALIDDATA 142
#define ATTR_CONDITIONAL 143
#define ATTR_PATTERN_END 140 // Ende Zellattribut-Pattern
#define ATTR_PATTERN_END 143 // Ende Zellattribut-Pattern
#define ATTR_PATTERN 141
#define ATTR_PATTERN 144
// Seitenattribute
#define ATTR_LRSPACE 142 // Editor: PageDesc-TabPage
#define ATTR_ULSPACE 143
#define ATTR_PAGE 144
#define ATTR_PAGE_PAPERTRAY 145
#define ATTR_PAGE_PAPERBIN 146
#define ATTR_PAGE_SIZE 147
#define ATTR_PAGE_MAXSIZE 148
#define ATTR_PAGE_HORCENTER 149
#define ATTR_PAGE_VERCENTER 150
#define ATTR_LRSPACE 145 // Editor: PageDesc-TabPage
#define ATTR_ULSPACE 146
#define ATTR_PAGE 147
#define ATTR_PAGE_PAPERTRAY 148
#define ATTR_PAGE_PAPERBIN 149
#define ATTR_PAGE_SIZE 150
#define ATTR_PAGE_MAXSIZE 151
#define ATTR_PAGE_HORCENTER 152
#define ATTR_PAGE_VERCENTER 153
#define ATTR_PAGE_ON 151 // Editor: Header/Footer-Page
#define ATTR_PAGE_DYNAMIC 152
#define ATTR_PAGE_SHARED 153
#define ATTR_PAGE_ON 154 // Editor: Header/Footer-Page
#define ATTR_PAGE_DYNAMIC 155
#define ATTR_PAGE_SHARED 156
#define ATTR_PAGE_NOTES 154 // Editor: Tabelle
#define ATTR_PAGE_GRID 155
#define ATTR_PAGE_HEADERS 156
#define ATTR_PAGE_CHARTS 157
#define ATTR_PAGE_OBJECTS 158
#define ATTR_PAGE_DRAWINGS 159
#define ATTR_PAGE_TOPDOWN 160
#define ATTR_PAGE_SCALE 161
#define ATTR_PAGE_SCALETOPAGES 162
#define ATTR_PAGE_FIRSTPAGENO 163
#define ATTR_PAGE_NOTES 157 // Editor: Tabelle
#define ATTR_PAGE_GRID 158
#define ATTR_PAGE_HEADERS 159
#define ATTR_PAGE_CHARTS 160
#define ATTR_PAGE_OBJECTS 161
#define ATTR_PAGE_DRAWINGS 162
#define ATTR_PAGE_TOPDOWN 163
#define ATTR_PAGE_SCALE 164
#define ATTR_PAGE_SCALETOPAGES 165
#define ATTR_PAGE_FIRSTPAGENO 166
#define ATTR_PAGE_PRINTAREA 164 // Editor: Druckbereiche
#define ATTR_PAGE_REPEATROW 165
#define ATTR_PAGE_REPEATCOL 166
#define ATTR_PAGE_PRINTTABLES 167
#define ATTR_PAGE_PRINTAREA 167 // Editor: Druckbereiche
#define ATTR_PAGE_REPEATROW 168
#define ATTR_PAGE_REPEATCOL 169
#define ATTR_PAGE_PRINTTABLES 170
#define ATTR_PAGE_HEADERLEFT 168 // Inhalte der Kopf-/
#define ATTR_PAGE_FOOTERLEFT 169 // Fusszeilen (links)
#define ATTR_PAGE_HEADERRIGHT 170 // Inhalte der Kopf-/
#define ATTR_PAGE_FOOTERRIGHT 171 // Fusszeilen (rechts)
#define ATTR_PAGE_HEADERSET 172 // die Sets dazu...
#define ATTR_PAGE_FOOTERSET 173
#define ATTR_PAGE_HEADERLEFT 171 // Inhalte der Kopf-/
#define ATTR_PAGE_FOOTERLEFT 172 // Fusszeilen (links)
#define ATTR_PAGE_HEADERRIGHT 173 // Inhalte der Kopf-/
#define ATTR_PAGE_FOOTERRIGHT 174 // Fusszeilen (rechts)
#define ATTR_PAGE_HEADERSET 175 // die Sets dazu...
#define ATTR_PAGE_FOOTERSET 176
#define ATTR_PAGE_FORMULAS 174
#define ATTR_PAGE_NULLVALS 175
#define ATTR_PAGE_FORMULAS 177
#define ATTR_PAGE_NULLVALS 178
#define ATTR_ENDINDEX ATTR_PAGE_NULLVALS // Ende Pool-Range
@ -229,6 +232,9 @@
#define ITEMID_LANGUAGE ATTR_FONT_LANGUAGE
#define ITEMID_EMPHASISMARK ATTR_FONT_EMPHASISMARK
#define ITEMID_TWOLINES ATTR_FONT_TWOLINES
#define ITEMID_SCRIPTSPACE ATTR_SCRIPTSPACE
#define ITEMID_HANGINGPUNCTUATION ATTR_HANGPUNCTUATION
#define ITEMID_FORBIDDENRULE ATTR_FORBIDDEN_RULES
#define ITEMID_HORJUSTIFY ATTR_HOR_JUSTIFY
#define ITEMID_VERJUSTIFY ATTR_VER_JUSTIFY
#define ITEMID_ORIENTATION ATTR_ORIENTATION

36
sc/source/core/data/docpool.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: docpool.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: nn $ $Date: 2000-11-25 12:13:30 $
* last change: $Author: nn $ $Date: 2000-11-30 18:17:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -80,6 +80,8 @@
#include <svx/emphitem.hxx>
#include <svx/fhgtitem.hxx>
#include <svx/fontitem.hxx>
#include <svx/forbiddenruleitem.hxx>
#include <svx/hngpnctitem.hxx>
#include <svx/itemtype.hxx>
#include <svx/langitem.hxx>
#include <svx/lrspitem.hxx>
@ -87,6 +89,7 @@
#include <svx/pbinitem.hxx>
#include <svx/postitem.hxx>
#include <svx/rotmodit.hxx>
#include <svx/scriptspaceitem.hxx>
#include <svx/shaditem.hxx>
#include <svx/shdditem.hxx>
#include <svx/sizeitem.hxx>
@ -114,6 +117,7 @@ USHORT* ScDocumentPool::pVersionMap2 = 0;
USHORT* ScDocumentPool::pVersionMap3 = 0;
USHORT* ScDocumentPool::pVersionMap4 = 0;
USHORT* ScDocumentPool::pVersionMap5 = 0;
USHORT* ScDocumentPool::pVersionMap6 = 0;
static SfxItemInfo __READONLY_DATA aItemInfos[] =
{
@ -139,6 +143,9 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] =
{ SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_LANGUAGE from 614
{ 0, SFX_ITEM_POOLABLE }, // ATTR_FONT_EMPHASISMARK from 614
{ 0, SFX_ITEM_POOLABLE }, // ATTR_FONT_TWOLINES from 614
{ SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // ATTR_SCRIPTSPACE from 614d
{ SID_ATTR_PARA_HANGPUNCTUATION,SFX_ITEM_POOLABLE }, // ATTR_HANGPUNCTUATION from 614d
{ SID_ATTR_PARA_FORBIDDEN_RULES,SFX_ITEM_POOLABLE }, // ATTR_FORBIDDEN_RULES from 614d
{ SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY
{ SID_ATTR_ALIGN_INDENT, SFX_ITEM_POOLABLE }, // ATTR_INDENT ab 350
{ SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY
@ -258,6 +265,9 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
ATTR_CTL_FONT_LANGUAGE );
ppPoolDefaults[ ATTR_FONT_EMPHASISMARK-ATTR_STARTINDEX ] = new SvxEmphasisMarkItem;
ppPoolDefaults[ ATTR_FONT_TWOLINES - ATTR_STARTINDEX ] = new SvxTwoLinesItem;
ppPoolDefaults[ ATTR_SCRIPTSPACE - ATTR_STARTINDEX ] = new SvxScriptSpaceItem;
ppPoolDefaults[ ATTR_HANGPUNCTUATION - ATTR_STARTINDEX ] = new SvxHangingPunctuationItem;
ppPoolDefaults[ ATTR_FORBIDDEN_RULES - ATTR_STARTINDEX ] = new SvxForbiddenRuleItem;
ppPoolDefaults[ ATTR_HOR_JUSTIFY - ATTR_STARTINDEX ] = new SvxHorJustifyItem;
ppPoolDefaults[ ATTR_INDENT - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 );
ppPoolDefaults[ ATTR_VER_JUSTIFY - ATTR_STARTINDEX ] = new SvxVerJustifyItem;
@ -342,6 +352,9 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
// CJK, CTL, EMPHASISMARK, TWOLINES from 614
SetVersionMap( 5, 100, 163, pVersionMap5 );
// ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES from 614d
SetVersionMap( 6, 100, 175, pVersionMap6 );
}
__EXPORT ScDocumentPool::~ScDocumentPool()
@ -362,7 +375,7 @@ void ScDocumentPool::InitVersionMaps()
{
DBG_ASSERT( !pVersionMap1 && !pVersionMap2 &&
!pVersionMap3 && !pVersionMap4 &&
!pVersionMap5, "InitVersionMaps call multiple times" );
!pVersionMap5 && !pVersionMap6, "InitVersionMaps call multiple times" );
// alte WhichId's mappen
// nicht mit ATTR_* zaehlen, falls die sich nochmal aendern
@ -432,14 +445,29 @@ void ScDocumentPool::InitVersionMaps()
// 12 entries inserted
for ( i=nMap5New, j=nMap5Start+nMap5New+12; i < nMap5Count; i++, j++ )
pVersionMap5[i] = j;
// sixth map: ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES added in 614d
const USHORT nMap6Start = 100; // ATTR_STARTINDEX
const USHORT nMap6End = 175; // ATTR_ENDINDEX
const USHORT nMap6Count = nMap6End - nMap6Start + 1;
const USHORT nMap6New = 22; // ATTR_SCRIPTSPACE - ATTR_STARTINDEX
pVersionMap6 = new USHORT [ nMap6Count ];
for ( i=0, j=nMap6Start; i < nMap6New; i++, j++ )
pVersionMap6[i] = j;
// 3 entries inserted
for ( i=nMap6New, j=nMap6Start+nMap6New+3; i < nMap6Count; i++, j++ )
pVersionMap6[i] = j;
}
void ScDocumentPool::DeleteVersionMaps()
{
DBG_ASSERT( pVersionMap1 && pVersionMap2 &&
pVersionMap3 && pVersionMap4 &&
pVersionMap5, "DeleteVersionMaps without maps" );
pVersionMap5 && pVersionMap6, "DeleteVersionMaps without maps" );
delete[] pVersionMap6;
pVersionMap6 = 0;
delete[] pVersionMap5;
pVersionMap5 = 0;
delete[] pVersionMap4;