diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-07 18:52:36 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-07 18:52:36 +0100 |
| commit | 67791d91c26061b34a0084ca4011d58a0f8ff3c5 (patch) | |
| tree | a39ec564a1d90f573a96d3cbd539fc95c8ac6cda /editeng | |
| parent | aed3f1817f4de6314285efed1e48dc7c305e4f67 (diff) | |
#i107450#: make svx buildable with new editeng lib
Diffstat (limited to 'editeng')
33 files changed, 590 insertions, 1619 deletions
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc index dfc490f45a50..b255d01a80c2 100644 --- a/editeng/inc/editeng.hrc +++ b/editeng/inc/editeng.hrc @@ -30,26 +30,7 @@ #ifndef _EDITENG_HRC #define _EDITENG_HRC -#ifndef _SOLAR_HRC -#include <svl/solar.hrc> -#endif - -#define RID_EDITUNDO_DEL ( RID_EDIT_START + 0 ) -#define RID_EDITUNDO_MOVE ( RID_EDIT_START + 1 ) -#define RID_EDITUNDO_INSERT ( RID_EDIT_START + 2 ) -#define RID_EDITUNDO_REPLACE ( RID_EDIT_START + 3 ) -#define RID_EDITUNDO_SETATTRIBS ( RID_EDIT_START + 4 ) -#define RID_EDITUNDO_SETSTYLE ( RID_EDIT_START + 5 ) -#define RID_EDITUNDO_RESETATTRIBS ( RID_EDIT_START + 6 ) -#define RID_EDITUNDO_INDENT ( RID_EDIT_START + 7 ) -#define RID_EDITUNDO_TRANSLITERATE ( RID_EDIT_START + 8 ) - -#define RID_MENU_SPELL ( RID_EDIT_START + 10 ) -#define RID_STR_PARAGRAPH ( RID_EDIT_START + 11 ) -#define RID_STR_WORD ( RID_EDIT_START + 12 ) - -#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 13) -#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 14) +#include <editeng/editrids.hrc> #define MN_SPELLING 1 #define MN_INSERT 2 @@ -62,5 +43,4 @@ #define MN_AUTOSTART 2000 #define MN_DICTSTART 3000 - #endif // _EDITENG_HRC diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx index 4e297f44c3b5..776f3180f072 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.hxx +++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx @@ -49,9 +49,10 @@ #include <comphelper/accessibletexthelper.hxx> #include <comphelper/broadcasthelper.hxx> -#include "AccessibleParaManager.hxx" -#include "AccessibleImageBullet.hxx" -#include "unoedprx.hxx" +#include "editeng/AccessibleParaManager.hxx" +#include "editeng/AccessibleImageBullet.hxx" +#include "editeng/unoedprx.hxx" +#include "editeng/editengdllapi.h" namespace accessibility { @@ -66,7 +67,7 @@ namespace accessibility /** This class implements the actual text paragraphs for the EditEngine/Outliner UAA */ - class AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText + class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText { protected: diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx index 72b20b8b2d42..b3ad47e7f3fd 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/inc/editeng/AccessibleImageBullet.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleImageBullet.hxx,v $ + * $RCSfile: editeng/AccessibleImageBullet.hxx,v $ * $Revision: 1.12 $ * * This file is part of OpenOffice.org. @@ -44,7 +44,7 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include "AccessibleParaManager.hxx" +#include "editeng/AccessibleParaManager.hxx" #include <editeng/unoedsrc.hxx> namespace accessibility diff --git a/editeng/source/accessibility/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx index bf50b97d32fb..16c346e960de 100644 --- a/editeng/source/accessibility/AccessibleParaManager.hxx +++ b/editeng/inc/editeng/AccessibleParaManager.hxx @@ -40,6 +40,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/accessibility/XAccessibleContext.hpp> +#include "editeng/editengdllapi.h" class SvxEditSourceAdapter; @@ -144,7 +145,7 @@ namespace accessibility To facilitate automatic deletion of paragraphs no longer used, this class uses the WeakCppRef helper to hold the objects weakly. */ - class AccessibleParaManager + class EDITENG_DLLPUBLIC AccessibleParaManager { public: typedef WeakCppRef < ::com::sun::star::accessibility::XAccessible, AccessibleEditableTextPara > WeakPara; diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx index 468d7b6a04a6..284118ff302c 100644 --- a/editeng/inc/editeng/boxitem.hxx +++ b/editeng/inc/editeng/boxitem.hxx @@ -33,6 +33,7 @@ #include <svl/poolitem.hxx> #include <editeng/borderline.hxx> #include <editeng/editengdllapi.h> +#include <com/sun/star/table/BorderLine.hpp> namespace rtl { class OUString; } @@ -108,6 +109,8 @@ public: //JP 09.06.99: bIgnoreLine = TRUE -> Distance auch returnen, wenn // keine Line gesetzt ist USHORT CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const; + static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert ); + static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); }; inline void SvxBoxItem::SetDistance( USHORT nNew ) diff --git a/editeng/inc/editeng/editerr.hxx b/editeng/inc/editeng/editerr.hxx new file mode 100644 index 000000000000..ab17123800f7 --- /dev/null +++ b/editeng/inc/editeng/editerr.hxx @@ -0,0 +1,39 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: svxids.hrc,v $ + * $Revision: 1.10.132.2 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _EDIT_ERR_HRC +#define _EDIT_ERR_HRC + +#include <tools/errcode.hxx> + +#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) + +#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | \ + ERRCODE_CLASS_READ ) +#endif diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc index 475c84ca3cb8..40c203e85176 100644 --- a/editeng/inc/editeng/editids.hrc +++ b/editeng/inc/editeng/editids.hrc @@ -32,1120 +32,114 @@ // include ------------------------------------------------------------------ -#include <svl/memberid.hrc> #include <svl/solar.hrc> -#include <tools/errcode.hxx> -#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) - -#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | \ - ERRCODE_CLASS_READ ) - -#define SID_PARA_VERTALIGN ( SID_SVX_START + 925 ) -#define SID_ATTR_BORDER_OUTER ( SID_SVX_START + 24 ) -#define SID_ATTR_BORDER_SHADOW ( SID_SVX_START + 25 ) -#define SID_ATTR_BRUSH ( SID_SVX_START + 1 ) -#define SID_ATTR_BRUSH_CHAR ( SID_SVX_START + 591 ) -#define SID_ATTR_NUMBERING_RULE ( SID_SVX_START + 855 ) -#define SID_ATTR_TABSTOP ( SID_SVX_START + 2 ) -#define SID_FIELD ( SID_SVX_START + 363 ) -#define SID_ATTR_FRAMEDIRECTION ( SID_SVX_START + 944 ) -#define SID_ATTR_PARA ( SID_SVX_START + 26 ) -#define SID_ATTR_PARA_ADJUST ( SID_SVX_START + 27 ) -#define SID_ATTR_PARA_ADJUST_LEFT ( SID_SVX_START + 28 ) -#define SID_ATTR_PARA_BULLET ( SID_SVX_START + 250 ) -#define SID_ATTR_PARA_OUTLLEVEL ( SID_SVX_START + 300 ) -#define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 ) -#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 ) -#define SID_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 ) -#define SID_ATTR_PARA_SCRIPTSPACE ( SID_SVX_START + 901 ) -#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_SVX_START + 902 ) -#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_SVX_START + 903 ) -#define SID_ATTR_PARA_SNAPTOGRID ( SID_SVX_START + 945 ) -#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_SVX_START + 947 ) -#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_SVX_START + 950 ) -#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_SVX_START + 951 ) -#define SID_ATTR_PARA_OUTLINE_LEVEL (SID_SVX_START+1092) -#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 ) -#define SID_ATTR_PARA_ADJUST_CENTER ( SID_SVX_START + 30 ) -#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_SVX_START + 31 ) -#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_SVX_START + 32 ) -#define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 ) -#define SID_ATTR_PARA_LINESPACE_10 ( SID_SVX_START + 34 ) -#define SID_ATTR_PARA_LINESPACE_15 ( SID_SVX_START + 35 ) -#define SID_ATTR_PARA_LINESPACE_20 ( SID_SVX_START + 36 ) -#define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 ) -#define SID_ATTR_PARA_HYPHENZONE ( SID_SVX_START + 38 ) -#define SID_ATTR_PARA_SPLIT ( SID_SVX_START + 39 ) -#define SID_ATTR_PARA_ORPHANS ( SID_SVX_START + 40 ) -#define SID_ATTR_PARA_WIDOWS ( SID_SVX_START + 41 ) -#define SID_ATTR_PARA_ULSPACE ( SID_SVX_START + 42 ) -#define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 ) -#define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 ) -#define SID_ATTR_PARA_KEEP ( SID_SVX_START + 66 ) -#define SID_ATTR_NUMBERING_RULE ( SID_SVX_START + 855 ) -#define SID_ATTR_LRSPACE ( SID_SVX_START + 48 ) -#define SID_ATTR_ULSPACE ( SID_SVX_START + 49 ) -#define SID_ATTR_TABSTOP ( SID_SVX_START + 2 ) -#define SID_ATTR_TABSTOP_DEFAULTS ( SID_SVX_START + 3 ) -#define SID_ATTR_TABSTOP_POS ( SID_SVX_START + 4 ) -#define SID_ATTR_TABSTOP_OFFSET ( SID_SVX_START + 5 ) -#define SID_ATTR_CHAR (SID_SVX_START + 6) -#define SID_ATTR_CHAR_FONT (SID_SVX_START + 7) -#define SID_ATTR_CHAR_POSTURE (SID_SVX_START + 8) -#define SID_ATTR_CHAR_WEIGHT (SID_SVX_START + 9) -#define SID_ATTR_CHAR_SHADOWED (SID_SVX_START + 10) -#define SID_ATTR_CHAR_WORDLINEMODE (SID_SVX_START + 11) -#define SID_ATTR_CHAR_CONTOUR (SID_SVX_START + 12) -#define SID_ATTR_CHAR_STRIKEOUT (SID_SVX_START + 13) -#define SID_ATTR_CHAR_UNDERLINE (SID_SVX_START + 14) -#define SID_ATTR_CHAR_FONTHEIGHT (SID_SVX_START + 15) -#define SID_ATTR_CHAR_PROPSIZE (SID_SVX_START + 16) -#define SID_ATTR_CHAR_COLOR (SID_SVX_START + 17) -#define SID_ATTR_CHAR_KERNING (SID_SVX_START + 18) -#define SID_ATTR_CHAR_CASEMAP (SID_SVX_START + 19) -#define SID_ATTR_CHAR_LANGUAGE (SID_SVX_START + 20) -#define SID_ATTR_CHAR_ESCAPEMENT (SID_SVX_START + 21) -#define SID_ATTR_CHAR_FONTLIST (SID_SVX_START + 22) -#define SID_ATTR_CHAR_MAPTYPE (SID_SVX_START + 64) -#define SID_ATTR_CHAR_AUTOKERN (SID_SVX_START + 67) -#define SID_ATTR_CHAR_OVERLINE (SID_SVX_START + 68) -#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_SVX_START + 877 ) -#define SID_ATTR_CHAR_CJK_FONT ( SID_SVX_START + 887 ) -#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_SVX_START + 888 ) -#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_SVX_START + 889 ) -#define SID_ATTR_CHAR_CJK_POSTURE ( SID_SVX_START + 890 ) -#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_SVX_START + 891 ) -#define SID_ATTR_CHAR_CTL_FONT ( SID_SVX_START + 892 ) -#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_SVX_START + 893 ) -#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_SVX_START + 894 ) -#define SID_ATTR_CHAR_CTL_POSTURE ( SID_SVX_START + 895 ) -#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_SVX_START + 896 ) -#define SID_ATTR_CHAR_TWO_LINES ( SID_SVX_START + 897 ) -#define SID_ATTR_CHAR_CJK_RUBY ( SID_SVX_START + 898 ) -#define SID_ATTR_CHAR_EMPHASISMARK ( SID_SVX_START + 899 ) -#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_SVX_START + 900 ) -#define SID_ATTR_CHAR_VERTICAL ( SID_SVX_START + 905 ) - -#define SID_ATTR_CHAR_ROTATED ( SID_SVX_START + 910 ) -#define SID_ATTR_CHAR_SCALEWIDTH ( SID_SVX_START + 911 ) -#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_SVX_START + 919 ) -#define SID_ATTR_CHAR_RELIEF ( SID_SVX_START + 920 ) -#define SID_ATTR_CHAR_HIDDEN ( SID_SVX_START + 989 ) -#define SID_ATTR_CHAR_LATIN_FONT ( SID_SVX_START + 994 ) -#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_SVX_START + 995 ) -#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_SVX_START + 996 ) -#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 ) -#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 ) -#define SID_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT -#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT -#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER -#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK - - -#if 0 -// -------------------------------------------------------------------------- -// Member-Id's -// -------------------------------------------------------------------------- - -#define MID_APPFLAG 0x20 -#define MID_AUTOBREAK 0x21 -#define MID_BG_COLOR 0x22 -#define MID_BREAKxxx 0x22 -#define MID_BRUSHSTYLE 0x23 -#define MID_CELLTYPE 0x24 -#define MID_CHARSET 0x25 -#define MID_COMMAND 0x26 -#define MID_CONTENT 0x27 -#define MID_DESCNAMExxx 0x28 -#define MID_DISTANCE 0x29 -#define MID_ESCAPEMENT 0x2a -#define MID_FAMILY 0x2b -#define MID_FG_COLOR 0x2c -#define MID_FIRSTLINE_OFFSET 0x2d -#define MID_FLAGS 0x2e -#define MID_FONTFAMILY 0x2f -#define MID_FONTFAMILYNAME 0x30 -#define MID_FONTPITCH 0x31 -#define MID_FONTSTYLE 0x32 -#define MID_PERCENT 0x33 -#define MID_HYPHEN 0x34 -#define MID_INNER_WIDTH 0x35 -#define MID_INTER_LINESPACE 0x36 -#define MID_INTER_SPACE 0x37 -#define MID_LANDSCAPE 0x38 - -#define MID_LEFT_MARGIN 0x3a -#define MID_LINESPACE 0x3b -#define MID_LOCATION 0x3c -#define MID_LOWER 0x3d -#define MID_MAXHYPHENS 0x3e -#define MID_MINLEAD 0x3f -#define MID_MINTRAIL 0x40 -#define MID_NUMTYPExxx 0x41 -#define MID_OUTER_WIDTH 0x41 -#define MID_PAGEEND 0x42 -#define MID_POS 0x43 -#define MID_PROPORTIONAL 0x44 -#define MID_REPLACE_STRING 0x45 -#define MID_RIGHT 0x46 -#define MID_RIGHT_MARGIN 0x47 -#define MID_ROW_DIRECTION 0x48 -#define MID_SIZE 0x4a -#define MID_TRANSPARENT 0x4b -#define MID_TYPE 0x4c -#define MID_UPPER 0x4d -#define MID_USExxx 0x4e -#define MID_VALUESET 0x4f - -#define MID_ADR_CITY 0x50 -#define MID_ADR_COMPANY 0x51 -#define MID_ADR_COUNTRY 0x52 -#define MID_ADR_EMAIL 0x53 -#define MID_ADR_FAX 0x54 -#define MID_ADR_FIRSTNAME 0x55 -#define MID_ADR_ID 0x56 -#define MID_ADR_LASTNAME 0x57 -#define MID_ADR_PHONE 0x58 -#define MID_ADR_PHONEPRIVATE 0x59 -#define MID_ADR_POSITION 0x5a -#define MID_ADR_STREET 0x5b -#define MID_ADR_TITLE 0x5c -#define MID_ADR_ZIPCODE 0x5d -#define MID_ADR_STATE 0x5e - -#define MID_FILENAME 0x6c -#define MID_FILTERNAME 0x6d -#define MID_POSITION 0x6e - -#define MID_HLINK_NAME 0x6f -#define MID_HLINK_URL 0x70 -#define MID_HLINK_TARGET 0x71 -#define MID_HLINK_TYPE 0x72 -#define MID_HLINK_TEXT 0x73 - -#define MID_COUNT 0x74 -#define MID_READONLY 0x76 - -#define MID_VIEWLAYOUT_COLUMNS 0x77 -#define MID_VIEWLAYOUT_BOOKMODE 0x78 - -#define MID_ZOOMSLIDER_CURRENTZOOM 0x79 -#define MID_ZOOMSLIDER_SNAPPINGPOINTS 0x7a -#define MID_ZOOMSLIDER_MINZOOM 0x7b -#define MID_ZOOMSLIDER_MAXZOOM 0x7c - -#define MID_ADR_FATHERSNAME 0x80 -#define MID_ADR_APARTMENT 0x81 - - -// -------------------------------------------------------------------------- -// Svx-Id's -// -------------------------------------------------------------------------- - -#define SID_ATTR_ZOOM ( SID_SVX_START + 0 ) -#define SID_ATTR_BRUSH ( SID_SVX_START + 1 ) -#define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) -#define SID_ATTR_BORDER_OUTER ( SID_SVX_START + 24 ) -#define SID_ATTR_BORDER_SHADOW ( SID_SVX_START + 25 ) -#define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 ) -#define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 ) -#define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 ) -#define SID_ATTR_SEARCH ( SID_SVX_START + 47 ) -#define SID_ATTR_PAGE ( SID_SVX_START + 50 ) -#define SID_ATTR_PAGE_SIZE ( SID_SVX_START + 51 ) -#define SID_ATTR_PAGE_MAXSIZE ( SID_SVX_START + 52 ) -#define SID_ATTR_PAGE_PAPERBIN ( SID_SVX_START + 54 ) -#define SID_ATTR_PAGE_APP ( SID_SVX_START + 55 ) -#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 56 ) -#define SID_ATTR_PAGE_EXT2 ( SID_SVX_START + 57 ) -#define SID_ATTR_PAGE_HEADERSET ( SID_SVX_START + 58 ) -#define SID_ATTR_PAGE_FOOTERSET ( SID_SVX_START + 59 ) -#define SID_ATTR_PAGE_ON ( SID_SVX_START + 60 ) -#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 ) -#define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 ) -#define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 ) -#define SID_ATTR_DBSESS_SERVERTYPE ( SID_SVX_START + 70 ) -#define SID_ATTR_DBSESS_SERVEROPTS ( SID_SVX_START + 71 ) -#define SID_ATTR_DBSESS_USERNAME ( SID_SVX_START + 72 ) -#define SID_ATTR_DBSESS_PASSWORD ( SID_SVX_START + 73 ) -#define SID_ATTR_DBSESS_SAVESESS ( SID_SVX_START + 74 ) -#define SID_ATTR_DBSESS_SAVEUSER ( SID_SVX_START + 75 ) -#define SID_ATTR_DBSESS_SERVERNAME ( SID_SVX_START + 76 ) -#define SID_ATTR_DBSESS_ENABLETYPE ( SID_SVX_START + 77 ) -#define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 ) -#define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 ) -#define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 ) -#define SID_ATTR_TRANSFORM_POS_X ( SID_SVX_START + 88 ) -#define SID_ATTR_TRANSFORM_POS_Y ( SID_SVX_START + 89 ) -#define SID_ATTR_TRANSFORM_WIDTH ( SID_SVX_START + 90 ) -#define SID_ATTR_TRANSFORM_HEIGHT ( SID_SVX_START + 91 ) -#define SID_ATTR_TRANSFORM_SIZE_POINT ( SID_SVX_START + 92 ) -#define SID_ATTR_TRANSFORM_ROT_X ( SID_SVX_START + 93 ) -#define SID_ATTR_TRANSFORM_ROT_Y ( SID_SVX_START + 94 ) -#define SID_ATTR_TRANSFORM_ANGLE ( SID_SVX_START + 95 ) -#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 ) -#define SID_RULER_BORDERS ( SID_SVX_START + 80 ) -#define SID_RULER_OBJECT ( SID_SVX_START + 81 ) -#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 ) -#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 ) -#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 ) -//#define SID_ZOOM_TOOLBOX ( SID_SVX_START + 96 ) -> sfxsids.hrc -//#define SID_ZOOM_OUT ( SID_SVX_START + 97 ) -> sfxsids.hrc -//#define SID_ZOOM_IN ( SID_SVX_START + 98 ) -> sfxsids.hrc -//#define SID_SIZE_REAL ( SID_SVX_START + 99 ) -> sfxsids.hrc -//#define SID_SIZE_PAGE ( SID_SVX_START + 100 ) -> sfxsids.hrc -#define SID_SIZE_ALL ( SID_SVX_START + 101 ) -#define SID_DRAW_LINE ( SID_SVX_START + 102 ) -#define SID_DRAW_XLINE ( SID_SVX_START + 103 ) -#define SID_DRAW_RECT ( SID_SVX_START + 104 ) -#define SID_DRAW_RECT_ROUND ( SID_SVX_START + 105 ) -#define SID_DRAW_RECT_MOREROUND ( SID_SVX_START + 106 ) -#define SID_DRAW_FULLRECT ( SID_SVX_START + 107 ) -#define SID_DRAW_FULLRECT_ROUND ( SID_SVX_START + 108 ) -#define SID_DRAW_FULLRECT_MOREROUND ( SID_SVX_START + 109 ) -#define SID_DRAW_ELLIPSE ( SID_SVX_START + 110 ) -#define SID_DRAW_FULLELLIPSE ( SID_SVX_START + 111 ) -#define SID_DRAW_PIE ( SID_SVX_START + 112 ) -#define SID_DRAW_FULLPIE ( SID_SVX_START + 113 ) -#define SID_DRAW_ARC ( SID_SVX_START + 114 ) -#define SID_DRAW_CIRCLECUT ( SID_SVX_START + 115 ) -#define SID_DRAW_FULLCIRCLECUT ( SID_SVX_START + 116 ) -#define SID_DRAW_POLYGON ( SID_SVX_START + 117 ) -#define SID_DRAW_BEZIER_FILL ( SID_SVX_START + 118 ) -#define SID_BEZIER_INSERT ( SID_SVX_START + 119 ) -#define SID_BEZIER_DELETE ( SID_SVX_START + 120 ) -#define SID_BEZIER_MOVE ( SID_SVX_START + 121 ) -#define SID_BEZIER_CLOSE ( SID_SVX_START + 122 ) -#define SID_BEZIER_SMOOTH ( SID_SVX_START + 123 ) -#define SID_BEZIER_APPEND ( SID_SVX_START + 124 ) -#define SID_BEZIER_OPEN ( SID_SVX_START + 125 ) -#define SID_BEZIER_EDIT ( SID_SVX_START + 126 ) -#define SID_BEZIER_CUTLINE ( SID_SVX_START + 127 ) -#define SID_OBJECT_SELECT ( SID_SVX_START + 128 ) -#define SID_OBJECT_ROTATE ( SID_SVX_START + 129 ) -#define SID_OBJECT_ALIGN ( SID_SVX_START + 130 ) -#define SID_OBJECT_ALIGN_LEFT ( SID_SVX_START + 131 ) -#define SID_OBJECT_ALIGN_CENTER ( SID_SVX_START + 132 ) -#define SID_OBJECT_ALIGN_RIGHT ( SID_SVX_START + 133 ) -#define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 ) -#define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 ) -#define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) -#define SID_COPY_FORMAT ( SID_SVX_START + 137 ) -#define SID_PASTE_FORMAT ( SID_SVX_START + 138 ) -#define SID_INSERT_ORGANIGRAM ( SID_SVX_START + 139 ) -#define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) -#define SID_DRAW_CHART SID_INSERT_DIAGRAM -#define SID_INSERT_TABLE ( SID_SVX_START + 141 ) -#define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) -#define SID_ATTRIBUTES_LINE ( SID_SVX_START + 143 ) -#define SID_CHOOSE_CONTROLS ( SID_SVX_START + 144 ) -#define SID_ACTIVATE_CONTROLS ( SID_SVX_START + 145 ) -#define SID_INSERT_PUSHBUTTON ( SID_SVX_START + 146 ) -#define SID_INSERT_RADIOBUTTON ( SID_SVX_START + 147 ) -#define SID_INSERT_CHECKBOX ( SID_SVX_START + 148 ) -#define SID_OUTLINE ( SID_SVX_START + 149 ) -#define SID_OUTLINE_UP ( SID_SVX_START + 150 ) -#define SID_OUTLINE_DOWN ( SID_SVX_START + 151 ) -#define SID_OUTLINE_LEFT ( SID_SVX_START + 152 ) -#define SID_OUTLINE_RIGHT ( SID_SVX_START + 153 ) -#define SID_OUTLINE_FORMAT ( SID_SVX_START + 154 ) -#define SID_OUTLINE_COLLAPSE_ALL ( SID_SVX_START + 155 ) -#define SID_OUTLINE_BULLET ( SID_SVX_START + 156 ) -#define SID_PRESENTATION ( SID_SVX_START + 157 ) -#define SID_TIMER ( SID_SVX_START + 158 ) -#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 ) -#define SID_DIA ( SID_SVX_START + 160 ) -#define SID_HIDE_SLIDE ( SID_SVX_START + 161 ) -#define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 ) -//#define SID_SHOW_BROWSER ( SID_SVX_START + 163 ) -> sfxsids.hrc -#define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 ) -#define SID_ATTR_FILL_COLOR ( SID_SVX_START + 165 ) -#define SID_ATTR_FILL_GRADIENT ( SID_SVX_START + 166 ) -#define SID_ATTR_FILL_HATCH ( SID_SVX_START + 167 ) -#define SID_ATTR_FILL_BITMAP ( SID_SVX_START + 168 ) -#define SID_ATTR_LINE_STYLE ( SID_SVX_START + 169 ) -#define SID_ATTR_LINE_DASH ( SID_SVX_START + 170 ) -#define SID_ATTR_LINE_WIDTH ( SID_SVX_START + 171 ) -#define SID_ATTR_LINE_COLOR ( SID_SVX_START + 172 ) -#define SID_ATTR_LINE_START ( SID_SVX_START + 173 ) -#define SID_ATTR_LINE_END ( SID_SVX_START + 174 ) -#define SID_ATTR_LINE_STARTWIDTH ( SID_SVX_START + 175 ) -#define SID_ATTR_LINE_ENDWIDTH ( SID_SVX_START + 176 ) -#define SID_ATTR_LINE_STARTCENTER ( SID_SVX_START + 177 ) -#define SID_ATTR_LINE_ENDCENTER ( SID_SVX_START + 178 ) -#define SID_COLOR_TABLE ( SID_SVX_START + 179 ) -#define SID_GRADIENT_LIST ( SID_SVX_START + 180 ) -#define SID_HATCH_LIST ( SID_SVX_START + 181 ) -#define SID_BITMAP_LIST ( SID_SVX_START + 182 ) -#define SID_DASH_LIST ( SID_SVX_START + 183 ) -#define SID_LINEEND_LIST ( SID_SVX_START + 184 ) -#define SID_BACKGROUND_COLOR ( SID_SVX_START + 185 ) -#define SID_BACKGROUND_PATTERN ( SID_SVX_START + 186 ) -#define SID_ATTR_BORDER ( SID_SVX_START + 187 ) -#define SID_INSERT_FIXEDTEXT ( SID_SVX_START + 188 ) -#define SID_INSERT_GROUPBOX ( SID_SVX_START + 189 ) -#define SID_INSERT_EDIT ( SID_SVX_START + 190 ) -#define SID_INSERT_LISTBOX ( SID_SVX_START + 191 ) -#define SID_INSERT_COMBOBOX ( SID_SVX_START + 192 ) -#define SID_INSERT_SPINBUTTON ( SID_SVX_START + 193 ) -#define SID_INSERT_HSCROLLBAR ( SID_SVX_START + 194 ) -#define SID_INSERT_VSCROLLBAR ( SID_SVX_START + 195 ) -#define SID_INSERT_PREVIEW ( SID_SVX_START + 196 ) -#define SID_INSERT_URLBUTTON ( SID_SVX_START + 197 ) -#define SID_INSERT_SELECT ( SID_SVX_START + 198 ) -#define SID_DIALOG_TESTMODE ( SID_SVX_START + 199 ) -#define SID_FRAME_LINESTYLE ( SID_SVX_START + 200 ) -#define SID_FRAME_LINECOLOR ( SID_SVX_START + 201 ) -#define SID_ATTR_GRID_USE ( SID_SVX_START + 202 ) -#define SID_ATTR_GRID_VISIBLE ( SID_SVX_START + 203 ) -#define SID_ATTR_GRID_DRAW_X ( SID_SVX_START + 204 ) -#define SID_ATTR_GRID_DRAW_Y ( SID_SVX_START + 205 ) -#define SID_ATTR_GRID_DIVISION_X ( SID_SVX_START + 206 ) -#define SID_ATTR_GRID_DIVISION_Y ( SID_SVX_START + 207 ) -#define SID_ATTR_GRID_SNAP_X ( SID_SVX_START + 208 ) -#define SID_ATTR_GRID_SNAP_Y ( SID_SVX_START + 209 ) -#define SID_ATTR_GRID_ORIGIN_X ( SID_SVX_START + 210 ) -#define SID_ATTR_GRID_ORIGIN_Y ( SID_SVX_START + 211 ) -#define SID_IMPORT_GRAPH_PREVIEW ( SID_SVX_START + 212 ) -#define SID_IMPORT_GRAPH_LASTPATH ( SID_SVX_START + 213 ) -#define SID_IMPORT_GRAPH_LASTFILTER ( SID_SVX_START + 214 ) -#define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 ) -#define SID_SEARCHDLG_REPLACESTRINGS ( SID_SVX_START + 216 ) -#define SID_ATTR_TABLE ( SID_SVX_START + 217 ) -#define SID_ATTR_TABLE_COLUMN ( SID_SVX_START + 218 ) -#define SID_ATTR_TABLE_ROW ( SID_SVX_START + 219 ) -#define SID_ATTR_COLUMNS ( SID_SVX_START + 220 ) -#define SID_ATTR_INSERT ( SID_SVX_START + 221 ) -#define SID_ATTR_ZOOM_USER ( SID_SVX_START + 222 ) -#define SID_ATTR_POSITION ( SID_SVX_START + 223 ) -#define SID_ATTR_SIZE ( SID_SVX_START + 224 ) -#define SID_TABLE_CELL ( SID_SVX_START + 225 ) -#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) -#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) -#define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 ) -#define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 ) -#define SID_ATTR_ALIGN_LINEBREAK ( SID_SVX_START + 230 ) -#define SID_OUTLINE_COLLAPSE ( SID_SVX_START + 231 ) -#define SID_OUTLINE_EXPAND_ALL ( SID_SVX_START + 232 ) -#define SID_OUTLINE_EXPAND ( SID_SVX_START + 233 ) -#define SID_OUTLINE_DELETEALL ( SID_SVX_START + 234 ) -#define SID_ATTR_TRANSFORM_PROTECT_POS ( SID_SVX_START + 236 ) -#define SID_ATTR_TRANSFORM_PROTECT_SIZE ( SID_SVX_START + 237 ) -#define SID_ATTR_TRANSFORM_AUTOSIZE ( SID_SVX_START + 238 ) // !!! -#define SID_ATTR_TRANSFORM_INTERN ( SID_SVX_START + 239 ) -#define SID_INSERT_FRAME ( SID_SVX_START + 240 ) -#define SID_INSERT_GRAPHIC ( SID_SVX_START + 241 ) -#define SID_AUTOFORMAT ( SID_SVX_START + 242 ) -#define SID_SPELL_DIALOG ( SID_SVX_START + 243 ) -#define SID_INSERT_DRAW ( SID_SVX_START + 244 ) -#define SID_THESAURUS ( SID_SVX_START + 245 ) -#define SID_AUTOCOMPLETEWORD ( SID_SVX_START + 251 ) -#define SID_DRAW_TEXT ( SID_SVX_START + 253 ) -#define SID_DRAW_CAPTION ( SID_SVX_START + 254 ) -#define SID_INSERT_LEGEND SID_DRAW_CAPTION -#define SID_DRAW_SELECT ( SID_SVX_START + 255 ) -#define SID_FONTWORK ( SID_SVX_START + 256 ) -#define SID_FORMTEXT_STYLE ( SID_SVX_START + 257 ) -#define SID_FORMTEXT_ADJUST ( SID_SVX_START + 258 ) -#define SID_FORMTEXT_DISTANCE ( SID_SVX_START + 259 ) -#define SID_FORMTEXT_START ( SID_SVX_START + 260 ) -#define SID_FORMTEXT_MIRROR ( SID_SVX_START + 261 ) -#define SID_FORMTEXT_OUTLINE ( SID_SVX_START + 262 ) -#define SID_FORMTEXT_SHADOW ( SID_SVX_START + 263 ) -#define SID_FORMTEXT_SHDWCOLOR ( SID_SVX_START + 264 ) -#define SID_FORMTEXT_SHDWXVAL ( SID_SVX_START + 265 ) -#define SID_FORMTEXT_SHDWYVAL ( SID_SVX_START + 266 ) -#define SID_FORMTEXT_STDFORM ( SID_SVX_START + 267 ) -#define SID_FORMTEXT_HIDEFORM ( SID_SVX_START + 268 ) -#define SID_FORMTEXT_RESERVED1 ( SID_SVX_START + 269 ) -#define SID_FORMTEXT_RESERVED2 ( SID_SVX_START + 270 ) -#define SID_FORMTEXT_RESERVED3 ( SID_SVX_START + 271 ) -#define SID_FORMTEXT_RESERVED4 ( SID_SVX_START + 272 ) -#define SID_FORMTEXT_RESERVED5 ( SID_SVX_START + 273 ) -#define SID_FORMTEXT_RESERVED_LAST ( SID_SVX_START + 274 ) -#define SID_GALLERY_ENABLE_ADDCOPY ( SID_SVX_START + 276 ) -#define SID_GALLERY_IMPORTTHEME ( SID_SVX_START + 277 ) -#define SID_GALLERY_BG_POS ( SID_SVX_START + 278 ) -//#define SID_GALLERY_BG_BRUSH ( SID_SVX_START + 279 ) -> sfxsids.hrc -#define SID_GALLERY_FORMATS ( SID_SVX_START + 280 ) -//#define SID_SEARCH_OPTIONS ( SID_SVX_START + 281 ) -> sfxsids.hrc -#define SID_OBJECT_HELL ( SID_SVX_START + 282 ) -#define SID_OBJECT_HEAVEN ( SID_SVX_START + 283 ) -#define SID_ATTR_LONG_ULSPACE ( SID_SVX_START + 284 ) -#define SID_ATTR_LONG_LRSPACE ( SID_SVX_START + 285 ) -#define SID_FRAME_TO_TOP ( SID_SVX_START + 286 ) -#define SID_FRAME_TO_BOTTOM ( SID_SVX_START + 287 ) -#define SID_POSTIT ( SID_SVX_START + 288 ) -//#define SID_ZOOM ( SID_SVX_START + 289 ) -> sfxsids.hrc -#define SID_GRID ( SID_SVX_START + 290 ) -//#define SID_SEARCH_ITEM ( SID_SVX_START + 291 ) -> sfxsids.hrc -#define SID_SEARCH_SEARCHSET ( SID_SVX_START + 292 ) -#define SID_SEARCH_REPLACESET ( SID_SVX_START + 293 ) -#define SID_SET_SUPER_SCRIPT ( SID_SVX_START + 294 ) -#define SID_SET_SUB_SCRIPT ( SID_SVX_START + 295 ) -#define SID_CHAR_DLG ( SID_SVX_START + 296 ) -#define SID_PARA_DLG ( SID_SVX_START + 297 ) -#define SID_ATTR_GRID_OPTIONS ( SID_SVX_START + 298 ) -#define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 ) -#define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 ) -#define SID_ATTR_TRANSFORM_SLANT ( SID_SVX_START + 302 ) // !!! -#define SID_ATTR_TRANSFORM_SHEAR ( SID_SVX_START + 304 ) -#define SID_ATTR_TRANSFORM_SHEAR_X ( SID_SVX_START + 305 ) -#define SID_ATTR_TRANSFORM_SHEAR_Y ( SID_SVX_START + 306 ) -#define SID_ATTR_TRANSFORM_SHEAR_VERTICAL ( SID_SVX_START + 307 ) -#define SID_ATTR_TRANSFORM_RESIZE_REF_X ( SID_SVX_START + 308 ) -#define SID_ATTR_TRANSFORM_RESIZE_REF_Y ( SID_SVX_START + 309 ) -#define SID_ATTR_TRANSFORM_AUTOWIDTH ( SID_SVX_START + 310 ) -#define SID_ATTR_TRANSFORM_AUTOHEIGHT ( SID_SVX_START + 311 ) -#define SID_ATTR_TRANSFORM_HORI_RELATION ( SID_SVX_START + 312 ) -#define SID_ATTR_TRANSFORM_VERT_RELATION ( SID_SVX_START + 313 ) -#define SID_ATTR_TRANSFORM_HORI_ORIENT ( SID_SVX_START + 314 ) -#define SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ( SID_SVX_START + 315 ) -#define SID_ATTR_TRANSFORM_IN_RTL_TEXT ( SID_SVX_START + 316 ) -#define SID_ATTR_TRANSFORM_HORI_MIRROR ( SID_SVX_START + 317 ) -#define SID_ATTR_TRANSFORM_ANCHOR ( SID_SVX_START + 318 ) -#define SID_ATTR_TRANSFORM_VERT_ORIENT ( SID_SVX_START + 319 ) -#define SID_TAB_INSERT ( SID_SVX_START + 320 ) -#define SID_TAB_COUNT ( SID_SVX_START + 321 ) -#define SID_TAB_POSITION ( SID_SVX_START + 322 ) -#define SID_TAB_ADJUST ( SID_SVX_START + 323 ) -#define SID_TAB_DECIMAL ( SID_SVX_START + 324 ) -#define SID_TAB_FILLCHAR ( SID_SVX_START + 325 ) -#define SID_SCAN ( SID_SVX_START + 330 ) -#define SID_TWAIN_SELECT ( SID_SVX_START + 331 ) -#define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 ) -#define SID_CONTOUR_DLG ( SID_SVX_START + 334 ) -#define SID_CONTOUR_EXEC ( SID_SVX_START + 335 ) -#define SID_BORDER_OBJECT ( SID_SVX_START + 340 ) -#define SID_BORDER_LEFTLINE ( SID_SVX_START + 341 ) -#define SID_BORDER_RIGHTLINE ( SID_SVX_START + 342 ) -#define SID_BORDER_TOPLINE ( SID_SVX_START + 343 ) -#define SID_BORDER_BOTTOMLINE ( SID_SVX_START + 344 ) -#define SID_BORDER_HORIZONTALLINE ( SID_SVX_START + 345 ) -#define SID_BORDER_VERTICALLINE ( SID_SVX_START + 346 ) -#define SID_BORDER_DISTANCE ( SID_SVX_START + 347 ) -#define SID_SB_CONNECTIONPOOLING ( SID_SVX_START + 348 ) -#define SID_SB_DBREGISTEROPTIONS ( SID_SVX_START + 349 ) -#define SID_BMPMASK ( SID_SVX_START + 350 ) -#define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 ) -#define SID_BMPMASK_BMPSELECT ( SID_SVX_START + 352 ) -#define SID_BMPMASK_EXEC ( SID_SVX_START + 353 ) -//#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc -//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc -//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc -#define SID_NO_GRAPHICS ( SID_SVX_START + 364 ) -#define SID_IMPORT_GRAPH_LASTURL ( SID_SVX_START + 365 ) -//#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc -#define SID_ATTR_TEXT_FITTOSIZE ( SID_SVX_START + 367 ) -#define SID_ATTR_BRUSH_ROW ( SID_SVX_START + 368 ) -#define SID_OPTFILTER_MSOFFICE ( SID_SVX_START + 369 ) -#define SID_IMAP ( SID_SVX_START + 371 ) -#define SID_IMAP_DLG ( SID_SVX_START + 372 ) -#define SID_IMAP_SELECT ( SID_SVX_START + 373 ) -#define SID_IMAP_EXEC ( SID_SVX_START + 374 ) -#define SID_SHOW_HIDDEN ( SID_SVX_START + 375 ) -#define SID_SHOW_FORMS ( SID_SVX_START + 376 ) -#define SID_DRAW_RECT_NOFILL ( SID_SVX_START + 378 ) -#define SID_DRAW_RECT_ROUND_NOFILL ( SID_SVX_START + 379 ) -#define SID_DRAW_SQUARE ( SID_SVX_START + 380 ) -#define SID_DRAW_SQUARE_ROUND ( SID_SVX_START + 381 ) -#define SID_DRAW_SQUARE_NOFILL ( SID_SVX_START + 382 ) -#define SID_DRAW_SQUARE_ROUND_NOFILL ( SID_SVX_START + 383 ) -#define SID_DRAW_ELLIPSE_NOFILL ( SID_SVX_START + 384 ) -#define SID_DRAW_CIRCLE ( SID_SVX_START + 385 ) -#define SID_DRAW_CIRCLE_NOFILL ( SID_SVX_START + 386 ) -#define SID_DRAW_PIE_NOFILL ( SID_SVX_START + 387 ) -#define SID_DRAW_CIRCLEPIE ( SID_SVX_START + 388 ) -#define SID_DRAW_CIRCLEPIE_NOFILL ( SID_SVX_START + 389 ) -#define SID_DRAW_CIRCLEARC ( SID_SVX_START + 390 ) -#define SID_DRAW_CIRCLECUT_NOFILL ( SID_SVX_START + 391 ) -#define SID_DRAW_ELLIPSECUT ( SID_SVX_START + 392 ) -#define SID_DRAW_ELLIPSECUT_NOFILL ( SID_SVX_START + 393 ) -#define SID_DRAW_XPOLYGON ( SID_SVX_START + 394 ) -#define SID_DRAW_POLYGON_NOFILL ( SID_SVX_START + 395 ) -#define SID_DRAW_XPOLYGON_NOFILL ( SID_SVX_START + 396 ) -#define SID_DRAW_BEZIER_NOFILL ( SID_SVX_START + 397 ) -#define SID_DRAWTBX_TEXT ( SID_SVX_START + 398 ) -#define SID_DRAWTBX_RECTANGLES ( SID_SVX_START + 399 ) -#define SID_DRAWTBX_ELLIPSES ( SID_SVX_START + 400 ) -#define SID_DRAWTBX_LINES ( SID_SVX_START + 401 ) -//#define SID_ZOOM_NEXT ( SID_SVX_START + 402 ) -> sfxsids.hrc -//#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc -#define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) -#define SID_ATTR_FLASH ( SID_SVX_START + 406 ) -#define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_START SID_ATTR_3D_LIGHT -#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ -#define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) -#define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) -#define SID_HTML_MODE ( SID_SVX_START + 414 ) -#define SID_RULER_PROTECT ( SID_SVX_START + 415 ) -//#define SID_INET_DLG ( SID_SVX_START + 416 ) -> sfxsids.hrc -#define SID_COLOR_CONTROL ( SID_SVX_START + 417 ) -#define SID_ATTR_3D_PERSPECTIVE ( SID_SVX_START + 418 ) -#define SID_ATTR_3D_DEPTH ( SID_SVX_START + 419 ) -#define SID_ATTR_3D_DISTANCE ( SID_SVX_START + 420 ) -#define SID_ATTR_3D_FOCAL_LENGTH ( SID_SVX_START + 421 ) -#define SID_ATTR_3D_INTERN ( SID_SVX_START + 422 ) -#define SID_PSZ_FUNCTION ( SID_SVX_START + 423 ) -//#define SID_AUTO_CORRECT_DLG ( SID_SVX_START + 424 ) -> sfxsids.hrc -#define SID_OFASLOTS_START ( SID_SVX_START + 425 ) -//#define SID_SD_AUTOPILOT ( SID_SVX_START + 425 ) -> sfxsids.hrc -#define SID_AUTOPILOT SID_SD_AUTOPILOT - -#define SID_TABLE_INSERT_COL_DLG ( SID_SVX_START + 426 ) -#define SID_TABLE_INSERT_ROW_DLG ( SID_SVX_START + 427 ) -#define SID_TABLE_PARAM_INSERT_AFTER ( SID_SVX_START + 428 ) - -#define SID_TABLEDESIGN ( SID_SVX_START + 429 ) -#define SID_MN_AUTOPILOT ( SID_SVX_START + 430 ) -#define SID_GENERAL_OPTIONS ( SID_SVX_START + 432 ) -#define SID_SW_EDITOPTIONS ( SID_SVX_START + 433 ) -#define SID_SD_EDITOPTIONS ( SID_SVX_START + 434 ) -#define SID_SC_EDITOPTIONS ( SID_SVX_START + 435 ) -#define SID_SM_EDITOPTIONS ( SID_SVX_START + 436 ) -#define SID_SCH_EDITOPTIONS ( SID_SVX_START + 437 ) -#define SID_SIM_EDITOPTIONS ( SID_SVX_START + 438 ) -#define SID_SW_ONLINEOPTIONS ( SID_SVX_START + 439 ) -#define SID_MN_OPTIONS ( SID_SVX_START + 440 ) -#define SID_GET_COLORTABLE ( SID_SVX_START + 441 ) -#define SID_MN_INSERT_OBJECT_DLGS ( SID_SVX_START + 442 ) -#define SID_OUTLINE_TO_IMPRESS ( SID_SVX_START + 443 ) -#define SID_SIM_TP_COLOR ( SID_SVX_START + 444 ) -#define SID_SIM_TP_EFFECTS ( SID_SVX_START + 445 ) -#define SID_SPELLCHECKER_CHANGED ( SID_SVX_START + 446 ) -#define SID_SD_GRAPHIC_OPTIONS ( SID_SVX_START + 447 ) -#define SID_SM_TP_PRINTOPTIONS ( SID_SVX_START + 448 ) -#define SID_OFASLOTS_END ( SID_SVX_START + 449 ) -#define SID_SB_STARBASEOPTIONS ( SID_SVX_START + 450 ) -#define SID_SWREGISTER_COLLECTION ( SID_SVX_START + 451 ) -#define SID_FILTER_DLG ( SID_SVX_START + 452 ) -#define SID_ATTR_BRUSH_TABLE ( SID_SVX_START + 453 ) -#define SID_GROUP ( SID_SVX_START + 454 ) -#define SID_UNGROUP ( SID_SVX_START + 455 ) -#define SID_SET_DEFAULT ( SID_SVX_START + 456 ) -#define SID_BEZIER ( SID_SVX_START + 458 ) -#define SID_ATTR_3D_DOUBLE_SIDED ( SID_SVX_START + 459 ) -#define SID_ATTR_ALIGN_INDENT ( SID_SVX_START + 460 ) -#define SID_DEC_INDENT ( SID_SVX_START + 461 ) -#define SID_INC_INDENT ( SID_SVX_START + 462 ) -#define SID_DRAW_FREELINE ( SID_SVX_START + 463 ) -#define SID_DRAW_FREELINE_NOFILL ( SID_SVX_START + 464 ) -#define SID_DRAW_TEXT_MARQUEE ( SID_SVX_START + 465 ) -#define SID_SCH_TP_DEFCOLORS ( SID_SVX_START + 466 ) -#define SID_SWREGISTER_MODE ( SID_SVX_START + 467 ) -#define SID_OPTBASE_DATABASENAMES ( SID_SVX_START + 468 ) -#define SID_GRFFILTER ( SID_SVX_START + 469 ) -#define SID_GRFFILTER_INVERT ( SID_SVX_START + 470 ) -#define SID_GRFFILTER_SMOOTH ( SID_SVX_START + 471 ) -#define SID_GRFFILTER_SHARPEN ( SID_SVX_START + 472 ) -#define SID_GRFFILTER_REMOVENOISE ( SID_SVX_START + 473 ) -#define SID_GRFFILTER_SOBEL ( SID_SVX_START + 474 ) -#define SID_GRFFILTER_MOSAIC ( SID_SVX_START + 475 ) -#define SID_GRFFILTER_EMBOSS ( SID_SVX_START + 476 ) -#define SID_GRFFILTER_POSTER ( SID_SVX_START + 477 ) -#define SID_GRFFILTER_POPART ( SID_SVX_START + 478 ) -#define SID_GRFFILTER_SEPIA ( SID_SVX_START + 479 ) -#define SID_GRFFILTER_SOLARIZE ( SID_SVX_START + 480 ) -#define SID_COLL_CLEAR ( SID_SVX_START + 536 ) -#define SID_SHOW_ADDRESS ( SID_SVX_START + 538 ) -#define SID_APP_ENTERWAIT ( SID_SVX_START + 550 ) -#define SID_APP_LEAVEWAIT ( SID_SVX_START + 551 ) -#define SID_APP_ISWAIT ( SID_SVX_START + 552 ) -#define SID_OFA_TBL_DESIGNVIEW ( SID_SVX_START + 554 ) -#define SID_OFA_TBL_ADRESSBOOK ( SID_SVX_START + 555 ) -#define SID_OFA_QRY_DESIGNVIEW ( SID_SVX_START + 556 ) -#define SID_OFA_QRY_SQLVIEW ( SID_SVX_START + 557 ) -#define SID_OFA_FRM_DESIGNVIEW ( SID_SVX_START + 558 ) -#define SID_OFA_RPT_DESIGNVIEW ( SID_SVX_START + 559 ) -#define SID_OFA_TBL_CREATE ( SID_SVX_START + 560 ) -#define SID_OFA_QRY_CREATE ( SID_SVX_START + 561 ) -#define SID_OFA_FRM_CREATE ( SID_SVX_START + 562 ) -#define SID_OFA_RPT_CREATE ( SID_SVX_START + 563 ) -#define SID_FIELD_GRABFOCUS ( SID_SVX_START + 567 ) -#define SID_ATTR_3D_HORZ_SEGS ( SID_SVX_START + 568 ) -#define SID_ATTR_3D_VERT_SEGS ( SID_SVX_START + 569 ) -#define SID_ATTR_3D_DUMMY_1 ( SID_SVX_START + 570 ) -#define SID_ATTR_3D_DUMMY_2 ( SID_SVX_START + 571 ) -#define SID_BROWSER_DLG ( SID_SVX_START + 572 ) -#define SID_OFA_TBL_COMPRESS ( SID_SVX_START + 576 ) -#define SID_ATTR_ALIGN_DEGREES ( SID_SVX_START + 577 ) -#define SID_ATTR_ALIGN_LOCKPOS ( SID_SVX_START + 578 ) -#define SID_ATTR_LINEEND_WIDTH_DEFAULT ( SID_SVX_START + 579 ) -#define SID_ATTR_NUMBERFORMAT_ONE_AREA ( SID_SVX_START + 580 ) -#define SID_FUNCTION_CONTROL ( SID_SVX_START + 581 ) -#define SID_TAB_REMOVE ( SID_SVX_START + 582 ) -#define SID_TAB_REMOVE_ALL ( SID_SVX_START + 583 ) -#define SID_TAB_REMOVE_BY_INDEX ( SID_SVX_START + 584 ) -#define SID_OFA_VW_CREATE ( SID_SVX_START + 585 ) -#define SID_OFA_REL_DESIGNVIEW ( SID_SVX_START + 588 ) -#define SID_OFA_MANUAL_SQL ( SID_SVX_START + 589 ) -#define SID_PARA_BACKGRND_DESTINATION ( SID_SVX_START + 590 ) -#define SID_ATTR_BRUSH_CHAR ( SID_SVX_START + 591 ) -#define SID_FMSLOTS_START ( SID_SVX_START + 592 ) -#define SID_FM_CONFIG ( SID_SVX_START + 593 ) -#define SID_FM_PUSHBUTTON ( SID_SVX_START + 594 ) -#define SID_FM_RADIOBUTTON ( SID_SVX_START + 595 ) -#define SID_FM_CHECKBOX ( SID_SVX_START + 596 ) -#define SID_FM_FIXEDTEXT ( SID_SVX_START + 597 ) -#define SID_FM_GROUPBOX ( SID_SVX_START + 598 ) -#define SID_FM_EDIT ( SID_SVX_START + 599 ) -#define SID_FM_LISTBOX ( SID_SVX_START + 600 ) -#define SID_FM_COMBOBOX ( SID_SVX_START + 601 ) -#define SID_FM_DBGRID ( SID_SVX_START + 603 ) -#define SID_FM_IMAGEBUTTON ( SID_SVX_START + 604 ) -#define SID_FM_FILECONTROL ( SID_SVX_START + 605 ) -#define SID_FM_CHANGECOL ( SID_SVX_START + 606 ) -#define SID_FM_NAVIGATIONBAR ( SID_SVX_START + 607 ) -#define SID_FM_NEW_HIDDEN ( SID_SVX_START + 608 ) -#define SID_FM_RENAME_OBJECT ( SID_SVX_START + 609 ) -#define SID_FM_DELETEROWS ( SID_SVX_START + 610 ) -#define SID_FM_INSERTCOL ( SID_SVX_START + 611 ) -#define SID_FM_DELETECOL ( SID_SVX_START + 612 ) -#define SID_FM_CTL_PROPERTIES ( SID_SVX_START + 613 ) -#define SID_FM_PROPERTIES ( SID_SVX_START + 614 ) -#define SID_FM_TAB_DIALOG ( SID_SVX_START + 615 ) -#define SID_FM_RECORD_FIRST ( SID_SVX_START + 616 ) -#define SID_FM_RECORD_NEXT ( SID_SVX_START + 617 ) -#define SID_FM_RECORD_PREV ( SID_SVX_START + 618 ) -#define SID_FM_RECORD_LAST ( SID_SVX_START + 619 ) -#define SID_FM_RECORD_NEW ( SID_SVX_START + 620 ) -#define SID_FM_RECORD_DELETE ( SID_SVX_START + 621 ) -#define SID_FM_RECORD_ABSOLUTE ( SID_SVX_START + 622 ) -#define SID_FM_ADD_FIELD ( SID_SVX_START + 623 ) -#define SID_FM_RECORD_TEXT ( SID_SVX_START + 624 ) -#define SID_FM_RECORD_FROM_TEXT ( SID_SVX_START + 625 ) -#define SID_FM_RECORD_TOTAL ( SID_SVX_START + 626 ) -#define SID_FM_RECORD_SAVE ( SID_SVX_START + 627 ) -#define SID_FM_CREATE_CONTROL ( SID_SVX_START + 628 ) -#define SID_FM_DESIGN_MODE ( SID_SVX_START + 629 ) -#define SID_FM_RECORD_UNDO ( SID_SVX_START + 630 ) -#define SID_FM_CONTROL_IDENTIFIER ( SID_SVX_START + 631 ) -#define SID_FM_CONTROL_INVENTOR ( SID_SVX_START + 632 ) -#define SID_FM_SHOW_FMEXPLORER ( SID_SVX_START + 633 ) -#define SID_FM_FIELDS_CONTROL ( SID_SVX_START + 634 ) -#define SID_FM_SHOW_PROPERTIES ( SID_SVX_START + 635 ) -#define SID_FM_PROPERTY_CONTROL ( SID_SVX_START + 636 ) -#define SID_FM_FMEXPLORER_CONTROL ( SID_SVX_START + 637 ) -#define SID_FM_NEW ( SID_SVX_START + 638 ) -#define SID_FM_DELETE ( SID_SVX_START + 639 ) -#define SID_FM_NEW_FORM ( SID_SVX_START + 640 ) -#define SID_FMSLOTS_END ( SID_SVX_START + 641 ) -#define SID_REDLIN_FILTER_PAGE ( SID_SVX_START + 642 ) -#define SID_REDLIN_VIEW_PAGE ( SID_SVX_START + 643 ) -#define SID_3D_WIN ( SID_SVX_START + 644 ) -#define SID_3D_STATE ( SID_SVX_START + 645 ) -#define SID_3D_INIT ( SID_SVX_START + 646 ) -#define SID_3D_ASSIGN ( SID_SVX_START + 647 ) -#define SID_CONVERT_TO_3D ( SID_SVX_START + 648 ) -#define SID_CONVERT_TO_3D_LATHE_FAST ( SID_SVX_START + 649 ) -#define SID_ATTR_3D_PERCENT_DIAGONAL ( SID_SVX_START + 650 ) -#define SID_ATTR_3D_BACKSCALE ( SID_SVX_START + 651 ) -#define SID_ATTR_3D_END_ANGLE ( SID_SVX_START + 652 ) -#define SID_ATTR_3D_NORMALS_KIND ( SID_SVX_START + 653 ) -#define SID_ATTR_3D_NORMALS_INVERT ( SID_SVX_START + 654 ) -#define SID_ATTR_3D_TWO_SIDED_LIGHTING ( SID_SVX_START + 655 ) -#define SID_ATTR_3D_TEXTURE_KIND ( SID_SVX_START + 656 ) -#define SID_ATTR_3D_TEXTURE_MODE ( SID_SVX_START + 657 ) -#define SID_ATTR_3D_TEXTURE_PROJ_X ( SID_SVX_START + 658 ) -#define SID_ATTR_3D_TEXTURE_PROJ_Y ( SID_SVX_START + 659 ) -#define SID_ATTR_3D_TEXTURE_FILTER ( SID_SVX_START + 660 ) -#define SID_ATTR_3D_MAT_COLOR ( SID_SVX_START + 661 ) -#define SID_ATTR_3D_MAT_EMISSION ( SID_SVX_START + 662 ) -#define SID_ATTR_3D_MAT_SPECULAR ( SID_SVX_START + 663 ) -#define SID_ATTR_3D_MAT_SPECULAR_INTENSITY ( SID_SVX_START + 664 ) -#define SID_ATTR_3D_SHADE_MODE ( SID_SVX_START + 665 ) -#define SID_ATTR_3D_SHADOW_3D ( SID_SVX_START + 666 ) -#define SID_ATTR_3D_SHADOW_SLANT ( SID_SVX_START + 667 ) -#define SID_ATTR_3D_LIGHTCOLOR_1 ( SID_SVX_START + 668 ) -#define SID_ATTR_3D_LIGHTCOLOR_2 ( SID_SVX_START + 669 ) -#define SID_ATTR_3D_LIGHTCOLOR_3 ( SID_SVX_START + 670 ) -#define SID_ATTR_3D_LIGHTCOLOR_4 ( SID_SVX_START + 671 ) -#define SID_ATTR_3D_LIGHTCOLOR_5 ( SID_SVX_START + 672 ) -#define SID_ATTR_3D_LIGHTCOLOR_6 ( SID_SVX_START + 673 ) -#define SID_ATTR_3D_LIGHTCOLOR_7 ( SID_SVX_START + 674 ) -#define SID_ATTR_3D_LIGHTCOLOR_8 ( SID_SVX_START + 675 ) -#define SID_ATTR_3D_LIGHTON_1 ( SID_SVX_START + 676 ) -#define SID_ATTR_3D_LIGHTON_2 ( SID_SVX_START + 677 ) -#define SID_ATTR_3D_LIGHTON_3 ( SID_SVX_START + 678 ) -#define SID_ATTR_3D_LIGHTON_4 ( SID_SVX_START + 679 ) -#define SID_ATTR_3D_LIGHTON_5 ( SID_SVX_START + 680 ) -#define SID_ATTR_3D_LIGHTON_6 ( SID_SVX_START + 681 ) -#define SID_ATTR_3D_LIGHTON_7 ( SID_SVX_START + 682 ) -#define SID_ATTR_3D_LIGHTON_8 ( SID_SVX_START + 683 ) -#define SID_ATTR_3D_LIGHTDIRECTION_1 ( SID_SVX_START + 684 ) -#define SID_ATTR_3D_LIGHTDIRECTION_2 ( SID_SVX_START + 685 ) -#define SID_ATTR_3D_LIGHTDIRECTION_3 ( SID_SVX_START + 686 ) -#define SID_ATTR_3D_LIGHTDIRECTION_4 ( SID_SVX_START + 687 ) -#define SID_ATTR_3D_LIGHTDIRECTION_5 ( SID_SVX_START + 688 ) -#define SID_ATTR_3D_LIGHTDIRECTION_6 ( SID_SVX_START + 689 ) -#define SID_ATTR_3D_LIGHTDIRECTION_7 ( SID_SVX_START + 690 ) -#define SID_ATTR_3D_LIGHTDIRECTION_8 ( SID_SVX_START + 691 ) -#define SID_ATTR_3D_END SID_ATTR_3D_LIGHTDIRECTION_8 -#define SID_ATTR_3D_DUMMY_3 ( SID_SVX_START + 692 ) -#define SID_ATTR_3D_DUMMY_4 ( SID_SVX_START + 693 ) -#define SID_ATTR_3D_DUMMY_5 ( SID_SVX_START + 694 ) -#define SID_ATTR_3D_DUMMY_6 ( SID_SVX_START + 695 ) -#define SID_ATTR_3D_DUMMY_7 ( SID_SVX_START + 696 ) -#define SID_ATTR_3D_DUMMY_8 ( SID_SVX_START + 697 ) -#define SID_ATTR_3D_DUMMY_9 ( SID_SVX_START + 698 ) -#define SID_ATTR_3D_DUMMY_10 ( SID_SVX_START + 699 ) -#define SID_ATTR_NUMBERFORMAT_NOLANGUAGE ( SID_SVX_START + 700 ) -#define SID_MN_GROUP ( SID_SVX_START + 701 ) -#define SID_FM_AUTO_ORDER ( SID_SVX_START + 702 ) - -#define SID_MORE_FMSLOTS_START ( SID_SVX_START + 702 ) -#define SID_FM_SHOW_PROPERTY_BROWSER ( SID_SVX_START + 703 ) -#define SID_FM_DATEFIELD ( SID_SVX_START + 704 ) -#define SID_FM_TIMEFIELD ( SID_SVX_START + 705 ) -#define SID_FM_NUMERICFIELD ( SID_SVX_START + 706 ) -#define SID_FM_CURRENCYFIELD ( SID_SVX_START + 707 ) -#define SID_FM_PATTERNFIELD ( SID_SVX_START + 708 ) -#define SID_FM_OPEN_READONLY ( SID_SVX_START + 709 ) -#define SID_FM_IMAGECONTROL ( SID_SVX_START + 710 ) -#define SID_FM_REMOVE_FILTER_SORT ( SID_SVX_START + 711 ) -#define SID_FM_SORTUP ( SID_SVX_START + 712 ) -#define SID_FM_SORTDOWN ( SID_SVX_START + 713 ) -#define SID_FM_ORDERCRIT ( SID_SVX_START + 714 ) -#define SID_FM_FILTERCRIT ( SID_SVX_START + 715 ) -#define SID_FM_AUTOFILTER ( SID_SVX_START + 716 ) -#define SID_FM_COUNTALL ( SID_SVX_START + 717 ) -#define SID_FM_NATIVESQL ( SID_SVX_START + 720 ) -#define SID_FM_EXECUTE ( SID_SVX_START + 721 ) -#define SID_SBA_QRY_EXECUTE SID_FM_EXECUTE -#define SID_FM_ADDTABLE ( SID_SVX_START + 722 ) -#define SID_FM_FORM_FILTERED ( SID_SVX_START + 723 ) -#define SID_FM_REFRESH ( SID_SVX_START + 724 ) -#define SID_FM_SEARCH ( SID_SVX_START + 725 ) -#define SID_FM_LEAVE_CREATE ( SID_SVX_START + 726 ) // Formcontroller-Button rauspoppen -#define SID_FM_USE_WIZARDS ( SID_SVX_START + 727 ) -#define SID_FM_FORMATTEDFIELD ( SID_SVX_START + 728 ) -#define SID_FM_FILTER_START ( SID_SVX_START + 729 ) -#define SID_FM_FILTER_EXIT ( SID_SVX_START + 730 ) -#define SID_FM_FILTER_EXECUTE ( SID_SVX_START + 731 ) -#define SID_FM_FILTER_NAVIGATOR ( SID_SVX_START + 732 ) -#define SID_FM_CHANGECONTROLTYPE ( SID_SVX_START + 733 ) -#define SID_FM_CONVERTTO_EDIT ( SID_SVX_START + 734 ) -#define SID_FM_CONVERTTO_BUTTON ( SID_SVX_START + 735 ) -#define SID_FM_CONVERTTO_FIXEDTEXT ( SID_SVX_START + 736 ) -#define SID_FM_CONVERTTO_LISTBOX ( SID_SVX_START + 737 ) -#define SID_FM_CONVERTTO_CHECKBOX ( SID_SVX_START + 738 ) -#define SID_FM_CONVERTTO_RADIOBUTTON ( SID_SVX_START + 739 ) -#define SID_FM_CONVERTTO_GROUPBOX ( SID_SVX_START + 740 ) -#define SID_FM_CONVERTTO_COMBOBOX ( SID_SVX_START + 741 ) -#define SID_FM_CONVERTTO_IMAGEBUTTON ( SID_SVX_START + 743 ) -#define SID_FM_CONVERTTO_FILECONTROL ( SID_SVX_START + 744 ) -#define SID_FM_CONVERTTO_DATE ( SID_SVX_START + 745 ) -#define SID_FM_CONVERTTO_TIME ( SID_SVX_START + 746 ) -#define SID_FM_CONVERTTO_NUMERIC ( SID_SVX_START + 747 ) -#define SID_FM_CONVERTTO_CURRENCY ( SID_SVX_START + 748 ) -#define SID_FM_CONVERTTO_PATTERN ( SID_SVX_START + 749 ) -#define SID_FM_CONVERTTO_IMAGECONTROL ( SID_SVX_START + 750 ) -#define SID_FM_CONVERTTO_FORMATTED ( SID_SVX_START + 751 ) -#define SID_FM_FILTER_NAVIGATOR_CONTROL ( SID_SVX_START + 752 ) -#define SID_FM_HIDECOL ( SID_SVX_START + 753 ) -#define SID_FM_SHOWCOLS ( SID_SVX_START + 754 ) -#define SID_FM_SHOWCOLS_MORE ( SID_SVX_START + 755 ) -#define SID_FM_SHOWALLCOLS ( SID_SVX_START + 756 ) -#define SID_FM_TWOFIELDS_DATE_N_TIME ( SID_SVX_START + 757 ) -#define SID_FM_FILTER_EDIT ( SID_SVX_START + 758 ) -#define SID_FM_FILTER_IS_NULL ( SID_SVX_START + 759 ) -#define SID_FM_FILTER_IS_NOT_NULL ( SID_SVX_START + 760 ) -#define SID_FM_VIEW_AS_GRID ( SID_SVX_START + 761 ) -#define SID_FM_FILTER_REMOVE ( SID_SVX_START + 762 ) -#define SID_FM_AUTOCONTROLFOCUS ( SID_SVX_START + 763 ) -#define SID_DSBROWSER_EXPLORER ( SID_SVX_START + 764 ) -#define SID_FM_CREATE_FIELDCONTROL ( SID_SVX_START + 765 ) -#define SID_FM_DATACCESS_DESCRIPTOR ( SID_SVX_START + 766 ) -#define SID_FM_GRABCONTROLFOCUS ( SID_SVX_START + 767 ) -#define SID_FM_SCROLLBAR ( SID_SVX_START + 768 ) -#define SID_FM_SPINBUTTON ( SID_SVX_START + 769 ) -#define SID_FM_CONVERTTO_SCROLLBAR ( SID_SVX_START + 770 ) -#define SID_FM_CONVERTTO_SPINBUTTON ( SID_SVX_START + 771 ) -#define SID_FM_CONVERTTO_NAVIGATIONBAR ( SID_SVX_START + 772 ) -#define SID_FM_SHOW_DATANAVIGATOR ( SID_SVX_START + 773 ) -#define SID_FM_DATANAVIGATOR_CONTROL ( SID_SVX_START + 774 ) -#define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 ) -#define SID_MORE_FMSLOTS_END ( SID_SVX_START + 850 ) - -#define SID_HLINKBAR_LINK ( SID_SVX_START + 851 ) -#define SID_HLINKBAR_BOOKMARK ( SID_SVX_START + 852 ) -#define SID_HLINKBAR_SEARCH ( SID_SVX_START + 853 ) -#define SID_HLINKBAR_TARGET ( SID_SVX_START + 854 ) -#define SID_PARAM_NUM_PRESET ( SID_SVX_START + 856 ) -#define SID_PARAM_CUR_NUMBER ( SID_SVX_START + 857 ) -#define SID_PARAM_CHILD_LEVELS ( SID_SVX_START + 858 ) -#define SID_PARAM_CUR_NUM_LEVEL ( SID_SVX_START + 859 ) -#define SID_CREATE_SW_DRAWVIEW ( SID_SVX_START + 860 ) -#define SID_ATTR_GRAF_LUMINANCE ( SID_SVX_START + 863 ) -#define SID_ATTR_GRAF_CONTRAST ( SID_SVX_START + 864 ) -#define SID_ATTR_GRAF_RED ( SID_SVX_START + 865 ) -#define SID_ATTR_GRAF_GREEN ( SID_SVX_START + 866 ) -#define SID_ATTR_GRAF_BLUE ( SID_SVX_START + 867 ) -#define SID_ATTR_GRAF_GAMMA ( SID_SVX_START + 868 ) -#define SID_ATTR_GRAF_TRANSPARENCE ( SID_SVX_START + 869 ) -#define SID_ATTR_GRAF_INVERT ( SID_SVX_START + 870 ) -#define SID_ATTR_GRAF_MODE ( SID_SVX_START + 871 ) -#define SID_ATTR_GRAF_RESERVE2 ( SID_SVX_START + 872 ) -#define SID_ATTR_GRAF_RESERVE3 ( SID_SVX_START + 873 ) -#define SID_ATTR_GRAF_RESERVE4 ( SID_SVX_START + 874 ) -#define SID_ATTR_GRAF_RESERVE5 ( SID_SVX_START + 875 ) -//#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc -#define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 ) -#define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 ) -#define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 ) -#define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 ) -#define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 ) -#define SID_ASIAN_DLG ( SID_SVX_START + 904 ) -#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL -#define SID_DRAW_CAPTION_VERTICAL ( SID_SVX_START + 906 ) -#define SID_TEXTDIRECTION_LEFT_TO_RIGHT ( SID_SVX_START + 907 ) -#define SID_TEXTDIRECTION_TOP_TO_BOTTOM ( SID_SVX_START + 908 ) -#define SID_TRANSLITERATE_UPPER ( SID_SVX_START + 912 ) -#define SID_TRANSLITERATE_LOWER ( SID_SVX_START + 913 ) -#define SID_TRANSLITERATE_HALFWIDTH ( SID_SVX_START + 914 ) -#define SID_TRANSLITERATE_FULLWIDTH ( SID_SVX_START + 915 ) -#define SID_TRANSLITERATE_HIRAGANA ( SID_SVX_START + 916 ) -#define SID_TRANSLITERATE_KATAGANA ( SID_SVX_START + 917 ) -#define SID_MN_SUB_TRANSLITERATE ( SID_SVX_START + 918 ) -#define SID_LANGUAGE_OPTIONS ( SID_SVX_START + 921 ) -#define SID_GETUNDOSTRINGS ( SID_SVX_START + 923 ) -#define SID_GETREDOSTRINGS ( SID_SVX_START + 924 ) -#define SID_PARA_VERTALIGN ( SID_SVX_START + 925 ) -#define SID_INSERT_IMAGECONTROL ( SID_SVX_START + 926 ) -#define SID_INSERT_PROGRESSBAR ( SID_SVX_START + 927 ) -#define SID_INSERT_HFIXEDLINE ( SID_SVX_START + 928 ) -#define SID_INSERT_VFIXEDLINE ( SID_SVX_START + 929 ) -#define SID_READONLY_MODE ( SID_SVX_START + 930 ) -#define SID_ATTR_ALIGN_HYPHENATION ( SID_SVX_START + 931 ) -#define SID_ATTR_NUMBERFORMAT_SOURCE ( SID_SVX_START + 932 ) -#define SID_ATTR_AUTO_COLOR_INVALID ( SID_SVX_START + 933 ) -//#define SID_ADDRESS_DATA_SOURCE ( SID_SVX_START + 934 ) -> sfxsids.hrc -#define SID_RULER_BORDER_DISTANCE ( SID_SVX_START + 935 ) -#define SID_INSERT_DATEFIELD ( SID_SVX_START + 936 ) -#define SID_INSERT_TIMEFIELD ( SID_SVX_START + 937 ) -#define SID_INSERT_NUMERICFIELD ( SID_SVX_START + 938 ) -#define SID_INSERT_CURRENCYFIELD ( SID_SVX_START + 939 ) -#define SID_INSERT_FORMATTEDFIELD ( SID_SVX_START + 940 ) -#define SID_INSERT_PATTERNFIELD ( SID_SVX_START + 941 ) -#define SID_INSERT_FILECONTROL ( SID_SVX_START + 942 ) -#define SID_SHOW_PROPERTYBROWSER ( SID_SVX_START + 943 ) -#define SID_ATTR_TABSTOP_VERTICAL ( SID_SVX_START + 946 ) -#define SID_RULER_BORDERS_VERTICAL ( SID_SVX_START + 948 ) -#define SID_ATTR_ALIGN_ASIANVERTICAL ( SID_SVX_START + 949 ) -#define SID_RULER_TEXT_RIGHT_TO_LEFT ( SID_SVX_START + 952 ) -#define SID_ATTR_HDFT_DYNAMIC_SPACING ( SID_SVX_START + 953 ) -#define SID_ATTR_NUMBERFORMAT_ADD_AUTO ( SID_SVX_START + 954 ) -#define SID_OPEN_HYPERLINK ( SID_SVX_START + 955 ) -#define SID_CTLFONT_STATE ( SID_SVX_START + 956 ) -#define SID_VERTICALTEXT_STATE ( SID_SVX_START + 957 ) -#define SID_OPEN_XML_FILTERSETTINGS ( SID_SVX_START + 958 ) -#define SID_HANGUL_HANJA_CONVERSION ( SID_SVX_START + 959 ) -#define SID_EXTRUSION_TOOGLE ( SID_SVX_START + 960 ) -#define SID_EXTRUSION_TILT_DOWN ( SID_SVX_START + 961 ) -#define SID_EXTRUSION_TILT_UP ( SID_SVX_START + 962 ) -#define SID_EXTRUSION_TILT_LEFT ( SID_SVX_START + 963 ) -#define SID_EXTRUSION_TILT_RIGHT ( SID_SVX_START + 964 ) -#define SID_EXTRUSION_DEPTH_FLOATER ( SID_SVX_START + 965 ) -#define SID_EXTRUSION_DIRECTION_FLOATER ( SID_SVX_START + 966 ) -#define SID_EXTRUSION_LIGHTING_FLOATER ( SID_SVX_START + 967 ) -#define SID_EXTRUSION_SURFACE_FLOATER ( SID_SVX_START + 968 ) -#define SID_EXTRUSION_3D_COLOR ( SID_SVX_START + 969 ) -#define SID_EXTRUSION_DEPTH ( SID_SVX_START + 970 ) -#define SID_EXTRUSION_DIRECTION ( SID_SVX_START + 971 ) -#define SID_EXTRUSION_PROJECTION ( SID_SVX_START + 972 ) -#define SID_EXTRUSION_LIGHTING_DIRECTION ( SID_SVX_START + 973 ) -#define SID_EXTRUSION_LIGHTING_INTENSITY ( SID_SVX_START + 974 ) -#define SID_EXTRUSION_SURFACE ( SID_SVX_START + 975 ) -#define SID_EXTRUSION_DEPTH_DIALOG ( SID_SVX_START + 976 ) -#define SID_FONTWORK_GALLERY_FLOATER ( SID_SVX_START + 977 ) -// free ( SID_SVX_START + 978 ) -#define SID_FONTWORK_SHAPE_TYPE ( SID_SVX_START + 979 ) -#define SID_FONTWORK_SAME_LETTER_HEIGHTS ( SID_SVX_START + 980 ) -#define SID_FONTWORK_ALIGNMENT_FLOATER ( SID_SVX_START + 981 ) -#define SID_FONTWORK_CHARACTER_SPACING_FLOATER ( SID_SVX_START + 982 ) -#define SID_FONTWORK_SHAPE ( SID_SVX_START + 983 ) -#define SID_FONTWORK_ALIGNMENT ( SID_SVX_START + 984 ) -#define SID_FONTWORK_CHARACTER_SPACING ( SID_SVX_START + 985 ) -#define SID_FONTWORK_KERN_CHARACTER_PAIRS ( SID_SVX_START + 986 ) -#define SID_DRAW_FONTWORK ( SID_SVX_START + 987 ) -#define SID_DRAW_FONTWORK_VERTICAL ( SID_SVX_START + 988 ) -#define SID_ATTR_BORDER_CONNECT ( SID_SVX_START + 990 ) -#define SID_SW_FOLLOW_TEXT_FLOW ( SID_SVX_START + 991 ) /* #i18732# - slot-id for new option IsFollowingTextFlow' */ -#define SID_RULER_ROWS ( SID_SVX_START + 992 ) -#define SID_RULER_ROWS_VERTICAL ( SID_SVX_START + 993 ) -#define SID_ATTR_TRANSFORM_HORI_POSITION ( SID_SVX_START + 999 ) -#define SID_ATTR_TRANSFORM_VERT_POSITION ( SID_SVX_START + 1000 ) -#define SID_SHOW_ITEMBROWSER ( SID_SVX_START + 1001 ) -#define SID_ALIGN_ANY_LEFT ( SID_SVX_START + 1002 ) -#define SID_ALIGN_ANY_HCENTER ( SID_SVX_START + 1003 ) -#define SID_ALIGN_ANY_RIGHT ( SID_SVX_START + 1004 ) -#define SID_ALIGN_ANY_JUSTIFIED ( SID_SVX_START + 1005 ) -#define SID_ALIGN_ANY_TOP ( SID_SVX_START + 1006 ) -#define SID_ALIGN_ANY_VCENTER ( SID_SVX_START + 1007 ) -#define SID_ALIGN_ANY_BOTTOM ( SID_SVX_START + 1008 ) -#define SID_ALIGN_ANY_HDEFAULT ( SID_SVX_START + 1009 ) -#define SID_ALIGN_ANY_VDEFAULT ( SID_SVX_START + 1010 ) -#define SID_SW_COLLAPSING_BORDERS ( SID_SVX_START + 1011 ) -#define SID_SW_WRAP_INFLUENCE_ON_OBJPOS ( SID_SVX_START + 1012 ) /* #i28701# - slot-id for new attribute WrapInfluenceOnObjPos' */ -#define SID_ATTR_BORDER_DIAG_TLBR ( SID_SVX_START + 1013 ) -#define SID_ATTR_BORDER_DIAG_BLTR ( SID_SVX_START + 1014 ) -#define SID_ATTR_ALIGN_SHRINKTOFIT ( SID_SVX_START + 1015 ) -#define SID_CHINESE_CONVERSION ( SID_SVX_START + 1016 ) -#define SID_PAGE_TYPE ( SID_SVX_START + 1017 ) -#define SID_DLG_TYPE ( SID_SVX_START + 1018 ) -#define SID_TABPAGE_POS ( SID_SVX_START + 1019 ) -#define SID_GRAPHIC ( SID_SVX_START + 1020 ) -#define SID_OBJECT_LIST ( SID_SVX_START + 1021 ) -#define SID_ATTR_SET ( SID_SVX_START + 1022 ) -#define SID_CHAR_FMT_LIST_BOX ( SID_SVX_START + 1023 ) -#define SID_METRIC_ITEM ( SID_SVX_START + 1024 ) -#define SID_NUM_CHAR_FMT ( SID_SVX_START + 1025 ) -#define SID_BULLET_CHAR_FMT ( SID_SVX_START + 1026 ) -#define SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK ( SID_SVX_START + 1027 ) -#define SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT ( SID_SVX_START + 1028 ) -#define SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH ( SID_SVX_START + 1029 ) -#define SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET ( SID_SVX_START + 1030 ) -#define SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST ( SID_SVX_START + 1031 ) -#define SID_SVXTABULATORTABPAGE_CONTROLFLAGS ( SID_SVX_START + 1032 ) -#define SID_SVXTEXTATTRPAGE_VIEW ( SID_SVX_START + 1033 ) -#define SID_FLAG_TYPE ( SID_SVX_START + 1034 ) -#define SID_SWMODE_TYPE ( SID_SVX_START + 1035 ) -#define SID_DISABLE_CTL ( SID_SVX_START + 1036 ) -#define SID_LINK_TYPE ( SID_SVX_START + 1037 ) -#define SID_ENUM_PAGE_MODE ( SID_SVX_START + 1038 ) -#define SID_PAPER_START ( SID_SVX_START + 1039 ) -#define SID_PAPER_END ( SID_SVX_START + 1040 ) -#define SID_COLLECT_LIST ( SID_SVX_START + 1041 ) -#define SID_GROW_FONT_SIZE ( SID_SVX_START + 1042 ) -#define SID_SHRINK_FONT_SIZE ( SID_SVX_START + 1043 ) -// color subtoolbar on graphictoolbar -#define SID_COLOR_SETTINGS ( SID_SVX_START + 1044 ) -#define SID_FM_MORE_CONTROLS ( SID_SVX_START + 1045 ) -#define SID_FM_FORM_DESIGN_TOOLS ( SID_SVX_START + 1046 ) -#define SID_DRAWTBX_CS_BASIC ( SID_SVX_START + 1047 ) -#define SID_DRAWTBX_CS_SYMBOL ( SID_SVX_START + 1048 ) -#define SID_DRAWTBX_CS_ARROW ( SID_SVX_START + 1049 ) -#define SID_DRAWTBX_CS_FLOWCHART ( SID_SVX_START + 1050 ) -#define SID_DRAWTBX_CS_CALLOUT ( SID_SVX_START + 1051 ) -#define SID_DRAWTBX_CS_STAR ( SID_SVX_START + 1052 ) -#define SID_DRAW_CS_ID ( SID_SVX_START + 1053 ) -#define SID_FONTWORK_CHARACTER_SPACING_DIALOG ( SID_SVX_START + 1054 ) -#define SID_BORDER_REDUCED_MODE ( SID_SVX_START + 1055 ) -#define SID_INSERT_RLM ( SID_SVX_START + 1056 ) /* insert RLM - right to left mark */ -#define SID_INSERT_LRM ( SID_SVX_START + 1057 ) /* insert LRM - left to right mark */ -#define SID_INSERT_ZWSP ( SID_SVX_START + 1058 ) /* insert ZWJ - invisible space, keep words together*/ -#define SID_INSERT_ZWNBSP ( SID_SVX_START + 1059 ) /* insert ZWNJ - invisible space, forces linebreak*/ -#define SID_OPTIONS_DATABASES ( SID_SVX_START + 1060 ) -#define SID_OPEN_SMARTTAGMENU ( SID_SVX_START + 1061 ) -#define SID_OPEN_SMARTTAGOPTIONS ( SID_SVX_START + 1062 ) -#define SID_INSERT_TREECONTROL ( SID_SVX_START + 1063 ) -#define SID_ATTR_VIEWLAYOUT ( SID_SVX_START + 1064 ) -#define SID_ATTR_ZOOMSLIDER ( SID_SVX_START + 1065 ) -#define SID_FONTNAMELIST ( SID_SVX_START + 1066 ) -#define SID_LANGUAGE_STATUS ( SID_SVX_START + 1067 ) -#define SID_CHAR_DLG_FOR_PARAGRAPH ( SID_SVX_START + 1068 ) -#define SID_SET_DOCUMENT_LANGUAGE ( SID_SVX_START + 1069 ) - -#define SID_TABLE_MERGE_CELLS (SID_SVX_START+1070) -#define SID_TABLE_SPLIT_CELLS (SID_SVX_START+1071) -#define SID_OPTIMIZE_TABLE (SID_SVX_START+1072) -#define SID_TABLE_VERT_BOTTOM (SID_SVX_START+1073) -#define SID_TABLE_VERT_CENTER (SID_SVX_START+1074) -#define SID_TABLE_VERT_NONE (SID_SVX_START+1075) -#define SID_TABLE_INSERT_ROW (SID_SVX_START+1076) -#define SID_TABLE_INSERT_COL (SID_SVX_START+1077) -#define SID_TABLE_DELETE_ROW (SID_SVX_START+1078) -#define SID_TABLE_DELETE_COL (SID_SVX_START+1079) -#define SID_TABLE_SELECT_ALL (SID_SVX_START+1080) -#define SID_TABLE_SELECT_COL (SID_SVX_START+1081) -#define SID_TABLE_SELECT_ROW (SID_SVX_START+1082) -#define SID_FORMAT_TABLE_DLG (SID_SVX_START+1083) -#define SID_TABLE_SORT_DIALOG (SID_SVX_START+1084) -#define SID_TABLE_AUTOSUM (SID_SVX_START+1085) -#define SID_TABLE_DISTRIBUTE_COLUMNS (SID_SVX_START+1086) -#define SID_TABLE_DISTRIBUTE_ROWS (SID_SVX_START+1087) -#define SID_TABLE_STYLE (SID_SVX_START+1088) -#define SID_TABLE_STYLE_SETTINGS (SID_SVX_START+1089) -#define SID_CHAR_DLG_PREVIEW_STRING (SID_SVX_START+1090) -#define SID_RECHECK_DOCUMENT (SID_SVX_START+1091) -#define SID_OBJECT_MIRROR (SID_SVX_START+1093) - -#define SID_DELETE_POSTIT (SID_SVX_START+1094) -#define SID_NEXT_POSTIT (SID_SVX_START+1095) -#define SID_PREVIOUS_POSTIT (SID_SVX_START+1096) -#define SID_DELETEALL_POSTIT (SID_SVX_START+1097) -#define SID_SHOW_POSTIT (SID_SVX_START+1098) -#define SID_REPLYTO_POSTIT (SID_SVX_START+1099) -#define SID_DELETEALLBYAUTHOR_POSTIT (SID_SVX_START+1100) -#define SID_INSERT_POSTIT (SID_SVX_START+1101) - -// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE SID_INSERT_POSTIT + 1 - -// -------------------------------------------------------------------------- -// Overflow check for slot IDs -// -------------------------------------------------------------------------- - -#if SID_SVX_FIRSTFREE > SID_SVX_END +#define SID_PARA_VERTALIGN ( SID_EDIT_START ) +#define SID_ATTR_BORDER_OUTER ( SID_EDIT_START + 1 ) +#define SID_ATTR_BORDER_SHADOW ( SID_EDIT_START + 2 ) +#define SID_ATTR_BRUSH ( SID_EDIT_START + 3 ) +#define SID_ATTR_BRUSH_CHAR ( SID_EDIT_START + 4 ) + + +#define SID_FIELD ( SID_EDIT_START + 7 ) +#define SID_ATTR_FRAMEDIRECTION ( SID_EDIT_START + 8 ) +#define SID_ATTR_PARA ( SID_EDIT_START + 9 ) +#define SID_ATTR_PARA_ADJUST ( SID_EDIT_START + 10 ) +#define SID_ATTR_PARA_ADJUST_LEFT ( SID_EDIT_START + 11 ) +#define SID_ATTR_PARA_BULLET ( SID_EDIT_START + 12 ) +#define SID_ATTR_PARA_OUTLLEVEL ( SID_EDIT_START + 13 ) +#define SID_ATTR_PARA_REGISTER ( SID_EDIT_START + 14 ) +#define SID_ATTR_PARA_PAGENUM ( SID_EDIT_START + 15 ) +#define SID_ATTR_PARA_NUMRULE ( SID_EDIT_START + 16 ) +#define SID_ATTR_PARA_SCRIPTSPACE ( SID_EDIT_START + 17 ) +#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_EDIT_START + 18 ) +#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_EDIT_START + 19 ) +#define SID_ATTR_PARA_SNAPTOGRID ( SID_EDIT_START + 20 ) +#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_EDIT_START + 21 ) +#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_EDIT_START + 22 ) +#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_EDIT_START + 23 ) +#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_EDIT_START + 24 ) +#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_EDIT_START + 25 ) +#define SID_ATTR_PARA_ADJUST_CENTER ( SID_EDIT_START + 26 ) +#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_EDIT_START + 27 ) +#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_EDIT_START + 28 ) +#define SID_ATTR_PARA_LINESPACE ( SID_EDIT_START + 29 ) +#define SID_ATTR_PARA_LINESPACE_10 ( SID_EDIT_START + 30 ) +#define SID_ATTR_PARA_LINESPACE_15 ( SID_EDIT_START + 31 ) +#define SID_ATTR_PARA_LINESPACE_20 ( SID_EDIT_START + 32 ) +#define SID_ATTR_PARA_PAGEBREAK ( SID_EDIT_START + 33 ) +#define SID_ATTR_PARA_HYPHENZONE ( SID_EDIT_START + 34 ) +#define SID_ATTR_PARA_SPLIT ( SID_EDIT_START + 35 ) +#define SID_ATTR_PARA_ORPHANS ( SID_EDIT_START + 36 ) +#define SID_ATTR_PARA_WIDOWS ( SID_EDIT_START + 37 ) +#define SID_ATTR_PARA_ULSPACE ( SID_EDIT_START + 38 ) +#define SID_ATTR_PARA_LRSPACE ( SID_EDIT_START + 39 ) +#define SID_ATTR_PARA_MODEL ( SID_EDIT_START + 40 ) +#define SID_ATTR_PARA_KEEP ( SID_EDIT_START + 41 ) +#define SID_ATTR_NUMBERING_RULE ( SID_EDIT_START + 42 ) +#define SID_ATTR_LRSPACE ( SID_EDIT_START + 43 ) +#define SID_ATTR_ULSPACE ( SID_EDIT_START + 44 ) +#define SID_ATTR_TABSTOP ( SID_EDIT_START + 45 ) +#define SID_ATTR_TABSTOP_DEFAULTS ( SID_EDIT_START + 46 ) +#define SID_ATTR_TABSTOP_POS ( SID_EDIT_START + 47 ) +#define SID_ATTR_TABSTOP_OFFSET ( SID_EDIT_START + 48 ) +#define SID_ATTR_CHAR ( SID_EDIT_START + 49 ) +#define SID_ATTR_CHAR_FONT ( SID_EDIT_START + 50 ) +#define SID_ATTR_CHAR_POSTURE ( SID_EDIT_START + 51 ) +#define SID_ATTR_CHAR_WEIGHT ( SID_EDIT_START + 52 ) +#define SID_ATTR_CHAR_SHADOWED ( SID_EDIT_START + 53 ) +#define SID_ATTR_CHAR_WORDLINEMODE ( SID_EDIT_START + 54 ) +#define SID_ATTR_CHAR_CONTOUR ( SID_EDIT_START + 55 ) +#define SID_ATTR_CHAR_STRIKEOUT ( SID_EDIT_START + 56 ) +#define SID_ATTR_CHAR_UNDERLINE ( SID_EDIT_START + 57 ) +#define SID_ATTR_CHAR_FONTHEIGHT ( SID_EDIT_START + 58 ) +#define SID_ATTR_CHAR_PROPSIZE ( SID_EDIT_START + 59 ) +#define SID_ATTR_CHAR_COLOR ( SID_EDIT_START + 60 ) +#define SID_ATTR_CHAR_KERNING ( SID_EDIT_START + 61 ) +#define SID_ATTR_CHAR_CASEMAP ( SID_EDIT_START + 62 ) +#define SID_ATTR_CHAR_LANGUAGE ( SID_EDIT_START + 63 ) +#define SID_ATTR_CHAR_ESCAPEMENT ( SID_EDIT_START + 64 ) +#define SID_ATTR_CHAR_FONTLIST ( SID_EDIT_START + 65 ) +#define SID_ATTR_CHAR_MAPTYPE ( SID_EDIT_START + 66 ) +#define SID_ATTR_CHAR_AUTOKERN ( SID_EDIT_START + 67 ) +#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) +#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_EDIT_START + 69 ) +#define SID_ATTR_CHAR_CJK_FONT ( SID_EDIT_START + 70 ) +#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_EDIT_START + 71 ) +#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_EDIT_START + 72 ) +#define SID_ATTR_CHAR_CJK_POSTURE ( SID_EDIT_START + 73 ) +#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_EDIT_START + 74 ) +#define SID_ATTR_CHAR_CTL_FONT ( SID_EDIT_START + 75 ) +#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_EDIT_START + 76 ) +#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_EDIT_START + 77 ) +#define SID_ATTR_CHAR_CTL_POSTURE ( SID_EDIT_START + 78 ) +#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_EDIT_START + 79 ) +#define SID_ATTR_CHAR_TWO_LINES ( SID_EDIT_START + 80 ) +#define SID_ATTR_CHAR_CJK_RUBY ( SID_EDIT_START + 81 ) +#define SID_ATTR_CHAR_EMPHASISMARK ( SID_EDIT_START + 82 ) +#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_EDIT_START + 83 ) +#define SID_ATTR_CHAR_VERTICAL ( SID_EDIT_START + 84 ) +#define SID_ATTR_CHAR_ROTATED ( SID_EDIT_START + 85 ) +#define SID_ATTR_CHAR_SCALEWIDTH ( SID_EDIT_START + 86 ) +#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_EDIT_START + 87 ) +#define SID_ATTR_CHAR_RELIEF ( SID_EDIT_START + 88 ) +#define SID_ATTR_CHAR_HIDDEN ( SID_EDIT_START + 89 ) +#define SID_ATTR_CHAR_LATIN_FONT ( SID_EDIT_START + 90 ) +#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_EDIT_START + 91 ) +#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_EDIT_START + 92 ) +#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_EDIT_START + 93 ) +#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_EDIT_START + 94 ) +#define SID_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT +#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT +#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER +#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK + +#if 94 > (SID_EDIT_END-SID_EDIT_START) #error Resource-Ueberlauf in #line, #file #endif -// -------------------------------------------------------------------------- -// Ranges, um ItemSets fuer bestimmte 3D-Objekte erstellen zu koennen -// -------------------------------------------------------------------------- - -// -// SceneObject: -#define SID_ATTR_3D_RANGE_SCENE \ -SID_ATTR_3D_AMBIENTCOLOR, SID_ATTR_3D_PERSPECTIVE, \ -SID_ATTR_3D_DISTANCE, SID_ATTR_3D_FOCAL_LENGTH, \ -SID_ATTR_3D_TWO_SIDED_LIGHTING, SID_ATTR_3D_TWO_SIDED_LIGHTING, \ -SID_ATTR_3D_SHADE_MODE, SID_ATTR_3D_SHADE_MODE, \ -SID_ATTR_3D_SHADOW_SLANT, SID_ATTR_3D_LIGHTDIRECTION_8 \ - -// -// CompoundObject: -#define SID_ATTR_3D_RANGE_COMPOUND \ -SID_ATTR_3D_DOUBLE_SIDED, SID_ATTR_3D_DOUBLE_SIDED, \ -SID_ATTR_3D_NORMALS_KIND, SID_ATTR_3D_NORMALS_INVERT, \ -SID_ATTR_3D_TEXTURE_KIND, SID_ATTR_3D_MAT_SPECULAR_INTENSITY, \ -SID_ATTR_3D_SHADOW_3D, SID_ATTR_3D_SHADOW_3D \ - -// -// ExtrudeObject: -#define SID_ATTR_3D_RANGE_EXTRUDE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_BACKSCALE \ - -// -// LatheObject: -#define SID_ATTR_3D_RANGE_LATHE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \ - -// -// SphereObject: -#define SID_ATTR_3D_RANGE_SPHERE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS \ - -// -// Spezieller Range fuer alle 3D-Objekte -#define SID_ATTR_3D_RANGE_OBJECT \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \ #endif -#endif // #ifndef _SVX_SVXIDS_HRC - // ******************************************************************* EOF diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc index 392151e781aa..90ef95ca039b 100644 --- a/editeng/inc/editeng/editrids.hrc +++ b/editeng/inc/editeng/editrids.hrc @@ -35,384 +35,394 @@ #include <svl/solar.hrc> // strings also used in cui -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) -#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) - -// outliner -#ifndef RID_OUTL_START -#define RID_OUTL_START ( RID_EDIT_END + 100 ) -#endif - -#define RID_OUTLUNDO_DEPTH ( RID_OUTL_START + 0 ) -#define RID_OUTLUNDO_HEIGHT ( RID_OUTL_START + 1 ) -#define RID_OUTLUNDO_EXPAND ( RID_OUTL_START + 2 ) -#define RID_OUTLUNDO_COLLAPSE ( RID_OUTL_START + 3 ) -#define RID_OUTLUNDO_ATTR ( RID_OUTL_START + 4 ) -#define RID_OUTLUNDO_INSERT ( RID_OUTL_START + 5 ) +#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_EDIT_START) +#define RID_SVXSTR_PAPERBIN (RID_EDIT_START + 1) +#define RID_OUTLUNDO_EXPAND (RID_EDIT_START + 2) +#define RID_OUTLUNDO_COLLAPSE (RID_EDIT_START + 3) +#define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4) +#define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5) +#define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6) +#define RID_OUTLUNDO_HEIGHT (RID_EDIT_START + 7) // strings for items -#define RID_SVXITEMS_TRUE (RID_SVXITEMS_START + 0) -#define RID_SVXITEMS_FALSE (RID_SVXITEMS_START + 1) - -#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDITITEMS_START + 570) -#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDITITEMS_START + 570) -#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDITITEMS_START + 571) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDITITEMS_START + 572) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDITITEMS_START + 573) -#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDITITEMS_START + 574) -#define RID_SVXITEMS_FRMDIR_END (RID_EDITITEMS_START + 574) - -#define RID_SVXITEMS_BORDER_COMPLETE (RID_SVXITEMS_START + 490) -#define RID_SVXITEMS_BORDER_TOP (RID_SVXITEMS_START + 491) -#define RID_SVXITEMS_BORDER_BOTTOM (RID_SVXITEMS_START + 492) -#define RID_SVXITEMS_BORDER_LEFT (RID_SVXITEMS_START + 493) -#define RID_SVXITEMS_BORDER_RIGHT (RID_SVXITEMS_START + 494) -#define RID_SVXITEMS_BORDER_DISTANCE (RID_SVXITEMS_START + 495) -#define RID_SVXITEMS_BORDER_NONE (RID_SVXITEMS_START + 528) - -#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_SVXITEMS_START + 441) -#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_SVXITEMS_START + 442) - -#define RID_SVXITEMS_OPAQUE_TRUE (RID_SVXITEMS_START + 429) -#define RID_SVXITEMS_OPAQUE_FALSE (RID_SVXITEMS_START + 430) - -#define RID_SVXITEMS_SHADOW_COMPLETE (RID_SVXITEMS_START + 489) -#define RID_SVXITEMS_GRAPHIC (RID_SVXITEMS_START + 526) -#define RID_SVXITEMS_LINES (RID_SVXITEMS_START + 511) -#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_SVXITEMS_START + 513) -#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_SVXITEMS_START + 512) -#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_SVXITEMS_START + 517) - -#define RID_SVXITEMS_SHADOWED_TRUE (RID_SVXITEMS_START + 415) -#define RID_SVXITEMS_SHADOWED_FALSE (RID_SVXITEMS_START + 416) -#define RID_SVXITEMS_AUTOKERN_TRUE (RID_SVXITEMS_START + 417) -#define RID_SVXITEMS_AUTOKERN_FALSE (RID_SVXITEMS_START + 418) -#define RID_SVXITEMS_WORDLINE_TRUE (RID_SVXITEMS_START + 419) -#define RID_SVXITEMS_WORDLINE_FALSE (RID_SVXITEMS_START + 420) -#define RID_SVXITEMS_CONTOUR_TRUE (RID_SVXITEMS_START + 421) -#define RID_SVXITEMS_CONTOUR_FALSE (RID_SVXITEMS_START + 422) -#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_SVXITEMS_START + 423) -#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_SVXITEMS_START + 424) -#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_SVXITEMS_START + 425) -#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_SVXITEMS_START + 426) -#define RID_SVXITEMS_FMTKEEP_TRUE (RID_SVXITEMS_START + 431) -#define RID_SVXITEMS_FMTKEEP_FALSE (RID_SVXITEMS_START + 432) -#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_SVXITEMS_START + 433) -#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_SVXITEMS_START + 434) - -#define RID_SVXITEMS_PRINT_TRUE (RID_SVXITEMS_START + 427) -#define RID_SVXITEMS_PRINT_FALSE (RID_SVXITEMS_START + 428) -#define RID_SVXITEMS_PROT_POS_TRUE (RID_SVXITEMS_START + 439) -#define RID_SVXITEMS_PROT_POS_FALSE (RID_SVXITEMS_START + 440) -#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_SVXITEMS_START + 437) -#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_SVXITEMS_START + 438) -#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_SVXITEMS_START + 435) -#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_SVXITEMS_START + 436) -#define RID_SVXITEMS_ULSPACE_UPPER (RID_SVXITEMS_START + 496) -#define RID_SVXITEMS_ULSPACE_LOWER (RID_SVXITEMS_START + 497) -#define RID_SVXITEMS_LRSPACE_LEFT (RID_SVXITEMS_START + 486) -#define RID_SVXITEMS_LRSPACE_FLINE (RID_SVXITEMS_START + 487) -#define RID_SVXITEMS_LRSPACE_RIGHT (RID_SVXITEMS_START + 488) -#define RID_SVXITEMS_SIZE_WIDTH (RID_SVXITEMS_START + 484) -#define RID_SVXITEMS_SIZE_HEIGHT (RID_SVXITEMS_START + 485) -#define RID_SVXITEMS_PAGE_END_TRUE (RID_SVXITEMS_START + 451) -#define RID_SVXITEMS_PAGE_END_FALSE (RID_SVXITEMS_START + 452) -#define RID_SVXITEMS_HYPHEN_TRUE (RID_SVXITEMS_START + 449) -#define RID_SVXITEMS_HYPHEN_FALSE (RID_SVXITEMS_START + 450) -#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_SVXITEMS_START + 514) -#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_SVXITEMS_START + 515) -#define RID_SVXITEMS_HYPHEN_MAX (RID_SVXITEMS_START + 516) -#define RID_SVXITEMS_HNGPNCT_OFF (RID_SVXITEMS_START + 552) -#define RID_SVXITEMS_HNGPNCT_ON (RID_SVXITEMS_START + 553) -#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_SVXITEMS_START + 554) -#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_SVXITEMS_START + 555) -#define RID_SVXITEMS_SCRPTSPC_OFF (RID_SVXITEMS_START + 550) -#define RID_SVXITEMS_SCRPTSPC_ON (RID_SVXITEMS_START + 551) -#define RID_SVXITEMS_CHARSCALE_OFF (RID_SVXITEMS_START + 559) -#define RID_SVXITEMS_CHARSCALE (RID_SVXITEMS_START + 560) -#define RID_SVXITEMS_CHARROTATE_OFF (RID_SVXITEMS_START + 556) -#define RID_SVXITEMS_CHARROTATE (RID_SVXITEMS_START + 557) -#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_SVXITEMS_START + 558) - -#define RID_SVXITEMS_RELIEF_BEGIN (RID_SVXITEMS_START + 561) -#define RID_SVXITEMS_RELIEF_NONE (RID_SVXITEMS_START + 561) -#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_SVXITEMS_START + 562) -#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_SVXITEMS_START + 563) -#define RID_SVXITEMS_RELIEF_END (RID_SVXITEMS_START + 564) - -#define RID_ATTR_CHAR_EMPHASISMARK (RID_ATTR_BEGIN + 899) +#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDIT_START + 8) +#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDIT_START + 9) +#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDIT_START + 10) +#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11) +#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12) +#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) +#define RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) + +#define RID_SVXITEMS_TRUE (RID_EDIT_START + 15) +#define RID_SVXITEMS_FALSE (RID_EDIT_START + 16) +#define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17) +#define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18) +#define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19) +#define RID_SVXITEMS_BORDER_LEFT (RID_EDIT_START + 20) +#define RID_SVXITEMS_BORDER_RIGHT (RID_EDIT_START + 21) +#define RID_SVXITEMS_BORDER_DISTANCE (RID_EDIT_START + 22) +#define RID_SVXITEMS_BORDER_NONE (RID_EDIT_START + 23) + +#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_EDIT_START + 24) +#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_EDIT_START + 25) +#define RID_SVXITEMS_OPAQUE_TRUE (RID_EDIT_START + 26) +#define RID_SVXITEMS_OPAQUE_FALSE (RID_EDIT_START + 27) + +#define RID_SVXITEMS_SHADOW_COMPLETE (RID_EDIT_START + 28) +#define RID_SVXITEMS_GRAPHIC (RID_EDIT_START + 29) +#define RID_SVXITEMS_LINES (RID_EDIT_START + 30) +#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_EDIT_START + 31) +#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_EDIT_START + 32) +#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_EDIT_START + 33) + +#define RID_SVXITEMS_SHADOWED_TRUE (RID_EDIT_START + 34) +#define RID_SVXITEMS_SHADOWED_FALSE (RID_EDIT_START + 35) +#define RID_SVXITEMS_AUTOKERN_TRUE (RID_EDIT_START + 36) +#define RID_SVXITEMS_AUTOKERN_FALSE (RID_EDIT_START + 37) +#define RID_SVXITEMS_WORDLINE_TRUE (RID_EDIT_START + 38) +#define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39) +#define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40) +#define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41) +#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_EDIT_START + 42) +#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_EDIT_START + 43) +#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_EDIT_START + 44) +#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_EDIT_START + 45) +#define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46) +#define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47) +#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48) +#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_EDIT_START + 49) +#define RID_SVXITEMS_PRINT_TRUE (RID_EDIT_START + 50) +#define RID_SVXITEMS_PRINT_FALSE (RID_EDIT_START + 51) +#define RID_SVXITEMS_PROT_POS_TRUE (RID_EDIT_START + 52) +#define RID_SVXITEMS_PROT_POS_FALSE (RID_EDIT_START + 53) +#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_EDIT_START + 54) +#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_EDIT_START + 55) +#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_EDIT_START + 56) +#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_EDIT_START + 57) +#define RID_SVXITEMS_ULSPACE_UPPER (RID_EDIT_START + 58) +#define RID_SVXITEMS_ULSPACE_LOWER (RID_EDIT_START + 59) +#define RID_SVXITEMS_LRSPACE_LEFT (RID_EDIT_START + 60) +#define RID_SVXITEMS_LRSPACE_FLINE (RID_EDIT_START + 62) +#define RID_SVXITEMS_LRSPACE_RIGHT (RID_EDIT_START + 63) +#define RID_SVXITEMS_SIZE_WIDTH (RID_EDIT_START + 64) +#define RID_SVXITEMS_SIZE_HEIGHT (RID_EDIT_START + 65) +#define RID_SVXITEMS_PAGE_END_TRUE (RID_EDIT_START + 66) +#define RID_SVXITEMS_PAGE_END_FALSE (RID_EDIT_START + 67) +#define RID_SVXITEMS_HYPHEN_TRUE (RID_EDIT_START + 68) +#define RID_SVXITEMS_HYPHEN_FALSE (RID_EDIT_START + 69) +#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_EDIT_START + 70) +#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_EDIT_START + 71) +#define RID_SVXITEMS_HYPHEN_MAX (RID_EDIT_START + 72) +#define RID_SVXITEMS_HNGPNCT_OFF (RID_EDIT_START + 73) +#define RID_SVXITEMS_HNGPNCT_ON (RID_EDIT_START + 74) +#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_EDIT_START + 75) +#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_EDIT_START + 76) +#define RID_SVXITEMS_SCRPTSPC_OFF (RID_EDIT_START + 77) +#define RID_SVXITEMS_SCRPTSPC_ON (RID_EDIT_START + 78) +#define RID_SVXITEMS_CHARSCALE_OFF (RID_EDIT_START + 79) +#define RID_SVXITEMS_CHARSCALE (RID_EDIT_START + 80) +#define RID_SVXITEMS_CHARROTATE_OFF (RID_EDIT_START + 81) +#define RID_SVXITEMS_CHARROTATE (RID_EDIT_START + 82) +#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_EDIT_START + 83) +#define RID_SVXITEMS_RELIEF_BEGIN (RID_EDIT_START + 84) +#define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85) +#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86) +#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) +#define RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) + +// HM_ERR +#define RID_SVXSTR_HMERR_THESAURUS (RID_EDIT_START + 89) // enum FontEmphasisMark --------------------------------------------------- -#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_SVXITEMS_START + 530) -#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_SVXITEMS_START + 530) -#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_SVXITEMS_START + 531) -#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_SVXITEMS_START + 532) -#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_SVXITEMS_START + 533) -#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_SVXITEMS_START + 534) +#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90) +#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90) +#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_EDIT_START + 91) +#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_EDIT_START + 92) +#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_EDIT_START + 93) +#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_EDIT_START + 94) -#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_SVXITEMS_START + 540) -#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_SVXITEMS_START + 541) +#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_EDIT_START + 95) +#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_EDIT_START + 96) // enum ESCAPEMENT ------------------------------------------------------- -#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_SVXITEMS_START + 166) -#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_SVXITEMS_START + 166) -#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_SVXITEMS_START + 167) -#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_SVXITEMS_START + 168) -#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_SVXITEMS_START + 169) +#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_EDIT_START + 97) +#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_EDIT_START + 97) +#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_EDIT_START + 98) +#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_EDIT_START + 99) +#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_EDIT_START + 100) // enum CASEMAP ---------------------------------------------------------- -#define RID_SVXITEMS_CASEMAP_BEGIN (RID_SVXITEMS_START + 160) -#define RID_SVXITEMS_CASEMAP_NONE (RID_SVXITEMS_START + 160) -#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_SVXITEMS_START + 161) -#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_SVXITEMS_START + 162) -#define RID_SVXITEMS_CASEMAP_TITEL (RID_SVXITEMS_START + 163) -#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_SVXITEMS_START + 164) +#define RID_SVXITEMS_CASEMAP_BEGIN (RID_EDIT_START + 101) +#define RID_SVXITEMS_CASEMAP_NONE (RID_EDIT_START + 101) +#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_EDIT_START + 102) +#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_EDIT_START + 103) +#define RID_SVXITEMS_CASEMAP_TITEL (RID_EDIT_START + 104) +#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_EDIT_START + 105) -#define RID_SVXITEMS_KERNING_COMPLETE (RID_SVXITEMS_START + 518) -#define RID_SVXITEMS_KERNING_EXPANDED (RID_SVXITEMS_START + 519) -#define RID_SVXITEMS_KERNING_CONDENSED (RID_SVXITEMS_START + 520) +#define RID_SVXITEMS_KERNING_COMPLETE (RID_EDIT_START + 106) +#define RID_SVXITEMS_KERNING_EXPANDED (RID_EDIT_START + 107) +#define RID_SVXITEMS_KERNING_CONDENSED (RID_EDIT_START + 108) -#define RID_SVXITEMS_BLINK_TRUE (RID_SVXITEMS_START + 453) -#define RID_SVXITEMS_BLINK_FALSE (RID_SVXITEMS_START + 454) +#define RID_SVXITEMS_BLINK_TRUE (RID_EDIT_START + 109) +#define RID_SVXITEMS_BLINK_FALSE (RID_EDIT_START + 110) -#define RID_SVXITEMS_TWOLINES_OFF (RID_SVXITEMS_START + 545) -#define RID_SVXITEMS_TWOLINES (RID_SVXITEMS_START + 546) +#define RID_SVXITEMS_TWOLINES_OFF (RID_EDIT_START + 111) +#define RID_SVXITEMS_TWOLINES (RID_EDIT_START + 112) // enum FontStrikeout ---------------------------------------------------- -#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_SVXITEMS_START + 135) -#define RID_SVXITEMS_STRIKEOUT_NONE (RID_SVXITEMS_START + 135) -#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_SVXITEMS_START + 136) -#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_SVXITEMS_START + 137) -#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_SVXITEMS_START + 138) -#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_SVXITEMS_START + 139) -#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_SVXITEMS_START + 140) -#define RID_SVXITEMS_STRIKEOUT_X (RID_SVXITEMS_START + 141) +#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_EDIT_START + 113) +#define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113) +#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114) +#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115) +#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_EDIT_START + 116) +#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117) +#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118) +#define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119) // enum FontUnderline - used for overline -------------------------------- -#define RID_SVXITEMS_OL_BEGIN (RID_SVXITEMS_START + 200) -#define RID_SVXITEMS_OL_NONE (RID_SVXITEMS_START + 200) -#define RID_SVXITEMS_OL_SINGLE (RID_SVXITEMS_START + 201) -#define RID_SVXITEMS_OL_DOUBLE (RID_SVXITEMS_START + 202) -#define RID_SVXITEMS_OL_DOTTED (RID_SVXITEMS_START + 203) -#define RID_SVXITEMS_OL_DONTKNOW (RID_SVXITEMS_START + 204) -#define RID_SVXITEMS_OL_DASH (RID_SVXITEMS_START + 205) -#define RID_SVXITEMS_OL_LONGDASH (RID_SVXITEMS_START + 206) -#define RID_SVXITEMS_OL_DASHDOT (RID_SVXITEMS_START + 207) -#define RID_SVXITEMS_OL_DASHDOTDOT (RID_SVXITEMS_START + 208) -#define RID_SVXITEMS_OL_SMALLWAVE (RID_SVXITEMS_START + 209) -#define RID_SVXITEMS_OL_WAVE (RID_SVXITEMS_START + 210) -#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_SVXITEMS_START + 211) -#define RID_SVXITEMS_OL_BOLD (RID_SVXITEMS_START + 212) -#define RID_SVXITEMS_OL_BOLDDOTTED (RID_SVXITEMS_START + 213) -#define RID_SVXITEMS_OL_BOLDDASH (RID_SVXITEMS_START + 214) -#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_SVXITEMS_START + 215) -#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_SVXITEMS_START + 216) -#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_SVXITEMS_START + 217) -#define RID_SVXITEMS_OL_BOLDWAVE (RID_SVXITEMS_START + 218) +#define RID_SVXITEMS_OL_BEGIN (RID_EDIT_START + 120) +#define RID_SVXITEMS_OL_NONE (RID_EDIT_START + 120) +#define RID_SVXITEMS_OL_SINGLE (RID_EDIT_START + 121) +#define RID_SVXITEMS_OL_DOUBLE (RID_EDIT_START + 122) +#define RID_SVXITEMS_OL_DOTTED (RID_EDIT_START + 123) +#define RID_SVXITEMS_OL_DONTKNOW (RID_EDIT_START + 124) +#define RID_SVXITEMS_OL_DASH (RID_EDIT_START + 125) +#define RID_SVXITEMS_OL_LONGDASH (RID_EDIT_START + 126) +#define RID_SVXITEMS_OL_DASHDOT (RID_EDIT_START + 127) +#define RID_SVXITEMS_OL_DASHDOTDOT (RID_EDIT_START + 128) +#define RID_SVXITEMS_OL_SMALLWAVE (RID_EDIT_START + 129) +#define RID_SVXITEMS_OL_WAVE (RID_EDIT_START + 130) +#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_EDIT_START + 131) +#define RID_SVXITEMS_OL_BOLD (RID_EDIT_START + 132) +#define RID_SVXITEMS_OL_BOLDDOTTED (RID_EDIT_START + 133) +#define RID_SVXITEMS_OL_BOLDDASH (RID_EDIT_START + 134) +#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_EDIT_START + 135) +#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_EDIT_START + 136) +#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_EDIT_START + 137) +#define RID_SVXITEMS_OL_BOLDWAVE (RID_EDIT_START + 138) // enum FontUnderline - used for underline ------------------------------- -#define RID_SVXITEMS_UL_BEGIN (RID_SVXITEMS_START + 170) -#define RID_SVXITEMS_UL_NONE (RID_SVXITEMS_START + 170) -#define RID_SVXITEMS_UL_SINGLE (RID_SVXITEMS_START + 171) -#define RID_SVXITEMS_UL_DOUBLE (RID_SVXITEMS_START + 172) -#define RID_SVXITEMS_UL_DOTTED (RID_SVXITEMS_START + 173) -#define RID_SVXITEMS_UL_DONTKNOW (RID_SVXITEMS_START + 174) -#define RID_SVXITEMS_UL_DASH (RID_SVXITEMS_START + 175) -#define RID_SVXITEMS_UL_LONGDASH (RID_SVXITEMS_START + 176) -#define RID_SVXITEMS_UL_DASHDOT (RID_SVXITEMS_START + 177) -#define RID_SVXITEMS_UL_DASHDOTDOT (RID_SVXITEMS_START + 178) -#define RID_SVXITEMS_UL_SMALLWAVE (RID_SVXITEMS_START + 179) -#define RID_SVXITEMS_UL_WAVE (RID_SVXITEMS_START + 180) -#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_SVXITEMS_START + 181) -#define RID_SVXITEMS_UL_BOLD (RID_SVXITEMS_START + 182) -#define RID_SVXITEMS_UL_BOLDDOTTED (RID_SVXITEMS_START + 183) -#define RID_SVXITEMS_UL_BOLDDASH (RID_SVXITEMS_START + 184) -#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_SVXITEMS_START + 185) -#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_SVXITEMS_START + 186) -#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_SVXITEMS_START + 187) -#define RID_SVXITEMS_UL_BOLDWAVE (RID_SVXITEMS_START + 188) +#define RID_SVXITEMS_UL_BEGIN (RID_EDIT_START + 139) +#define RID_SVXITEMS_UL_NONE (RID_EDIT_START + 139) +#define RID_SVXITEMS_UL_SINGLE (RID_EDIT_START + 140) +#define RID_SVXITEMS_UL_DOUBLE (RID_EDIT_START + 141) +#define RID_SVXITEMS_UL_DOTTED (RID_EDIT_START + 142) +#define RID_SVXITEMS_UL_DONTKNOW (RID_EDIT_START + 143) +#define RID_SVXITEMS_UL_DASH (RID_EDIT_START + 144) +#define RID_SVXITEMS_UL_LONGDASH (RID_EDIT_START + 145) +#define RID_SVXITEMS_UL_DASHDOT (RID_EDIT_START + 146) +#define RID_SVXITEMS_UL_DASHDOTDOT (RID_EDIT_START + 147) +#define RID_SVXITEMS_UL_SMALLWAVE (RID_EDIT_START + 148) +#define RID_SVXITEMS_UL_WAVE (RID_EDIT_START + 149) +#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_EDIT_START + 150) +#define RID_SVXITEMS_UL_BOLD (RID_EDIT_START + 151) +#define RID_SVXITEMS_UL_BOLDDOTTED (RID_EDIT_START + 152) +#define RID_SVXITEMS_UL_BOLDDASH (RID_EDIT_START + 153) +#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_EDIT_START + 154) +#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_EDIT_START + 155) +#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_EDIT_START + 156) +#define RID_SVXITEMS_UL_BOLDWAVE (RID_EDIT_START + 157) // enum FontWeight ------------------------------------------------------- -#define RID_SVXITEMS_WEIGHT_BEGIN (RID_SVXITEMS_START + 120) -#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_SVXITEMS_START + 120) -#define RID_SVXITEMS_WEIGHT_THIN (RID_SVXITEMS_START + 121) -#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_SVXITEMS_START + 122) -#define RID_SVXITEMS_WEIGHT_LIGHT (RID_SVXITEMS_START + 123) -#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_SVXITEMS_START + 124) -#define RID_SVXITEMS_WEIGHT_NORMAL (RID_SVXITEMS_START + 125) -#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_SVXITEMS_START + 126) -#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_SVXITEMS_START + 127) -#define RID_SVXITEMS_WEIGHT_BOLD (RID_SVXITEMS_START + 128) -#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_SVXITEMS_START + 129) -#define RID_SVXITEMS_WEIGHT_BLACK (RID_SVXITEMS_START + 130) +#define RID_SVXITEMS_WEIGHT_BEGIN (RID_EDIT_START + 158) +#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_EDIT_START + 158) +#define RID_SVXITEMS_WEIGHT_THIN (RID_EDIT_START + 159) +#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_EDIT_START + 160) +#define RID_SVXITEMS_WEIGHT_LIGHT (RID_EDIT_START + 161) +#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_EDIT_START + 162) +#define RID_SVXITEMS_WEIGHT_NORMAL (RID_EDIT_START + 163) +#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_EDIT_START + 164) +#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_EDIT_START + 165) +#define RID_SVXITEMS_WEIGHT_BOLD (RID_EDIT_START + 166) +#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_EDIT_START + 167) +#define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168) // paper formats -#define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 100) -#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101) -#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102) -#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103) -#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104) -#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105) -#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106) -#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107) -#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108) -#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109) -#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110) -#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111) -#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112) -#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113) -#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114) -#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115) -#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116) -#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117) -#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118) -#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119) -#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120) -#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121) -#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122) -#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123) -#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124) -#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125) -#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126) -#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127) -#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128) -#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129) -#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130) -#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131) -#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132) -#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133) -#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134) -#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135) -#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136) +#define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 169) +#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 170) +#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 171) +#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 172) +#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 173) +#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 174) +#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 175) +#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 176) +#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 177) +#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 178) +#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 179) +#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 180) +#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 181) +#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 182) +#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 183) +#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 184) +#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 185) +#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 186) +#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 187) +#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 188) +#define RID_SVXSTR_PAPER_C (RID_SVX_START + 189) +#define RID_SVXSTR_PAPER_D (RID_SVX_START + 190) +#define RID_SVXSTR_PAPER_E (RID_SVX_START + 191) +#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 192) +#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 193) +#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 194) +#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 195) +#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 196) +#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 197) +#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 198) +#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 199) +#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 200) +#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 201) +#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 202) +#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 203) +#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 204) +#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 205) // enum FontItalic ------------------------------------------------------- -#define RID_SVXITEMS_ITALIC_BEGIN (RID_SVXITEMS_START + 115) -#define RID_SVXITEMS_ITALIC_NONE (RID_SVXITEMS_START + 115) -#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_SVXITEMS_START + 116) -#define RID_SVXITEMS_ITALIC_NORMAL (RID_SVXITEMS_START + 117) +#define RID_SVXITEMS_ITALIC_BEGIN (RID_EDIT_START + 206) +#define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206) +#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207) +#define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208) // enum SvxAdjust ----------------------------------------------------------- -#define RID_SVXITEMS_ADJUST_BEGIN (RID_SVXITEMS_START + 230) -#define RID_SVXITEMS_ADJUST_LEFT (RID_SVXITEMS_START + 230) -#define RID_SVXITEMS_ADJUST_RIGHT (RID_SVXITEMS_START + 231) -#define RID_SVXITEMS_ADJUST_BLOCK (RID_SVXITEMS_START + 232) -#define RID_SVXITEMS_ADJUST_CENTER (RID_SVXITEMS_START + 233) -#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_SVXITEMS_START + 234) - -#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_SVXITEMS_START + 243) -#define RID_SVXITEMS_TAB_FILL_CHAR (RID_SVXITEMS_START + 244) -#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_SVXITEMS_START + 245) -#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_SVXITEMS_START + 245) -#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_SVXITEMS_START + 246) -#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_SVXITEMS_START + 247) -#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_SVXITEMS_START + 248) -#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_SVXITEMS_START + 249) +#define RID_SVXITEMS_ADJUST_BEGIN (RID_EDIT_START + 209) +#define RID_SVXITEMS_ADJUST_LEFT (RID_EDIT_START + 209) +#define RID_SVXITEMS_ADJUST_RIGHT (RID_EDIT_START + 210) +#define RID_SVXITEMS_ADJUST_BLOCK (RID_EDIT_START + 211) +#define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212) +#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213) + +#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_EDIT_START + 214) +#define RID_SVXITEMS_TAB_FILL_CHAR (RID_EDIT_START + 215) +#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_EDIT_START + 216) +#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_EDIT_START + 217) +#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_EDIT_START + 218) +#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_EDIT_START + 219) +#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_EDIT_START + 220) +#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_EDIT_START + 221) // enum SvxBreak ------------------------------------------------------------ -#define RID_SVXITEMS_BREAK_BEGIN (RID_SVXITEMS_START + 30) -#define RID_SVXITEMS_BREAK_NONE (RID_SVXITEMS_START + 30) -#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_SVXITEMS_START + 31) -#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_SVXITEMS_START + 32) -#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_SVXITEMS_START + 33) -#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_SVXITEMS_START + 34) -#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_SVXITEMS_START + 35) -#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_SVXITEMS_START + 36) +#define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222) +#define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222) +#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_EDIT_START + 223) +#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_EDIT_START + 224) +#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_EDIT_START + 225) +#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_EDIT_START + 226) +#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_EDIT_START + 227) +#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_EDIT_START + 228) // enum SvxShadowLocation --------------------------------------------------- -#define RID_SVXITEMS_SHADOW_BEGIN (RID_SVXITEMS_START + 40) -#define RID_SVXITEMS_SHADOW_NONE (RID_SVXITEMS_START + 40) -#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_SVXITEMS_START + 41) -#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_SVXITEMS_START + 42) -#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_SVXITEMS_START + 43) -#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_SVXITEMS_START + 44) +#define RID_SVXITEMS_SHADOW_BEGIN (RID_EDIT_START + 229) +#define RID_SVXITEMS_SHADOW_NONE (RID_EDIT_START + 229) +#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_EDIT_START + 230) +#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_EDIT_START + 231) +#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_EDIT_START + 232) +#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_EDIT_START + 233) // Umrandungslinien -#define RID_SINGLE_LINE0 (RID_SVXITEMS_START + 360) -#define RID_SINGLE_LINE1 (RID_SVXITEMS_START + 361) -#define RID_SINGLE_LINE2 (RID_SVXITEMS_START + 362) -#define RID_SINGLE_LINE3 (RID_SVXITEMS_START + 363) -#define RID_SINGLE_LINE4 (RID_SVXITEMS_START + 364) -#define RID_DOUBLE_LINE0 (RID_SVXITEMS_START + 365) -#define RID_DOUBLE_LINE1 (RID_SVXITEMS_START + 366) -#define RID_DOUBLE_LINE2 (RID_SVXITEMS_START + 367) -#define RID_DOUBLE_LINE3 (RID_SVXITEMS_START + 368) -#define RID_DOUBLE_LINE4 (RID_SVXITEMS_START + 369) -#define RID_DOUBLE_LINE5 (RID_SVXITEMS_START + 370) -#define RID_DOUBLE_LINE6 (RID_SVXITEMS_START + 371) -#define RID_DOUBLE_LINE7 (RID_SVXITEMS_START + 372) -#define RID_DOUBLE_LINE8 (RID_SVXITEMS_START + 373) -#define RID_DOUBLE_LINE9 (RID_SVXITEMS_START + 374) -#define RID_DOUBLE_LINE10 (RID_SVXITEMS_START + 375) +#define RID_SINGLE_LINE0 (RID_EDIT_START + 234) +#define RID_SINGLE_LINE1 (RID_EDIT_START + 235) +#define RID_SINGLE_LINE2 (RID_EDIT_START + 236) +#define RID_SINGLE_LINE3 (RID_EDIT_START + 237) +#define RID_SINGLE_LINE4 (RID_EDIT_START + 238) +#define RID_DOUBLE_LINE0 (RID_EDIT_START + 239) +#define RID_DOUBLE_LINE1 (RID_EDIT_START + 240) +#define RID_DOUBLE_LINE2 (RID_EDIT_START + 241) +#define RID_DOUBLE_LINE3 (RID_EDIT_START + 242) +#define RID_DOUBLE_LINE4 (RID_EDIT_START + 243) +#define RID_DOUBLE_LINE5 (RID_EDIT_START + 244) +#define RID_DOUBLE_LINE6 (RID_EDIT_START + 245) +#define RID_DOUBLE_LINE7 (RID_EDIT_START + 246) +#define RID_DOUBLE_LINE8 (RID_EDIT_START + 247) +#define RID_DOUBLE_LINE9 (RID_EDIT_START + 248) +#define RID_DOUBLE_LINE10 (RID_EDIT_START + 249) // Metric-Texte -#define RID_SVXITEMS_METRIC_MM (RID_SVXITEMS_START + 380) -#define RID_SVXITEMS_METRIC_CM (RID_SVXITEMS_START + 381) -#define RID_SVXITEMS_METRIC_INCH (RID_SVXITEMS_START + 382) -#define RID_SVXITEMS_METRIC_POINT (RID_SVXITEMS_START + 383) -#define RID_SVXITEMS_METRIC_TWIP (RID_SVXITEMS_START + 384) -#define RID_SVXITEMS_METRIC_PIXEL (RID_SVXITEMS_START + 385) +#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250) +#define RID_SVXITEMS_METRIC_CM (RID_EDIT_START + 251) +#define RID_SVXITEMS_METRIC_INCH (RID_EDIT_START + 252) +#define RID_SVXITEMS_METRIC_POINT (RID_EDIT_START + 253) +#define RID_SVXITEMS_METRIC_TWIP (RID_EDIT_START + 254) +#define RID_SVXITEMS_METRIC_PIXEL (RID_EDIT_START + 255) // enum ColorName ----------------------------------------------------------- -#define RID_SVXITEMS_COLOR_BEGIN (RID_SVXITEMS_START + 60) -#define RID_SVXITEMS_COLOR (RID_SVXITEMS_START + 60) -#define RID_SVXITEMS_COLOR_BLACK (RID_SVXITEMS_START + 61) -#define RID_SVXITEMS_COLOR_BLUE (RID_SVXITEMS_START + 62) -#define RID_SVXITEMS_COLOR_GREEN (RID_SVXITEMS_START + 63) -#define RID_SVXITEMS_COLOR_CYAN (RID_SVXITEMS_START + 64) -#define RID_SVXITEMS_COLOR_RED (RID_SVXITEMS_START + 65) -#define RID_SVXITEMS_COLOR_MAGENTA (RID_SVXITEMS_START + 66) -#define RID_SVXITEMS_COLOR_BROWN (RID_SVXITEMS_START + 67) -#define RID_SVXITEMS_COLOR_GRAY (RID_SVXITEMS_START + 68) -#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_SVXITEMS_START + 69) -#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_SVXITEMS_START + 70) -#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_SVXITEMS_START + 71) -#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_SVXITEMS_START + 72) -#define RID_SVXITEMS_COLOR_LIGHTRED (RID_SVXITEMS_START + 73) -#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_SVXITEMS_START + 74) -#define RID_SVXITEMS_COLOR_YELLOW (RID_SVXITEMS_START + 75) -#define RID_SVXITEMS_COLOR_WHITE (RID_SVXITEMS_START + 76) -#define RID_SVXITEMS_COLOR_MENUBAR (RID_SVXITEMS_START + 77) -#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_SVXITEMS_START + 78) -#define RID_SVXITEMS_COLOR_POPUPMENU (RID_SVXITEMS_START + 79) -#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_SVXITEMS_START + 80) -#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_SVXITEMS_START + 81) -#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_SVXITEMS_START + 82) -#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_SVXITEMS_START + 83) -#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_SVXITEMS_START + 84) -#define RID_SVXITEMS_COLOR_3DTEXT (RID_SVXITEMS_START + 85) -#define RID_SVXITEMS_COLOR_3DFACE (RID_SVXITEMS_START + 86) -#define RID_SVXITEMS_COLOR_3DLIGHT (RID_SVXITEMS_START + 87) -#define RID_SVXITEMS_COLOR_3DSHADOW (RID_SVXITEMS_START + 88) -#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_SVXITEMS_START + 89) -#define RID_SVXITEMS_COLOR_FIELD (RID_SVXITEMS_START + 90) -#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_SVXITEMS_START + 91) - - -#define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_SVXITEMS_START + 575) -#define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_SVXITEMS_START + 576) - -#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_SVXITEMS_START + 565) -#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_SVXITEMS_START + 566) -#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_SVXITEMS_START + 567) -#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_SVXITEMS_START + 568) -#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_SVXITEMS_START + 569) - -#define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_SVXITEMS_START + 577) -#define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_SVXITEMS_START + 578) +#define RID_SVXITEMS_COLOR_BEGIN (RID_EDIT_START + 256) +#define RID_SVXITEMS_COLOR (RID_EDIT_START + 256) +#define RID_SVXITEMS_COLOR_BLACK (RID_EDIT_START + 257) +#define RID_SVXITEMS_COLOR_BLUE (RID_EDIT_START + 258) +#define RID_SVXITEMS_COLOR_GREEN (RID_EDIT_START + 259) +#define RID_SVXITEMS_COLOR_CYAN (RID_EDIT_START + 260) +#define RID_SVXITEMS_COLOR_RED (RID_EDIT_START + 261) +#define RID_SVXITEMS_COLOR_MAGENTA (RID_EDIT_START + 262) +#define RID_SVXITEMS_COLOR_BROWN (RID_EDIT_START + 263) +#define RID_SVXITEMS_COLOR_GRAY (RID_EDIT_START + 264) +#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_EDIT_START + 265) +#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_EDIT_START + 266) +#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_EDIT_START + 267) +#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_EDIT_START + 268) +#define RID_SVXITEMS_COLOR_LIGHTRED (RID_EDIT_START + 269) +#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_EDIT_START + 270) +#define RID_SVXITEMS_COLOR_YELLOW (RID_EDIT_START + 271) +#define RID_SVXITEMS_COLOR_WHITE (RID_EDIT_START + 272) +#define RID_SVXITEMS_COLOR_MENUBAR (RID_EDIT_START + 273) +#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_EDIT_START + 274) +#define RID_SVXITEMS_COLOR_POPUPMENU (RID_EDIT_START + 275) +#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_EDIT_START + 276) +#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_EDIT_START + 277) +#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_EDIT_START + 278) +#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_EDIT_START + 279) +#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_EDIT_START + 280) +#define RID_SVXITEMS_COLOR_3DTEXT (RID_EDIT_START + 281) +#define RID_SVXITEMS_COLOR_3DFACE (RID_EDIT_START + 282) +#define RID_SVXITEMS_COLOR_3DLIGHT (RID_EDIT_START + 283) +#define RID_SVXITEMS_COLOR_3DSHADOW (RID_EDIT_START + 284) +#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_EDIT_START + 285) +#define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) +#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) + + +#define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288) +#define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289) + +#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_EDIT_START + 290) +#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291) +#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_EDIT_START + 292) +#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_EDIT_START + 293) +#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_EDIT_START + 294) + +#define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_EDIT_START + 295) +#define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_EDIT_START + 296) // strings for error messsages in dictionary updates -#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_SVX_START + 810) -#define RID_SVXSTR_DIC_ERR_FULL (RID_SVX_START + 811) -#define RID_SVXSTR_DIC_ERR_READONLY (RID_SVX_START + 812) - -// HM_ERR -#define RID_SVXSTR_HMERR_THESAURUS (RID_SVX_START + 150) +#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_EDIT_START + 297) +#define RID_SVXSTR_DIC_ERR_FULL (RID_EDIT_START + 298) +#define RID_SVXSTR_DIC_ERR_READONLY (RID_EDIT_START + 299) // ResIds fuer HM-QueryBoxen und Error-Strings -#define RID_SVXQB_BW_CONTINUE (RID_SVX_START + 39) -#define RID_SVXQB_CONTINUE (RID_SVX_START + 34) +#define RID_SVXQB_BW_CONTINUE (RID_EDIT_START + 300) +#define RID_SVXQB_CONTINUE (RID_EDIT_START + 301) + +// EditEngine +#define RID_EDITUNDO_DEL (RID_EDIT_START + 302) +#define RID_EDITUNDO_MOVE (RID_EDIT_START + 303) +#define RID_EDITUNDO_INSERT (RID_EDIT_START + 304) +#define RID_EDITUNDO_REPLACE (RID_EDIT_START + 305) +#define RID_EDITUNDO_SETATTRIBS (RID_EDIT_START + 306) +#define RID_EDITUNDO_SETSTYLE (RID_EDIT_START + 307) +#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308) +#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309) +#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310) +#define RID_MENU_SPELL (RID_EDIT_START + 311) +#define RID_STR_PARAGRAPH (RID_EDIT_START + 312) +#define RID_STR_WORD (RID_EDIT_START + 313) +#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) +#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) + +#if 315 > (RID_EDIT_END-RID_EDIT_START) +#error Resource-Ueberlauf in #line, #file +#endif + + #endif diff --git a/editeng/inc/editeng/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx index 7b93f7f49798..da4570126a96 100644 --- a/editeng/inc/editeng/eeitemid.hxx +++ b/editeng/inc/editeng/eeitemid.hxx @@ -31,7 +31,7 @@ #ifndef _EEITEMID_HXX #define _EEITEMID_HXX -#include <editing/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifdef ITEMID_FONT #undef ITEMID_FONT diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index d7ad1a9d6397..ac0d1d8b9e04 100644 --- a/editeng/inc/editeng/eerdll.hxx +++ b/editeng/inc/editeng/eerdll.hxx @@ -35,8 +35,9 @@ class GlobalEditData; #include <tools/resid.hxx> #include <tools/shl.hxx> +#include <editeng/editengdllapi.h> -class EditResId: public ResId +class EDITENG_DLLPUBLIC EditResId: public ResId { public: EditResId( USHORT nId ); diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx index 03d43916ea42..ac6b7ca090ae 100644 --- a/editeng/inc/editeng/escpitem.hxx +++ b/editeng/inc/editeng/escpitem.hxx @@ -33,8 +33,8 @@ // include --------------------------------------------------------------- #include <svl/eitem.hxx> -#include <svx/svxenum.hxx> -#include <svx/svxdllapi.h> +#include <editeng/svxenum.hxx> +#include <editeng/editengdllapi.h> class SvXMLUnitConverter; namespace rtl @@ -55,7 +55,7 @@ namespace rtl Dieses Item beschreibt die Schrift-Position. */ -class SVX_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface +class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface { short nEsc; BYTE nProp; diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc index 1af5300bd33d..6bd88ebf164d 100644 --- a/editeng/inc/editeng/memberids.hrc +++ b/editeng/inc/editeng/memberids.hrc @@ -30,6 +30,8 @@ #ifndef _EDT_UNOMID_HXX #define _EDT_UNOMID_HXX +#include <svl/memberid.hrc> + #define MID_LOCATION 0x3c #define MID_TRANSPARENT 0x4b #define MID_BG_COLOR 0x22 @@ -57,11 +59,6 @@ #define MID_HYPHEN_MIN_TRAIL 2 #define MID_HYPHEN_MAX_HYPHENS 3 -// SvxSizeItem -#define MID_SIZE_SIZE 0 -#define MID_SIZE_WIDTH 1 -#define MID_SIZE_HEIGHT 2 - // SvxBoxInfoItem #define MID_HORIZONTAL 1 #define MID_VERTICAL 2 diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx index d4214eb5072d..a4c0b51c6a72 100644 --- a/editeng/inc/editeng/scripttypeitem.hxx +++ b/editeng/inc/editeng/scripttypeitem.hxx @@ -48,7 +48,7 @@ EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang ); USHORT GetItemScriptType( short nI18NType ); short GetI18NScriptType( USHORT nItemType ); -class SvxScriptTypeItem : public SfxUInt16Item +class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item { public: TYPEINFO(); diff --git a/editeng/inc/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx index e93d6a47aef6..b546a4c4fd59 100644 --- a/editeng/inc/unoedprx.hxx +++ b/editeng/inc/editeng/unoedprx.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoedprx.hxx,v $ + * $RCSfile: editeng/unoedprx.hxx,v $ * $Revision: 1.10 $ * * This file is part of OpenOffice.org. @@ -36,7 +36,7 @@ #include <editeng/unoedsrc.hxx> #include <editeng/editdata.hxx> - +#include "editeng/editengdllapi.h" class SvxAccessibleTextAdapter : public SvxTextForwarder { @@ -141,7 +141,7 @@ private: SvxAccessibleTextAdapter* mrTextForwarder; }; -class SvxEditSourceAdapter : public SvxEditSource +class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource { public: SvxEditSourceAdapter(); diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx index d702280d980b..7cac75b94979 100644 --- a/editeng/inc/editeng/unofield.hxx +++ b/editeng/inc/editeng/unofield.hxx @@ -65,7 +65,7 @@ class SvxUnoFieldData_Impl; class SfxItemPropertySet; class SvxFieldData; -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL EDITENG_DLLPUBLIC SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper, diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx index 24c77f08be5b..57bc4c3183ad 100644 --- a/editeng/inc/editeng/unoipset.hxx +++ b/editeng/inc/editeng/unoipset.hxx @@ -57,8 +57,8 @@ public: ~SvxItemPropertySet(); // Methoden, die direkt mit dem ItemSet arbeiten - ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bConvert ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bConvert ) const; + ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent ) const; + void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet ) const; // Methoden, die stattdessen Any benutzen ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const; diff --git a/editeng/inc/editeng/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx index bc2fef611ad0..11d0cc30ed70 100644 --- a/editeng/inc/editeng/unoviwou.hxx +++ b/editeng/inc/editeng/unoviwou.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_UNOVIWOU_HXX #define _SVX_UNOVIWOU_HXX -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> #include <editeng/editengdllapi.h> class OutlinerView; diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index c4cc03bb4213..d523fae6bced 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -35,15 +35,35 @@ #include <svl/solar.hrc> // Help-Ids -------------------------------------------------------------- -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34) -#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32) -#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33) -#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35) +#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_EDIT_START) +#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_EDIT_START + 1) +#define HID_EDITENG_SPELLER_ADDWORD (HID_EDIT_START + 2) +#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_EDIT_START + 3) +#define HID_EDITENG_SPELLER_IGNORE (HID_EDIT_START + 4) +#define HID_EDITENG_SPELLER_START (HID_EDIT_START + 5) +#define HID_AUTOCORR_HELP_END (HID_EDIT_START + 6) +#define HID_AUTOCORR_HELP_START (HID_EDIT_START + 7) +#define HID_EDIT_WORD HID_AUTOCORR_HELP_START +#define HID_EDIT_SENT (HID_AUTOCORR_HELP+1) +#define HID_EDIT_SENTWORD (HID_AUTOCORR_HELP+2) +#define HID_EDIT_ACORWORD (HID_AUTOCORR_HELP+3) -#define HID_AUTOCORR_HELP_END (HID_SVX_START + 2) -#define HID_AUTOCORR_HELP_START (HID_SVX_START + 3) +#define HID_EDIT_ACORSENTWORD (HID_AUTOCORR_HELP+5) + +#define HID_EDIT_CHGTOENEMDASH (HID_AUTOCORR_HELP+7) +#define HID_EDIT_WORDENEMDASH (HID_AUTOCORR_HELP+8) +#define HID_EDIT_SENTENEMDASH (HID_AUTOCORR_HELP+9) +#define HID_EDIT_SENTWORDENEMDASH (HID_AUTOCORR_HELP+10) +#define HID_EDIT_ACORWORDENEMDASH (HID_AUTOCORR_HELP+11) + +#define HID_EDIT_ACORSENTWORDENEMDASH (HID_AUTOCORR_HELP+13) +#define HID_EDIT_CHGQUOTES (HID_AUTOCORR_HELP+15) +#define HID_EDIT_CHGSGLQUOTES (HID_AUTOCORR_HELP+16) +#define HID_EDIT_SETINETATTR (HID_AUTOCORR_HELP+17) +#define HID_EDIT_INGNOREDOUBLESPACE (HID_AUTOCORR_HELP+18) +#define HID_EDIT_CHGWEIGHTUNDERL (HID_AUTOCORR_HELP+19) +#define HID_EDIT_CHGFRACTIONSYMBOL (HID_AUTOCORR_HELP+20) +#define HID_EDIT_CHGORDINALNUMBER (HID_AUTOCORR_HELP+21) // HID_EDIT_START + 28 // please adjust ACT_SVX_HID_END2 below if you add entries here! @@ -51,8 +71,8 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_SVX_HID_END (HID_SVX_START+247) -#if ACT_SVX_HID_END > HID_SVX_END +#define ACT_SVX_HID_END (HID_EDIT_START+28) +#if ACT_SVX_HID_END > HID_EDIT_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 065102c58534..141dc19af7c1 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -75,7 +75,7 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <editeng/unolingu.hxx> #include <editeng/unopracc.hxx> -#include "AccessibleEditableTextPara.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" #include <svtools/colorcfg.hxx> diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 5ab0d25b7994..91aff356db6d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -44,8 +44,8 @@ #include <comphelper/accessibleeventnotifier.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <editeng/unolingu.hxx> -#include "AccessibleEditableTextPara.hxx" -#include "AccessibleImageBullet.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" +#include "editeng/AccessibleImageBullet.hxx" #include <editeng/eerdll.hxx> #include <editeng/editdata.hxx> diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 876c844b4460..6953c5922ccf 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -51,8 +51,8 @@ #include <editeng/unoedhlp.hxx> #include <editeng/unopracc.hxx> #include <editeng/unoedsrc.hxx> -#include "AccessibleParaManager.hxx" -#include "AccessibleEditableTextPara.hxx" +#include "editeng/AccessibleParaManager.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" using namespace ::com::sun::star; diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 1b880aec4328..c74b44904252 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -59,9 +59,9 @@ #include <editeng/editdata.hxx> #include <editeng/unopracc.hxx> -#include "unoedprx.hxx" +#include "editeng/unoedprx.hxx" #include <editeng/AccessibleStaticTextBase.hxx> -#include "AccessibleEditableTextPara.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" using namespace ::com::sun::star; diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk index 2a4fce319d20..83ce10567c67 100644 --- a/editeng/source/editeng/makefile.mk +++ b/editeng/source/editeng/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svx +PRJNAME=editeng TARGET=editeng AUTOSEG=true diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index e4a533ca7413..97cd3a500a53 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/CellVertJustify.hpp> #include <com/sun/star/table/ShadowLocation.hpp> #include <com/sun/star/table/TableBorder.hpp> @@ -94,6 +93,7 @@ #include <editeng/eerdll.hxx> #include <editeng/unoprnms.hxx> #include <editeng/memberids.hrc> +#include <editeng/editerr.hxx> using namespace ::rtl; using namespace ::com::sun::star; @@ -1830,7 +1830,7 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const } // ----------------------------------------------------------------------- -table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert) +table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert) { table::BorderLine aLine; if(pLine) @@ -1859,10 +1859,10 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // 4 Borders and 5 distances uno::Sequence< uno::Any > aSeq( 9 ); - aSeq[0] = uno::makeAny( lcl_SvxLineToLine(GetLeft(), bConvert) ); - aSeq[1] = uno::makeAny( lcl_SvxLineToLine(GetRight(), bConvert) ); - aSeq[2] = uno::makeAny( lcl_SvxLineToLine(GetBottom(), bConvert) ); - aSeq[3] = uno::makeAny( lcl_SvxLineToLine(GetTop(), bConvert) ); + aSeq[0] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetLeft(), bConvert) ); + aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) ); + aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) ); + aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) ); aSeq[4] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( GetDistance()) : GetDistance())); aSeq[5] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nTopDist ) : nTopDist )); aSeq[6] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nBottomDist ) : nBottomDist )); @@ -1874,22 +1874,22 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const case MID_LEFT_BORDER: bSerialize = sal_True; // intentionally no break! case LEFT_BORDER: - aRetLine = lcl_SvxLineToLine(GetLeft(), bConvert); + aRetLine = SvxBoxItem::SvxLineToLine(GetLeft(), bConvert); break; case MID_RIGHT_BORDER: bSerialize = sal_True; // intentionally no break! case RIGHT_BORDER: - aRetLine = lcl_SvxLineToLine(GetRight(), bConvert); + aRetLine = SvxBoxItem::SvxLineToLine(GetRight(), bConvert); break; case MID_BOTTOM_BORDER: bSerialize = sal_True; // intentionally no break! case BOTTOM_BORDER: - aRetLine = lcl_SvxLineToLine(GetBottom(), bConvert); + aRetLine = SvxBoxItem::SvxLineToLine(GetBottom(), bConvert); break; case MID_TOP_BORDER: bSerialize = sal_True; // intentionally no break! case TOP_BORDER: - aRetLine = lcl_SvxLineToLine(GetTop(), bConvert); + aRetLine = SvxBoxItem::SvxLineToLine(GetTop(), bConvert); break; case BORDER_DISTANCE: nDist = GetDistance(); @@ -1936,7 +1936,7 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const } // ----------------------------------------------------------------------- -sal_Bool lcl_LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert) +sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert) { rSvxLine.SetColor( Color(rLine.Color)); rSvxLine.SetInWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth )); @@ -1967,7 +1967,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) table::BorderLine aBorderLine; if ( aSeq[0] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT ); } else @@ -1975,7 +1975,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if ( aSeq[1] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT ); } else @@ -1983,7 +1983,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if ( aSeq[2] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM ); } else @@ -1991,7 +1991,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if ( aSeq[3] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); SetLine(bSet ? &aLine : 0, BOX_LINE_TOP ); } else @@ -2101,7 +2101,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) else return sal_False; - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); SetLine(bSet ? &aLine : 0, nLine); } @@ -2796,8 +2796,8 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // 2 BorderLines, flags, valid flags and distance ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 5 ); - aSeq[0] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pHori, bConvert) ); - aSeq[1] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pVert, bConvert) ); + aSeq[0] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) ); + aSeq[1] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) ); if ( IsTable() ) nVal |= 0x01; if ( IsDist() ) @@ -2814,11 +2814,11 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const case MID_HORIZONTAL: bSerialize = sal_True; - aRetLine = lcl_SvxLineToLine( pHori, bConvert); + aRetLine = SvxBoxItem::SvxLineToLine( pHori, bConvert); break; case MID_VERTICAL: bSerialize = sal_True; - aRetLine = lcl_SvxLineToLine( pVert, bConvert); + aRetLine = SvxBoxItem::SvxLineToLine( pVert, bConvert); break; case MID_FLAGS: bIntMember = sal_True; @@ -2885,7 +2885,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) sal_Int32 nVal( 0 ); if ( aSeq[0] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); if ( bSet ) SetLine( &aLine, BOXINFO_LINE_HORI ); } @@ -2893,7 +2893,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) return sal_False; if ( aSeq[1] >>= aBorderLine ) { - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); if ( bSet ) SetLine( &aLine, BOXINFO_LINE_VERT ); } @@ -2977,7 +2977,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) return sal_False; SvxBorderLine aLine; - sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert); if ( bSet ) SetLine( &aLine, nMemberId == MID_HORIZONTAL ? BOXINFO_LINE_HORI : BOXINFO_LINE_VERT ); break; @@ -3275,7 +3275,7 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const nMemId &= ~CONVERT_TWIPS; if ( nMemId == 0 ) { - rVal <<= uno::makeAny( lcl_SvxLineToLine(pLine, bConvert) ); + rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) ); return sal_True; } else if ( pLine ) @@ -3309,7 +3309,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId ) { if ( !pLine ) pLine = new SvxBorderLine; - if( !lcl_LineToSvxLine(aLine, *pLine, bConvert) ) + if( !SvxBoxItem::LineToSvxLine(aLine, *pLine, bConvert) ) DELETEZ( pLine ); return sal_True; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index f921fec2180e..8cb43c6c65ad 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -44,7 +44,6 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <tools/rtti.hxx> -#include <basic/sbx.hxx> #define GLOBALOVERFLOW3 #define _SVX_PARAITEM_CXX diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 224df3340a58..4f68b68e8c45 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -41,10 +41,7 @@ #ifndef __RSC #include <tools/errinf.hxx> #endif -//#include <svxerr.hxx> -//#include <dlgutil.hxx> #include <editeng/unolingu.hxx> -#include <sfx2/sfxuno.hxx> #include <linguistic/lngprops.hxx> #include <com/sun/star/frame/XStorable.hpp> @@ -56,6 +53,7 @@ #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> #include <editeng/editids.hrc> +#include <editeng/editerr.hxx> #define WAIT_ON() if(pWin != NULL) { pWin->EnterWait(); } diff --git a/editeng/source/outliner/makefile.mk b/editeng/source/outliner/makefile.mk index deef3530499c..4c7245eeb316 100644 --- a/editeng/source/outliner/makefile.mk +++ b/editeng/source/outliner/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svx +PRJNAME=editeng TARGET=outliner AUTOSEG=true ENABLE_EXCEPTIONS=TRUE diff --git a/editeng/source/uno/makefile.mk b/editeng/source/uno/makefile.mk index c044e1e38d14..71e2c9b89e2f 100644 --- a/editeng/source/uno/makefile.mk +++ b/editeng/source/uno/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svx +PRJNAME=editeng TARGET=uno ENABLE_EXCEPTIONS=TRUE diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 800c77b1f05f..ba6c86226b50 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -51,7 +51,7 @@ // Project-local header // //------------------------------------------------------------------------ -#include "unoedprx.hxx" +#include "editeng/unoedprx.hxx" #include <editeng/unotext.hxx> #include <editeng/unoedhlp.hxx> #include <editeng/editdata.hxx> diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index adab5fc3817c..b6a5876a25af 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -114,33 +114,8 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) pCombiList->Insert(pNew); } -/** this function checks if a SFX_METRIC_ITEM realy needs to be converted. - This check is for items that store either metric values if theire positiv - or percentage if theire negativ. -*/ -#if 0 -sal_Bool SvxUnoCheckForConversion( const SfxItemSet&, sal_Int32 nWID, const uno::Any& rVal ) -{ - sal_Bool bConvert = sal_True; // the default is that all metric items must be converted - - switch( nWID ) - { - case XATTR_FILLBMP_SIZEX: - case XATTR_FILLBMP_SIZEY: - { - sal_Int32 nValue = 0; - if( rVal >>= nValue ) - bConvert = nValue > 0; - break; - } - } - - // the default is to always - return bConvert; -} -#endif //---------------------------------------------------------------------- -uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bConvert ) const +uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent ) const { uno::Any aVal; if(!pMap || !pMap->nWID) @@ -150,7 +125,6 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* const SfxPoolItem* pItem = 0; SfxItemPool* pPool = rSet.GetPool(); - // pMap->nWID != SDRATTR_XMLATTRIBUTES rSet.GetItemState( pMap->nWID, bSearchInParent, &pItem ); if( NULL == pItem && pPool ) @@ -169,19 +143,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* { pItem->QueryValue( aVal, nMemberId ); - if( pMap->nMemberId & SFX_METRIC_ITEM ) - { - // check for needed metric translation - if ( bConvert ) -// if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) - { -// if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) ) - SvxUnoConvertToMM( eMapUnit, aVal ); - } - } // convert typeless SfxEnumItem to enum type - else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && - aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) + if ( !(pMap->nMemberId & SFX_METRIC_ITEM) && pMap->pType->getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) { sal_Int32 nEnum; aVal >>= nEnum; @@ -198,7 +161,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } //---------------------------------------------------------------------- -void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bConvert ) const +void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) const { if(!pMap || !pMap->nWID) return; @@ -227,18 +190,6 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa uno::Any aValue( rVal ); const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; - - if( pMap->nMemberId & SFX_METRIC_ITEM ) - { - // check for needed metric translation - if ( bConvert ) -// if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) - { -// if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) ) - SvxUnoConvertFromMM( eMapUnit, aValue ); - } - } - pNewItem = pItem->Clone(); BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 4d39ffb15712..e79e351278ff 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -541,7 +541,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) // muss vorher das alte Item aus dem Dokument geholt werden rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set - mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false); + mpPropSet->setPropertyValue(pMap, rValue, rNewSet ); } } @@ -712,7 +712,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM default: if(!GetPropertyValueHelper( *((SfxItemSet*)(&rSet)), pMap, rAny, &maSelection, GetEditSource() )) - rAny = mpPropSet->getPropertyValue(pMap, rSet, false, false ); + rAny = mpPropSet->getPropertyValue(pMap, rSet, false ); } } @@ -1329,7 +1329,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp { SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); - return mpPropSet->getPropertyValue(pMap, aSet, false, false); + return mpPropSet->getPropertyValue(pMap, aSet, false ); } } } diff --git a/editeng/util/hidother.src b/editeng/util/hidother.src index da1e345f5951..6f3b2285f845 100644 --- a/editeng/util/hidother.src +++ b/editeng/util/hidother.src @@ -27,28 +27,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "../inc/helpid.hrc" // HID_XXX -#include <editeng/svxids.hrc> -#include "../inc/fmhelp.hrc" -#define HID_AUTOCORR_HELP_ACORSENTWORD HID_AUTOCORR_HELP_START+5 -#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH HID_AUTOCORR_HELP_START+13 -#define HID_AUTOCORR_HELP_ACORWORD HID_AUTOCORR_HELP_START+3 -#define HID_AUTOCORR_HELP_ACORWORDENEMDASH HID_AUTOCORR_HELP_START+11 -#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL HID_AUTOCORR_HELP_START+20 -#define HID_AUTOCORR_HELP_CHGORDINALNUMBER HID_AUTOCORR_HELP_START+21 -#define HID_AUTOCORR_HELP_CHGQUOTES HID_AUTOCORR_HELP_START+15 -#define HID_AUTOCORR_HELP_CHGSGLQUOTES HID_AUTOCORR_HELP_START+16 -#define HID_AUTOCORR_HELP_CHGTOENEMDASH HID_AUTOCORR_HELP_START+7 -#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL HID_AUTOCORR_HELP_START+19 -#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE HID_AUTOCORR_HELP_START+18 -#define HID_AUTOCORR_HELP_SENT HID_AUTOCORR_HELP_START+1 -#define HID_AUTOCORR_HELP_SENTENEMDASH HID_AUTOCORR_HELP_START+9 -#define HID_AUTOCORR_HELP_SENTWORD HID_AUTOCORR_HELP_START+2 -#define HID_AUTOCORR_HELP_SENTWORDENEMDASH HID_AUTOCORR_HELP_START+10 -#define HID_AUTOCORR_HELP_SETINETATTR HID_AUTOCORR_HELP_START+17 -#define HID_AUTOCORR_HELP_WORD HID_AUTOCORR_HELP_START+0 -#define HID_AUTOCORR_HELP_WORDENEMDASH HID_AUTOCORR_HELP_START+8 +#include "../inc/helpid.hrc" hidspecial HID_AUTOCORR_HELP_ACORSENTWORD { HelpID = HID_AUTOCORR_HELP_ACORSENTWORD;}; hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH { HelpID = HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;}; diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk index 6eda6550f757..5eef76146a41 100644 --- a/editeng/util/makefile.mk +++ b/editeng/util/makefile.mk @@ -62,7 +62,6 @@ SHL1STDLIBS= \ $(XMLOFFLIB) \ $(BASEGFXLIB) \ $(LNGLIB) \ - $(BASICLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ $(VCLLIB) \ @@ -89,9 +88,7 @@ DEFLIB1NAME=$(TARGET) # Resource files SRSFILELIST=\ $(SRS)$/misc.srs \ - $(SRS)$/items.srs \ - $(SRS)$/editeng.srs \ - $(SRS)$/outliner.srs + $(SRS)$/items.srs RESLIB1NAME=editeng RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw |