diff options
203 files changed, 1235 insertions, 3384 deletions
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc index 9b8593e6f7..0a7dcf1c9f 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 f78cbd4ad4..424d2cfd16 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 b1dc462021..86f25d01ad 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 17644c2b7a..204dddd1f5 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 c4c9504265..eeef748763 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 0000000000..7ded1075db --- /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 33f04bc868..7ba4842989 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 869d2253bf..a08893ed0a 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 3d9db90255..0003339f3d 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 162d3aead7..85b72e32e7 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 32cec4f4cb..bd45fe31bc 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 48444b3575..0eaff89bbe 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 4badeaeb15..a0291194f9 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 55f47d35c3..14e86f1792 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 1ec3a11ca9..dbaa99f187 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 eeac3fbc9e..ea058c9785 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 269ae3e44d..c949e35bc3 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 eefc01970b..27cddf0449 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 7b32e6fe58..53efd0b120 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 064f196049..bc1b8ef2ed 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 0d8e75020c..c6b1e53eeb 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 1caa0e7392..0ff255cf50 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 2a4fce319d..83ce10567c 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 7ccb6860ab..392cb812a5 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 1f62a43fae..f435bbd7b0 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 bf3ae7d092..47d839c580 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 deef353049..4c7245eeb3 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 c044e1e38d..71e2c9b89e 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 e2de161139..c232ef75cd 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 f5f0322f93..319ed6cbdd 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 189af6cb15..3ad334bccb 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 01f457b457..6f3b2285f8 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 6eda6550f7..5eef76146a 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 diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 673b058306..fe9bb265b0 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -34,7 +34,7 @@ #include <svl/solar.hrc> #include <sfx2/cntids.hrc> -#include <editeng/editids.hrc> +#include <svl/memberid.hrc> // Please be careful: // Changing just one part here doesn't add new diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 5345a050aa..8bad35d6a6 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -276,8 +276,6 @@ FASTBOOL SfxApplication::Initialize_Impl() new SfxErrorHandler( RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END); new SfxErrorHandler( - (RID_SJ_START +1), ERRCODE_AREA_JAVA, ERRCODE_AREA_JAVA_END); - new SfxErrorHandler( RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END ); // diverse Pointer diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index b176c7c942..4f3cc8a9bf 100755 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -32,9 +32,10 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX -#include <svx/AccessibleContextBase.hxx> -#include <svx/AccessibleComponentBase.hxx> +#include <editeng/AccessibleContextBase.hxx> +#include <editeng/AccessibleComponentBase.hxx> #include <svx/IAccessibleViewForwarderListener.hxx> +#include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -43,6 +44,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <svx/AccessibleTextHelper.hxx> #include "svx/svxdllapi.h" +#include "ChildrenManager.hxx" class SdrObject; diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index 58f594da3b..981dded8e5 100644 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -32,7 +32,7 @@ #define SVX_SPELL_DIALOG_CHILD_WINDOW_HXX #include <sfx2/childwin.hxx> -#include <svx/SpellPortions.hxx> +#include <editeng/SpellPortions.hxx> #include "svx/svxdllapi.h" #include <vcl/image.hxx> diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index c2644b9bce..77cf61bd1e 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -35,7 +35,7 @@ #include <svx/svxids.hrc> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "svx/svxdllapi.h" class SvStream; diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 31422c88b1..02a91a72aa 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/window.hxx> -#include <svx/svxfont.hxx> +#include <editeng/svxfont.hxx> #include "svx/svxdllapi.h" #ifndef _RTL_USTRING_HXX_ diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index 804a90f59b..f7280a1395 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -35,7 +35,7 @@ #include <vcl/lstbox.hxx> #endif #include <sfx2/itemconnect.hxx> -#include <svx/frmdir.hxx> +#include <editeng/frmdir.hxx> #include "svx/svxdllapi.h" class SvxFrameDirectionItem; diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index de5a1db55d..a4c27abab6 100644 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/window.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "svx/svxdllapi.h" // enum ------------------------------------------------------------------ diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx index aaba3620ea..da5a3dd0e5 100644 --- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx @@ -34,7 +34,7 @@ #include <sal/types.h> #include <svx/xenum.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/sdtaitm.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index b9f27511e0..d057c55429 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -36,7 +36,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <tools/color.hxx>
#include <svx/sdr/attribute/sdrformtextattribute.hxx> #include <tools/weakbase.hxx> diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 8a93741bc3..15ccd73897 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -38,7 +38,7 @@ #include <vcl/outdev.hxx> #endif #include <tools/shl.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index 1bf875b809..b21ec019ec 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -33,7 +33,7 @@ #include <svx/svdotext.hxx> #include "svx/svxdllapi.h" -#include <svx/svdfield.hxx> +#include <editeng/svdfield.hxx> //************************************************************ // Vorausdeklarationen diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index f5457dd885..697cfdd68c 100644 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -31,7 +31,7 @@ #ifndef _SVDOUTL_HXX #define _SVDOUTL_HXX -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "svx/svxdllapi.h" #include <svx/svdobj.hxx> diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index 2bff30ee10..21e11c3e1a 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -34,7 +34,7 @@ #include <svl/eitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/viewpt3d.hxx> #include <svx/svddef.hxx> diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 958b000e85..6857f49ba3 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -36,7 +36,7 @@ class SdrModel; class SdrView; -using namespace svx; + #include <svx/dstribut_enum.hxx> #include <svx/rectenum.hxx> //add for enum RECT_POINT #include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index b0e28f0056..fc4b0f5c4d 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -35,7 +35,7 @@ #include <svl/solar.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> - +#include <editeng/editids.hrc> #include <svx/unomid.hxx> // solange noch im sfxids.hrc definiert ------------------------------------- @@ -44,11 +44,6 @@ #undef SID_INSERT_FRAME #endif -// ID-Bereiche -------------------------------------------------------------- - -// Slot-Id's -#define SID_SVX_END (SID_LIB_START + 1199) - // -------------------------------------------------------------------------- // Member-Id's // -------------------------------------------------------------------------- @@ -418,55 +413,14 @@ // -------------------------------------------------------------------------- #define SID_ATTR_ZOOM ( SID_SVX_START + 0 ) -#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 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONT ( SID_SVX_START + 7 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_POSTURE ( SID_SVX_START + 8 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_WEIGHT ( SID_SVX_START + 9 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_SHADOWED ( SID_SVX_START + 10 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_WORDLINEMODE ( SID_SVX_START + 11 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_CONTOUR ( SID_SVX_START + 12 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_ESCAPEMENT ( SID_SVX_START + 21 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 ) -> sfxsids.hrc + #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) -#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_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT -#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 ) -#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT -#define SID_ATTR_PARA_ADJUST_CENTER ( SID_SVX_START + 30 ) -#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER -#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_SVX_START + 31 ) -#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK -#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_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_LRSPACE ( SID_SVX_START + 48 ) -#define SID_ATTR_ULSPACE ( SID_SVX_START + 49 ) #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 ) @@ -480,10 +434,6 @@ #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_CHAR_MAPTYPE ( SID_SVX_START + 64 ) -> sfxsids.hrc -#define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 ) -#define SID_ATTR_PARA_KEEP ( SID_SVX_START + 66 ) -//#define SID_ATTR_CHAR_AUTOKERN ( SID_SVX_START + 67 ) -> sfxsids.hrc #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 ) @@ -492,12 +442,6 @@ #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_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_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 ) #define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 ) #define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 ) @@ -509,6 +453,12 @@ #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 @@ -659,7 +609,6 @@ #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_ATTR_PARA_BULLET ( SID_SVX_START + 250 ) #define SID_AUTOCOMPLETEWORD ( SID_SVX_START + 251 ) #define SID_DRAW_TEXT ( SID_SVX_START + 253 ) #define SID_DRAW_CAPTION ( SID_SVX_START + 254 ) @@ -708,10 +657,8 @@ #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_PARA_OUTLLEVEL ( SID_SVX_START + 300 ) #define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 ) #define SID_ATTR_TRANSFORM_SLANT ( SID_SVX_START + 302 ) // !!! -//#define SID_ATTR_CHAR_FONTWIDTH ( SID_SVX_START + 303 ) -> sfxsids.hrc #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 ) @@ -756,7 +703,6 @@ //#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_FIELD ( SID_SVX_START + 363 ) #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 @@ -804,7 +750,6 @@ #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_ATTR_PARA_REGISTER ( SID_SVX_START + 413 ) #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 @@ -851,7 +796,6 @@ #define SID_GROUP ( SID_SVX_START + 454 ) #define SID_UNGROUP ( SID_SVX_START + 455 ) #define SID_SET_DEFAULT ( SID_SVX_START + 456 ) -#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 ) #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 ) @@ -875,11 +819,7 @@ #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_ATTR_CHAR_COLOR_EXT ( SID_SVX_START + 488 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR_BACKGROUND ( SID_SVX_START + 489 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ( SID_SVX_START + 490 ) -> sfxsids.hrc #define SID_COLL_CLEAR ( SID_SVX_START + 536 ) -//#define SID_ATTR_CHAR_COLOR2 ( SID_SVX_START + 537 ) -> sfxsids.hrc #define SID_SHOW_ADDRESS ( SID_SVX_START + 538 ) #define SID_APP_ENTERWAIT ( SID_SVX_START + 550 ) #define SID_APP_LEAVEWAIT ( SID_SVX_START + 551 ) @@ -910,10 +850,10 @@ #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_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 ) #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_FMSLOTS_START ( SID_SVX_START + 592 ) #define SID_FM_CONFIG ( SID_SVX_START + 593 ) #define SID_FM_PUSHBUTTON ( SID_SVX_START + 594 ) @@ -1122,38 +1062,17 @@ #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_ATTR_CHAR_CHARSETCOLOR ( SID_SVX_START + 877 ) //#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_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_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_ASIAN_DLG ( SID_SVX_START + 904 ) -#define SID_DRAW_TEXT_VERTICAL ( SID_SVX_START + 905 ) -#define SID_ATTR_CHAR_VERTICAL SID_DRAW_TEXT_VERTICAL +#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_ATTR_CHAR_ROTATED ( SID_SVX_START + 910 ) -#define SID_ATTR_CHAR_SCALEWIDTH ( SID_SVX_START + 911 ) #define SID_TRANSLITERATE_UPPER ( SID_SVX_START + 912 ) #define SID_TRANSLITERATE_LOWER ( SID_SVX_START + 913 ) #define SID_TRANSLITERATE_HALFWIDTH ( SID_SVX_START + 914 ) @@ -1161,11 +1080,10 @@ #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_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_SVX_START + 919 ) -#define SID_ATTR_CHAR_RELIEF ( SID_SVX_START + 920 ) #define SID_LANGUAGE_OPTIONS ( SID_SVX_START + 921 ) #define SID_GETUNDOSTRINGS ( SID_SVX_START + 923 ) #define SID_GETREDOSTRINGS ( SID_SVX_START + 924 ) + #define SID_INSERT_IMAGECONTROL ( SID_SVX_START + 926 ) #define SID_INSERT_PROGRESSBAR ( SID_SVX_START + 927 ) #define SID_INSERT_HFIXEDLINE ( SID_SVX_START + 928 ) @@ -1184,14 +1102,9 @@ #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_FRAMEDIRECTION ( SID_SVX_START + 944 ) -#define SID_ATTR_PARA_SNAPTOGRID ( SID_SVX_START + 945 ) #define SID_ATTR_TABSTOP_VERTICAL ( SID_SVX_START + 946 ) -#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_SVX_START + 947 ) #define SID_RULER_BORDERS_VERTICAL ( SID_SVX_START + 948 ) #define SID_ATTR_ALIGN_ASIANVERTICAL ( SID_SVX_START + 949 ) -#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_SVX_START + 950 ) -#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_SVX_START + 951 ) #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 ) @@ -1229,16 +1142,10 @@ #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_CHAR_HIDDEN ( SID_SVX_START + 989 ) #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_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_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 ) @@ -1334,7 +1241,6 @@ #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_ATTR_PARA_OUTLINE_LEVEL (SID_SVX_START+1092) #define SID_OBJECT_MIRROR (SID_SVX_START+1093) #define SID_DELETE_POSTIT (SID_SVX_START+1094) diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index f5041c2e90..11d8c33d2e 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -66,19 +66,19 @@ #define RID_SVXITEMS_SEARCHAPP_BASE (RID_SVXITEMS_START + 28) // enum BrushStyle ---------------------------------------------------------- -//#define RID_SVXITEMS_BRUSHSTYLE_BEGIN (RID_SVXITEMS_START + 45) -//#define RID_SVXITEMS_BRUSHSTYLE_NULL (RID_SVXITEMS_START + 45) -//#define RID_SVXITEMS_BRUSHSTYLE_SOLID (RID_SVXITEMS_START + 46) -//#define RID_SVXITEMS_BRUSHSTYLE_HORZ (RID_SVXITEMS_START + 47) -//#define RID_SVXITEMS_BRUSHSTYLE_VERT (RID_SVXITEMS_START + 48) -//#define RID_SVXITEMS_BRUSHSTYLE_CROSS (RID_SVXITEMS_START + 49) -//#define RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS (RID_SVXITEMS_START + 50) -//#define RID_SVXITEMS_BRUSHSTYLE_UPDIAG (RID_SVXITEMS_START + 51) -//#define RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG (RID_SVXITEMS_START + 52) -//#define RID_SVXITEMS_BRUSHSTYLE_25 (RID_SVXITEMS_START + 53) -//#define RID_SVXITEMS_BRUSHSTYLE_50 (RID_SVXITEMS_START + 54) -//#define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) -//#define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) +#define RID_SVXITEMS_BRUSHSTYLE_BEGIN (RID_SVXITEMS_START + 45) +#define RID_SVXITEMS_BRUSHSTYLE_NULL (RID_SVXITEMS_START + 45) +#define RID_SVXITEMS_BRUSHSTYLE_SOLID (RID_SVXITEMS_START + 46) +#define RID_SVXITEMS_BRUSHSTYLE_HORZ (RID_SVXITEMS_START + 47) +#define RID_SVXITEMS_BRUSHSTYLE_VERT (RID_SVXITEMS_START + 48) +#define RID_SVXITEMS_BRUSHSTYLE_CROSS (RID_SVXITEMS_START + 49) +#define RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS (RID_SVXITEMS_START + 50) +#define RID_SVXITEMS_BRUSHSTYLE_UPDIAG (RID_SVXITEMS_START + 51) +#define RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG (RID_SVXITEMS_START + 52) +#define RID_SVXITEMS_BRUSHSTYLE_25 (RID_SVXITEMS_START + 53) +#define RID_SVXITEMS_BRUSHSTYLE_50 (RID_SVXITEMS_START + 54) +#define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) +#define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) // enum FontFamily ------------------------------------------------------- #define RID_SVXITEMS_FONTFAMILY_BEGIN (RID_SVXITEMS_START + 100) @@ -118,23 +118,23 @@ #define RID_ATTR_TABSTOP_DEFAULTS (RID_ATTR_BEGIN + 3) #define RID_ATTR_TABSTOP_POS (RID_ATTR_BEGIN + 4) #define RID_ATTR_TABSTOP_OFFSET (RID_ATTR_BEGIN + 5) -//#define RID_ATTR_CHAR (RID_ATTR_BEGIN + 6) -//#define RID_ATTR_CHAR_FONT (RID_ATTR_BEGIN + 7) -//#define RID_ATTR_CHAR_POSTURE (RID_ATTR_BEGIN + 8) -//#define RID_ATTR_CHAR_WEIGHT (RID_ATTR_BEGIN + 9) -//#define RID_ATTR_CHAR_SHADOWED (RID_ATTR_BEGIN + 10) -//#define RID_ATTR_CHAR_WORDLINEMODE (RID_ATTR_BEGIN + 11) -//#define RID_ATTR_CHAR_CONTOUR (RID_ATTR_BEGIN + 12) -//#define RID_ATTR_CHAR_STRIKEOUT (RID_ATTR_BEGIN + 13) -//#define RID_ATTR_CHAR_UNDERLINE (RID_ATTR_BEGIN + 14) -//#define RID_ATTR_CHAR_FONTHEIGHT (RID_ATTR_BEGIN + 15) -//#define RID_ATTR_CHAR_PROPSIZE (RID_ATTR_BEGIN + 16) -//#define RID_ATTR_CHAR_COLOR (RID_ATTR_BEGIN + 17) -//#define RID_ATTR_CHAR_KERNING (RID_ATTR_BEGIN + 18) -//#define RID_ATTR_CHAR_CASEMAP (RID_ATTR_BEGIN + 19) -//#define RID_ATTR_CHAR_LANGUAGE (RID_ATTR_BEGIN + 20) -//#define RID_ATTR_CHAR_ESCAPEMENT (RID_ATTR_BEGIN + 21) -//#define RID_ATTR_CHAR_FONTLIST (RID_ATTR_BEGIN + 22) +#define RID_ATTR_CHAR (RID_ATTR_BEGIN + 6) +#define RID_ATTR_CHAR_FONT (RID_ATTR_BEGIN + 7) +#define RID_ATTR_CHAR_POSTURE (RID_ATTR_BEGIN + 8) +#define RID_ATTR_CHAR_WEIGHT (RID_ATTR_BEGIN + 9) +#define RID_ATTR_CHAR_SHADOWED (RID_ATTR_BEGIN + 10) +#define RID_ATTR_CHAR_WORDLINEMODE (RID_ATTR_BEGIN + 11) +#define RID_ATTR_CHAR_CONTOUR (RID_ATTR_BEGIN + 12) +#define RID_ATTR_CHAR_STRIKEOUT (RID_ATTR_BEGIN + 13) +#define RID_ATTR_CHAR_UNDERLINE (RID_ATTR_BEGIN + 14) +#define RID_ATTR_CHAR_FONTHEIGHT (RID_ATTR_BEGIN + 15) +#define RID_ATTR_CHAR_PROPSIZE (RID_ATTR_BEGIN + 16) +#define RID_ATTR_CHAR_COLOR (RID_ATTR_BEGIN + 17) +#define RID_ATTR_CHAR_KERNING (RID_ATTR_BEGIN + 18) +#define RID_ATTR_CHAR_CASEMAP (RID_ATTR_BEGIN + 19) +#define RID_ATTR_CHAR_LANGUAGE (RID_ATTR_BEGIN + 20) +#define RID_ATTR_CHAR_ESCAPEMENT (RID_ATTR_BEGIN + 21) +#define RID_ATTR_CHAR_FONTLIST (RID_ATTR_BEGIN + 22) #define RID_ATTR_BORDER_INNER (RID_ATTR_BEGIN + 23) #define RID_ATTR_BORDER_OUTER (RID_ATTR_BEGIN + 24) #define RID_ATTR_BORDER_SHADOW (RID_ATTR_BEGIN + 25) @@ -199,6 +199,8 @@ #define RID_ATTR_CHAR_CTL_WEIGHT (RID_ATTR_BEGIN + 896) #define RID_ATTR_CHAR_TWO_LINES (RID_ATTR_BEGIN + 897) +#define RID_ATTR_CHAR_EMPHASISMARK (RID_ATTR_BEGIN + 899) + #define RID_ATTR_PARA_SCRIPTSPACE (RID_ATTR_BEGIN + 901) #define RID_ATTR_PARA_HANGPUNCTUATION (RID_ATTR_BEGIN + 902) #define RID_ATTR_PARA_FORBIDDEN_RULES (RID_ATTR_BEGIN + 903) @@ -267,7 +269,7 @@ // Ueberlaufpruefung -------------------------------------------------------- // Resource-Id's -#define ACT_RID_SVXITEMS_END RID_SVXITEMS_CHARHIDDEN_TRUE +#define ACT_RID_SVXITEMS_END RID_SVXITEMS_BRUSH_CHAR #if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index a84360ccb8..1d39c572b8 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -45,7 +45,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <svl/lstner.hxx> -#include <svx/mutxhelp.hxx> +#include <editeng/mutxhelp.hxx> #include "svx/svxdllapi.h" #include <cppuhelper/implbase5.hxx> diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index e4b0cad4e5..c50e4d8f5c 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -127,31 +127,7 @@ extern UHashMap aSdrShapeIdentifierMap; #define E3D_INVENTOR_FLAG (0x80000000) -#include <svx/unoipset.hxx> - -/*********************************************************************** -* class SvxServiceInfoHelper * -***********************************************************************/ - -/** this class provides a basic helper for classes suporting the XServiceInfo Interface. - * - * you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo. - * you can use the static helper methods to combine your services with that of parent - * or aggregatet classes. - */ -class SVX_DLLPUBLIC SvxServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo -{ -public: - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - - // helper - static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw(); - static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq,UINT16 nServices, /* sal_Char* */... ) throw(); - static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw(); -}; +#include <editeng/unoipset.hxx> /*********************************************************************** * class SvxPropertySetInfoPool * diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index fd95b762dc..9f1f9a3f4d 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -50,13 +50,14 @@ #include <tools/gen.hxx> #include <tools/weakbase.hxx> #include <svl/lstner.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/interfacecontainer.h> #include <osl/mutex.hxx> #include "svx/svxdllapi.h" #include <rtl/ref.hxx> +#include <com/sun/star/uno/Any.hxx> #include <svx/svdouno.hxx> @@ -86,6 +87,15 @@ protected: struct SvxShapeImpl; class SvxShapeMaster; +class SvxItemPropertySet; +class SvxItemPropertySimpleEntry; +class SfxItemSet; + +void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, + const com::sun::star::uno::Any& rVal, SfxItemSet& rSet ); + +com::sun::star::uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); + // WARNING: if you update the supported interfaces, // also update SvxShape::_getTypes() @@ -324,7 +334,7 @@ private: SVX_DLLPRIVATE void impl_construct(); }; -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase { diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 1ad6e3db5c..459433a06a 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -79,9 +79,9 @@ #define _SVX_USE_UNOGLOBALS_ #include <svx/unoprov.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/unomid.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svl/itemprop.hxx> #include <svx/svxids.hrc> diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 1c0c2d0de6..35fa0fad78 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -32,7 +32,7 @@ #define SVX_UNOSHTXT_HXX #include <memory> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> #include "svx/svxdllapi.h" namespace com { namespace sun { namespace star { diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx index 9c2a153ee2..5e88f92bf9 100644 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svxerr.hxx @@ -40,7 +40,7 @@ ERRCODE_CLASS_NOTEXISTS) // moved to editeng lib -#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) +//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS (3UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) @@ -54,8 +54,8 @@ #define ERRCODE_SVX_GRAPHIC_NOTREADABLE (7UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_READ ) // moved to editeng lib -//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | \ - ERRCODE_CLASS_READ ) +//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | ERRCODE_CLASS_READ ) + #define ERRCODE_SVX_LINGU_NOLANGUAGE (9UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) #define ERRCODE_SVX_FORMS_NOIOSERVICES (10UL | ERRCODE_AREA_SVX ) diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 3f66b2ae19..5e7b2b8f93 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,23 +1,13 @@ -sx svx : sfx2 l10n connectivity xmloff linguistic jvmfwk avmedia drawinglayer NULL +sx svx : sfx2 l10n connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL sx svx usr1 - all sx_mkout NULL sx svx\inc nmake - all sx_inc NULL -sx svx\uiconfig\layout nmake - all sx_layout NULL -sx svx\prj get - all sx_prj NULL -sx svx\win\res get - all sx_wres NULL -sx svx\os2\res get - all sx_ores NULL -sx svx\unx\res get - all sx_ures NULL -sx svx\source\inc get - all sx_sinc NULL -sx svx\mac\inc get - all sx_minc NULL -sx svx\source\unodialogs get - all sx_unodialogs NULL -sx svx\source\unodialogs\inc get - all sx_unodialogs_inc NULL +sx svx\uiconfig\layout nmake - all sx_layout NULL sx svx\source\unodialogs\textconversiondlgs nmake - all sx_textconversiondlgs sx_inc NULL sx svx\sdi nmake - all sx_sdi sx_inc NULL sx svx\source\src nmake - all sx_src sx_inc sx_sdi NULL sx svx\source\intro nmake - all sx_intro sx_inc NULL sx svx\source\items nmake - all sx_items sx_inc sx_sdi NULL sx svx\source\xoutdev nmake - all sx_xout sx_items sx_inc NULL -sx svx\source\editeng nmake - all sx_eeng sx_inc NULL -sx svx\source\outliner nmake - all sx_outl sx_inc NULL sx svx\source\svdraw nmake - all sx_draw sx_inc NULL sx svx\source\sdr\attribute nmake - all sx_attribute sx_inc NULL sx svx\source\sdr\primitive2d nmake - all sx_primitive2d sx_inc NULL @@ -37,15 +27,13 @@ sx svx\source\form nmake - all sx_form sx_sdi sx_inc NULL sx svx\source\fmcomp nmake - all sx_fmcmp sx_sdi sx_inc NULL sx svx\source\tbxctrls nmake - all sx_tbxc sx_inc NULL sx svx\source\options nmake - all sx_opt sx_inc NULL -sx svx\source\dialog nmake - all sx_dlg sx_inc NULL -sx svx\source\svrtf nmake - all sx_rtf sx_inc NULL +sx svx\source\dialog nmake - all sx_dlg sx_inc NULL sx svx\source\unodraw nmake - all sx_undrw sx_inc NULL -sx svx\source\unoedit nmake - all sx_unedt sx_inc NULL sx svx\source\unogallery nmake - all sx_ungal sx_inc NULL sx svx\source\gallery2 nmake - all sx_gall sx_inc NULL sx svx\source\xml nmake - all sx_xml sx_inc NULL sx svx\source\accessibility nmake - all sx_accessibility sx_inc NULL sx svx\source\customshapes nmake - all sx_customshapes sx_inc NULL sx svx\source\toolbars nmake - all sx_toolbars sx_inc NULL -sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL +sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_opt sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL sx svx\source\gengal nmake - all sx_gengal sx_util NULL diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index e3826708c1..89ea36ef7a 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6870,31 +6870,6 @@ SfxBoolItem LastRecord SID_FM_RECORD_LAST ] //-------------------------------------------------------------------------- -SfxVoidItem LaunchStarImage SID_SIM_START -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_APPLICATION; -] - -//-------------------------------------------------------------------------- SfxVoidItem LeaveFMCreateMode SID_FM_LEAVE_CREATE (SfxBoolItem Leave SID_FM_LEAVE_CREATE) [ diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc index a1c7ae70b9..b59c064612 100644 --- a/svx/sdi/svxslots.hrc +++ b/svx/sdi/svxslots.hrc @@ -28,7 +28,9 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> +#include <sfx2/sfxsids.hrc> +#include <editeng/memberids.hrc> +#include <editeng/editids.hrc> #include <svx/svxids.hrc> #include <svx/unomid.hxx> -#include <sfx2/sfxsids.hrc> diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 0ed80a5af8..44ed58e7af 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -37,8 +37,8 @@ // //------------------------------------------------------------------------ #include <svl/itemset.hxx> -#include <svx/editdata.hxx> -#include <svx/outliner.hxx> +#include <editeng/editdata.hxx> +#include <editeng/outliner.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 83350ae116..10c9628c09 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -35,7 +35,7 @@ #include <svl/lstner.hxx> #include <memory> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> class SdrObject; class SdrView; diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 49287b16b8..22a56c9c6b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -51,7 +51,7 @@ #include <vcl/svapp.hxx> #include <svx/frmsel.hxx> #include <svx/dialmgr.hxx> -#include "unolingu.hxx" +#include "editeng/unolingu.hxx" #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 14ec72bfb3..df9a6c1179 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -48,9 +48,9 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/XText.hpp> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <rtl/ref.hxx> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 59a67e3c2f..f1524377d9 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -32,16 +32,16 @@ #include "precompiled_svx.hxx" #include "AccessibleTextEventQueue.hxx" #include <svx/unoshape.hxx> -#include "unolingu.hxx" -#include <svx/unotext.hxx> +#include "editeng/unolingu.hxx" +#include <editeng/unotext.hxx> -#include "unoedhlp.hxx" -#include "unopracc.hxx" +#include "editeng/unoedhlp.hxx" +#include "editeng/unopracc.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editdata.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> namespace accessibility { diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 6217cf9caf..0351c724c9 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -70,18 +70,18 @@ #include "AccessibleTextEventQueue.hxx" #include <svx/AccessibleTextHelper.hxx> #include <svx/unoshape.hxx> -#include "unolingu.hxx" -#include <svx/unotext.hxx> +#include "editeng/unolingu.hxx" +#include <editeng/unotext.hxx> -#include "unoedhlp.hxx" -#include "unopracc.hxx" -#include "AccessibleParaManager.hxx" -#include "AccessibleEditableTextPara.hxx" +#include "editeng/unoedhlp.hxx" +#include "editeng/unopracc.hxx" +#include "editeng/AccessibleParaManager.hxx" +#include "editeng/AccessibleEditableTextPara.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editdata.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index b28430befa..02bfd499d8 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -33,21 +33,16 @@ #include <svx/IAccessibleViewForwarderListener.hxx> #include <svx/IAccessibleParent.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> -#include <svx/AccessibleContextBase.hxx> +#include <editeng/AccessibleContextBase.hxx> #include <cppuhelper/compbase2.hxx> #include <vos/mutex.hxx> #include <vector> +#include <memory> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/document/XEventListener.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_XSELECTIONCHANGELISTENER_HPP_ #include <com/sun/star/view/XSelectionChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBLE_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif -#include <vector> - using namespace ::com::sun::star; diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk index 8b1802bf1a..053cb6c107 100755 --- a/svx/source/accessibility/makefile.mk +++ b/svx/source/accessibility/makefile.mk @@ -33,7 +33,6 @@ PRJ=..$/.. PRJNAME=svx TARGET=accessibility -LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- @@ -43,21 +42,13 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/AccessibleStringWrap.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ +SLOFILES= \ $(SLO)$/charmapacc.obj \ $(SLO)$/svxrectctaccessiblecontext.obj \ $(SLO)$/GraphCtlAccessibleContext.obj \ $(SLO)$/ChildrenManager.obj \ $(SLO)$/ChildrenManagerImpl.obj \ $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleContextBase.obj \ - $(SLO)$/AccessibleComponentBase.obj \ - $(SLO)$/AccessibleSelectionBase.obj \ $(SLO)$/AccessibleShape.obj \ $(SLO)$/AccessibleGraphicShape.obj \ $(SLO)$/AccessibleOLEShape.obj \ @@ -66,18 +57,12 @@ LIB2OBJFILES= \ $(SLO)$/AccessibleTextHelper.obj \ $(SLO)$/AccessibleEmptyEditSource.obj \ $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/AccessibleStaticTextBase.obj \ - $(SLO)$/AccessibleParaManager.obj \ - $(SLO)$/AccessibleEditableTextPara.obj \ - $(SLO)$/AccessibleImageBullet.obj \ $(SLO)$/ShapeTypeHandler.obj \ $(SLO)$/SvxShapeTypes.obj \ $(SLO)$/AccessibleControlShape.obj \ $(SLO)$/DGColorNameLookUp.obj \ $(SLO)$/AccessibleFrameSelector.obj -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - SRS2NAME = accessibility SRC2FILES = accessibility.src diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 1ce09428f0..f9da96d8fa 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -45,8 +45,8 @@ #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> #include <svx/svdorect.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> #include <svx/svdoutl.hxx> #include <svl/itemset.hxx> #include <svx/svdopath.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 1769009824..d6746aef94 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -43,19 +43,19 @@ #include <vcl/virdev.hxx> #include <svditer.hxx> #include <vcl/metric.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> -#include <fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/charscaleitem.hxx> #include "EnhancedCustomShapeTypeNames.hxx" #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> -#include <svx/outliner.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/editeng.hxx> +#include <editeng/outliner.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editeng.hxx> #include <svx/svdmodel.hxx> #include <vector> #include <numeric> diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 7a695c550c..0191e27ef9 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -39,7 +39,7 @@ #include <svtools/txtcmp.hxx> #include <unotools/charclass.hxx> // INCLUDE ------------------------------------------------------------------- -#include <unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dialmgr.hxx> #include "ctredlin.hrc" #include <svx/ctredlin.hxx> diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 565378cc68..502b5097ec 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -36,6 +36,7 @@ #include "dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> +#include <svl/intitem.hxx> // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 0e8786c272..bf9cbb2699 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -49,7 +49,7 @@ #include <svx/dialogs.hrc> #include "fontwork.hrc" #include <svx/fontwork.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 2fe4d8187d..11aa7f6149 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -34,7 +34,7 @@ #include <math.h> #include <vcl/outdev.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> // ---------------------------------------------------------------------------- diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 713a29eb3b..8bc78b5ab4 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -42,17 +42,7 @@ #include <svx/dialogs.hrc> #include "hdft.hrc" - - - - - - - - - - - +#include <svl/intitem.hxx> #define _SVX_HDFT_CXX @@ -63,12 +53,12 @@ #include <svx/dialmgr.hxx> #include "htmlmode.hxx" -#include <svx/brshitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/boxitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 89ed523ac6..1c2a9b2002 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -44,8 +44,8 @@ #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <i18npool/lang.h> -#include <svx/scripttypeitem.hxx> -#include <unolingu.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/unolingu.hxx> #include <svx/langbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 0cd91e7b1f..d80c1cb1d0 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -60,7 +60,6 @@ SRC1FILES = \ imapdlg.src \ langbox.src \ language.src \ - lingu.src \ passwd.src \ prtqry.src \ rubydialog.src\ @@ -81,11 +80,9 @@ LIB1OBJFILES= \ $(SLO)$/dialmgr.obj\ $(SLO)$/dlgutil.obj \ $(SLO)$/framelink.obj\ - $(SLO)$/hangulhanja.obj \ $(SLO)$/langbox.obj \ $(SLO)$/opengrf.obj \ $(SLO)$/simptabl.obj \ - $(SLO)$/splwrap.obj \ $(SLO)$/svxdlg.obj \ $(SLO)$/stddlg.obj \ @@ -131,7 +128,6 @@ LIB2OBJFILES= \ $(SLO)$/srchdlg.obj \ $(SLO)$/strarray.obj \ $(SLO)$/svxbmpnumvalueset.obj\ - $(SLO)$/svxbox.obj \ $(SLO)$/svxgrahicitem.obj \ $(SLO)$/svxruler.obj \ $(SLO)$/swframeexample.obj \ diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index 6a9834a1ef..2b09b4a43d 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -126,8 +126,6 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog() } -GraphicFilter* GetGrfFilter(); - short SvxOpenGraphicDialog::Execute() { USHORT nImpRet; @@ -138,7 +136,7 @@ short SvxOpenGraphicDialog::Execute() { if( GetPath().Len() ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aObj( GetPath() ); // check whether we can load the graphic diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index a7cb2f0c69..3c1a401c51 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -35,10 +35,10 @@ #include <vcl/bitmap.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/pageitem.hxx> #include <svx/pagectrl.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include <algorithm> diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index d81ec83ceb..18c0e3828d 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -42,10 +42,10 @@ #include <svx/dialogs.hrc> #include <svx/ruler.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/tstpitem.hxx> -#include "protitem.hxx" +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/tstpitem.hxx> +#include "editeng/protitem.hxx" #include "rlrcitem.hxx" #include "rulritem.hxx" #include <svl/eitem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 88f3e983ad..e16d6ecd15 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> #include <svl/itempool.hxx> +#include <svl/intitem.hxx> #include <sfx2/app.hxx> #include <toolkit/unohlp.hxx> @@ -72,7 +73,7 @@ #include "srchctrl.hxx" #include <svx/dialmgr.hxx> #include "dlgutil.hxx" -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 10a572d43a..63a0c34e95 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -41,17 +41,17 @@ #ifndef _SVX_HELPID_HRC #include <helpid.hrc> #endif -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <gallery.hxx> #include <svl/urihelper.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> -#include <flstitem.hxx> +#include <editeng/flstitem.hxx> #include <dlgutil.hxx> #ifndef _XTABLE_HXX //autogen @@ -62,7 +62,7 @@ #include <htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> -#include <unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 50c3b5a64d..2af235bafc 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -52,9 +52,9 @@ #include <svx/ruler.hxx> #include "rlrcitem.hxx" #include "rulritem.hxx" -#include <svx/tstpitem.hxx> -#include <svx/lrspitem.hxx> -#include "protitem.hxx" +#include <editeng/tstpitem.hxx> +#include <editeng/lrspitem.hxx> +#include "editeng/protitem.hxx" #ifndef _APP_HXX #include <vcl/svapp.hxx> #endif diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index 920b98efe4..819e5e3cdc 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -34,7 +34,7 @@ #include <svx/deflt3d.hxx> #include <svx/cube3d.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> /************************************************************************* diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index a564149499..e02504a570 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/e3dundo.hxx> #include <svx/svdmodel.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/view3d.hxx> #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index bfd0ed8d6b..79e9aa9aed 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -49,9 +49,9 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/polysc3d.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/style.hxx> - +#include <dlgutil.hxx> #include <dlgutil.hxx> #include <svx/dialmgr.hxx> @@ -60,7 +60,7 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <gallery.hxx> diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 77dd79673b..0a64ffcc31 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -60,7 +60,7 @@ #include <tools/poly.hxx> #include <tools/b3dtrans.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> @@ -70,7 +70,7 @@ #include <svx/svx3ditems.hxx> #include <svl/whiter.hxx> #include <svtools/colorcfg.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xgrscit.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/e3dproperties.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 05de87c705..97a9f964fd 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -45,7 +45,7 @@ #include <svx/e3dundo.hxx> #include <svx/svdtrans.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 06eb512996..43e10a61a8 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -41,7 +41,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/xtable.hxx> #include <svx/svdview.hxx> #include <svx/dialogs.hrc> @@ -697,7 +697,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, |* 3D-Konvertierung zu Extrude ausfuehren |* \************************************************************************/ -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) { diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 9e33b281f2..76cb45f6a4 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -44,7 +44,7 @@ #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> #include <svx/e3ditem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/lathe3d.hxx> #include <svx/sphere3d.hxx> #include <svx/extrud3d.hxx> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 106f081418..91d285c7ee 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -35,7 +35,7 @@ #include "fmobj.hxx" #include "fmprop.hrc" #include "fmvwimp.hxx" -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svx/svdovirt.hxx> /** === begin UNO includes === **/ diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 32a245120f..08eec2a203 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -42,7 +42,7 @@ #ifndef _SVX_PARAGRPH_HXX //#include "paragrph.hxx" #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #ifndef _SVX_TABSTPGE_HXX //#include "tabstpge.hxx" #endif diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 2506e05cca..16da108518 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -36,14 +36,14 @@ #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" -#include "svx/crsditem.hxx" +#include "editeng/crsditem.hxx" #include "svx/dialmgr.hxx" -#include "svx/editeng.hxx" -#include "svx/eeitem.hxx" +#include "editeng/editeng.hxx" +#include "editeng/eeitem.hxx" #include "svx/fmglob.hxx" -#include "svx/scriptspaceitem.hxx" +#include "editeng/scriptspaceitem.hxx" #include "svx/svxids.hrc" -#include "svx/udlnitem.hxx" +#include "editeng/udlnitem.hxx" /** === begin UNO includes === **/ #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 5a8baa8086..56e7108986 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -34,34 +34,35 @@ #include <sfx2/msg.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/postitem.hxx> #ifndef _SVX_CLIPBOARDCTL_HXX_ #include "clipfmtitem.hxx" #endif -#include <svx/fhgtitem.hxx> -#include "fontitem.hxx" -#include <svx/charreliefitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/colritem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/charscaleitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/langitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/charreliefitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/adjitem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif +#include <editeng/memberids.hrc> #define SFX_TYPEMAP #include "svxslots.hxx" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 8d4a38aa14..a99723633a 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -44,8 +44,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/sfxsids.hrc> -#include "svx/impgrf.hxx" -#include <svx/brshitem.hxx> +#include "svtools/filter.hxx" +#include <editeng/brshitem.hxx> #include "helpid.hrc" #include "gallery.hxx" #include "galobj.hxx" @@ -1154,7 +1154,7 @@ String GalleryBrowser2::GetFilterName() const if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL ); sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 9f751c98fa..03e949b58e 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -40,12 +40,12 @@ #include "galtheme.hxx" #include "svx/galmisc.hxx" #include "galctrl.hxx" -#include "AccessibleStringWrap.hxx" -#include <svx/svxfont.hxx> +#include "editeng/AccessibleStringWrap.hxx" +#include <editeng/svxfont.hxx> #include "galobj.hxx" #include <avmedia/mediawindow.hxx> #include "gallery.hrc" -#include <svx/impgrf.hxx> +#include <svtools/filter.hxx> // ----------- // - Defines - @@ -97,7 +97,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) } else { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress aProgress( pFilter ); if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) bRet = false; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 0353af86ef..2dbd57b5f1 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -45,7 +45,7 @@ #include <avmedia/mediawindow.hxx> #include <vcl/svapp.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include <svx/svdpage.hxx> #include <svx/svdograf.hxx> #include <svx/fmmodel.hxx> @@ -129,7 +129,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, if( pIStm ) { - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL; USHORT nFormat; diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 5d3ab50217..7eec671391 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -33,7 +33,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/tabdlg.hxx> -#include <flstitem.hxx> +#include <editeng/flstitem.hxx> //........................................................................ namespace svx diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index fd14d1c7e4..a0806ffd01 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -35,7 +35,7 @@ #include <vcl/image.hxx> #include <svx/frmsel.hxx> #include <svx/framelinkarray.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> namespace svx { diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 4ce57b6603..418effb7e0 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -53,7 +53,7 @@ #include <svx/algitem.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/unomid.hxx> using namespace ::rtl; diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index c8bf3195a0..c18c3b64de 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -34,7 +34,7 @@ #include <tools/stream.hxx> #include <svx/grfcrop.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <com/sun/star/text/GraphicCrop.hpp> using namespace ::com::sun::star; diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index 0c2e4b7ff5..8b6b023d40 100644 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk @@ -50,7 +50,6 @@ LIBTARGET=NO SRS1NAME=svxitems SRC1FILES = \ svxerr.src \ - page.src \ svxitems.src LIB1TARGET= $(SLB)$/$(TARGET)-core.lib diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 5268071f9c..e5a3963677 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -36,11 +36,13 @@ #include <svx/pageitem.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/unomid.hxx> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/BreakType.hpp> #include <svl/itemset.hxx> +#include <svx/svxitems.hrc> +#include <svx/dialmgr.hxx> using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index c694ab4863..1bdffe36ba 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -35,7 +35,9 @@ #define _SVX_POSTATTR_CXX #include "postattr.hxx" -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> +#include <svx/svxitems.hrc> +#include <svx/dialmgr.hxx> // ----------------------------------------------------------------------- diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 84ca05c9b6..66ea4f55b7 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -31,6 +31,8 @@ #define __RSC #include "svxerr.hxx" #include <svx/dialogs.hrc> +#include <editeng/editerr.hxx> + // pragma ---------------------------------------------------------------- // Error-Context --------------------------------------------------------- diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index c7a35f625b..7f38844ddc 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -31,15 +31,6 @@ #include <svx/svxitems.hrc> // pragma ------------------------------------------------------------------- - // Value-Strings ------------------------------------------------------------ -String RID_SVXITEMS_TRUE -{ - Text [ en-US ] = "True" ; -}; -String RID_SVXITEMS_FALSE -{ - Text [ en-US ] = "False" ; -}; // Extras ------------------------------------------------------------------- String RID_SVXITEMS_EXTRAS_CHARCOLOR { @@ -110,56 +101,6 @@ String RID_SVXITEMS_SEARCHAPP_BASE { Text = "StarBase" ; }; - // enum SvxBreak ------------------------------------------------------------ -String RID_SVXITEMS_BREAK_NONE -{ - Text [ en-US ] = "No break" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BEFORE -{ - Text [ en-US ] = "Break before new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_AFTER -{ - Text [ en-US ] = "Break after new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BOTH -{ - Text [ en-US ] = "Break before and after new column" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BEFORE -{ - Text [ en-US ] = "Break before new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_AFTER -{ - Text [ en-US ] = "Break after new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BOTH -{ - Text [ en-US ] = "Break before and after new page" ; -}; - // enum SvxShadowLocation --------------------------------------------------- -String RID_SVXITEMS_SHADOW_NONE -{ - Text [ en-US ] = "No Shadow" ; -}; -String RID_SVXITEMS_SHADOW_TOPLEFT -{ - Text [ en-US ] = "Shadow top left" ; -}; -String RID_SVXITEMS_SHADOW_TOPRIGHT -{ - Text [ en-US ] = "Shadow top right" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMLEFT -{ - Text [ en-US ] = "Shadow bottom left" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMRIGHT -{ - Text [ en-US ] = "Shadow bottom right" ; -}; // enum BrushStyle ---------------------------------------------------------- String RID_SVXITEMS_BRUSHSTYLE_NULL { @@ -209,460 +150,6 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP { Text [ en-US ] = "Image" ; }; - // enum ColorName ----------------------------------------------------------- -String RID_SVXITEMS_COLOR -{ - Text [ en-US ] = "Color " ; -}; -String RID_SVXITEMS_COLOR_BLACK -{ - Text [ en-US ] = "Black" ; -}; -String RID_SVXITEMS_COLOR_BLUE -{ - Text [ en-US ] = "Blue" ; -}; -String RID_SVXITEMS_COLOR_GREEN -{ - Text [ en-US ] = "Green" ; -}; -String RID_SVXITEMS_COLOR_CYAN -{ - Text [ en-US ] = "Cyan" ; -}; -String RID_SVXITEMS_COLOR_RED -{ - Text [ en-US ] = "Red" ; -}; -String RID_SVXITEMS_COLOR_MAGENTA -{ - Text [ en-US ] = "Magenta" ; -}; -String RID_SVXITEMS_COLOR_BROWN -{ - Text [ en-US ] = "Brown" ; -}; -String RID_SVXITEMS_COLOR_GRAY -{ - Text [ en-US ] = "Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGRAY -{ - Text [ en-US ] = "Light Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTBLUE -{ - Text [ en-US ] = "Light Blue" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGREEN -{ - Text [ en-US ] = "Light Green" ; -}; -String RID_SVXITEMS_COLOR_LIGHTCYAN -{ - Text [ en-US ] = "Light Cyan" ; -}; -String RID_SVXITEMS_COLOR_LIGHTRED -{ - Text [ en-US ] = "Light Red" ; -}; -String RID_SVXITEMS_COLOR_LIGHTMAGENTA -{ - Text [ en-US ] = "Light Magenta" ; -}; -String RID_SVXITEMS_COLOR_YELLOW -{ - Text [ en-US ] = "Yellow" ; -}; -String RID_SVXITEMS_COLOR_WHITE -{ - Text [ en-US ] = "White" ; -}; -String RID_SVXITEMS_COLOR_MENUBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_MENUBARTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENU -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENUTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWWORKSPACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DFACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DSHADOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_SCROLLBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELD -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELDTEXT -{ - Text = "?" ; -}; - // enum FontItalic ------------------------------------------------------- -String RID_SVXITEMS_ITALIC_NONE -{ - Text [ en-US ] = "Not Italic" ; -}; -String RID_SVXITEMS_ITALIC_OBLIQUE -{ - Text [ en-US ] = "Oblique italic" ; -}; -String RID_SVXITEMS_ITALIC_NORMAL -{ - Text [ en-US ] = "Italic" ; -}; - // enum FontWeight ------------------------------------------------------- -String RID_SVXITEMS_WEIGHT_DONTKNOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_WEIGHT_THIN -{ - Text [ en-US ] = "thin" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRALIGHT -{ - Text [ en-US ] = "ultra thin" ; -}; -String RID_SVXITEMS_WEIGHT_LIGHT -{ - Text [ en-US ] = "light" ; -}; -String RID_SVXITEMS_WEIGHT_SEMILIGHT -{ - Text [ en-US ] = "semi light" ; -}; -String RID_SVXITEMS_WEIGHT_NORMAL -{ - Text [ en-US ] = "normal" ; -}; -String RID_SVXITEMS_WEIGHT_MEDIUM -{ - Text [ en-US ] = "medium" ; -}; -String RID_SVXITEMS_WEIGHT_SEMIBOLD -{ - Text [ en-US ] = "semi bold" ; -}; -String RID_SVXITEMS_WEIGHT_BOLD -{ - Text [ en-US ] = "bold" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRABOLD -{ - Text [ en-US ] = "ultra bold" ; -}; -String RID_SVXITEMS_WEIGHT_BLACK -{ - Text [ en-US ] = "black" ; -}; - // enum FontUnderline - used for underline ------------------------------ -String RID_SVXITEMS_UL_NONE -{ - Text [ en-US ] = "No underline" ; -}; -String RID_SVXITEMS_UL_SINGLE -{ - Text [ en-US ] = "Single underline" ; -}; -String RID_SVXITEMS_UL_DOUBLE -{ - Text [ en-US ] = "Double underline" ; -}; -String RID_SVXITEMS_UL_DOTTED -{ - Text [ en-US ] = "Dotted underline" ; -}; -String RID_SVXITEMS_UL_DONTKNOW -{ - Text [ en-US ] = "Underline"; -}; -String RID_SVXITEMS_UL_DASH -{ - Text [ en-US ] = "Underline (dashes)"; -}; -String RID_SVXITEMS_UL_LONGDASH -{ - Text [ en-US ] = "Underline (long dashes)"; -}; -String RID_SVXITEMS_UL_DASHDOT -{ - Text [ en-US ] = "Underline (dot dash)"; -}; -String RID_SVXITEMS_UL_DASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash)"; -}; -String RID_SVXITEMS_UL_SMALLWAVE -{ - Text [ en-US ] = "Underline (small wave)"; -}; -String RID_SVXITEMS_UL_WAVE -{ - Text [ en-US ] = "Underline (Wave)"; -}; -String RID_SVXITEMS_UL_DOUBLEWAVE -{ - Text [ en-US ] = "Underline (Double wave)"; -}; -String RID_SVXITEMS_UL_BOLD -{ - Text [ en-US ] = "Underlined (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted underline (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASH -{ - Text [ en-US ] = "Underline (Dash bold)"; -}; -String RID_SVXITEMS_UL_BOLDLONGDASH -{ - Text [ en-US ] = "Underline (long dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOT -{ - Text [ en-US ] = "Underline (dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDWAVE -{ - Text [ en-US ] = "Underline (wave, bold)"; -}; - // enum FontUnderline - used for overline ------------------------------- -String RID_SVXITEMS_OL_NONE -{ - Text [ en-US ] = "No overline" ; -}; -String RID_SVXITEMS_OL_SINGLE -{ - Text [ en-US ] = "Single overline" ; -}; -String RID_SVXITEMS_OL_DOUBLE -{ - Text [ en-US ] = "Double overline" ; -}; -String RID_SVXITEMS_OL_DOTTED -{ - Text [ en-US ] = "Dotted overline" ; -}; -String RID_SVXITEMS_OL_DONTKNOW -{ - Text [ en-US ] = "Overline"; -}; -String RID_SVXITEMS_OL_DASH -{ - Text [ en-US ] = "Overline (dashes)"; -}; -String RID_SVXITEMS_OL_LONGDASH -{ - Text [ en-US ] = "Overline (long dashes)"; -}; -String RID_SVXITEMS_OL_DASHDOT -{ - Text [ en-US ] = "Overline (dot dash)"; -}; -String RID_SVXITEMS_OL_DASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash)"; -}; -String RID_SVXITEMS_OL_SMALLWAVE -{ - Text [ en-US ] = "Overline (small wave)"; -}; -String RID_SVXITEMS_OL_WAVE -{ - Text [ en-US ] = "Overline (Wave)"; -}; -String RID_SVXITEMS_OL_DOUBLEWAVE -{ - Text [ en-US ] = "Overline (Double wave)"; -}; -String RID_SVXITEMS_OL_BOLD -{ - Text [ en-US ] = "Overlined (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted overline (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASH -{ - Text [ en-US ] = "Overline (Dash bold)"; -}; -String RID_SVXITEMS_OL_BOLDLONGDASH -{ - Text [ en-US ] = "Overline (long dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOT -{ - Text [ en-US ] = "Overline (dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDWAVE -{ - Text [ en-US ] = "Overline (wave, bold)"; -}; - // enum FontStrikeout ---------------------------------------------------- -String RID_SVXITEMS_STRIKEOUT_NONE -{ - Text [ en-US ] = "No strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_SINGLE -{ - Text [ en-US ] = "Single strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_DOUBLE -{ - Text [ en-US ] = "Double strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_BOLD -{ - Text [ en-US ] = "Bold strikethrough"; -}; -String RID_SVXITEMS_STRIKEOUT_SLASH -{ - Text [ en-US ] = "Strike through with slash"; -}; -String RID_SVXITEMS_STRIKEOUT_X -{ - Text [ en-US ] = "Strike through with Xes"; -}; - // enum CASEMAP ---------------------------------------------------------- -String RID_SVXITEMS_CASEMAP_NONE -{ - Text [ en-US ] = "None" ; -}; -String RID_SVXITEMS_CASEMAP_VERSALIEN -{ - Text [ en-US ] = "Caps" ; -}; -String RID_SVXITEMS_CASEMAP_GEMEINE -{ - Text [ en-US ] = "Lowercase" ; -}; -String RID_SVXITEMS_CASEMAP_TITEL -{ - Text [ en-US ] = "Title" ; -}; -String RID_SVXITEMS_CASEMAP_KAPITAELCHEN -{ - Text [ en-US ] = "Small caps" ; -}; - // enum ESCAPEMENT ------------------------------------------------------- -String RID_SVXITEMS_ESCAPEMENT_OFF -{ - Text [ en-US ] = "Normal position" ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUPER -{ - Text [ en-US ] = "Superscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUB -{ - Text [ en-US ] = "Subscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_AUTO -{ - Text [ en-US ] = "automatic" ; -}; - // enum SvxAdjust ----------------------------------------------------------- -String RID_SVXITEMS_ADJUST_LEFT -{ - Text [ en-US ] = "Align left" ; -}; -String RID_SVXITEMS_ADJUST_RIGHT -{ - Text [ en-US ] = "Align right" ; -}; -String RID_SVXITEMS_ADJUST_BLOCK -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SVXITEMS_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_ADJUST_BLOCKLINE -{ - Text [ en-US ] = "Justify" ; -}; - // enum SvxTabAdjust -------------------------------------------------------- -String RID_SVXITEMS_TAB_DECIMAL_CHAR -{ - Text [ en-US ] = "Decimal Symbol:" ; -}; -String RID_SVXITEMS_TAB_FILL_CHAR -{ - Text [ en-US ] = "Fill character:" ; -}; -String RID_SVXITEMS_TAB_ADJUST_LEFT -{ - Text [ en-US ] = "Left" ; -}; -String RID_SVXITEMS_TAB_ADJUST_RIGHT -{ - Text [ en-US ] = "Right" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DECIMAL -{ - Text [ en-US ] = "Decimal" ; -}; -String RID_SVXITEMS_TAB_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_TAB_ADJUST_DEFAULT -{ - Text [ en-US ] = "Default" ; -}; // Typ-Namen der SlotIds ---------------------------------------------------- String RID_ATTR_ZOOM { @@ -1032,94 +519,6 @@ String RID_PARA_VERTALIGN { Text [ en-US ] = "Vertical text alignment"; }; -String RID_SINGLE_LINE0 -{ - Text [ en-US ] = "Single, fine lines" ; -}; -String RID_SINGLE_LINE1 -{ - Text [ en-US ] = "Single, thin" ; -}; -String RID_SINGLE_LINE2 -{ - Text [ en-US ] = "Single, thick" ; -}; -String RID_SINGLE_LINE3 -{ - Text [ en-US ] = "Single, very thick" ; -}; -String RID_SINGLE_LINE4 -{ - Text [ en-US ] = "Single, bold" ; -}; -String RID_DOUBLE_LINE0 -{ - Text [ en-US ] = "Double, fine lines, spacing: small" ; -}; -String RID_DOUBLE_LINE1 -{ - Text [ en-US ] = "Double, fine line, spacing: large" ; -}; -String RID_DOUBLE_LINE2 -{ - Text [ en-US ] = "Double, thin, spacing: small" ; -}; -String RID_DOUBLE_LINE3 -{ - Text [ en-US ] = "Double, thick, spacing: large" ; -}; -String RID_DOUBLE_LINE4 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: thin, spacing: large" ; -}; -String RID_DOUBLE_LINE5 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: thick, spacing: large" ; -}; -String RID_DOUBLE_LINE6 -{ - Text [ en-US ] = "Double, inside: fine lines, outside: very thick, spacing: large" ; -}; -String RID_DOUBLE_LINE7 -{ - Text [ en-US ] = "Double, inside: thin, outside: thick, spacing: large" ; -}; -String RID_DOUBLE_LINE8 -{ - Text [ en-US ] = "Double, inside: thick, outside: thin, spacing: small" ; -}; -String RID_DOUBLE_LINE9 -{ - Text [ en-US ] = "Double, inside: thick, outside: very thick, spacing: large" ; -}; -String RID_DOUBLE_LINE10 -{ - Text [ en-US ] = "Double, inside: very thick, outside: thick, Spacing: large" ; -}; -String RID_SVXITEMS_METRIC_MM -{ - Text = "mm" ; -}; -String RID_SVXITEMS_METRIC_CM -{ - Text = "cm" ; -}; -String RID_SVXITEMS_METRIC_INCH -{ - Text = "inch" ; -}; -String RID_SVXITEMS_METRIC_POINT -{ - Text = "pt" ; -}; -String RID_SVXITEMS_METRIC_TWIP -{ - Text = "twip" ; -}; -String RID_SVXITEMS_METRIC_PIXEL -{ - Text = "pixel" ; -}; String RID_SVXITEMS_HORJUST_STANDARD { Text [ en-US ] = "Horizontal alignment default" ; @@ -1177,126 +576,6 @@ String RID_SVXITEMS_ORI_STACKED Text [ en-US ] = "Stacked" ; }; // GetValueText von BoolItems -String RID_SVXITEMS_SHADOWED_TRUE -{ - Text [ en-US ] = "Shadowed" ; -}; -String RID_SVXITEMS_SHADOWED_FALSE -{ - Text [ en-US ] = "Not Shadowed" ; -}; -String RID_SVXITEMS_BLINK_TRUE -{ - Text [ en-US ] = "Blinking" ; -}; -String RID_SVXITEMS_BLINK_FALSE -{ - Text [ en-US ] = "Not Blinking" ; -}; -String RID_SVXITEMS_AUTOKERN_TRUE -{ - Text [ en-US ] = "Pair Kerning" ; -}; -String RID_SVXITEMS_AUTOKERN_FALSE -{ - Text [ en-US ] = "No pair kerning" ; -}; -String RID_SVXITEMS_WORDLINE_TRUE -{ - Text [ en-US ] = "Individual words" ; -}; -String RID_SVXITEMS_WORDLINE_FALSE -{ - Text [ en-US ] = "Not Words Only" ; -}; -String RID_SVXITEMS_CONTOUR_TRUE -{ - Text [ en-US ] = "Outline" ; -}; -String RID_SVXITEMS_CONTOUR_FALSE -{ - Text [ en-US ] = "No Outline" ; -}; -String RID_SVXITEMS_NOLINEBREAK_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOLINEBREAK_FALSE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_TRUE -{ - Text = "?" ; -}; -String RID_SVXITEMS_NOHYPHEN_FALSE -{ - Text = "?" ; -}; -String RID_SVXITEMS_PRINT_TRUE -{ - Text [ en-US ] = "Print" ; -}; -String RID_SVXITEMS_PRINT_FALSE -{ - Text [ en-US ] = "Don't print" ; -}; -String RID_SVXITEMS_OPAQUE_TRUE -{ - Text [ en-US ] = "Opaque" ; -}; -String RID_SVXITEMS_OPAQUE_FALSE -{ - Text [ en-US ] = "Not Opaque" ; -}; -String RID_SVXITEMS_FMTKEEP_TRUE -{ - Text [ en-US ] = "Keep with next paragraph" ; -}; -String RID_SVXITEMS_FMTKEEP_FALSE -{ - Text [ en-US ] = "Don't Keep Paragraphs Together" ; -}; -String RID_SVXITEMS_FMTSPLIT_TRUE -{ - Text [ en-US ] = "Split paragraph" ; -}; -String RID_SVXITEMS_FMTSPLIT_FALSE -{ - Text [ en-US ] = "Don't split paragraph" ; -}; -String RID_SVXITEMS_PROT_CONTENT_TRUE -{ - Text [ en-US ] = "Contents protected" ; -}; -String RID_SVXITEMS_PROT_CONTENT_FALSE -{ - Text [ en-US ] = "Contents not protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_TRUE -{ - Text [ en-US ] = "Size protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_FALSE -{ - Text [ en-US ] = "Size not protected" ; -}; -String RID_SVXITEMS_PROT_POS_TRUE -{ - Text [ en-US ] = "Position protected" ; -}; -String RID_SVXITEMS_PROT_POS_FALSE -{ - Text [ en-US ] = "Position not protected" ; -}; -String RID_SVXITEMS_TRANSPARENT_TRUE -{ - Text [ en-US ] = "Transparent" ; -}; -String RID_SVXITEMS_TRANSPARENT_FALSE -{ - Text [ en-US ] = "Not Transparent" ; -}; String RID_SVXITEMS_BOXINF_TABLE_TRUE { Text [ en-US ] = "Table" ; @@ -1321,22 +600,6 @@ String RID_SVXITEMS_BOXINF_MDIST_FALSE { Text [ en-US ] = "Allowed to fall short of spacing interval" ; }; -String RID_SVXITEMS_HYPHEN_TRUE -{ - Text [ en-US ] = "Hyphenation" ; -}; -String RID_SVXITEMS_HYPHEN_FALSE -{ - Text [ en-US ] = "No hyphenation" ; -}; -String RID_SVXITEMS_PAGE_END_TRUE -{ - Text [ en-US ] = "Page End" ; -}; -String RID_SVXITEMS_PAGE_END_FALSE -{ - Text [ en-US ] = "No Page End" ; -}; String RID_SVXITEMS_MARGIN_LEFT { Text [ en-US ] = "Left margin: " ; @@ -1353,66 +616,6 @@ String RID_SVXITEMS_MARGIN_BOTTOM { Text [ en-US ] = "Bottom margin: " ; }; -String RID_SVXITEMS_SIZE_WIDTH -{ - Text [ en-US ] = "Width: " ; -}; -String RID_SVXITEMS_SIZE_HEIGHT -{ - Text [ en-US ] = "Height: " ; -}; -String RID_SVXITEMS_LRSPACE_LEFT -{ - Text [ en-US ] = "Indent left " ; -}; -String RID_SVXITEMS_LRSPACE_FLINE -{ - Text [ en-US ] = "First Line " ; -}; -String RID_SVXITEMS_LRSPACE_RIGHT -{ - Text [ en-US ] = "Indent right " ; -}; -String RID_SVXITEMS_SHADOW_COMPLETE -{ - Text [ en-US ] = "Shadow: " ; -}; -String RID_SVXITEMS_BORDER_COMPLETE -{ - Text [ en-US ] = "Borders " ; -}; -String RID_SVXITEMS_BORDER_NONE -{ - Text [ en-US ] = "No border"; -}; -String RID_SVXITEMS_BORDER_TOP -{ - Text [ en-US ] = "top " ; -}; -String RID_SVXITEMS_BORDER_BOTTOM -{ - Text [ en-US ] = "bottom " ; -}; -String RID_SVXITEMS_BORDER_LEFT -{ - Text [ en-US ] = "left " ; -}; -String RID_SVXITEMS_BORDER_RIGHT -{ - Text [ en-US ] = "right " ; -}; -String RID_SVXITEMS_BORDER_DISTANCE -{ - Text [ en-US ] = "Spacing " ; -}; -String RID_SVXITEMS_ULSPACE_UPPER -{ - Text [ en-US ] = "From top " ; -}; -String RID_SVXITEMS_ULSPACE_LOWER -{ - Text [ en-US ] = "From bottom " ; -}; String RID_SVXITEMS_PAGE_COMPLETE { Text [ en-US ] = "Page Description: " ; @@ -1465,47 +668,6 @@ String RID_SVXITEMS_PAGE_USAGE_MIRROR { Text [ en-US ] = "Mirrored" ; }; -String RID_SVXITEMS_LINES -{ - Text [ en-US ] = "%1 Lines" ; - Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines"; -}; -String RID_SVXITEMS_WIDOWS_COMPLETE -{ - Text [ en-US ] = "Widow control" ; -}; -String RID_SVXITEMS_ORPHANS_COMPLETE -{ - Text [ en-US ] = "Orphan control" ; -}; -String RID_SVXITEMS_HYPHEN_MINLEAD -{ - Text [ en-US ] = "Characters at end of line" ; -}; -String RID_SVXITEMS_HYPHEN_MINTRAIL -{ - Text [ en-US ] = "Characters at beginning of line" ; -}; -String RID_SVXITEMS_HYPHEN_MAX -{ - Text [ en-US ] = "Hyphens" ; -}; -String RID_SVXITEMS_PAGEMODEL_COMPLETE -{ - Text [ en-US ] = "Page Style: " ; -}; -String RID_SVXITEMS_KERNING_COMPLETE -{ - Text [ en-US ] = "Kerning " ; -}; -String RID_SVXITEMS_KERNING_EXPANDED -{ - Text [ en-US ] = "locked " ; -}; -String RID_SVXITEMS_KERNING_CONDENSED -{ - Text [ en-US ] = "Condensed " ; -}; String RID_SVXITEMS_AUTHOR_COMPLETE { Text [ en-US ] = "Author: " ; @@ -1526,176 +688,9 @@ String RID_SVXITEMS_PATTERN_COLOR { Text [ en-US ] = "Pattern color: " ; }; -String RID_SVXITEMS_GRAPHIC -{ - Text [ en-US ] = "Graphic" ; -}; - String RID_SVXITEMS_BRUSH_CHAR { Text [ en-US ] = "Character background"; }; - - -String RID_SVXITEMS_EMPHASIS_NONE_STYLE -{ - Text [ en-US ] = "none"; -}; -String RID_SVXITEMS_EMPHASIS_DOT_STYLE -{ - Text [ en-US ] = "Dots "; -}; -String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE -{ - Text [ en-US ] = "Circle "; -}; -String RID_SVXITEMS_EMPHASIS_DISC_STYLE -{ -// ??? disc == filled ring - Text [ en-US ] = "Filled circle "; -}; -String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE -{ - Text [ en-US ] = "Accent "; -}; - -String RID_SVXITEMS_EMPHASIS_ABOVE_POS -{ - Text [ en-US ] = "Above"; -}; -String RID_SVXITEMS_EMPHASIS_BELOW_POS -{ - Text [ en-US ] = "Below"; -}; - -String RID_SVXITEMS_TWOLINES_OFF -{ - Text [ en-US ] = "Double-lined off"; -}; -String RID_SVXITEMS_TWOLINES -{ - Text [ en-US ] = "Double-lined"; -}; - -String RID_SVXITEMS_SCRPTSPC_OFF -{ - Text [ en-US ] = "No automatic character spacing"; -}; -String RID_SVXITEMS_SCRPTSPC_ON -{ - Text [ en-US ] = "No automatic character spacing"; -}; - -String RID_SVXITEMS_HNGPNCT_OFF -{ - Text [ en-US ] = "No hanging punctuation at line end"; -}; -String RID_SVXITEMS_HNGPNCT_ON -{ - Text [ en-US ] = "Hanging punctuation at line end"; -}; -String RID_SVXITEMS_FORBIDDEN_RULE_OFF -{ - Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines"; -}; - -String RID_SVXITEMS_FORBIDDEN_RULE_ON -{ - Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines"; -}; - - -String RID_SVXITEMS_CHARROTATE_OFF -{ - Text [ en-US ] = "No rotated characters"; -}; -String RID_SVXITEMS_CHARROTATE -{ - Text [ en-US ] = "Character rotated by $(ARG1)°"; -}; -String RID_SVXITEMS_CHARROTATE_FITLINE -{ - Text [ en-US ] = "Fit to line"; -}; -String RID_SVXITEMS_CHARSCALE -{ - Text [ en-US ] = "Characters scaled $(ARG1)%"; -}; -String RID_SVXITEMS_CHARSCALE_OFF -{ - Text [ en-US ] = "No scaled characters"; -}; - -String RID_SVXITEMS_RELIEF_NONE -{ - Text [ en-US ] = "No relief"; -}; -String RID_SVXITEMS_RELIEF_EMBOSSED -{ - Text [ en-US ] = "Relief"; -}; -String RID_SVXITEMS_RELIEF_ENGRAVED -{ - Text [ en-US ] = "Engraved"; -}; -String RID_SVXITEMS_PARAVERTALIGN_AUTO -{ - Text [ en-US ] = "Automatic text alignment"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BASELINE -{ - Text [ en-US ] = "Text aligned to base line"; -}; -String RID_SVXITEMS_PARAVERTALIGN_TOP -{ - Text [ en-US ] = "Text aligned top"; -}; -String RID_SVXITEMS_PARAVERTALIGN_CENTER -{ - Text [ en-US ] = "Text aligned middle"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BOTTOM -{ - Text [ en-US ] = "Text aligned bottom"; -}; - -String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP -{ - Text [ en-US ] = "Text direction left-to-right (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP -{ - Text [ en-US ] = "Text direction right-to-left (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT -{ - Text [ en-US ] = "Text direction right-to-left (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT -{ - Text [ en-US ] = "Text direction left-to-right (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_ENVIRONMENT -{ - Text [ en-US ] = "Use superordinate object text direction setting"; -}; - -String RID_SVXITEMS_PARASNAPTOGRID_ON -{ - Text[ en-US ] = "Paragraph snaps to text grid (if active)"; -}; - -String RID_SVXITEMS_PARASNAPTOGRID_OFF -{ - Text[ en-US ] = "Paragraph does not snap to text grid"; -}; -String RID_SVXITEMS_CHARHIDDEN_FALSE -{ - Text [ en-US ] = "Not hidden"; -}; -String RID_SVXITEMS_CHARHIDDEN_TRUE -{ - Text [ en-US ] = "Hidden"; -}; // ********************************************************************** EOF diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 0ab16726aa..ba40d2fa58 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -39,8 +39,8 @@ #include <svx/fntctl.hxx> // #include <svx/svxids.hrc> -#include "flstitem.hxx" -#include "fontitem.hxx" +#include "editeng/flstitem.hxx" +#include "editeng/fontitem.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index c279e75633..3775f4acfb 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -42,9 +42,9 @@ #include <svx/fntszctl.hxx> // #include <svx/dialogs.hrc> -#include <svx/fhgtitem.hxx> -#include "fontitem.hxx" -#include "flstitem.hxx" +#include <editeng/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include "editeng/flstitem.hxx" #include "dlgutil.hxx" #include <svx/dialmgr.hxx> diff --git a/svx/source/options/optgrid.cxx b/svx/source/options/optgrid.cxx index 7b52d12c1c..a7ba01eb63 100644 --- a/svx/source/options/optgrid.cxx +++ b/svx/source/options/optgrid.cxx @@ -35,6 +35,7 @@ #include <tools/shl.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> +#include <svl/intitem.hxx> #define _SVX_OPTGRID_CXX diff --git a/svx/source/options/optitems.cxx b/svx/source/options/optitems.cxx index f37e9ecc98..ff98e21d89 100644 --- a/svx/source/options/optitems.cxx +++ b/svx/source/options/optitems.cxx @@ -38,6 +38,8 @@ #include "optitems.hxx" #include <svx/dialmgr.hxx> #include <svx/svxitems.hrc> +#include <editeng/eerdll.hxx> +#include <editeng/editrids.hrc> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; @@ -169,10 +171,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText += String::CreateFromInt32( nMinLead ); - rText += String( ResId( RID_SVXITEMS_HYPHEN_MINLEAD, DIALOG_MGR() ) ); + rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) ); rText += ','; rText += String::CreateFromInt32( nMinTrail ); - rText += String( ResId( RID_SVXITEMS_HYPHEN_MINTRAIL, DIALOG_MGR() ) ); + rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) ); return ePres; } default: diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index 244946e393..1703e4b90a 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -34,9 +34,9 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> #include <svx/svdotext.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <svx/sdr/properties/properties.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index d7dee2ceda..dddf29ffb0 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -61,8 +61,8 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> -#include <svx/eeitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/colritem.hxx> //#include <svx/xtable.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index bd8547c8b8..d49ff6afac 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -35,9 +35,9 @@ #include <basegfx/color/bcolor.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/flditem.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <unoapi.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 2e7cf36079..4b853f3d93 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdocapt.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 78f1a865ee..088460b17d 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdocirc.hxx> #include <svx/sxcikitm.hxx> #include <svx/sxciaitm.hxx> diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 7ed8a62e33..f72c1ee2c1 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoedge.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 5d55b764a8..f960752908 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svdoashp.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtagitm.hxx> #include <svl/whiter.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index bd1f683c5e..2282e2de01 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -39,7 +39,7 @@ #include <svx/svdobj.hxx> #include <svx/svddef.hxx> #include <svx/svdpool.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 2a180810e0..dafdf4926e 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdograf.hxx> #include <svx/sdgcpitm.hxx> diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index e5d01d2c6c..1dfc58e40b 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/whiter.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdpool.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 681bfa8728..93a7bd6900 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -34,7 +34,7 @@ #include <svl/itemset.hxx> #include <svl/style.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdomeas.hxx> #include <svx/sxmsuitm.hxx> #include <svx/xlnstit.hxx> diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index f545b24fc2..932e36c902 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -38,14 +38,14 @@ #include <svx/svddef.hxx> #include <svx/svdotext.hxx> #include <svx/svdoutl.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/svdmodel.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/xflclit.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/svdetc.hxx> -#include <svx/editeng.hxx> -#include <svx/flditem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/flditem.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 7bccab593a..369ca02947 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -35,12 +35,8 @@ #include <limits.h> #include <tools/shl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vcl/image.hxx> #include <svl/stritem.hxx> #include <svl/ptitem.hxx> @@ -49,14 +45,14 @@ #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> - +#include <svl/intitem.hxx> #define _SVX_PSZCTRL_CXX #include "pszctrl.hxx" #define PAINT_OFFSET 5 -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/dialmgr.hxx> #include "dlgutil.hxx" #include "stbctrls.h" diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 56de9a8e3a..85ba8186f5 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -61,7 +61,7 @@ #define PAINT_OFFSET 5 -//#include <svx/sizeitem.hxx> +//#include <editeng/sizeitem.hxx> //#include <svx/dialmgr.hxx> //#include "dlgutil.hxx" //#include "stbctrls.h" diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk index 0f8fcb06a7..6e158341ae 100644 --- a/svx/source/svdraw/makefile.mk +++ b/svx/source/svdraw/makefile.mk @@ -77,7 +77,6 @@ LIB1OBJFILES= \ $(SLO)$/svdorect.obj \ $(SLO)$/svdoedge.obj \ $(SLO)$/svdomeas.obj \ - $(SLO)$/svdfield.obj \ $(SLO)$/svdopath.obj \ $(SLO)$/svdocapt.obj \ $(SLO)$/svdocirc.obj \ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 37366c4f36..f7d3d4e58a 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -53,7 +53,7 @@ #include <svx/svdpool.hxx> #include <svl/solar.hrc> -#include "xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() @@ -63,9 +63,9 @@ #include "svdglob.hxx" // Stringcache #include "svdstr.hrc" #include <svx/sdgcpitm.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <tools/bigint.hxx> #include <tools/stream.hxx> @@ -76,13 +76,13 @@ #define ITEMID_BOX SDRATTR_TABLE_BORDER #define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER -#include "svx/boxitem.hxx" +#include "editeng/boxitem.hxx" #define ITEMID_SHADOW SDRATTR_TABLE_BORDER_SHADOW -#include "svx/shaditem.hxx" +#include "editeng/shaditem.hxx" #define ITEMID_LINE 0 -#include "bolnitem.hxx" +#include "editeng/bolnitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index cd35046601..e44b6ff6c3 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -55,7 +55,7 @@ #include <svx/svdopath.hxx> // fuer Crook #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> #include <svx/sdr/contact/objectcontact.hxx> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 1ddf95ee01..ca501caa99 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <svx/svdedtv.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdundo.hxx> #include <svx/svdogrp.hxx> // fuer's Gruppieren #include <svx/svdovirt.hxx> // fuer VirtualObject-Bundling (Writer) @@ -48,8 +48,8 @@ #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> #include <vcl/msgbox.hxx> -#include <svx/outlobj.hxx> -#include <svx/eeitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/eeitem.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 162d3522e6..ad46279c9e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -44,15 +44,15 @@ #include <vcl/hatch.hxx> #include <svl/whiter.hxx> #include <svl/style.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <tools/config.hxx> #include <vcl/cursor.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> -#include <svx/outlobj.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/scripttypeitem.hxx> #include "svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> @@ -73,8 +73,8 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include "globl3d.hxx" -#include <svx/outliner.hxx> -#include <svx/adjitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/adjitem.hxx> // #98988# #include <svtools/colorcfg.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 60a96b1722..27643f04f7 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "forbiddencharacterstable.hxx" +#include "editeng/forbiddencharacterstable.hxx" #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> @@ -43,15 +43,15 @@ #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <tools/config.hxx> #include <unotools/cacheoptions.hxx> #include <svl/whiter.hxx> #include <tools/bigint.hxx> -#include "fontitem.hxx" -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/xgrad.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index f9f4ad2070..7d9913d096 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -32,31 +32,31 @@ #include "precompiled_svx.hxx" #include "svdfmtf.hxx" -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <math.h> #include <svx/xpoly.hxx> #include <vcl/svapp.hxx> -#include <svx/eeitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/shdditem.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xflclit.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> -#include <fontitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/colritem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/colritem.hxx> #include <vcl/metric.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svx/xflhtit.hxx> #include <svx/svdattr.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 4c67ed985c..0ce8d9e4a3 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdibrow.hxx" @@ -40,8 +40,8 @@ #endif #include "svditext.hxx" -#include <svx/flditem.hxx> -#include <svx/editdata.hxx> +#include <editeng/flditem.hxx> +#include <editeng/editdata.hxx> #include <svx/svdpool.hxx> #include <svx/svdattr.hxx> #include <svx/svdattrx.hxx> @@ -56,13 +56,13 @@ #include <svx/xflbstit.hxx> #include <svx/xflbtoxy.hxx> #include <svx/xftshit.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svl/whiter.hxx> #include <svl/flagitem.hxx> #include <svl/ptitem.hxx> diff --git a/svx/source/svdraw/svditext.hxx b/svx/source/svdraw/svditext.hxx index c817269bcc..b2ba80ac94 100644 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/source/svdraw/svditext.hxx @@ -33,7 +33,7 @@ // SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #endif // _SVDITEXT_HXX diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 5bf35f2398..6734349902 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -53,7 +53,7 @@ #include <svx/xlnstit.hxx> #include "svditext.hxx" -#include <svx/editeng.hxx> // Fuer EditEngine::CreatePool() +#include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> @@ -74,15 +74,15 @@ #include "asiancfg.hxx" -#include "fontitem.hxx" -#include <svx/colritem.hxx> -#include <svx/fhgtitem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/colritem.hxx> +#include <editeng/fhgtitem.hxx> #include <svl/style.hxx> #include <tools/bigint.hxx> -#include <svx/numitem.hxx> -#include <bulitem.hxx> -#include <svx/outlobj.hxx> -#include "forbiddencharacterstable.hxx" +#include <editeng/numitem.hxx> +#include <editeng/bulitem.hxx> +#include <editeng/outlobj.hxx> +#include "editeng/forbiddencharacterstable.hxx" #include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> @@ -93,7 +93,7 @@ // #95114# #include <vcl/svapp.hxx> #include <svx/sdr/properties/properties.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> using namespace ::com::sun::star; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index a55d46264d..7f5193801c 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -63,10 +63,10 @@ #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svx/eeitem.hxx> -#include "editstat.hxx" +#include <editeng/eeitem.hxx> +#include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> #include "../customshapes/EnhancedCustomShapeGeometry.hxx" #include "../customshapes/EnhancedCustomShapeTypeNames.hxx" @@ -77,7 +77,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/xlnclit.hxx> #include <svx/svxids.hrc> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index d447507542..b0ceb42a3f 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -60,11 +60,11 @@ #include <svx/xftshit.hxx> -#include <svx/colritem.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> -//#include <svx/charscaleitem.hxx> +//#include <editeng/charscaleitem.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> #include <svl/style.hxx> @@ -75,7 +75,7 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xlnedcit.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xbtmpit.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index f5c55af0d8..50e51358fd 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -88,14 +88,14 @@ #include <svx/xflftrit.hxx> #include "svx/xlinjoit.hxx" #include <svx/unopage.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xenum.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdpool.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <vcl/salbtype.hxx> // FRound #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 13b5f4a3a2..ba5adb65e5 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -51,7 +51,7 @@ #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdr/properties/captionproperties.hxx> #include <vcl/salbtype.hxx> // FRound #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 39d67e0646..591d3f3294 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -52,7 +52,7 @@ #include <svx/svdview.hxx> // Zum Draggen (Ortho) #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 8c927b1146..12459e901f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -50,7 +50,7 @@ #include "svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/connectorproperties.hxx> #include <svx/sdr/contact/viewcontactofsdredgeobj.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 38cdbfcf12..299d58789e 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -58,7 +58,7 @@ #include <svx/svdpagv.hxx> #include "svdviter.hxx" #include <svx/svdview.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <svx/xbitmap.hxx> @@ -67,7 +67,7 @@ #include <svx/svdundo.hxx> #include "svdfmtf.hxx" #include <svx/sdgcpitm.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdr/properties/graphicproperties.hxx> #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -1158,7 +1158,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) mbIsPreview = sal_True; } - if( !GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream, + if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) ) { const String aUserData( pGraphic->GetUserData() ); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 4f043942cb..84c7938493 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -47,7 +47,7 @@ #include "svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> @@ -55,11 +55,11 @@ #include <svx/xlnedwit.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnedcit.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> -#include <svx/editobj.hxx> -#include <svx/svdfield.hxx> -#include <svx/flditem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editobj.hxx> +#include <editeng/svdfield.hxx> +#include <editeng/flditem.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 7f2dde332a..0cdd655afb 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -85,7 +85,6 @@ #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" -#include "svx/impgrf.hxx" #include <svtools/chartprettypainter.hxx> #include <svx/sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdograf.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 5d1b83146c..065b6c837f 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -42,25 +42,25 @@ #include <svx/svdmodel.hxx> // OutlinerDefaults #include "svdglob.hxx" // Stringcache #include "svdstr.hrc" // Objektname -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> -#include <svx/eeitem.hxx> -#include <editstat.hxx> -#include <svx/outlobj.hxx> -#include <svx/editobj.hxx> -#include <svx/outliner.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/editobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/fhgtitem.hxx> #include <svl/itempool.hxx> -#include <svx/adjitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/flditem.hxx> #include <svx/xftouit.hxx> #include <vcl/salbtype.hxx> // FRound #include <svx/xflgrit.hxx> #include <svx/svdpool.hxx> #include <svx/xflclit.hxx> #include <svl/style.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <svl/itemiter.hxx> #include <svx/sdr/properties/textproperties.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 004c97f6ef..515c694bae 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -39,7 +39,7 @@ #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/salbtype.hxx> #include <svx/sdtfchim.hxx> #include <svl/itemset.hxx> @@ -48,10 +48,10 @@ #include <drawinglayer/animation/animationtiming.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/svapp.hxx> -#include <svx/eeitemid.hxx> -#include <svx/escpitem.hxx> -#include <svx/svxenum.hxx> -#include <svx/flditem.hxx> +#include <editeng/eeitemid.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/flditem.hxx> #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx> #include <vcl/metaact.hxx> #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> @@ -59,7 +59,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> ////////////////////////////////////////////////////////////////////////////// // helpers diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 060b916ad0..2f3110a020 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#include <unolingu.hxx> +#include <editeng/unolingu.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -67,7 +67,7 @@ #include <svx/xlndsit.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index d5d09aea94..86ea7ec89f 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -39,30 +39,30 @@ #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight #include <svx/svdocapt.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight #include <svx/svdetc.hxx> -#include <svx/writingmodeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/flditem.hxx> +#include <editeng/writingmodeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/flditem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/smplhint.hxx> #include <svl/whiter.hxx> -#include <svx/outlobj.hxx> -#include <svx/outliner.hxx> -#include <svx/eeitem.hxx> -#include <svx/editobj.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editobj.hxx> +#include <editeng/fhgtitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svl/style.hxx> #include <svl/itemiter.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/lrspitem.hxx> #include <svl/itempool.hxx> -#include <svx/numitem.hxx> -#include <svx/editeng.hxx> -#include <svx/postitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/postitem.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 0191eee99e..ba43890ffc 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -35,10 +35,10 @@ #include "svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> -#include <svx/outliner.hxx> -#include <editstat.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editstat.hxx> #include <svl/itemset.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtfchim.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 566bd6fdd2..009b8e42a1 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> -#include <svx/svdfield.hxx> +#include <editeng/svdfield.hxx> #include <svx/svdotext.hxx> static BOOL bInit = FALSE; diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index a55e2d8740..84b06fc3ea 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -41,7 +41,7 @@ #include <svx/svdotext.hxx> #include "svditext.hxx" #include <svx/svdmodel.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #ifndef SVX_LIGHT #ifndef _LNKBASE_HXX //autogen diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 1dad4b45ce..b3c5cd8e1c 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -39,7 +39,7 @@ #include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> // fuer Convert #include <svx/svdmodel.hxx> // fuer Convert -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 79972849be..cbcf8bbc5b 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -31,11 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoutl.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdotext.hxx> -#include <editstat.hxx> +#include <editeng/editstat.hxx> #include <svx/svdmodel.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itempool.hxx> DBG_NAME(SdrOutliner) diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 7a8847dc0d..352de9adfc 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -44,7 +44,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 9c3b48a482..a1e6db2d5d 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -45,7 +45,7 @@ #include <svl/smplhint.hxx> #include <svx/svdpntv.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -67,7 +67,7 @@ #include <svx/svdview.hxx> #include <svx/sxlayitm.hxx> #include <svl/itemiter.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/whiter.hxx> #include <svl/style.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 83588ab129..f2afb41647 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -35,11 +35,11 @@ #include "svx/svdotext.hxx" #include "svx/svdetc.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdoutl.hxx" #include "svx/svdmodel.hxx" -#include "svx/fhgtitem.hxx" -#include <svx/eeitem.hxx> +#include "editeng/fhgtitem.hxx" +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ ) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index d55c311f14..21f4fc04f9 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -42,7 +42,7 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include <svx/scene3d.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c64937043e..8603d95bd7 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache @@ -49,8 +49,8 @@ #include "svx/svdoutl.hxx" #include "svx/svdview.hxx" -#include "svx/editview.hxx" // fuer GetField -#include "svx/flditem.hxx" // fuer URLField +#include "editeng/editview.hxx" // fuer GetField +#include "editeng/flditem.hxx" // fuer URLField #include "svx/obj3d.hxx" #include "svx/svddrgmt.hxx" #include "svx/svdoutl.hxx" @@ -977,7 +977,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } return bRet; } -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const { diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 5effd864f1..f28af9ce33 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <vector> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> diff --git a/svx/source/svxlink/fileobj.cxx b/svx/source/svxlink/fileobj.cxx index 125701b9f6..81088d5910 100644 --- a/svx/source/svxlink/fileobj.cxx +++ b/svx/source/svxlink/fileobj.cxx @@ -58,7 +58,6 @@ #include <svx/dialogs.hrc> #include "xoutbmp.hxx" #include "opengrf.hxx" -#include "svx/impgrf.hxx" namespace css = ::com::sun::star; @@ -337,7 +336,7 @@ BOOL SvFileObject::LoadFile_Impl() BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) { - GraphicFilter* pGF = GetGrfFilter(); + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); const USHORT nFilter = sFilter.Len() && pGF->GetImportFormatCount() ? pGF->GetImportFormatNumber( sFilter ) diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 84ebe26156..b4f00c118e 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -58,7 +58,7 @@ #include "fileobj.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "unolingu.hxx" +#include "editeng/unolingu.hxx" class SvxInternalLink : public sfx2::SvLinkSource { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 6066023eac..5345994932 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -42,7 +42,7 @@ #include <unotools/accessiblestatesethelper.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 6114b540bb..2469c21c39 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -38,10 +38,11 @@ #include <rtl/ref.hxx> -#include <svx/AccessibleContextBase.hxx> -#include <svx/AccessibleComponentBase.hxx> +#include <editeng/AccessibleContextBase.hxx> +#include <editeng/AccessibleComponentBase.hxx> #include <svx/IAccessibleViewForwarderListener.hxx> #include <svx/AccessibleTextHelper.hxx> +#include <svx/AccessibleShapeTreeInfo.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 1cec973885..9127fc5fb1 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -44,8 +44,8 @@ #include <vcl/svapp.hxx> #include "svx/sdr/properties/textproperties.hxx" -#include "svx/outlobj.hxx" -#include "svx/writingmodeitem.hxx" +#include "editeng/outlobj.hxx" +#include "editeng/writingmodeitem.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" #include "svx/unoshtxt.hxx" @@ -58,8 +58,8 @@ #include "svx/unoshtxt.hxx" #include "svx/unoshprp.hxx" #include "svx/unoshape.hxx" -#include "svx/editobj.hxx" -#include "svx/boxitem.hxx" +#include "editeng/editobj.hxx" +#include "editeng/boxitem.hxx" #include "svx/xflbstit.hxx" #include "svx/xflbmtit.hxx" #include <svx/svdpool.hxx> @@ -77,9 +77,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::style; using namespace ::com::sun::star::container; -extern sal_Bool lcl_LineToSvxLine(const BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); -extern BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert); - // ----------------------------------------------------------------------------- static const SvxItemPropertySet* ImplGetSvxCellPropertySet() @@ -969,7 +966,7 @@ sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException) Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) { - Any aAny( mpPropSet->getPropertyValue( pMap, aSet ) ); + Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) ); if( *pMap->pType != aAny.getValueType() ) { @@ -1034,27 +1031,27 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& SvxBoxInfoItem aBoxInfo( SDRATTR_TABLE_BORDER_INNER ); SvxBorderLine aLine; - sal_Bool bSet = lcl_LineToSvxLine(pBorder->TopLine, aLine, false); + sal_Bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_TOP); aBoxInfo.SetValid(VALID_TOP, pBorder->IsTopLineValid); - bSet = lcl_LineToSvxLine(pBorder->BottomLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->BottomLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM); aBoxInfo.SetValid(VALID_BOTTOM, pBorder->IsBottomLineValid); - bSet = lcl_LineToSvxLine(pBorder->LeftLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->LeftLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT); aBoxInfo.SetValid(VALID_LEFT, pBorder->IsLeftLineValid); - bSet = lcl_LineToSvxLine(pBorder->RightLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->RightLine, aLine, false); aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT); aBoxInfo.SetValid(VALID_RIGHT, pBorder->IsRightLineValid); - bSet = lcl_LineToSvxLine(pBorder->HorizontalLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->HorizontalLine, aLine, false); aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_HORI); aBoxInfo.SetValid(VALID_HORI, pBorder->IsHorizontalLineValid); - bSet = lcl_LineToSvxLine(pBorder->VerticalLine, aLine, false); + bSet = SvxBoxItem::LineToSvxLine(pBorder->VerticalLine, aLine, false); aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_VERT); aBoxInfo.SetValid(VALID_VERT, pBorder->IsVerticalLineValid); @@ -1169,17 +1166,17 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(mpProperties->GetItem(SDRATTR_TABLE_BORDER)); TableBorder aTableBorder; - aTableBorder.TopLine = lcl_SvxLineToLine(rBox.GetTop(), false); + aTableBorder.TopLine = SvxBoxItem::SvxLineToLine(rBox.GetTop(), false); aTableBorder.IsTopLineValid = rBoxInfoItem.IsValid(VALID_TOP); - aTableBorder.BottomLine = lcl_SvxLineToLine(rBox.GetBottom(), false); + aTableBorder.BottomLine = SvxBoxItem::SvxLineToLine(rBox.GetBottom(), false); aTableBorder.IsBottomLineValid = rBoxInfoItem.IsValid(VALID_BOTTOM); - aTableBorder.LeftLine = lcl_SvxLineToLine(rBox.GetLeft(), false); + aTableBorder.LeftLine = SvxBoxItem::SvxLineToLine(rBox.GetLeft(), false); aTableBorder.IsLeftLineValid = rBoxInfoItem.IsValid(VALID_LEFT); - aTableBorder.RightLine = lcl_SvxLineToLine(rBox.GetRight(), false); + aTableBorder.RightLine = SvxBoxItem::SvxLineToLine(rBox.GetRight(), false); aTableBorder.IsRightLineValid = rBoxInfoItem.IsValid(VALID_RIGHT ); - aTableBorder.HorizontalLine = lcl_SvxLineToLine(rBoxInfoItem.GetHori(), false); + aTableBorder.HorizontalLine = SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetHori(), false); aTableBorder.IsHorizontalLineValid = rBoxInfoItem.IsValid(VALID_HORI); - aTableBorder.VerticalLine = lcl_SvxLineToLine(rBoxInfoItem.GetVert(), false); + aTableBorder.VerticalLine = SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetVert(), false); aTableBorder.IsVerticalLineValid = rBoxInfoItem.IsValid(VALID_VERT); aTableBorder.Distance = rBox.GetDistance(); aTableBorder.IsDistanceValid = rBoxInfoItem.IsValid(VALID_DISTANCE); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 1feecb1ee6..fa11e86ff5 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -40,7 +40,7 @@ #include <svl/style.hxx> #include "svx/sdtaitm.hxx" #include "tablemodel.hxx" -#include "svx/unotext.hxx" +#include "editeng/unotext.hxx" #include "svx/svdtext.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index bdf6cf0537..ac06fc5708 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -47,17 +47,17 @@ #include "svx/svdmodel.hxx" #include "svx/svdoutl.hxx" #include "svx/svdobj.hxx" -#include "unoedhlp.hxx" +#include "editeng/unoedhlp.hxx" #include "svx/svdview.hxx" #include "svx/svdetc.hxx" -#include "svx/outliner.hxx" -#include "svx/unoforou.hxx" -#include "svx/unoviwou.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outliner.hxx" +#include "editeng/unoforou.hxx" +#include "editeng/unoviwou.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdotext.hxx" #include "svx/svdpage.hxx" -#include "svx/editeng.hxx" -#include "svx/unotext.hxx" +#include "editeng/editeng.hxx" +#include "editeng/unotext.hxx" #include "sdrpaintwindow.hxx" //------------------------------------------------------------------------ diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx index ebd991905b..52d36f7aa5 100644 --- a/svx/source/table/celleditsource.hxx +++ b/svx/source/table/celleditsource.hxx @@ -33,7 +33,7 @@ #include "cell.hxx" #include "celltypes.hxx" -#include "svx/unoedsrc.hxx" +#include "editeng/unoedsrc.hxx" class SvxTextForwarder; class SdrObject; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 00d09251cd..fa844f7e65 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -46,8 +46,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svl/style.hxx> -#include "editstat.hxx" -#include "svx/outlobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/outlobj.hxx" #include "svx/svdview.hxx" #include "svx/sdr/properties/textproperties.hxx" #include "svx/svdotable.hxx" @@ -62,14 +62,14 @@ #include "tablelayouter.hxx" #include "svx/svdetc.hxx" #include "tablehandles.hxx" -#include "svx/boxitem.hxx" +#include "editeng/boxitem.hxx" #include "svx/framelink.hxx" #include "svx/sdr/table/tabledesign.hxx" #include "svx/svdundo.hxx" #include "svdstr.hrc" #include "svdglob.hxx" -#include "svx/writingmodeitem.hxx" -#include "svx/frmdiritem.hxx" +#include "editeng/writingmodeitem.hxx" +#include "editeng/frmdiritem.hxx" #include "svx/xflhtit.hxx" #include "svx/xflftrit.hxx" #include "svx/xfltrit.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 43ef34d8c0..f546c9ca93 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -47,28 +47,28 @@ #include <sfx2/request.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <svx/svdotable.hxx> #include <svx/sdr/overlay/overlayobjectcell.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> #include <svx/svdetc.hxx> -#include <svx/editobj.hxx> -#include "editstat.hxx" -#include "unolingu.hxx" +#include <editeng/editobj.hxx> +#include "editeng/editstat.hxx" +#include "editeng/unolingu.hxx" #include "svx/sdrpagewindow.hxx" #include <svx/selectioncontroller.hxx> #include <svx/svdmodel.hxx> #include "sdrpaintwindow.hxx" #include <svx/svxdlg.hxx> -#include <svx/boxitem.hxx> +#include <editeng/boxitem.hxx> #include "cell.hxx" -#include <svx/borderline.hxx> -#include <svx/colritem.hxx> -#include "bolnitem.hxx" +#include <editeng/borderline.hxx> +#include <editeng/colritem.hxx> +#include "editeng/bolnitem.hxx" #include "svdstr.hrc" #include "svdglob.hxx" #include "svx/svdpage.hxx" diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 214ca0bad8..424705a5b2 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> +#include <comphelper/serviceinfohelper.hxx> #include <osl/mutex.hxx> #include <vos/mutex.hxx> @@ -237,7 +238,7 @@ OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeExcepti sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- @@ -515,7 +516,7 @@ OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeExcept sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } // ---------------------------------------------------------- diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index b27529a323..5c16026031 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -44,8 +44,8 @@ #include "tablecolumns.hxx" #include "tablelayouter.hxx" #include "svx/svdotable.hxx" -#include "svx/borderline.hxx" -#include "svx/boxitem.hxx" +#include "editeng/borderline.hxx" +#include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" #include "svdstr.hrc" #include "svdglob.hxx" diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 53c557d972..4a0bac9320 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -40,18 +40,18 @@ #include <svtools/rtfkeywd.hxx> #include <svtools/rtfout.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/sdtaitm.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> #include "cell.hxx" #include "celltypes.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" -#include "svx/editeng.hxx" -#include "svx/outlobj.hxx" +#include "editeng/editeng.hxx" +#include "editeng/outlobj.hxx" //#include <tablertfexporter.hxx> diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 399c6d2015..53a09336e0 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -39,19 +39,19 @@ #include <tools/stream.hxx> #include <svtools/rtftoken.h> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdetc.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/outlobj.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/outlobj.hxx> #include "cell.hxx" #include "celltypes.hxx" #include "svx/svdotable.hxx" #include "svx/svdoutl.hxx" -#include "svx/editeng.hxx" -#include "svx/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editdata.hxx" #include "svx/svdmodel.hxx" -#include "svxrtf.hxx" +#include "editeng/svxrtf.hxx" using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index f4d6e89aec..4b496e0dcd 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include "svx/sdr/properties/textproperties.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outlobj.hxx" #include "cell.hxx" #include "tableundo.hxx" diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 03ffdc3acf..a3c432924b 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -48,7 +48,7 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> -#include <svx/borderline.hxx> +#include <editeng/borderline.hxx> #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include "cell.hxx" diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index c7df83a525..1310736a87 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -44,7 +44,7 @@ #include <svx/svdview.hxx> #include "drawitem.hxx" -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 1931516032..458fa80d57 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -44,7 +44,7 @@ #include <svl/eitem.hxx> #include <vcl/settings.hxx> #include <svl/intitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "chrtitem.hxx" #include <tools/urlobj.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 83751efdcb..c48aa3ccd0 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -45,8 +45,8 @@ #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> #include "toolbarmenu.hxx" #include "fontworkgallery.hxx" diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index c42ac872ac..65372f4592 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -56,8 +56,8 @@ #include <svx/svxids.hrc> #include "grafctrl.hrc" #include <svx/dialogs.hrc> -#include <svx/brshitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/sdgcpitm.hxx> //CHINA001 #include "../dialog/grfpage.hxx" #include <svx/itemwin.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 9ee6ffd0ed..3fe0550631 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -59,9 +59,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> #include <unotools/fontoptions.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/smplhint.hxx> @@ -79,13 +77,13 @@ #include "helpid.hrc" #include "htmlmode.hxx" #include <svx/xtable.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/colritem.hxx> -#include "flstitem.hxx" -#include "bolnitem.hxx" +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/colritem.hxx> +#include "editeng/flstitem.hxx" +#include "editeng/bolnitem.hxx" #include "drawitem.hxx" #include <svx/tbcontrl.hxx> #include "dlgutil.hxx" @@ -94,6 +92,8 @@ #include <memory> #include <svx/tbxcolorupdate.hxx> +#include <editeng/eerdll.hxx> +#include <editeng/editrids.hrc> // ------------------------------------------------------------------------ @@ -882,7 +882,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, long nCount = pColorTable->Count(); XColorEntry* pEntry = NULL; ::Color aColWhite( COL_WHITE ); - String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) ); + String aStrWhite( EditResId(RID_SVXITEMS_COLOR_WHITE) ); if ( nCount > PALETTE_SIZE ) // Show scrollbar if more than PALLETTE_SIZE colors are available diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 2112510162..d07d5f6303 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -52,7 +52,7 @@ #include <svx/dialogs.hrc> #endif #include <svx/svdview.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include "chrtitem.hxx" #include <svx/extrusionbar.hxx> diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index b0ba9cbd8c..123052d1ce 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -48,9 +48,9 @@ #include <svx/svdoashp.hxx> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <sfx2/bindings.hxx> -#include <svx/eeitem.hxx> -#include <svx/charscaleitem.hxx> -#include <svx/kernitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/kernitem.hxx> #include <sdrpaintwindow.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index b75a2c6f1d..4e1854b2ff 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -65,11 +65,11 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/viewcontactofsdrobj.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdograf.hxx> #include "xoutbmp.hxx" -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include "unoapi.hxx" #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -77,9 +77,9 @@ #include <svx/fmmodel.hxx> #include <svx/unopage.hxx> #include <svx/pageitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include "boost/scoped_ptr.hpp" @@ -105,7 +105,7 @@ using namespace ::com::sun::star::task; #include <svx/sdr/contact/viewcontact.hxx> // #i102251# -#include <editstat.hxx> +#include <editeng/editstat.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -1013,7 +1013,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes if( NULL == mpUnoPage ) return sal_False; - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); if( NULL == pFilter || NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc ) return sal_False; @@ -1233,7 +1233,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam { const String aMimeTypeName( MimeTypeName ); - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = pFilter->GetExportFormatCount(); sal_uInt16 nFilter; for( nFilter = 0; nFilter < nCount; nFilter++ ) @@ -1249,7 +1249,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = pFilter->GetExportFormatCount(); sal_uInt16 nFilter; sal_uInt16 nFound = 0; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index f9d1ad5f0e..d2345d15a0 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -45,7 +45,7 @@ #include <comphelper/stl_types.hxx> #include <svl/itempool.hxx> #include "unoapi.hxx" -#include "xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" using namespace ::comphelper; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index ce983bc23a..87ea105aea 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -46,7 +46,7 @@ #include <svx/xdef.hxx> #include "unoapi.hxx" -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> using namespace com::sun::star; diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk index 4b8ecb093d..6f13f892de 100644 --- a/svx/source/unodraw/makefile.mk +++ b/svx/source/unodraw/makefile.mk @@ -49,7 +49,6 @@ LIB1OBJFILES= \ $(SLO)$/XPropertyTable.obj \ $(SLO)$/UnoNameItemTable.obj \ $(SLO)$/unoshape.obj \ - $(SLO)$/unoipset.obj \ $(SLO)$/unoshap2.obj \ $(SLO)$/unoshap3.obj \ $(SLO)$/unoshap4.obj \ @@ -57,8 +56,6 @@ LIB1OBJFILES= \ $(SLO)$/unoshtxt.obj \ $(SLO)$/unoprov.obj \ $(SLO)$/unomod.obj \ - $(SLO)$/unonrule.obj \ - $(SLO)$/unofdesc.obj \ $(SLO)$/unomlstr.obj \ $(SLO)$/unogtabl.obj \ $(SLO)$/unohtabl.obj \ diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 119f6fac39..b6889cfbb0 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -40,10 +40,10 @@ #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> #include "unoapi.hxx" -#include "svx/impgrf.hxx" #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include "unofill.hxx" +#include <editeng/memberids.hrc> using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index bd3c19b86d..9f45815bed 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -41,10 +41,11 @@ #include <svl/itemprop.hxx> #include <svtools/unoevent.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> #include <unofill.hxx> -#include <unonrule.hxx> +#include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> @@ -57,7 +58,7 @@ #include <svx/svdtypes.hxx> #include <svx/unoprov.hxx> #include <svx/unopage.hxx> -#include <svx/unofield.hxx> +#include <editeng/unofield.hxx> #include <svx/unomod.hxx> #include <svx/unomodel.hxx> #include <svx/svdobj.hxx> @@ -591,7 +592,7 @@ OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException) @@ -751,7 +752,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam uno::Sequence< OUString > aSeq( &aService, 1 ); return aSeq; } -#include <unonrule.hxx> +#include <editeng/unonrule.hxx> com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw() { SvxNumRule* pDefaultRule = NULL; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index a37b652f71..459362821b 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -38,6 +38,7 @@ #include <osl/mutex.hxx> #include <sfx2/dispatch.hxx> #include <sot/clsids.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> @@ -935,7 +936,7 @@ OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeExcept sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException ) diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 78a0f885f9..4d32955c59 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -49,7 +49,7 @@ #include <svx/xflbmtit.hxx> #include <svx/unopage.hxx> #include <svx/svdetc.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "unoapi.hxx" #include <memory> diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index ca39c9fa8c..89f35ffd0c 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -49,9 +49,9 @@ #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> #include "unoapi.hxx" -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svx/unoshprp.hxx> -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include "globl3d.hxx" #include <svx/dialogs.hrc> #include <svx/svdpool.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 5582ecad18..fe593c2c73 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -47,7 +47,7 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> #include <svtools/fltcall.hxx> -#include "svx/impgrf.hxx" +#include <svtools/filter.hxx> #include <boost/scoped_ptr.hpp> #include <svx/svdpool.hxx> @@ -55,7 +55,7 @@ #include <rtl/memory.h> #include <tools/urlobj.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/unoshape.hxx> #include <svx/unopage.hxx> #include <svx/svdobj.hxx> @@ -1738,7 +1738,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID ) { - GraphicFilter* pGrfFilter = GetGrfFilter(); + GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter(); aFilterName = pGrfFilter->GetImportFormatName( pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) ); } } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index ca956f0704..7022ae41a7 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -39,13 +39,14 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> #include <svx/svdpool.hxx> #include <svx/unoshape.hxx> #include <svx/unopage.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/polysc3d.hxx> #include "globl3d.hxx" #include <svx/cube3d.hxx> @@ -494,7 +495,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" ); + comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" ); return aSeq; } @@ -624,7 +625,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DCube"); return aSeq; } @@ -740,7 +741,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DSphere"); return aSeq; } @@ -948,7 +949,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DLathe"); return aSeq; } @@ -1059,7 +1060,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( throw(uno::RuntimeException) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DExtrude"); return aSeq; } @@ -1204,7 +1205,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames( throw(uno::RuntimeException) { Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); - SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", + comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D", "com.sun.star.drawing.Shape3DPolygon"); return aSeq; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e4782e8518..8c838d7188 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -41,15 +41,15 @@ #include <svl/itemprop.hxx> #include <svtools/fltcall.hxx> #include <vos/mutex.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <osl/mutex.hxx> #include <comphelper/extract.hxx> #include "svx/shapepropertynotifier.hxx" - +#include <comphelper/serviceinfohelper.hxx> #include <toolkit/unohlp.hxx> - +#include <comphelper/serviceinfohelper.hxx> #include <rtl/uuid.h> #include <rtl/memory.h> #include <vcl/gfxlink.hxx> @@ -96,7 +96,7 @@ #include "svdglob.hxx" #include "svdstr.hrc" #include "unomaster.hxx" -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vector> @@ -608,7 +608,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw() //---------------------------------------------------------------------- //---------------------------------------------------------------------- void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, - SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) const + SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) { if(rPropSet.AreThereOwnUsrAnys()) { @@ -639,7 +639,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID)); // setzen - setPropertyValue(pEntry, *pUsrAny, rSet); + SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet); } } } @@ -660,7 +660,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) { SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END, 0); Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY ); - ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() ); + SvxItemPropertySet_ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() ); mpObj->SetMergedItemSetAndBroadcast(aSet); @@ -2250,7 +2250,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE default: { // Hole Wert aus ItemSet - aAny = mpPropSet->getPropertyValue( pMap, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ); if( *pMap->pType != aAny.getValueType() ) { @@ -3459,7 +3459,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_GroupServices; - SvxServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2, sUNO_service_drawing_GroupShape, sUNO_service_drawing_Shape ); @@ -3479,7 +3479,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CustomShapeServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13, sUNO_service_drawing_CustomShape, sUNO_service_drawing_Shape, sUNO_service_drawing_CustomShapeProperties, @@ -3510,7 +3510,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_LineServices; - SvxServiceInfoHelper::addToSequence( SvxShape_LineServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_LineServices,14, sUNO_service_drawing_LineShape, sUNO_service_drawing_Shape, @@ -3545,7 +3545,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_RectServices; - SvxServiceInfoHelper::addToSequence( SvxShape_RectServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_RectServices,14, sUNO_service_drawing_RectangleShape, sUNO_service_drawing_Shape, @@ -3582,7 +3582,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CircServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CircServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CircServices,14, sUNO_service_drawing_EllipseShape, sUNO_service_drawing_Shape, @@ -3618,7 +3618,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_PathServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PathServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14, sUNO_service_drawing_PolyLineShape, sUNO_service_drawing_Shape, @@ -3653,7 +3653,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_PolyServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15, sUNO_service_drawing_PolyPolygonShape, sUNO_service_drawing_Shape, @@ -3691,7 +3691,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_FreeLineServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15, sUNO_service_drawing_OpenBezierShape, sUNO_service_drawing_Shape, @@ -3729,7 +3729,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_FreeFillServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15, sUNO_service_drawing_ClosedBezierShape, sUNO_service_drawing_Shape, @@ -3767,7 +3767,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_TextServices; - SvxServiceInfoHelper::addToSequence( SvxShape_TextServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14, sUNO_service_drawing_TextShape, sUNO_service_drawing_Shape, @@ -3801,7 +3801,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_GrafServices; - SvxServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12, sUNO_service_drawing_GraphicObjectShape, sUNO_service_drawing_Shape, @@ -3834,7 +3834,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_Ole2Services; - SvxServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2, sUNO_service_drawing_OLE2Shape, sUNO_service_drawing_Shape); @@ -3854,7 +3854,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_CaptionServices; - SvxServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14, sUNO_service_drawing_CaptionShape, sUNO_service_drawing_Shape, @@ -3890,7 +3890,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_PageServices; - SvxServiceInfoHelper::addToSequence( SvxShape_PageServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_PageServices, 2, sUNO_service_drawing_PageShape, sUNO_service_drawing_Shape ); @@ -3910,7 +3910,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_MeasureServices; - SvxServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15, sUNO_service_drawing_MeasureShape, sUNO_service_drawing_MeasureProperties, @@ -3948,7 +3948,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_FrameServices; - SvxServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2, sUNO_service_drawing_FrameShape, sUNO_service_drawing_Shape ); @@ -3968,7 +3968,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; - SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); @@ -3988,7 +3988,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_EdgeServices; - SvxServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15, sUNO_service_drawing_ConnectorShape, sUNO_service_drawing_ConnectorProperties, @@ -4023,7 +4023,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() { static uno::Sequence< OUString > SvxShape_MediaServices; - SvxServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2, sUNO_service_drawing_MediaShape, sUNO_service_drawing_Shape); @@ -4047,7 +4047,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() // if( 0 == pSeq ) { static uno::Sequence< OUString > SvxShape_UnoServices; - SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, + comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2, sUNO_service_drawing_ControlShape, sUNO_service_drawing_Shape ); @@ -4551,3 +4551,69 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); return pSvxShape ? pSvxShape->GetSdrObject() : 0; } + +/** 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. +*/ +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; +} + +uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) +{ + if(!pMap || !pMap->nWID) + return uno::Any(); + + uno::Any aVal = rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES) ); + if( pMap->nMemberId & SFX_METRIC_ITEM ) + { + // check for needed metric translation + SfxItemPool* pPool = rSet.GetPool(); + const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + if( (pMap->nMemberId & SFX_METRIC_ITEM) && (eMapUnit != SFX_MAPUNIT_100TH_MM) ) + { + if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) ) + SvxUnoConvertToMM( eMapUnit, aVal ); + } + } + + return aVal; +} + +void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) +{ + if(!pMap || !pMap->nWID) + return; + + uno::Any aValue( rVal ); + if( pMap->nMemberId & SFX_METRIC_ITEM ) + { + // check for needed metric translation + SfxItemPool* pPool = rSet.GetPool(); + const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM; + if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM ) + { + if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) ) + SvxUnoConvertFromMM( eMapUnit, aValue ); + } + } + + rPropSet.setPropertyValue( pMap, aValue, rSet ); +} diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 0cc232efdc..f2a813e061 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -34,6 +34,7 @@ #include "unoshcol.hxx" #include <svx/unoprov.hxx> +#include <comphelper/serviceinfohelper.hxx> using namespace ::cppu; using namespace ::com::sun::star; @@ -238,7 +239,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 9fa674012e..d9c2d6f79c 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -34,7 +34,7 @@ #include <vcl/svapp.hxx> #include <svx/unoshtxt.hxx> -#include <unoedhlp.hxx> +#include <editeng/unoedhlp.hxx> #include <svl/lstner.hxx> #include <rtl/ref.hxx> #include <osl/mutex.hxx> @@ -45,16 +45,16 @@ #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svx/svdetc.hxx> -#include <svx/outliner.hxx> -#include <svx/unoforou.hxx> -#include <svx/unoviwou.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outliner.hxx> +#include <editeng/unoforou.hxx> +#include <editeng/unoviwou.hxx> +#include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdpage.hxx> -#include <svx/editeng.hxx> -#include <svx/editobj.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editobj.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk index f8d77f9fea..84495a26b4 100644 --- a/svx/source/xml/makefile.mk +++ b/svx/source/xml/makefile.mk @@ -43,8 +43,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES = \ $(SLO)$/xmlexport.obj \ - $(SLO)$/xmltxtimp.obj \ - $(SLO)$/xmltxtexp.obj \ $(SLO)$/xmlxtimp.obj \ $(SLO)$/xmlxtexp.obj \ $(SLO)$/xmlgrhlp.obj \ diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 22e99d74d7..9b1cbaa6f1 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -49,7 +49,7 @@ #include <vcl/metaact.hxx> #include <tools/zcodec.hxx> -#include "svx/impgrf.hxx" +#include "svtools/filter.hxx" #include "xmlgrhlp.hxx" #include <algorithm> @@ -142,7 +142,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) @@ -334,7 +334,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() mpOStm->Seek( 0 ); USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; - GetGrfFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) { @@ -377,7 +377,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (nStreamLen_) { pDest->Seek(0L); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat ); } } delete pDest; @@ -573,7 +573,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); - GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream ); + GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream ); delete pStream; } @@ -619,7 +619,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { if( aGraphic.GetType() == GRAPHIC_BITMAP ) { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aFormat; if( aGraphic.IsAnimated() ) diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 0d8df75d8d..951378e3c2 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -41,9 +41,9 @@ #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include "svx/impgrf.hxx" #include "xoutbmp.hxx" #include <svtools/FilterConfigItem.hxx> +#include <svtools/filter.hxx> // ----------- // - Defines - @@ -330,7 +330,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, INetURLObject aURL( rFileName ); Graphic aGraphic; String aExt; - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index eb47f435ad..f163488037 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <svl/itempool.hxx> - +#include <editeng/memberids.hrc> #include <tools/stream.hxx> #include "unoapi.hxx" @@ -58,7 +58,7 @@ #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index b9f42039c4..4fc0b5d2ad 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -41,7 +41,7 @@ #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include <svx/itemtype.hxx> +#include <editeng/itemtype.hxx> #include <svx/xdef.hxx> #define GLOBALOVERFLOW diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 65b0ef95b0..4166d56349 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -38,13 +38,14 @@ #include <vcl/bitmapex.hxx> #include <toolkit/unohlp.hxx> #include <svl/style.hxx> +#include <editeng/memberids.hrc> #include <svx/dialogs.hrc> #include "xattr.hxx" #include <svx/xtable.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include "unoapi.hxx" #include <svx/svdmodel.hxx> diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 63e8d5082d..24301f3019 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -67,7 +67,6 @@ LIB2FILES=\ $(SLB)$/options.lib \ $(SLB)$/stbctrls.lib \ $(SLB)$/tbxctrls.lib \ - $(SLB)$/unoedit.lib \ $(SLB)$/smarttags.lib LIB3TARGET= $(SLB)$/$(TARGET)_3.lib @@ -86,13 +85,11 @@ LIB4FILES=\ # Objects needed for the svxcore library. LIB5TARGET= $(SLB)$/$(TARGET)_5.lib LIB5FILES=\ - $(SLB)$/accessibility-core.lib \ $(SLB)$/animation.lib \ $(SLB)$/attribute.lib \ $(SLB)$/contact.lib \ $(SLB)$/customshapes-core.lib \ $(SLB)$/dialogs-core.lib \ - $(SLB)$/editeng.lib \ $(SLB)$/engine3d-core.lib \ $(SLB)$/event.lib \ $(SLB)$/fmcomp-core.lib \ @@ -103,20 +100,16 @@ LIB5FILES=\ LIB6TARGET= $(SLB)$/$(TARGET)_6.lib LIB6FILES=\ - $(SLB)$/outliner.lib \ $(SLB)$/overlay.lib \ $(SLB)$/primitive2d.lib \ $(SLB)$/primitive3d.lib \ $(SLB)$/properties.lib \ $(SLB)$/svdraw-core.lib \ $(SLB)$/svxlink.lib \ - $(SLB)$/svxrtf-core.lib \ - $(SLB)$/svxrtf.lib \ $(SLB)$/table-core.lib \ $(SLB)$/tbxctrls-core.lib \ $(SLB)$/toolbars.lib \ $(SLB)$/unodraw-core.lib \ - $(SLB)$/unoedit-core.lib \ $(SLB)$/xml.lib \ $(SLB)$/xout.lib @@ -129,6 +122,7 @@ SHL1USE_EXPORTS=name SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(AVMEDIALIB) \ $(SFX2LIB) \ $(XMLOFFLIB) \ @@ -165,6 +159,7 @@ SHL2DEPN=$(SHL1TARGETN) SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET) SHL2STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SFX2LIB) \ $(XMLOFFLIB) \ @@ -205,8 +200,6 @@ SHL2STDLIBS += $(CPPUHELPERLIB) # Resource files SRSFILELIST=\ $(SRS)$/svdstr.srs \ - $(SRS)$/editeng.srs \ - $(SRS)$/outliner.srs \ $(SRS)$/dialogs.srs \ $(SRS)$/drawdlgs.srs \ $(SRS)$/mnuctrls.srs \ diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index 455b857488..aa29faa1c9 100644 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -54,7 +54,7 @@ #include <sfxview.hxx> #include <sfxdlg.hxx> #include <sfxstyle.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <sbx.hxx> #include <hmwrap.hxx> #include <mail.hxx> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index fa1b80b97e..13e3aea04a 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/editview.hxx> -#include <svx/editobj.hxx> -#include <editstat.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> #include <eerdll.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <tools/urlobj.hxx> #include <svx/svxacorr.hxx> #include <tools/fsys.hxx> @@ -69,23 +69,23 @@ #include <sfx2/sfxuno.hxx> // SVX -#include <svx/lrspitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/colritem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/postitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <fontitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> #include <fwdtitem.hxx> // SVTOOLS |