diff options
Diffstat (limited to 'svx')
496 files changed, 6894 insertions, 4049 deletions
diff --git a/svx/Makefile b/svx/Makefile new file mode 100644 index 0000000000..963c7870d9 --- /dev/null +++ b/svx/Makefile @@ -0,0 +1,36 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + + diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index f40993facc..5458ab9a04 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -27,91 +27,87 @@ #ifndef _SVX_FMHELP_HRC #define _SVX_FMHELP_HRC -// include ----------------------------------------------------------- -#include <svl/solar.hrc> - -// in solar.hrc -//#define HID_FORMS_START (HID_LIB_START+4000) -//#define HID_FORMS_END (HID_LIB_START+4999) - // Help-Ids -------------------------------------------------------------- -#define HID_DLG_DBMSG ( HID_FORMS_START + 1) -#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2) -#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3) -#define HID_FIELD_SEL ( HID_FORMS_START + 4) -#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5) -#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6) -#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7) -#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8) -#define HID_SEARCH_TEXT ( HID_FORMS_START + 9) -#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10) -//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11) -#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12) -#define HID_SEARCH_POSITION ( HID_FORMS_START + 13) -#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14) -#define HID_SEARCH_CASE ( HID_FORMS_START + 15) -#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16) -#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17) -#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18) -#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19) -#define HID_SEARCH_APPROX ( HID_FORMS_START + 20) -#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21) -#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22) -#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23) -#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24) -#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25) -#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26) -#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27) -#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28) -#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29) -#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30) -#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31) -#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32) -#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33) -#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34) -#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35) -#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36) -#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37) -#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38) -#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39) -#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40) -//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41) -//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42) -//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43) -#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44) -#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45) -#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46) -#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47) -#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48) -#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49) -#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50) -#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51) -#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54) -#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55) -#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56) -#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57) -#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58) -#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59) -#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60) -#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61) -#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62) -#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63) -#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64) -#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65) - // if you add a new define here, please adjust the overflow check - // at the end of the file!! - -// ----------------------------------------------------------------------- -// Overflow check -------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL - -#if ACT_FM_HID_END > HID_FORMS_END -#error Resource overflow in #line, #file -#endif +#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" +#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" +#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" +#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" +#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" +#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" +#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" +#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS" +#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE" +#define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME" +#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" +#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" +#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" +#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" +#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" +#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" +#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" +#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" +#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME" +#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW" +#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN" +#define HID_XFORMS_ADDDATAITEM_DLG "SVX_HID_XFORMS_ADDDATAITEM_DLG" +#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG" +#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG" +#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST" +#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG" +#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD" +#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT" +#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE" +#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD" +#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT" +#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE" +#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS" +#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX" +#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" +#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" +#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" +#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST" +#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST" +#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" +#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" +#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG" +#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG" +#define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" +#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" +#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" +#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS" +#define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL" +#define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL" +#define HID_FM_DELETECOL "SVX_HID_FM_DELETECOL" +#define HID_FM_HIDECOL "SVX_HID_FM_HIDECOL" +#define HID_FM_SHOWCOLS "SVX_HID_FM_SHOWCOLS" +#define HID_FM_SHOWCOLS_MORE "SVX_HID_FM_SHOWCOLS_MORE" +#define HID_FM_SHOWALLCOLS "SVX_HID_FM_SHOWALLCOLS" +#define HID_FM_DELETE "SVX_HID_FM_DELETE" +#define HID_FM_FILTER_EDIT "SVX_HID_FM_EDIT" +#define HID_FM_FILTER_IS_NULL "SVX_HID_FM_FILTER_IS_NULL" +#define HID_FM_FILTER_IS_NOT_NULL "SVX_HID_FM_IS_NOT_NULL" +#define HID_FM_NEW "SVX_HID_FM_NEW" +#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM" +#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN" +#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT" +#define HID_MENU_FM_TEXTATTRIBUTES_STYLE "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE" +#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT" +#define HID_MENU_FM_TEXTATTRIBUTES_SPACING "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING" #endif diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index dab48bd18a..23b8cd42f4 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -37,7 +37,7 @@ #include <svtools/transfer.hxx> #include <svl/lstner.hxx> #include <svtools/miscopt.hxx> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ---------------------- // - GalleryBrowserMode - diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc deleted file mode 100644 index b51334d0f8..0000000000 --- a/svx/inc/globlac.hrc +++ /dev/null @@ -1,223 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 _GLOBALACC_SRC -#define _GLOBALACC_SRC - -#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; }; - -#define ACC_FUNC( Id, f ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Function = f ; }; }; - -#define ACC_KEY( language, c, bSh, bM1, bM2 ) \ - Key[ language ] = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - -#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - - -#define AI_HELPINDEX ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE ) - -#define AI_ATTR_CHAR ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE ) -// new shortcut F9 for starting slide-show (see #73417#) -#define AI_PRESENTATION ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE ) -// formerly used shortcut Ctrl-F2. Still used (in sd) for compatibility -#define AI_PRESENTATION_COMPAT ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE ) -#define AI_ENTER_GROUP ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE ) -#define AI_COPYOBJECTS ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE ) -#define AI_LEAVE_GROUP ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE ) -#define AI_ATTR_TRANSFORM ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE ) -#define AI_NAVIGATOR ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE ) -#define AI_SPELLING ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE ) -#define AI_THESAURUS ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE ) -#define AI_BEZIER_EDIT ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE ) -#define AI_ATTR_TEXT_FITTOSIZE ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE ) -#define AI_STYLE_DESIGNER ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE ) -#define AI_OUTLINEMODE ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE ) -#define AI_DRAWINGMODE ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE ) - -#define AI_ATTR_PARA_LINESPACE_10 ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_20 ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_15 ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE ) -#define AI_SHOW_ITEMBROWSER ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE ) - -#define AI_ATTR_PARA_ADJUST_BLOCK AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\ - ACC_DEF_KEY( KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_CENTER AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\ - ACC_DEF_KEY( KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_C, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_WEIGHT AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\ - ACC_DEF_KEY( KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_N, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru, KEY_B, FALSE, TRUE, FALSE ) }; - -#define AI_SEARCH_DLG AcceleratorItem { Identifier = SID_SEARCH_DLG;\ - ACC_DEF_KEY( KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_F, FALSE, TRUE, FALSE ) }; - -#define AI_GROUP ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE ) -#define AI_UNGROUP ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE ) - -// Weitersuchen ... -#define AI_SET_SUPER_SCRIPT AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\ - ACC_DEF_KEY( KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_H, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_POSTURE AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\ - ACC_DEF_KEY( KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_I, FALSE, TRUE, FALSE ) }; - -#define AI_COMBINE ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE ) -#define AI_DISMANTLE ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE ) -#define AI_ATTR_PARA_ADJUST_LEFT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\ - ACC_DEF_KEY( KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_L, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_RIGHT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\ - ACC_DEF_KEY( KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_D, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_D, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_R, FALSE, TRUE, FALSE ) }; - -#define AI_SET_SUB_SCRIPT AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\ - ACC_DEF_KEY( KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_P, TRUE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_UNDERLINE AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\ - ACC_DEF_KEY( KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( da, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_U, FALSE, TRUE, FALSE ) }; - -#define AI_STYLE_CATALOG ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE ) -#define AI_WIN_FULLSCREEN ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE ) - -#define AI_FOCUSURLBOX ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE ) -#define AI_SELECTALL ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE ) - -// Anordnung -#define AI_FRAME_TO_TOP ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE ) -#define AI_MOREFRONT ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE ) -#define AI_FRAME_TO_BOTTOM ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE ) -#define AI_MOREBACK ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE ) - -// sonstige Acceleratoren -#define AI_NEWDOC ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE ) -#define AI_NEWDOCDIRECT ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE ) -#define AI_OPENDOC ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE ) -#define AI_CLOSEWIN ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE ) -#define AI_SAVEDOC ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE ) -#define AI_PRINTDOC ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE ) -#define AI_QUITAPP ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE ) -#define AI_CUT ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE ) -#define AI_COPY ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE ) -#define AI_PASTE ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE ) -#define AI_UNDO ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \ - ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE ) -#define AI_REDO ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE ) -#define AI_REPEAT ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE ) -#define AI_DELETE ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE ) - -#endif // _GLOBLACC_SRC - - - - diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index d76a647356..ed431a2727 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -38,288 +38,242 @@ #define ITEM_FORM_CONTROL_PROPERTIES\ Identifier = SID_FM_CTL_PROPERTIES ; \ Command = ".uno:ControlProperties" ; \ - HelpID = SID_FM_CTL_PROPERTIES ; \ Text [ en-US ] = "Con~trol..." ; \ #define ITEM_FORM_PROPERTIES\ Identifier = SID_FM_PROPERTIES ; \ Command = ".uno:FormProperties" ; \ - HelpID = SID_FM_PROPERTIES ; \ Text [ en-US ] = "For~m..." ; \ #define ITEM_REPLACE_CONTROL\ Identifier = SID_FM_CHANGECONTROLTYPE ;\ Command = ".uno:ChangeControlType" ; \ - HelpID = SID_FM_CHANGECONTROLTYPE ; \ Text [ en-US ] = "~Replace with"; \ #define ITEM_FORMAT_TEMPLATECATALOG \ Identifier = SID_STYLE_CATALOG ; \ Command = ".uno:StyleCatalog" ; \ - HelpID = SID_STYLE_CATALOG ; \ Text [ en-US ] = "~Catalog..." ; \ #define ITEM_FORMAT_TEMPLATE \ Identifier = SID_STYLE_DESIGNER ; \ Command = ".uno:DesignerDialog" ; \ - HelpID = SID_STYLE_DESIGNER ; \ Text [ en-US ] = "St~ylist" ; \ #define ITEM_FORMAT_AUTOFORMAT \ Identifier = SID_AUTOFORMAT ; \ Command = ".uno:AutoFormat" ; \ - HelpID = SID_AUTOFORMAT ; \ Text [ en-US ] = "Auto~Format..." ;\ #define ITEM_FORMAT_CHAR_DLG \ Identifier = SID_CHAR_DLG ; \ Command = ".uno:FontDialog" ; \ - HelpID = SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ;\ #define ITEM_FORMAT_PARA_DLG \ Identifier = SID_PARA_DLG ; \ Command = ".uno:ParagraphDialog" ; \ - HelpID = SID_PARA_DLG ; \ Text [ en-US ] = "P~aragraph..." ;\ #define ITEM_FORMAT_FONTWORK \ Identifier = SID_FONTWORK ; \ Command = ".uno:FontWork" ; \ - HelpID = SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ;\ #define ITEM_EDIT_CUT \ Identifier = SID_CUT ; \ Command = ".uno:Cut" ; \ - HelpID = SID_CUT ; \ Text [ en-US ] = "Cu~t" ;\ #define ITEM_EDIT_COPY \ Identifier = SID_COPY ; \ Command = ".uno:Copy" ; \ - HelpID = SID_COPY ; \ Text [ en-US ] = "~Copy" ;\ #define ITEM_EDIT_DELETE \ Identifier = SID_DELETE ; \ Command = ".uno:Delete" ; \ - HelpID = SID_DELETE ; \ Text [ en-US ] = "~Delete" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONT \ Identifier = SID_ATTR_CHAR_FONT ; \ Command = ".uno:CharFontName" ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "Font" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ Command = ".uno:FontHeight" ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ Text [ en-US ] = "Size" ;\ #define ITEM_FORMAT_ATTR_CHAR_WEIGHT \ Identifier = SID_ATTR_CHAR_WEIGHT ; \ Command = ".uno:Bold" ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ #define ITEM_FORMAT_ATTR_CHAR_POSTURE \ Identifier = SID_ATTR_CHAR_POSTURE ; \ Command = ".uno:Italic" ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ;\ #define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ Command = ".uno:Underline" ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ;\ #define ITEM_FORMAT_ATTR_CHAR_OVERLINE \ Identifier = SID_ATTR_CHAR_OVERLINE ; \ Command = ".uno:Overline" ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ;\ #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ Command = ".uno:Strikeout" ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ;\ #define ITEM_FORMAT_ATTR_CHAR_SHADOWED \ Identifier = SID_ATTR_CHAR_SHADOWED ; \ Command = ".uno:Shadowed" ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ;\ #define ITEM_FORMAT_ATTR_CHAR_CONTOUR \ Identifier = SID_ATTR_CHAR_CONTOUR ; \ Command = ".uno:OutlineFont" ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "Outline" ;\ #define ITEM_FORMAT_SET_SUPER_SCRIPT \ Identifier = SID_SET_SUPER_SCRIPT; \ - HelpID = SID_SET_SUPER_SCRIPT; \ + Command = CMD_SID_SET_SUPER_SCRIPT; \ Text [ en-US ] = "Su~perscript"; \ #define ITEM_FORMAT_SET_SUB_SCRIPT \ Identifier = SID_SET_SUB_SCRIPT; \ - HelpID = SID_SET_SUB_SCRIPT; \ + Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ Command = ".uno:RightPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ Command = ".uno:CenterPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ Text [ en-US ] = "Justified" ;\ #define ITEM_FORMAT_PARA_LINESPACE_10 \ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ Command = ".uno:SpacePara1" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ Text [ en-US ] = "Single" ;\ #define ITEM_FORMAT_PARA_LINESPACE_15 \ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ Command = ".uno:SpacePara15" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ Text [ en-US ] = "1.5 lines" ;\ #define ITEM_FORMAT_PARA_LINESPACE_20 \ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ Command = ".uno:SpacePara2" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ Text [ en-US ] = "~Double" ;\ #define ITEM_FORMAT_FRAME_TO_TOP \ Identifier = SID_FRAME_TO_TOP ; \ Command = ".uno:BringToFront" ; \ - HelpID = SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ;\ #define ITEM_FORMAT_FRAME_TO_BOTTOM \ Identifier = SID_FRAME_TO_BOTTOM ; \ Command = ".uno:SendToBack" ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ;\ #define ITEM_FORMAT_OBJECT_ALIGN \ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:ObjectAlign" ; \ - HelpID = SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_LEFT \ Identifier = SID_OBJECT_ALIGN_LEFT ; \ Command = ".uno:ObjectAlignLeft" ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_CENTER \ Identifier = SID_OBJECT_ALIGN_CENTER ; \ Command = ".uno:AlignCenter" ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ Command = ".uno:ObjectAlignRight" ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_UP \ Identifier = SID_OBJECT_ALIGN_UP ; \ Command = ".uno:AlignUp" ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ Command = ".uno:AlignMiddle" ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_DOWN \ Identifier = SID_OBJECT_ALIGN_DOWN ; \ Command = ".uno:AlignDown" ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ;\ #define ITEM_FORMAT_ATTRIBUTES_LINE \ Identifier = SID_ATTRIBUTES_LINE ; \ Command = ".uno:FormatLine" ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ;\ #define ITEM_FORMAT_ATTRIBUTES_AREA \ Identifier = SID_ATTRIBUTES_AREA ; \ Command = ".uno:FormatArea" ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "A~rea..." ;\ #define ITEM_FORMAT_ATTR_TRANSFORM \ Identifier = SID_ATTR_TRANSFORM ; \ Command = ".uno:TransformDialog" ; \ - HelpID = SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ;\ #define ITEM_FORMAT_OBJECT_HEAVEN \ Identifier = SID_OBJECT_HEAVEN ; \ Command = ".uno:SetObjectToForeground" ; \ - HelpID = SID_OBJECT_HEAVEN ; \ Text [ en-US ] = "~To Foreground" ;\ #define ITEM_FORMAT_OBJECT_HELL \ Identifier = SID_OBJECT_HELL ; \ Command = ".uno:SetObjectToBackground" ; \ - HelpID = SID_OBJECT_HELL ; \ Text [ en-US ] = "T~o Background" ;\ #define ITEM_FORMAT_BEZIER_EDIT \ Identifier = SID_BEZIER_EDIT ; \ Command = ".uno:ToggleObjectBezierMode" ; \ - HelpID = SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ;\ #define ITEM_FILE_PICKLIST \ Identifier = SID_PICKLIST ; \ Command = ".uno:PickList" ; \ - HelpID = SID_PICKLIST ; \ Text [ en-US ] = "~File" ; \ #define ITEM_FILE_NEWDOC \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ;\ #define ITEM_FILE_OPENDOC \ Identifier = SID_OPENDOC ; \ Command = ".uno:Open" ; \ - HelpID = SID_OPENDOC ; \ Text [ en-US ] = "~Open..." ;\ @@ -328,62 +282,52 @@ {\ Identifier = SID_AUTOPILOTMENU ; \ Command = ".uno:AutoPilotMenu" ; \ - HelpID = SID_AUTOPILOTMENU ; \ Text [ en-US ] = "A~utoPilot" ; \ }; #define ITEM_FILE_CLOSEDOC \ Identifier = SID_CLOSEDOC ; \ Command = ".uno:CloseDoc" ; \ - HelpID = SID_CLOSEDOC ; \ Text [ en-US ] = "~Close" ;\ #define ITEM_FILE_SAVEDOC \ Identifier = SID_SAVEDOC ; \ Command = ".uno:Save" ; \ - HelpID = SID_SAVEDOC ; \ Text [ en-US ] = "~Save" ; \ #define ITEM_FILE_SAVEDOCS \ Identifier = SID_SAVEDOCS ; \ Command = ".uno:SaveAll" ; \ - HelpID = SID_SAVEDOCS ; \ Text [ en-US ] = "Sa~ve All" ; \ #define ITEM_FILE_SAVEASDOC \ Identifier = SID_SAVEASDOC ; \ Command = ".uno:SaveAs" ; \ - HelpID = SID_SAVEASDOC ; \ Text [ en-US ] = "Save ~As..." ; \ #define ITEM_FILE_EXPORTDOC \ Identifier = SID_EXPORTDOC ; \ Command = ".uno:ExportTo" ; \ - HelpID = SID_EXPORTDOC ; \ Text [ en-US ] = "Expor~t..." ; \ #define ITEM_FILE_EXPORTDOCASPDF \ Identifier = SID_EXPORTDOCASPDF ; \ Command = ".uno:ExportToPDF" ; \ - HelpID = SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as P~DF..." ; \ #define ITEM_FILE_VERSIONDIALOG \ Identifier = SID_VERSION ; \ Command = ".uno:VersionDialog" ; \ - HelpID = SID_VERSION ; \ Text [ en-US ] = "Versions..." ; \ #define ITEM_FILE_LASTVERSIONDOC \ Identifier = SID_RELOAD ; \ Command = ".uno:Reload" ; \ - HelpID = SID_RELOAD ; \ Text [ en-US ] = "Reload" ;\ #define ITEM_FILE_DOCINFO \ Identifier = SID_DOCINFO ; \ Command = ".uno:SetDocumentProperties" ; \ - HelpID = SID_DOCINFO ; \ Text [ en-US ] = "Propert~ies..." ;\ #define ITEM_FILE_DOCTEMPLATE \ @@ -398,28 +342,24 @@ { \ Identifier = SID_ORGANIZER ; \ Command = ".uno:Organizer" ; \ - HelpId = SID_ORGANIZER ; \ Text [ en-US ] = "~Organize...";\ }; \ MenuItem \ { \ Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Command = ".uno:AddressBookSource" ; \ - HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Text [ en-US ] = "~Address Book Source..."; \ }; \ MenuItem \ { \ Identifier = SID_DOCTEMPLATE ; \ Command = ".uno:SaveAsTemplate" ; \ - HelpId = SID_DOCTEMPLATE ; \ Text [ en-US ] = "~Save...";\ }; \ MenuItem \ { \ Identifier = SID_OPENTEMPLATE ; \ Command = ".uno:OpenTemplate" ; \ - HelpId = SID_OPENTEMPLATE ; \ Text [ en-US ] = "~Edit...";\ }; \ }; \ @@ -428,164 +368,138 @@ #define ITEM_FILE_PRINTPREVIEW \ Identifier = SID_PRINTPREVIEW ; \ Command = ".uno:PrintPreview" ; \ - HelpID = SID_PRINTPREVIEW ; \ Text [ en-US ] = "Pa~ge Preview" ;\ #define ITEM_FILE_SETUPPRINTER \ Identifier = SID_SETUPPRINTER ; \ Command = ".uno:PrinterSetup" ; \ - HelpID = SID_SETUPPRINTER ; \ Text [ en-US ] = "P~rinter Settings..." ; \ #define ITEM_FILE_PRINTDOC \ Identifier = SID_PRINTDOC ; \ Command = ".uno:Print" ; \ - HelpID = SID_PRINTDOC ; \ Text [ en-US ] = "~Print..." ; \ #define ITEM_FILE_MAIL_SENDDOC \ Identifier = SID_MAIL_SENDDOC ; \ Command = ".uno:SendMail" ; \ - HelpID = SID_MAIL_SENDDOC ; \ Text [ en-US ] = "Document as ~E-mail..." ; \ #define ITEM_FILE_MAIL_SENDDOCASPDF \ Identifier = SID_MAIL_SENDDOCASPDF ; \ Command = ".uno:SendMailDocAsPDF" ; \ - HelpID = SID_MAIL_SENDDOCASPDF ; \ Text [ en-US ] = "Document as P~DF Attachment..." ; \ #define ITEM_FILE_QUITAPP \ Identifier = SID_QUITAPP ; \ Command = ".uno:Quit" ; \ - HelpID = SID_QUITAPP ; \ Text [ en-US ] = "E~xit" ; \ #define ITEM_FILE_LOGOUT \ Identifier = SID_LOGOUT ; \ Command = ".uno:Logout" ; \ - HelpID = SID_LOGOUT ; \ Text [ en-US ] = "Logout" ; \ #define ITEM_EDIT_UNDO \ Identifier = SID_UNDO ; \ Command = ".uno:UndoAction" ; \ - HelpID = SID_UNDO ; \ Text [ en-US ] = "Undo" ; \ #define ITEM_EDIT_REDO \ Identifier = SID_REDO ; \ Command = ".uno:Redo" ; \ - HelpID = SID_REDO ; \ Text [ en-US ] = "Redo" ; \ #define ITEM_EDIT_REPEAT \ Identifier = SID_REPEAT ; \ Command = ".uno:Repeat" ; \ - HelpID = SID_REPEAT ; \ Text [ en-US ] = "~Repeat" ; \ #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ - HelpID = SID_PASTE ; \ Text [ en-US ] = "~Paste" ; \ #define ITEM_EDIT_SELECTALL \ Identifier = SID_SELECTALL ; \ Command = ".uno:SelectAll" ; \ - HelpID = SID_SELECTALL ; \ Text [ en-US ] = "Select ~All" ; \ #define ITEM_EDIT_SEARCH_DLG \ Identifier = SID_SEARCH_DLG ; \ Command = ".uno:SearchDialog" ; \ - HelpID = SID_SEARCH_DLG ; \ Text [ en-US ] = "~Find & Replace..." ; \ #define ITEM_EDIT_NAVIGATOR \ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ Text [ en-US ] = "~Navigator" ; \ #define ITEM_EDIT_BIBLIOGRAPHY \ Identifier = SID_COMP_BIBLIOGRAPHY ; \ Command = ".uno:BibliographyComponent" ; \ - HelpID = SID_COMP_BIBLIOGRAPHY ; \ Text [ en-US ] = "~Bibliography Database"; \ #define ITEM_EDIT_PLUGINS_ACTIVE \ Identifier = SID_PLUGINS_ACTIVE ; \ Command = ".uno:PlugInsActive" ; \ - HelpID = SID_PLUGINS_ACTIVE ; \ Text [ en-US ] = "P~lug-in" ; \ #define ITEM_EDIT_IMAP \ Identifier = SID_IMAP ; \ Command = ".uno:ImageMapDialog" ; \ - HelpID = SID_IMAP ; \ Text [ en-US ] = "ImageMap" ; \ #define ITEM_EDIT_OBJECT \ Identifier = SID_OBJECT ; \ Command = ".uno:ObjectMenue" ; \ - HelpID = SID_OBJECT ; \ Text [ en-US ] = "~Object" ; \ #define ITEM_VIEW_ATTR_ZOOM \ Identifier = SID_ATTR_ZOOM ; \ Command = ".uno:Zoom" ; \ - HelpID = SID_ATTR_ZOOM ; \ Text [ en-US ] = "~Zoom..." ; \ #define ITEM_VIEW_TOGGLEFUNCTIONBAR \ Identifier = SID_TOGGLEFUNCTIONBAR ; \ Command = ".uno:FunctionBarVisible" ; \ - HelpID = SID_TOGGLEFUNCTIONBAR ; \ Text [ en-US ] = "~Function Bar" ; \ #define ITEM_VIEW_TOGGLEOBJECTBAR \ Identifier = SID_TOGGLEOBJECTBAR ; \ Command = ".uno:ObjectBarVisible" ; \ - HelpID = SID_TOGGLEOBJECTBAR ; \ Text [ en-US ] = "~Object Bar" ; \ #define ITEM_VIEW_TOGGLEINETBAR \ Identifier = SID_TOGGLEINETBAR ; \ - HelpID = SID_TOGGLEINETBAR ; \ + Command = CMD_SID_TOGGLEINETBAR; \ Text [ en-US ] = "Internet Bar" ; \ #define ITEM_VIEW_TOGGLESTATUSBAR \ Identifier = SID_TOGGLESTATUSBAR ; \ Command = ".uno:StatusBarVisible" ; \ - HelpID = SID_TOGGLESTATUSBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \ Identifier = SID_SHOW_IME_STATUS_WINDOW ; \ Command = ".uno:ShowImeStatusWindow" ; \ - HelpID = SID_SHOW_IME_STATUS_WINDOW ; \ Text [ en-US ] = "~Input Method Status"; \ #define ITEM_VIEW_TASKBAR \ Identifier = SID_TASKBAR ; \ Command = ".uno:TaskBarVisible" ; \ - HelpID = SID_TASKBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_COLORBAR \ Identifier = SID_COLOR_CONTROL ; \ Command = ".uno:ColorControl" ; \ - HelpID = SID_COLOR_CONTROL ; \ Text [ en-US ] = "~Color Bar" ; \ #define ITEM_VIEW_FULLSCREEN \ Identifier = SID_WIN_FULLSCREEN ; \ Command = ".uno:FullScreen" ; \ - HelpID = SID_WIN_FULLSCREEN ; \ Text [ en-US ] = "F~ull Screen" ; \ @@ -598,26 +512,22 @@ #define ITEM_VIEW_BROWSER_MODE \ Identifier = SID_BROWSER_MODE ; \ Command = ".uno:BrowseView" ; \ - HelpID = SID_BROWSER_MODE ; \ Text [ en-US ] = "~Online Layout" ; \ #define ITEM_VIEW_BROWSER \ Identifier = SID_BROWSER ; \ Command = ".uno:Beamer" ; \ - HelpID = SID_BROWSER ; \ Text [ en-US ] = "~Beamer" ; \ #define ITEM_INSERT_HYPERLINK_INSERT \ Identifier = SID_HYPERLINK_INSERT ; \ Command = ".uno:InsertHyperlink" ; \ - HelpID = SID_HYPERLINK_INSERT ; \ Text [ en-US ] = "~Hyperlink Bar" ; \ #define ITEM_INSERT_INSERT_GRAPHIC \ Identifier = SID_INSERT_GRAPHIC ; \ Command = ".uno:InsertGraphic" ; \ - HelpID = SID_INSERT_GRAPHIC ; \ Text [ en-US ] = "~Graphics..." ; \ #define ITEM_INSERT_TWAIN_SELECT \ @@ -625,7 +535,6 @@ {\ Identifier = SID_TWAIN_SELECT ; \ Command = ".uno:TwainSelect" ; \ - HelpID = SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -634,7 +543,6 @@ {\ Identifier = SID_TWAIN_TRANSFER ; \ Command = ".uno:TwainTransfer" ; \ - HelpID = SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -643,7 +551,6 @@ {\ Identifier = SID_SCAN ; \ Command = ".uno:Scan" ; \ - HelpID = SID_SCAN ; \ Text [ en-US ] = "Scan" ; \ SubMenu = Menu\ {\ @@ -658,19 +565,16 @@ #define ITEM_INSERT_INSERT_DIAGRAM \ Identifier = SID_INSERT_DIAGRAM ; \ Command = ".uno:InsertObjectChart" ; \ - HelpID = SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "~Chart..." ; \ #define ITEM_INSERT_GALLERY \ Identifier = SID_GALLERY ; \ Command = ".uno:Gallery" ; \ - HelpID = SID_GALLERY ; \ Text [ en-US ] = "~Gallery" ; \ #define ITEM_INSERT_INSERTDOC \ Identifier = SID_INSERTDOC ; \ Command = ".uno:InsertDoc" ; \ - HelpID = SID_INSERTDOC ; \ Text [ en-US ] = "~File..." ; \ #define TMP_SID_INSERT_PLUGIN \ @@ -678,7 +582,6 @@ {\ Identifier = SID_INSERT_PLUGIN ; \ Command = ".uno:InsertPlugin" ; \ - HelpID = SID_INSERT_PLUGIN ; \ Text [ en-US ] = "~Plug-in..." ; \ }; @@ -687,7 +590,6 @@ {\ Identifier = SID_INSERT_SOUND ; \ Command = ".uno:InsertSound" ; \ - HelpID = SID_INSERT_SOUND ; \ Text [ en-US ] = "~Sound..." ; \ }; @@ -696,27 +598,13 @@ {\ Identifier = SID_INSERT_VIDEO ; \ Command = ".uno:InsertVideo" ; \ - HelpID = SID_INSERT_VIDEO ; \ Text [ en-US ] = "~Video..." ; \ }; -#ifdef SOLAR_JAVA -#define TMP_SID_INSERT_APPLET \ - MenuItem\ - {\ - Identifier = SID_INSERT_APPLET ; \ - Command = ".uno:InsertApplet" ; \ - HelpID = SID_INSERT_APPLET ; \ - Text [ en-US ] = "~Applet..." ; \ - }; -#else -#define TMP_SID_INSERT_APPLET -#endif #define ITEM_INSERT_OBJECT_MN \ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -727,18 +615,15 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ TMP_SID_INSERT_PLUGIN\ TMP_SID_INSERT_SOUND\ TMP_SID_INSERT_VIDEO\ - TMP_SID_INSERT_APPLET\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula..." ; \ };\ };\ @@ -749,7 +634,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -760,14 +644,12 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula" ; \ };\ };\ @@ -778,7 +660,6 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ en-US ] = "~Numbering/Bullets..." ; \ }; @@ -786,7 +667,6 @@ #define ITEM_FORMAT \ Identifier = SID_OBJECTMENU0 ; \ - HelpID = SID_OBJECTMENU0 ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -794,7 +674,6 @@ #define ITEM_TOOLS_MACROS \ Identifier = SID_SCRIPTORGANIZER ; \ - HelpId = SID_SCRIPTORGANIZER ; \ Command = ".uno:ScriptOrganizer" ; \ Text [ en-US ] = "Scripts/Macros" ; \ @@ -810,13 +689,11 @@ { \ Identifier = SID_RECORDMACRO ; \ Command = ".uno:MacroRecorder" ; \ - HelpId = SID_RECORDMACRO ; \ Text [ en-US ] = "Record Macro"; }; \ MenuItem \ { \ Identifier = SID_BASICCHOOSER ; \ Command = ".uno:MacroDialog" ; \ - HelpID = SID_BASICCHOOSER ; \ Text [ en-US ] = "~Macro..." ; \ }; \ }; \ @@ -829,7 +706,6 @@ #define ITEM_TOOLS_CONFIG \ Identifier = SID_CONFIG ; \ Command = ".uno:ConfigureDialog"; \ - HelpID = SID_CONFIG ; \ Text [ en-US ] = "~Configure..." ; \ @@ -838,7 +714,6 @@ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ Command = ".uno:AutoCorrectDlg" ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -847,7 +722,6 @@ {\ Identifier = SID_SD_GRAPHIC_OPTIONS ; \ Command = ".uno:SdGraphicOptions" ; \ - HelpID = SID_SD_GRAPHIC_OPTIONS ; \ Text [ en-US ] = "~Drawing..." ; \ }; @@ -856,7 +730,6 @@ {\ Identifier = SID_OPTIONS_TREEDIALOG ; \ Command = ".uno:OptionsTreeDialog" ; \ - HelpID = SID_OPTIONS_TREEDIALOG ; \ Text [ en-US ] = "~Options..." ; \ }; @@ -867,13 +740,11 @@ #define ITEM_WINDOW_MDIWINDOWLIST \ Identifier = SID_MDIWINDOWLIST ; \ Command = ".uno:WindowList" ; \ - HelpID = SID_MDIWINDOWLIST ; \ Text [ en-US ] = "~Window" ; \ #define ITEM_WINDOW_CLONEWIN \ Identifier = SID_NEWWINDOW ; \ Command = ".uno:NewWindow" ; \ - HelpID = SID_NEWWINDOW ; \ Text [ en-US ] = "~New Window" ; \ #define ITEM_WINDOW_CASCADEWINS \ @@ -881,7 +752,6 @@ {\ Identifier = SID_CASCADEWINS ; \ Command = ".uno:Cascade" ; \ - HelpID = SID_CASCADEWINS ; \ Text [ en-US ] = "~Cascade" ; \ }; @@ -890,7 +760,6 @@ {\ Identifier = SID_TILEWINS ; \ Command = ".uno:Tile" ; \ - HelpID = SID_TILEWINS ; \ Text [ en-US ] = "~Tile" ; \ }; @@ -899,7 +768,6 @@ {\ Identifier = SID_HORIZONTALWINS ; \ Command = ".uno:ArrangeHorizontal" ; \ - HelpID = SID_HORIZONTALWINS ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -908,14 +776,12 @@ {\ Identifier = SID_VERTICALWINS ; \ Command = ".uno:ArrangeVertical" ; \ - HelpID = SID_VERTICALWINS ; \ Text [ en-US ] = "~Vertically" ; \ }; #define ITEM_WINDOW_CLOSEWIN \ Identifier = SID_CLOSEWIN ; \ Command = ".uno:CloseWin" ; \ - HelpID = SID_CLOSEWIN ; \ Text [ en-US ] = "Close Window" ; \ #define ITEM_HYPERLINK_DIALOG \ @@ -923,7 +789,6 @@ {\ Identifier = SID_HYPERLINK_DIALOG ; \ Command = ".uno:HyperlinkDialog" ; \ - HelpID = SID_HYPERLINK_DIALOG ; \ Text [ en-US ] = "~Hyperlink" ; \ } ; @@ -932,7 +797,6 @@ {\ Identifier = SID_POLY_MERGE ; \ Command = ".uno:Merge" ; \ - HelpID = SID_POLY_MERGE ; \ Text [ en-US ] = "~Merge" ; \ }; #define ITEM_POLY_SUBSTRACT \ @@ -940,7 +804,6 @@ {\ Identifier = SID_POLY_SUBSTRACT ; \ Command = ".uno:Substract" ; \ - HelpID = SID_POLY_SUBSTRACT ; \ Text [ en-US ] = "~Subtract" ; \ }; #define ITEM_POLY_INTERSECT \ @@ -948,7 +811,6 @@ {\ Identifier = SID_POLY_INTERSECT ; \ Command = ".uno:Intersect" ; \ - HelpID = SID_POLY_INTERSECT ; \ Text [ en-US ] = "I~ntersect" ; \ }; @@ -957,7 +819,6 @@ { \ Identifier = SID_POLY_FORMEN ; \ Command = ".uno:PolyFormen" ; \ - HelpID = SID_POLY_FORMEN ; \ Text [ en-US ] = "~Shapes" ; \ SubMenu = Menu \ {\ @@ -1016,43 +877,36 @@ #define ITEM_HELP_HELPMENU \ Identifier = SID_HELPMENU ; \ Command = ".uno:HelpMenu" ; \ - HelpID = SID_HELPMENU ; \ Text [ en-US ] = "~Help" ; \ #define ITEM_HELP_HELPINDEX \ Identifier = SID_HELPINDEX ; \ Command = ".uno:HelpIndex" ; \ - HelpID = SID_HELPINDEX ; \ Text [ en-US ] = "~Contents" ; \ #define ITEM_HELP_HELPONHELP \ Identifier = SID_HELPONHELP ; \ Command = ".uno:HelpOnHelp" ; \ - HelpID = SID_HELPONHELP ; \ Text [ en-US ] = "Using Help" ; \ #define ITEM_HELP_HELP_PI \ Identifier = SID_HELP_PI ; \ Command = ".uno:HelperDialog" ; \ - HelpID = SID_HELP_PI ; \ Text [ en-US ] = "Help ~Agent" ; \ #define ITEM_HELP_HELPTIPS \ Identifier = SID_HELPTIPS ; \ Command = ".uno:HelpTip" ; \ - HelpID = SID_HELPTIPS ; \ Text [ en-US ] = "~Tips" ; \ #define ITEM_HELP_BALLOONHELP \ Identifier = SID_HELPBALLOONS ; \ Command = ".uno:ActiveHelp" ; \ - HelpID = SID_HELPBALLOONS ; \ Text [ en-US ] = "~Extended Tips" ; \ #define ITEM_SHOW_LICENSE \ Identifier = SID_SHOW_LICENSE ; \ Command = ".uno:ShowLicense" ; \ - HelpID = SID_SHOW_LICENSE ; \ Text [ en-US ] = "License information..." ; \ #define ITEM_SHOW_CREDITS \ @@ -1064,14 +918,12 @@ #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ Command = ".uno:OnlineRegistrationDlg" ; \ - HelpID = SID_ONLINE_REGISTRATION ; \ Text [ en-US ] = "~Registration..." ; \ #define ITEM_HELP_ABOUT \ Identifier = SID_ABOUT ; \ Command = ".uno:About" ; \ - HelpID = SID_ABOUT ; \ Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \ /*------------------------------------------------------------------------ @@ -1137,39 +989,33 @@ #define ITEM_POPUP_TEMPLATE_EDIT \ Identifier = SID_STYLE_EDIT ; \ Command = ".uno:EditStyle" ; \ - HelpID = SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Paragraph Style..." ; \ // Gruppen-/Kombination-Funktionen #define ITEM_POPUP_GROUP \ Identifier = SID_GROUP ; \ Command = ".uno:FormatGroup" ; \ - HelpID = SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ #define ITEM_POPUP_UNGROUP \ Identifier = SID_UNGROUP ; \ Command = ".uno:FormatUngroup" ; \ - HelpID = SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ #define ITEM_POPUP_ENTER_GROUP \ Identifier = SID_ENTER_GROUP ; \ Command = ".uno:EnterGroup" ; \ - HelpID = SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ #define ITEM_POPUP_LEAVE_GROUP \ Identifier = SID_LEAVE_GROUP ; \ Command = ".uno:LeaveGroup" ; \ - HelpID = SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ #define ITEM_GROUP_MENU \ MenuItem\ {\ Identifier = SID_MN_GROUP ; \ - HelpID = SID_MN_GROUP ; \ Command = ".uno:GroupMenu" ; \ SubMenu = Menu\ {\ @@ -1201,14 +1047,12 @@ { \ Identifier = SID_DATASOURCE_ADMINISTRATION ; \ Command = ".uno:DatasourceAdministration" ; \ - HelpID = SID_DATASOURCE_ADMINISTRATION ; \ Text [ en-US ] = "~Data Sources..." ; \ }; #define ITEM_VIEW_DATA_SOURCE_BROWSER \ Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \ Command = ".uno:ViewDataSourceBrowser" ; \ - HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \ Text [ en-US ] = "~Data Sources" ; \ /*------------------------------------------------------------------------ @@ -1217,112 +1061,92 @@ #define ITEM_TOOLBAR_SET_JUSTIFY_PARA \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; #define ITEM_TOOLBAR_NEWDOCDIRECT \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; #define ITEM_TOOLBAR_PRINTDOCDIRECT \ Identifier = SID_PRINTDOCDIRECT ; \ Command = ".uno:PrintDefault" ; \ - HelpID = SID_PRINTDOCDIRECT ; #define ITEM_TOOLBAR_INSERT_DRAW \ Identifier = SID_INSERT_DRAW ; \ Command = ".uno:InsertDraw" ; \ - HelpID = SID_INSERT_DRAW ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_CHOOSE_CONTROLS \ Identifier = SID_CHOOSE_CONTROLS ; \ Command = ".uno:ChooseControls" ; \ - HelpID = SID_CHOOSE_CONTROLS ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_AUTOSPELL_CHECK \ Identifier = SID_AUTOSPELL_CHECK ; \ Command = ".uno:SpellOnline" ; \ - HelpID = SID_AUTOSPELL_CHECK ; #define ITEM_TOOLBAR_TEMPLATE_APPLY \ Identifier = SID_STYLE_APPLY ; \ Command = ".uno:StyleApply" ; \ - HelpID = SID_STYLE_APPLY ; #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \ Identifier = SID_ATTR_CHAR_COLOR ; \ Command = ".uno:Color" ; \ - HelpID = SID_ATTR_CHAR_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_PATTERN \ Identifier = SID_BACKGROUND_PATTERN ; \ Command = ".uno:BackgroundPatternController" ; \ - HelpID = SID_BACKGROUND_PATTERN ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_COLOR \ Identifier = SID_BACKGROUND_COLOR ; \ Command = ".uno:BackgroundColor" ; \ - HelpID = SID_BACKGROUND_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_BORDER \ Identifier = SID_ATTR_BORDER ; \ Command = ".uno:BorderStyle" ; \ - HelpID = SID_ATTR_BORDER ; #define ITEM_TOOLBAR_FRAME_LINESTYLE \ Identifier = SID_FRAME_LINESTYLE ; \ Command = ".uno:LineStyle" ; \ - HelpID = SID_FRAME_LINESTYLE ; #define ITEM_TOOLBAR_FRAME_LINECOLOR \ Identifier = SID_FRAME_LINECOLOR ; \ Command = ".uno:FrameLineColor" ; \ - HelpID = SID_FRAME_LINECOLOR ; #define ITEM_TOOLBAR_SIM_START \ Identifier = SID_SIM_START ; \ Command = ".uno:LaunchStarImage" ; \ - HelpID = SID_SIM_START ; #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \ Identifier = SID_ATTR_LINEEND_STYLE ; \ Command = ".uno:LineEndStyle" ; \ - HelpID = SID_ATTR_LINEEND_STYLE ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_LINE_STYLE \ Identifier = SID_ATTR_LINE_STYLE ; \ Command = ".uno:XLineStyle" ; \ - HelpID = SID_ATTR_LINE_STYLE ; #define ITEM_TOOLBAR_ATTR_LINE_WIDTH \ Identifier = SID_ATTR_LINE_WIDTH ; \ Command = ".uno:LineWidth" ; \ - HelpID = SID_ATTR_LINE_WIDTH ; #define ITEM_TOOLBAR_ATTR_LINE_COLOR \ Identifier = SID_ATTR_LINE_COLOR ; \ Command = ".uno:XLineColor" ; \ - HelpID = SID_ATTR_LINE_COLOR ; #define ITEM_TOOLBAR_ATTR_FILL_STYLE \ Identifier = SID_ATTR_FILL_STYLE ; \ Command = ".uno:FillStyle" ; \ - HelpID = SID_ATTR_FILL_STYLE ; #define ITEM_TOOLBAR_OBJECT_ROTATE \ Identifier = SID_OBJECT_ROTATE ; \ Command = ".uno:ToggleObjectRotateMode" ; \ - HelpID = SID_OBJECT_ROTATE ; #define ITEM_VIEW_OFFICEBAR \ Identifier = SID_GROUPVIEW; \ - HelpID = SID_GROUPVIEW; \ + Command = CMD_SID_GROUPVIEW; \ Text [ en-US ] = "~Office Bar" ; \ @@ -1330,7 +1154,6 @@ MenuItem\ {\ Identifier = SID_MN_SUB_TRANSLITERATE ; \ - HelpID = SID_MN_SUB_TRANSLITERATE ; \ Command = ".uno:TransliterateMenu" ; \ SubMenu = Menu\ {\ @@ -1340,63 +1163,54 @@ {\ Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \ Command = ".uno:ChangeCaseToSentenceCase" ; \ - HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \ Text [ en-US ] = "~Sentence case";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_LOWER; \ Command = ".uno:ChangeCaseToLower" ; \ - HelpID = SID_TRANSLITERATE_LOWER; \ Text [ en-US ] = "~lowercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_UPPER ; \ Command = ".uno:ChangeCaseToUpper" ; \ - HelpID = SID_TRANSLITERATE_UPPER ; \ Text [ en-US ] = "~UPPERCASE";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_TITLE_CASE; \ Command = ".uno:ChangeCaseToTitleCase" ; \ - HelpID = SID_TRANSLITERATE_TITLE_CASE; \ Text [ en-US ] = "~Capitalize Every Word";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \ Command = ".uno:ChangeCaseToToggleCase" ; \ - HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \ Text [ en-US ] = "~tOGGLE cASE";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HALFWIDTH; \ Command = ".uno:ChangeCaseToHalfWidth" ; \ - HelpID = SID_TRANSLITERATE_HALFWIDTH; \ Text [ en-US ] = "H~alf-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_FULLWIDTH; \ Command = ".uno:ChangeCaseToFullWidth" ; \ - HelpID = SID_TRANSLITERATE_FULLWIDTH; \ Text [ en-US ] = "Full-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HIRAGANA; \ Command = ".uno:ChangeCaseToHiragana" ; \ - HelpID = SID_TRANSLITERATE_HIRAGANA; \ Text [ en-US ] = "~Hiragana";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_KATAGANA; \ Command = ".uno:ChangeCaseToKatakana" ; \ - HelpID = SID_TRANSLITERATE_KATAGANA; \ Text [ en-US ] = "~Katakana";\ };\ };\ @@ -1406,23 +1220,23 @@ #define ITEM_OPEN_HYPERLINK \ Identifier = SID_OPEN_HYPERLINK ; \ - HelpID = SID_OPEN_HYPERLINK ; \ + Command = CMD_SID_OPEN_HYPERLINK; \ Text [ en-US ] = "~Open Hyperlink" ; \ #define ITEM_OPEN_SMARTTAGMENU \ Identifier = SID_OPEN_SMARTTAGMENU ; \ - HelpID = SID_OPEN_SMARTTAGMENU ; \ + Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ #define ITEM_OPEN_XML_FILTERSETTINGS \ Identifier = SID_OPEN_XML_FILTERSETTINGS ; \ - HelpID = SID_OPEN_XML_FILTERSETTINGS ; \ + Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \ Text [ en-US ] = "~XML Filter Settings..."; \ #define ITEM_HANGUL_HANJA_CONVERSION \ Identifier = SID_HANGUL_HANJA_CONVERSION; \ - HelpId = SID_HANGUL_HANJA_CONVERSION; \ + Command = CMD_SID_HANGUL_HANJA_CONVERSION; \ Text [ en-US ] = "Hangul/Hanja Conversion..."; \ #endif // #ifndef _GLOBLMN_HRC diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 573f7a9b71..7985d4af6c 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -26,270 +26,254 @@ ************************************************************************/ #ifndef _SVX_HELPID_HRC #define _SVX_HELPID_HRC -// include --------------------------------------------------------------- - -#include <svl/solar.hrc> #include <svx/exthelpid.hrc> - -// Help-Ids -------------------------------------------------------------- -#define HID_ALIGN_TBX (HID_SVX_START + 1) -#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4) -#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5) -#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6) -#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7) -#define HID_CONTDLG_APPLY (HID_SVX_START + 8) -#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9) -#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10) -#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11) -#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12) -#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13) -#define HID_CONTDLG_POLY (HID_SVX_START + 14) -#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15) -#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16) -#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17) -#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18) -#define HID_CONTDLG_RECT (HID_SVX_START + 19) -#define HID_CONTDLG_REDO (HID_SVX_START + 20) -#define HID_CONTDLG_SELECT (HID_SVX_START + 21) -#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22) -#define HID_CONTDLG_UNDO (HID_SVX_START + 23) -#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24) -#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25) -#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26) -#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27) -#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28) -#define HID_CTRL_COLOR (HID_SVX_START + 29) -#define HID_DRAWTOOL_TBX (HID_SVX_START + 30) -#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_PARALANGUAGE (HID_SVX_START + 34) -#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35) -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36) -#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37) -#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38) -#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39) -#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40) -#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41) -#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42) -#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43) -#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44) -#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45) -#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46) -#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47) -#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48) -#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49) -#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50) -#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51) -#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52) -#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53) -#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54) -#define HID_FORMAT_FOOTER (HID_SVX_START + 55) -#define HID_FORMAT_HEADER (HID_SVX_START + 56) +#include <svx/svxcommands.h> +#include <sfx2/sfxcommands.h> +#define HID_ALIGN_TBX "SVX_HID_ALIGN_TBX" +#define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE" +#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" +#define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE" +#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS" +#define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY" +#define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR" +#define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE" +#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY" +#define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND" +#define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE" +#define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY" +#define HID_CONTDLG_POLYDELETE "SVX_HID_CONTDLG_POLYDELETE" +#define HID_CONTDLG_POLYEDIT "SVX_HID_CONTDLG_POLYEDIT" +#define HID_CONTDLG_POLYINSERT "SVX_HID_CONTDLG_POLYINSERT" +#define HID_CONTDLG_POLYMOVE "SVX_HID_CONTDLG_POLYMOVE" +#define HID_CONTDLG_RECT "SVX_HID_CONTDLG_RECT" +#define HID_CONTDLG_REDO "SVX_HID_CONTDLG_REDO" +#define HID_CONTDLG_SELECT "SVX_HID_CONTDLG_SELECT" +#define HID_CONTDLG_TOOLBOX "SVX_HID_CONTDLG_TOOLBOX" +#define HID_CONTDLG_UNDO "SVX_HID_CONTDLG_UNDO" +#define HID_CONTDLG_WORKPLACE "SVX_HID_CONTDLG_WORKPLACE" +#define HID_CTL_FONTWORK_FAVORITES "SVX_HID_CTL_FONTWORK_FAVORITES" +#define HID_CTRL3D_HSCROLL "SVX_HID_CTRL3D_HSCROLL" +#define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" +#define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" +#define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" +#define HID_DRAWTOOL_TBX "SVX_HID_DRAWTOOL_TBX" +#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" +#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" +#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" +#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS" +#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE" +#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER" +#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT" +#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR" +#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT" +#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE" +#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL" +#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF" +#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT" +#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM" +#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF" +#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE" +#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" +#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" +#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" +#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER" +#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER" // free -#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58) -#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59) -#define HID_GALLERY_MN_ADD (HID_SVX_START + 60) -#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61) -#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62) -#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63) -#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64) -#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65) -#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66) -#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67) -#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68) -#define HID_GALLERY_PREVIEW (HID_SVX_START + 69) -#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70) -#define HID_GALLERY_RENAME (HID_SVX_START + 71) -#define HID_GALLERY_THEMELIST (HID_SVX_START + 72) +#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" +#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" +#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" +#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU" +#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK" +#define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND" +#define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD" +#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" +#define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD" +#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" +#define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" +#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW" +#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" +#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" +#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" // free -#define HID_GALLERY_WINDOW (HID_SVX_START + 74) -#define HID_GRFFILTER (HID_SVX_START + 75) -#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76) -#define HID_GRFFILTER_INVERT (HID_SVX_START + 77) -#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78) -#define HID_GRFFILTER_POPART (HID_SVX_START + 79) -#define HID_GRFFILTER_POSTER (HID_SVX_START + 80) -#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81) -#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82) -#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83) -#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84) -#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85) -#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86) - -#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88) -#define HID_IMAPDLG_APPLY (HID_SVX_START + 89) -#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90) -#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91) -#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92) -#define HID_IMAPDLG_MACRO (HID_SVX_START + 93) -#define HID_IMAPDLG_OPEN (HID_SVX_START + 94) -#define HID_IMAPDLG_POLY (HID_SVX_START + 95) -#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96) -#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97) -#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98) -#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99) -#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100) -#define HID_IMAPDLG_RECT (HID_SVX_START + 101) -#define HID_IMAPDLG_REDO (HID_SVX_START + 102) -#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103) -#define HID_IMAPDLG_SELECT (HID_SVX_START + 104) -#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105) -#define HID_IMAPDLG_UNDO (HID_SVX_START + 106) -#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107) -#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108) -#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109) -#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110) -#define HID_MNU_FUNC_AVG (HID_SVX_START + 111) -#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112) -#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113) -#define HID_MNU_FUNC_MAX (HID_SVX_START + 114) -#define HID_MNU_FUNC_MIN (HID_SVX_START + 115) -#define HID_MNU_FUNC_NONE (HID_SVX_START + 116) -#define HID_MNU_FUNC_SUM (HID_SVX_START + 117) -#define HID_MNU_ZOOM_100 (HID_SVX_START + 118) -#define HID_MNU_ZOOM_150 (HID_SVX_START + 119) -#define HID_MNU_ZOOM_200 (HID_SVX_START + 120) -#define HID_MNU_ZOOM_50 (HID_SVX_START + 121) -#define HID_MNU_ZOOM_75 (HID_SVX_START + 122) -#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123) -#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124) -#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125) -#define HID_OPTIONS_GRID (HID_SVX_START + 126) -#define HID_PASSWORD (HID_SVX_START + 127) -#define HID_POPUP_COLOR (HID_SVX_START + 128) -#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129) -#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130) -#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131) -#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132) -#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133) -#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134) -#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135) -#define HID_POPUP_FRAME (HID_SVX_START + 136) -#define HID_POPUP_LINE (HID_SVX_START + 137) -#define HID_POPUP_LINEEND (HID_SVX_START + 138) -#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139) -#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140) -#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141) -#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142) -#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143) -#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144) -#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145) -#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146) -#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147) -#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148) -#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149) -#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150) -#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151) -#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152) -#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153) -#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154) -#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155) -#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156) -#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157) -#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158) -#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159) -#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160) -#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161) -#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162) -#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163) -#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164) -#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165) -#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166) -#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167) -#define HID_RUBY_DIALOG (HID_SVX_START + 168) -#define HID_STYLE_LISTBOX (HID_SVX_START + 169) -#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170) -#define HID_SVXTBX_DRAW (HID_SVX_START + 171) -#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172) -#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173) -#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178) -#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181) -#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182) -#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183) -#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184) -#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185) -#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186) -#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187) -#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188) -#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189) -#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190) - -#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192) -#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193) -#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194) -#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195) -#define HID_XMLSEC_CALL (HID_SVX_START + 196) -#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197) -#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198) -#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199) -#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200) -#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201) -#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202) -#define HID_AUTOCORR_DLG (HID_SVX_START + 203) -#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204) -#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205) -#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206) -#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207) -#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208) -#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209) -#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210) -#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211) -#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212) -#define HID_SVX_DLGTABNEW (HID_SVX_START + 213) -#define HID_SVX_HYPERLINK (HID_SVX_START + 214) -#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215) -#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216) -#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217) -#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218) -#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219) -#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220) -#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221) -#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222) -#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223) -#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224) -#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225) -#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226) -#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227) -#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228) -#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229) -#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230) -#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231) -#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232) -#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233) -#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234) -#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235) -#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236) -#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237) -#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238) -#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239) -#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240) -#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241) -#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242) -#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243) -#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244) -#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245) -#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246) -#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247) -#define HID_CT_THES_ALTERNATIVES (HID_SVX_START + 248) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_SVX_START+248) -#if ACT_SVX_HID_END > HID_SVX_END -#error Resource overflow in #line, #file -#endif +#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" +#define HID_GRFFILTER "SVX_HID_GRFFILTER" +#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS" +#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT" +#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC" +#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART" +#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER" +#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE" +#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA" +#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN" +#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH" +#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL" +#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE" +#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE" +#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY" +#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE" +#define HID_IMAPDLG_FREEPOLY "SVX_HID_IMAPDLG_FREEPOLY" +#define HID_IMAPDLG_GRAPHWND "SVX_HID_IMAPDLG_GRAPHWND" +#define HID_IMAPDLG_MACRO "SVX_HID_IMAPDLG_MACRO" +#define HID_IMAPDLG_OPEN "SVX_HID_IMAPDLG_OPEN" +#define HID_IMAPDLG_POLY "SVX_HID_IMAPDLG_POLY" +#define HID_IMAPDLG_POLYDELETE "SVX_HID_IMAPDLG_POLYDELETE" +#define HID_IMAPDLG_POLYEDIT "SVX_HID_IMAPDLG_POLYEDIT" +#define HID_IMAPDLG_POLYINSERT "SVX_HID_IMAPDLG_POLYINSERT" +#define HID_IMAPDLG_POLYMOVE "SVX_HID_IMAPDLG_POLYMOVE" +#define HID_IMAPDLG_PROPERTY "SVX_HID_IMAPDLG_PROPERTY" +#define HID_IMAPDLG_RECT "SVX_HID_IMAPDLG_RECT" +#define HID_IMAPDLG_REDO "SVX_HID_IMAPDLG_REDO" +#define HID_IMAPDLG_SAVEAS "SVX_HID_IMAPDLG_SAVEAS" +#define HID_IMAPDLG_SELECT "SVX_HID_IMAPDLG_SELECT" +#define HID_IMAPDLG_TOOLBOX "SVX_HID_IMAPDLG_TOOLBOX" +#define HID_IMAPDLG_UNDO "SVX_HID_IMAPDLG_UNDO" +#define HID_MENU_EXTRUSION_DEPTH "SVX_HID_MENU_EXTRUSION_DEPTH" +#define HID_MENU_EXTRUSION_DIRECTION "SVX_HID_MENU_EXTRUSION_DIRECTION" +#define HID_MENU_EXTRUSION_LIGHTING "SVX_HID_MENU_EXTRUSION_LIGHTING" +#define HID_MENU_EXTRUSION_SURFACE "SVX_HID_MENU_EXTRUSION_SURFACE" +#define HID_MNU_FUNC_AVG "SVX_HID_MNU_FUNC_AVG" +#define HID_MNU_FUNC_COUNT "SVX_HID_MNU_FUNC_COUNT" +#define HID_MNU_FUNC_COUNT2 "SVX_HID_MNU_FUNC_COUNT2" +#define HID_MNU_FUNC_MAX "SVX_HID_MNU_FUNC_MAX" +#define HID_MNU_FUNC_MIN "SVX_HID_MNU_FUNC_MIN" +#define HID_MNU_FUNC_NONE "SVX_HID_MNU_FUNC_NONE" +#define HID_MNU_FUNC_SUM "SVX_HID_MNU_FUNC_SUM" +#define HID_MNU_ZOOM_100 "SVX_HID_MNU_ZOOM_100" +#define HID_MNU_ZOOM_150 "SVX_HID_MNU_ZOOM_150" +#define HID_MNU_ZOOM_200 "SVX_HID_MNU_ZOOM_200" +#define HID_MNU_ZOOM_50 "SVX_HID_MNU_ZOOM_50" +#define HID_MNU_ZOOM_75 "SVX_HID_MNU_ZOOM_75" +#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL" +#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH" +#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE" +#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID" +#define HID_PASSWORD "SVX_HID_PASSWORD" +#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" +#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" +#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH" +#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION" +#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING" +#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE" +#define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" +#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" +#define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" +#define HID_POPUP_LINE "SVX_HID_POPUP_LINE" +#define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" +#define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" +#define HID_REDLINING_FILTER_BTN_REF "SVX_HID_REDLINING_FILTER_BTN_REF" +#define HID_REDLINING_FILTER_CB_ACTION "SVX_HID_REDLINING_FILTER_CB_ACTION" +#define HID_REDLINING_FILTER_CB_AUTOR "SVX_HID_REDLINING_FILTER_CB_AUTOR" +#define HID_REDLINING_FILTER_CB_COMMENT "SVX_HID_REDLINING_FILTER_CB_COMMENT" +#define HID_REDLINING_FILTER_CB_DATE "SVX_HID_REDLINING_FILTER_CB_DATE" +#define HID_REDLINING_FILTER_CB_RANGE "SVX_HID_REDLINING_FILTER_CB_RANGE" +#define HID_REDLINING_FILTER_DF_DATE "SVX_HID_REDLINING_FILTER_DF_DATE" +#define HID_REDLINING_FILTER_DF_DATE2 "SVX_HID_REDLINING_FILTER_DF_DATE2" +#define HID_REDLINING_FILTER_ED_COMMENT "SVX_HID_REDLINING_FILTER_ED_COMMENT" +#define HID_REDLINING_FILTER_ED_RANGE "SVX_HID_REDLINING_FILTER_ED_RANGE" +#define HID_REDLINING_FILTER_IB_CLOCK "SVX_HID_REDLINING_FILTER_IB_CLOCK" +#define HID_REDLINING_FILTER_IB_CLOCK2 "SVX_HID_REDLINING_FILTER_IB_CLOCK2" +#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION" +#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR" +#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE" +#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE" +#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE" +#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2" +#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" +#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW" +#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER" +#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE" +#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE" +#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT" +#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL" +#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT" +#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL" +#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" +#define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG" +#define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" +#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT" +#define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW" +#define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" +#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" +#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN" +#define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR" +#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS" +#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW" +#define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY" +#define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER" +#define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE" +#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND" +#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME" +#define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" +#define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" +#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN" +#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE" +#define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" +#define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG" +#define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME" +#define HID_OFA_HYPERLINK_SEARCH "SVX_HID_OFA_HYPERLINK_SEARCH" +#define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET" +#define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL" +#define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT" +#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG" +#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH" +#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION" +#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE" +#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART" +#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER" +#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE" +#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH" +#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER" +#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW" +#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW" +#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK" +#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB" +#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB" +#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB" +#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB" +#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB" +#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB" +#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN" +#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB" +#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB" +#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB" +#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED" +#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB" +#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB" +#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB" +#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED" +#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS" +#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK" +#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE" +#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE" +#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN" +#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME" +#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS" +#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1" +#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2" +#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3" +#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4" +#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX" +#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT" +#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN" +#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN" +#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT" +#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE" +#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP" +#define HID_CT_THES_ALTERNATIVES "SVX_HID_CT_THES_ALTERNATIVES" #endif diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk index 37a079a68a..2038862527 100644 --- a/svx/inc/makefile.mk +++ b/svx/inc/makefile.mk @@ -43,8 +43,8 @@ LOCALIZE_ME=globlmn_tmpl.hrc .IF "$(ENABLE_PCH)"!="" ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - + $(SLO)$/precompiled.pch \ + $(SLO)$/precompiled_ex.pch + .ENDIF # "$(ENABLE_PCH)"!="" diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 676979c431..7b975872a0 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -56,7 +56,6 @@ #include "boost/scoped_ptr.hpp" #include "boost/shared_ptr.hpp" #include "boost/spirit/include/classic_core.hpp" -#include "bootstrp/sstring.hxx" #include "com/sun/star/accessibility/AccessibleEventId.hpp" #include "com/sun/star/accessibility/AccessibleEventObject.hpp" #include "com/sun/star/accessibility/AccessibleRelationType.hpp" @@ -809,7 +808,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" @@ -925,7 +923,7 @@ #include "vcl/cursor.hxx" #include "vcl/decoview.hxx" #include "vcl/dndhelp.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/fntstyle.hxx" #include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" @@ -944,7 +942,7 @@ #include "vcl/unohelp.hxx" #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "osl/mutex.hxx" #include "xmloff/DashStyle.hxx" #include "xmloff/GradientStyle.hxx" diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx deleted file mode 100644 index 5555922a55..0000000000 --- a/svx/inc/srchitem.hxx +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 _SVX_SRCHITEM_HXX -#define _SVX_SRCHITEM_HXX - -#include <svl/srchitem.hxx> - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 95e61a649f..95e61a649f 100644 --- a/svx/inc/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index 4b951aaee0..4b951aaee0 100644 --- a/svx/inc/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 568f533385..568f533385 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx index 4c16eb1bf7..4c16eb1bf7 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx +++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 4432c7a8a1..4432c7a8a1 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index fa90223515..fa90223515 100644 --- a/svx/inc/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index eaa7712863..eaa7712863 100644 --- a/svx/inc/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx index 45d8db0f25..45d8db0f25 100644 --- a/svx/inc/XPropertyTable.hxx +++ b/svx/inc/svx/XPropertyTable.hxx diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx index 516aebd18b..516aebd18b 100644 --- a/svx/inc/anchorid.hxx +++ b/svx/inc/svx/anchorid.hxx diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 4ce6daea7b..4ce6daea7b 100644 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 48651a9e26..48651a9e26 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index 03b9bc6aee..03b9bc6aee 100644 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx index 5bd0160031..5bd0160031 100644 --- a/svx/inc/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx index 352913bf5e..352913bf5e 100644 --- a/svx/inc/databaseregistrationui.hxx +++ b/svx/inc/svx/databaseregistrationui.hxx diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc index 1909ece6de..1909ece6de 100644 --- a/svx/inc/dbexch.hrc +++ b/svx/inc/svx/dbexch.hrc diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 5ead2c2b68..5ead2c2b68 100644 --- a/svx/inc/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index e337502c03..224f0e1778 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,8 +155,8 @@ #define SID_SD_TP_CONTENTS (RID_OFA_START + 225) #define SID_SD_TP_SNAP (RID_OFA_START + 227) #define SID_SD_TP_MISC (RID_OFA_START + 231) -#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) -#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) +#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) +#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) #define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc //--------------------------------------------------------------------- @@ -180,7 +180,6 @@ #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) #define RID_SVXIL_FRAME (RID_SVX_START + 65) - #define RID_SVXDLG_3D (RID_SVX_START + 70) #define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) #define RID_SVXPAGE_3DATTR (RID_SVX_START + 72) @@ -307,9 +306,6 @@ #define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) // for ToolboxControls alignment and draw objects -#define RID_SVXTBX_DRAW (RID_SVX_START + 189) -#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) - // Ids fuer auto correction #define RID_SVX_AUTOCORR (RID_SVX_START + 192) @@ -382,7 +378,6 @@ // ResIds for the PageDialog #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) - // Strings of the ToolBox-Controls from tbcontrl.cxx #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) @@ -893,33 +888,33 @@ #define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168) // if you add here, remember to adjust RID_SVXSTR_NEXTFREE -#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? #define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190) @@ -981,7 +976,6 @@ // TabPages -------------------------------------------------------------- // !!!! double defined ID's (see above) !!! - #define OFA_TP_APPEARANCE (RID_OFA_START + 203) #define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204) @@ -1005,9 +999,13 @@ #define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 258) // ---------------------------------------------------------------------------- -// ooo-build specific resources +// LibreOffice specific resources #define SVX_OOO_BUILD_START (RID_SVX_START + 1200) +#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) +#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) +#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 3) +#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 4) #define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) #define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 039fa22476..861203c2bd 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,11 +39,9 @@ class SfxItemSet; SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); -SVX_DLLPUBLIC BOOL GetApplyCharUnit( const SfxItemSet& ); #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx index cac8a37b87..cac8a37b87 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 2008375dde..3ad488c1d9 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -37,19 +37,8 @@ // are moved to this exported (delivered) hrc file // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) -#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) - -// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) -#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" +#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" #endif diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx index 8bd4a9392b..ca106ba8ee 100644 --- a/svx/inc/svx/extrusioncolorcontrol.hxx +++ b/svx/inc/svx/extrusioncolorcontrol.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,4 +54,3 @@ public: #endif // _SVX_EXTRUSIONCOLORCONTROL_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index 0be00e027f..0be00e027f 100644 --- a/svx/inc/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 7f6eb2c26d..79e1e2f6c1 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -33,7 +33,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <sfx2/dockwin.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 9c0cbedfb2..c6a9d2d967 100644 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -50,7 +50,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/uno3.hxx> diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx index b2767b6258..b2767b6258 100644 --- a/svx/inc/fmobjfac.hxx +++ b/svx/inc/svx/fmobjfac.hxx diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc index 07e994bb62..07e994bb62 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 6ba0bd062f..6ba0bd062f 100644 --- a/svx/source/inc/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 2b2ce7ba9c..e59c59526f 100644 --- a/svx/source/inc/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -45,17 +45,9 @@ #include <osl/mutex.hxx> #include <unotools/charclass.hxx> #include <unotools/collatorwrapper.hxx> -#include <osl/thread.hxx> - -#ifndef _SVSTDARR_ULONGS -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> -#endif - -// =================================================================================================== -// Hilfsstrukturen +#include "svx/svxdllapi.h" -SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16) +#include <deque> // =================================================================================================== // = class FmSearchThread - wie der Name schon sagt @@ -190,8 +182,8 @@ class SVX_DLLPUBLIC FmSearchEngine enum SEARCHFOR_TYPE { SEARCHFOR_STRING, SEARCHFOR_NULL, SEARCHFOR_NOTNULL }; // zugrundeliegende Daten - CursorWrapper m_xSearchCursor; - SvInt32Array m_arrFieldMapping; + CursorWrapper m_xSearchCursor; + std::deque<sal_Int32> m_arrFieldMapping; // da der Iterator durchaus mehr Spalten haben kann, als ich eigentlich verwalte (in meiner Feld-Listbox), // muss ich mir hier ein Mapping dieser ::com::sun::star::form-Schluessel auf die Indizies der entsprechenden Spalten im Iterator halten diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index 4cffe7f4a5..3d4ef3b930 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -72,7 +72,7 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormats.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <cppuhelper/weakref.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx index 6cbcee90dd..6cbcee90dd 100644 --- a/svx/inc/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 51c9901ab0..e3f531ddcc 100644 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,5 +129,3 @@ public: } #endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 6f73ecd1a4..6f73ecd1a4 100644 --- a/svx/inc/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx index a639fd7ac6..a639fd7ac6 100644 --- a/svx/inc/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 9352bfbc53..9352bfbc53 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx index 27fd7eeca6..27fd7eeca6 100644 --- a/svx/inc/gallery.hxx +++ b/svx/inc/svx/gallery.hxx diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index ec26c6edf2..6ab516c0d7 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -34,6 +34,7 @@ #include <tools/urlobj.hxx> #include <svl/brdcst.hxx> #include "svx/svxdllapi.h" +#include "gallery.hrc" #include <cstdio> #include <list> diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 9a4f44a06b..ff6ffc8330 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -43,6 +43,7 @@ #include <svx/svdmodel.hxx> #include <svx/galmisc.hxx> #include <vector> +//#include <svx/gallery1.hxx> // ----------------- // - GalleryObject - @@ -66,6 +67,11 @@ class SgaObject; class FmFormModel; class ListBox; +class GalleryThemeEntry; +class SgaObject; +class FmFormModel; +class ListBox; + // ----------------- // - GalDragParams - // ----------------- diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 4ec9f1ba2d..0d965bdd2a 100644 --- a/svx/inc/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,6 +30,7 @@ #include <tools/solar.h> +//#define ESODEBUG #define E3D_STREAMING const double PrecisionLimit = 1.0e-14; @@ -51,5 +51,3 @@ const UINT16 E3D_COMPOUNDOBJ_ID = 8; const UINT16 E3D_POLYGONOBJ_ID = 9; #endif // _E3D_GLOBL3D_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index f621e9ddd5..f621e9ddd5 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index af552f58f5..d7d83d2e59 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -248,7 +248,7 @@ private: // For that reason we have to listen to some properties of our data source. ::comphelper::OPropertyChangeMultiplexer* m_pDataSourcePropMultiplexer; FmXGridSourcePropListener* m_pDataSourcePropListener; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener> + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener> m_xRowSetListener; // get notification when rows were changed void* m_pFieldListeners; @@ -595,7 +595,7 @@ protected: const DbGridRowRef& GetSeekRow() const { return m_xSeekRow; } const DbGridRowRef& GetPaintRow() const { return m_xPaintRow; } CursorWrapper* GetSeekCursor() const { return m_pSeekCursor; } - + void ConnectToFields(); void DisconnectFromFields(); diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index 13b6b1d8d7..13b6b1d8d7 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx index d7c4d9588f..a701d03d39 100644 --- a/svx/inc/htmlmode.hxx +++ b/svx/inc/svx/htmlmode.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,4 +49,3 @@ -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index fc286e2389..fc286e2389 100644 --- a/svx/inc/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx diff --git a/svx/source/dialog/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx index b37c2cf2b2..b37c2cf2b2 100644 --- a/svx/source/dialog/hyprlink.hxx +++ b/svx/inc/svx/hyprlink.hxx diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index 05e30ee342..05e30ee342 100644 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx index 139b0197e2..139b0197e2 100644 --- a/svx/inc/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index a57524e170..30a394befd 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 37beb62cb3..37beb62cb3 100644 --- a/svx/inc/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 8483146ab4..8483146ab4 100644 --- a/svx/inc/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx index 3045a55141..3045a55141 100644 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx index 79efb8e1d6..79efb8e1d6 100644 --- a/svx/inc/measctrl.hxx +++ b/svx/inc/svx/measctrl.hxx diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx index fd4133083c..06d3ae008b 100644 --- a/svx/inc/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,16 +32,14 @@ #include <sfx2/stbitem.hxx> #include "svx/svxdllapi.h" -#include <boost/shared_ptr.hpp> - // class SvxModifyControl ------------------------------------------------ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rUsrEvt ); + virtual void Paint( const UserDrawEvent& rEvt ); virtual void DoubleClick(); SFX_DECL_STATUSBAR_CONTROL(); @@ -59,4 +56,3 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index fbac729f54..517e2590c7 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -1219,6 +1219,6 @@ BYTE m_bTag; void *m_pvBits; // raster bits of the blip. #endif -#endif +#endif // _MSDFFDEF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx index 69600123d4..69600123d4 100644 --- a/svx/inc/numvset.hxx +++ b/svx/inc/svx/numvset.hxx diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 3dd361b215..5911dbc9e2 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -118,6 +118,7 @@ private: protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + E3dObjList maSubList; // child objekts basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation) diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 9cb7ecb526..9cb7ecb526 100644 --- a/svx/inc/objfac3d.hxx +++ b/svx/inc/svx/objfac3d.hxx diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 766c8ee776..766c8ee776 100644 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index 85efb6104a..85efb6104a 100644 --- a/svx/inc/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx index f10267b02f..f10267b02f 100644 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 0b315add63..0b315add63 100644 --- a/svx/inc/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx index 5913851720..5913851720 100644 --- a/svx/inc/passwd.hxx +++ b/svx/inc/svx/passwd.hxx diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index 86f47c4136..50dd94c5d1 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -55,8 +55,6 @@ public: static bool IsAvailable (USHORT nKind); - // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const sal_Int32 nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx index 15d9456229..15d9456229 100644 --- a/svx/inc/postattr.hxx +++ b/svx/inc/svx/postattr.hxx diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx index 29d61a419c..29d61a419c 100644 --- a/svx/inc/prtqry.hxx +++ b/svx/inc/svx/prtqry.hxx diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index 08f49670f2..08f49670f2 100644 --- a/svx/inc/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx index 1a5e9dd913..1a5e9dd913 100644 --- a/svx/inc/relfld.hxx +++ b/svx/inc/svx/relfld.hxx diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 157ab6e715..157ab6e715 100644 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 2a1453b5ea..2a1453b5ea 100644 --- a/svx/inc/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx index e7a9a43d8d..e7a9a43d8d 100644 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 48de837682..14a607cf4d 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -96,6 +96,15 @@ namespace sdr // Process the whole displaying virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + // VirtualDevice? Default is false + virtual bool isOutputToVirtualDevice() const; + + // recording MetaFile? Default is false + virtual bool isOutputToRecordingMetaFile() const; + + // pdf export? Default is false + virtual bool isOutputToPDFFile() const; + // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. virtual OutputDevice* TryToGetOutputDevice() const; }; diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 2d9a197efb..7d28e5c936 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -117,6 +117,7 @@ public: void PrepareRedraw(const Region& rReg); void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const; void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const; + void PostPaint(); // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...) void InvalidatePageWindow(const basegfx::B2DRange& rRange); diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index 8be3874bbf..8be3874bbf 100644 --- a/svx/inc/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx index ab22210bde..ab22210bde 100644 --- a/svx/inc/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 8c4ebfbd09..bde1a83d38 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -167,7 +167,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);} + void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} }; diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index 58ed1b9c08..0bbf42a8de 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -30,7 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> #include <svx/stddlg.hxx> diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index 85adcf8a09..690188e940 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -119,7 +119,7 @@ public: // class SvxSearchDialog ------------------------------------------------- /* - {k:\svx\prototyp\dialog\srchdlg.hxx} + {k:\svx\prototyp\dialog\svx/srchdlg.hxx} [Description] In this modeless dialog the attributes for a search are configured diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 6314eced08..55e4b5c601 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -209,7 +209,6 @@ public: // verwendet. NotifyNewUndoAction() wird in diesem Fall erst beim letzten // EndUndo() gerufen. NotifyNewUndoAction() wird nicht gerufen bei einer // leeren Klammerung. -#ifndef WIN void BegUndo() { pMod->BegUndo(); } // Undo-Klammerung auf void BegUndo(const String& rComment) { pMod->BegUndo(rComment); } // Undo-Klammerung auf void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // Undo-Klammerung auf @@ -219,17 +218,6 @@ public: // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: void SetUndoComment(const String& rComment) { pMod->SetUndoComment(rComment); } void SetUndoComment(const String& rComment, const String& rObjDescr) { pMod->SetUndoComment(rComment,rObjDescr); } -#else // ifndef WIN - void BegUndo(); - void BegUndo(const String& rComment); - void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE); - void BegUndo(SdrUndoGroup* pUndoGrp); - void EndUndo(); // Undo-Klammerung zu (inkl BroadcastEdges) - void AddUndo(SdrUndoAction* pUndo); - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: - void SetUndoComment(const String& rComment); - void SetUndoComment(const String& rComment, const String& rObjDescr); -#endif bool IsUndoEnabled() const; std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO ); diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 8aca60b0e0..8aca60b0e0 100644 --- a/svx/inc/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 4d40eac061..e672ede87b 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -175,7 +175,7 @@ protected: unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ... bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle - + // create marker for this kind virtual void CreateB2dIAObject(); diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx index 7228516125..7228516125 100644 --- a/svx/inc/svditer.hxx +++ b/svx/inc/svx/svditer.hxx diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx index a2d3169aeb..a2d3169aeb 100644 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/inc/svx/svditext.hxx diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 1c0aa523ee..7d6d9a4697 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -54,11 +54,11 @@ class OutputDevice; #include <rtl/ref.hxx> -#if defined(UNX) || defined(WIN) || defined(WNT) +#if defined(UNX) || defined(WNT) #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif -#if defined(DOS) || defined(OS2) +#if defined(OS2) #define DEGREE_CHAR ((sal_Unicode)248) /* 0xF8 = IBM PC (Erw. ASCII) */ #endif diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 232755f390..de77d5a6d1 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -121,7 +121,8 @@ protected: void ImpLinkAnmeldung(); void ImpLinkAbmeldung(); - sal_Bool ImpUpdateGraphicLink() const; + sal_Bool ImpUpdateGraphicLink( sal_Bool bAsynchron = sal_True ) const; + void ImpSetLinkedGraphic( const Graphic& rGraphic ); DECL_LINK( ImpSwapHdl, GraphicObject* ); public: diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 9c6b09e168..864aa75dd7 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -185,6 +185,9 @@ public: // PrePaint call forwarded from app windows void PrePaint(); + // PostPaint call forwarded from app windows + void PostPaint(); + // rReg bezieht sich auf's OutDev, nicht auf die Page void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const; diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index eae3543a20..c9bfd21637 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -376,6 +376,9 @@ public: // PrePaint call forwarded from app windows void PrePaint(); + // PostPaint call forwarded from app windows + void PostPaint(); + //////////////////////////////////////////////////////////////////////////////////////////////////// // used internally for Draw/Impress/sch/chart2 virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc index 841f987a1a..85827266c3 100644 --- a/svx/inc/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -697,6 +697,7 @@ #define SIP_SA_GRAFRESERVE6 (SIP_Begin + 257) #define SIP_SA_MARKERS (SIP_Begin + 258) +#define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259) #define SIP_SA_FINE_MARKERS (SIP_Begin + 260) #define BMP_SVXOLEOBJ (SIP_Begin + 261) diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 922d0221ac..922d0221ac 100644 --- a/svx/inc/svdviter.hxx +++ b/svx/inc/svx/svdviter.hxx diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 5b8e893613..3515a9dbbb 100644 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx @@ -37,11 +37,7 @@ // - Defines - // ----------- -#ifdef WIN -#define _SVHUGE huge -#else #define _SVHUGE -#endif // ---------------- // - SimDepthType - diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index e02b98fab6..c29fcfda17 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -30,8 +30,6 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> - - #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/viewpt3d.hxx> diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h new file mode 100644 index 0000000000..01ff0bcd95 --- /dev/null +++ b/svx/inc/svx/svxcommands.h @@ -0,0 +1,604 @@ +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 SVX_SVXCOMMANDS_HRC
+#define SVX_SVXCOMMANDS_HRC
+
+#define CMD_SID_INET_DLG ".uno:InternetDialog"
+#define CMD_SID_FM_RECORD_ABSOLUTE ".uno:AbsoluteRecord"
+#define CMD_SID_FM_ADD_FIELD ".uno:AddField"
+#define CMD_SID_FM_ADDTABLE ".uno:AddTable"
+#define CMD_SID_OBJECT_ALIGN_CENTER ".uno:AlignCenter"
+#define CMD_SID_OBJECT_ALIGN_DOWN ".uno:AlignDown"
+#define CMD_SID_OBJECT_ALIGN_LEFT ".uno:ObjectAlignLeft"
+#define CMD_SID_ATTR_PARA_ADJUST ".uno:Alignment"
+#define CMD_SID_OBJECT_ALIGN_MIDDLE ".uno:AlignMiddle"
+#define CMD_SID_OBJECT_ALIGN_RIGHT ".uno:ObjectAlignRight"
+#define CMD_SID_OBJECT_ALIGN_UP ".uno:AlignUp"
+#define CMD_SID_DRAW_ARC ".uno:Arc"
+#define CMD_SID_3D_ASSIGN ".uno:Assign3D"
+#define CMD_SID_FM_AUTOCONTROLFOCUS ".uno:AutoControlFocus"
+#define CMD_SID_FM_AUTOFILTER ".uno:AutoFilter"
+#define CMD_SID_AUTOFORMAT ".uno:AutoFormat"
+#define CMD_SID_TABLE_STYLE ".uno:TableStyle"
+#define CMD_SID_TABLE_STYLE_SETTINGS ".uno:TableStyleSettings"
+#define CMD_SID_TABLEDESIGN ".uno:TableDesign"
+#define CMD_SID_BACKGROUND_COLOR ".uno:BackgroundColor"
+#define CMD_SID_ATTR_BRUSH ".uno:BackgroundPattern"
+#define CMD_SID_BACKGROUND_PATTERN ".uno:BackgroundPatternController"
+#define CMD_SID_DRAW_BEZIER_NOFILL ".uno:Bezier_Unfilled"
+#define CMD_SID_BEZIER_APPEND ".uno:BezierAppend"
+#define CMD_SID_BEZIER_CLOSE ".uno:BezierClose"
+#define CMD_SID_BEZIER_CONVERT ".uno:BezierConvert"
+#define CMD_SID_BEZIER_CUTLINE ".uno:BezierCutLine"
+#define CMD_SID_BEZIER_DELETE ".uno:BezierDelete"
+#define CMD_SID_BEZIER_EDGE ".uno:BezierEdge"
+#define CMD_SID_BEZIER_ELIMINATE_POINTS ".uno:BezierEliminatePoints"
+#define CMD_SID_DRAW_BEZIER_FILL ".uno:BezierFill"
+#define CMD_SID_BEZIER_INSERT ".uno:BezierInsert"
+#define CMD_SID_BEZIER_MOVE ".uno:BezierMove"
+#define CMD_SID_BEZIER_SMOOTH ".uno:BezierSmooth"
+#define CMD_SID_BEZIER_SYMMTR ".uno:BezierSymmetric"
+#define CMD_SID_BEZIERTO ".uno:BezierTo"
+#define CMD_SID_BMPMASK ".uno:BmpMask"
+#define CMD_SID_BMPMASK_EXEC ".uno:BmpMaskExec"
+#define CMD_SID_BMPMASK_PIPETTE ".uno:BmpMaskPipette"
+#define CMD_SID_ATTR_CHAR_WEIGHT ".uno:Bold"
+#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT ".uno:BoldLatin"
+#define CMD_SID_ATTR_CHAR_CJK_WEIGHT ".uno:BoldCJK"
+#define CMD_SID_ATTR_CHAR_CTL_WEIGHT ".uno:BoldCTL"
+#define CMD_SID_BORDER_OBJECT ".uno:Border"
+#define CMD_SID_ATTR_BORDER_INNER ".uno:BorderInner"
+#define CMD_SID_ATTR_BORDER_OUTER ".uno:BorderOuter"
+#define CMD_SID_ATTR_BORDER ".uno:SetBorderStyle"
+#define CMD_SID_FRAME_TO_TOP ".uno:BringToFront"
+#define CMD_SID_DRAW_CAPTION ".uno:DrawCaption"
+#define CMD_SID_ATTR_CHAR_CASEMAP ".uno:CaseMap"
+#define CMD_SID_ATTR_PARA_ADJUST_CENTER ".uno:CenterPara"
+#define CMD_SID_TRANSLITERATE_FULLWIDTH ".uno:ChangeCaseToFullWidth"
+#define CMD_SID_TRANSLITERATE_HALFWIDTH ".uno:ChangeCaseToHalfWidth"
+#define CMD_SID_TRANSLITERATE_HIRAGANA ".uno:ChangeCaseToHiragana"
+#define CMD_SID_TRANSLITERATE_KATAGANA ".uno:ChangeCaseToKatakana"
+#define CMD_SID_TRANSLITERATE_LOWER ".uno:ChangeCaseToLower"
+#define CMD_SID_TRANSLITERATE_UPPER ".uno:ChangeCaseToUpper"
+#define CMD_SID_FM_CHANGECONTROLTYPE ".uno:ChangeControlType"
+#define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName"
+#define CMD_SID_ATTR_CHAR_LATIN_FONT ".uno:CharFontNameLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONT ".uno:CharFontNameCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONT ".uno:CharFontNameCTL"
+#define CMD_SID_INSERT_CHECKBOX ".uno:Checkbox"
+#define CMD_SID_FM_CHECKBOX ".uno:CheckBox"
+#define CMD_SID_CHOOSE_CONTROLS ".uno:ChooseControls"
+#define CMD_SID_CHOOSE_POLYGON ".uno:ChoosePolygon"
+#define CMD_SID_DRAW_CIRCLE ".uno:Circle"
+#define CMD_SID_DRAW_CIRCLE_NOFILL ".uno:Circle_Unfilled"
+#define CMD_SID_DRAW_CIRCLEARC ".uno:CircleArc"
+#define CMD_SID_DRAW_CIRCLECUT ".uno:CircleCut"
+#define CMD_SID_DRAW_CIRCLECUT_NOFILL ".uno:CircleCut_Unfilled"
+#define CMD_SID_DRAW_CIRCLEPIE ".uno:CirclePie"
+#define CMD_SID_DRAW_CIRCLEPIE_NOFILL ".uno:CirclePie_Unfilled"
+#define CMD_SID_OUTLINE_DELETEALL ".uno:ClearOutline"
+#define CMD_SID_ATTR_CHAR_COLOR ".uno:Color"
+#define CMD_SID_COLOR_CONTROL ".uno:ColorControl"
+#define CMD_SID_FM_COMBOBOX ".uno:ComboBox"
+#define CMD_SID_FM_NAVIGATIONBAR ".uno:NavigationBar"
+#define CMD_SID_INSERT_COMBOBOX ".uno:Combobox"
+#define CMD_SID_FM_CONFIG ".uno:Config"
+#define CMD_SID_FM_MORE_CONTROLS ".uno:MoreControls"
+#define CMD_SID_FM_FORM_DESIGN_TOOLS ".uno:FormDesignTools"
+#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog"
+#define CMD_SID_CONTOUR_EXEC ".uno:ContourExecute"
+#define CMD_SID_FM_CTL_PROPERTIES ".uno:ControlProperties"
+#define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton"
+#define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox"
+#define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo"
+#define CMD_SID_FM_CONVERTTO_CURRENCY ".uno:ConvertToCurrency"
+#define CMD_SID_FM_CONVERTTO_DATE ".uno:ConvertToDate"
+#define CMD_SID_FM_CONVERTTO_EDIT ".uno:ConvertToEdit"
+#define CMD_SID_FM_CONVERTTO_FILECONTROL ".uno:ConvertToFileControl"
+#define CMD_SID_FM_CONVERTTO_FIXEDTEXT ".uno:ConvertToFixed"
+#define CMD_SID_FM_CONVERTTO_FORMATTED ".uno:ConvertToFormatted"
+#define CMD_SID_FM_CONVERTTO_SCROLLBAR ".uno:ConvertToScrollBar"
+#define CMD_SID_FM_CONVERTTO_SPINBUTTON ".uno:ConvertToSpinButton"
+#define CMD_SID_FM_CONVERTTO_GROUPBOX ".uno:ConvertToGroup"
+#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON ".uno:ConvertToImageBtn"
+#define CMD_SID_FM_CONVERTTO_IMAGECONTROL ".uno:ConvertToImageControl"
+#define CMD_SID_FM_CONVERTTO_LISTBOX ".uno:ConvertToList"
+#define CMD_SID_FM_CONVERTTO_NUMERIC ".uno:ConvertToNumeric"
+#define CMD_SID_FM_CONVERTTO_PATTERN ".uno:ConvertToPattern"
+#define CMD_SID_FM_CONVERTTO_RADIOBUTTON ".uno:ConvertToRadio"
+#define CMD_SID_FM_CONVERTTO_TIME ".uno:ConvertToTime"
+#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR ".uno:ConvertToNavigationBar"
+#define CMD_SID_FM_COUNTALL ".uno:CountAll"
+#define CMD_SID_FM_CREATE_CONTROL ".uno:CreateControl"
+#define CMD_SID_INSERT_CURRENCYFIELD ".uno:InsertCurrencyField"
+#define CMD_SID_FM_CURRENCYFIELD ".uno:CurrencyField"
+#define CMD_SID_DASH ".uno:Dash"
+#define CMD_SID_INSERT_DATEFIELD ".uno:AddDateField"
+#define CMD_SID_FM_DATEFIELD ".uno:DateField"
+#define CMD_FN_NUM_BULLET_ON ".uno:DefaultBullet"
+#define CMD_SID_FM_RECORD_DELETE ".uno:DeleteRecord"
+#define CMD_SID_FM_DESIGN_MODE ".uno:SwitchControlDesignMode"
+#define CMD_SID_DISTRIBUTE_DLG ".uno:DistributeSelection"
+#define CMD_SID_DRAW_SELECT ".uno:DrawSelect"
+#define CMD_SID_INSERT_DRAW ".uno:InsertDraw"
+#define CMD_SID_DSBROWSER_EXPLORER ".uno:DSBrowserExplorer"
+#define CMD_SID_FM_EDIT ".uno:Edit"
+#define CMD_SID_INSERT_EDIT ".uno:InsertEdit"
+#define CMD_SID_DRAW_ELLIPSE ".uno:Ellipse"
+#define CMD_SID_DRAW_ELLIPSE_NOFILL ".uno:Ellipse_Unfilled"
+#define CMD_SID_DRAW_ELLIPSECUT ".uno:EllipseCut"
+#define CMD_SID_DRAW_ELLIPSECUT_NOFILL ".uno:EllipseCut_Unfilled"
+#define CMD_SID_ENTER_GROUP ".uno:EnterGroup"
+#define CMD_SID_ATTR_CHAR_ESCAPEMENT ".uno:Escapement"
+#define CMD_SID_FM_FIELDS_CONTROL ".uno:FieldController"
+#define CMD_SID_FM_FILECONTROL ".uno:FileControl"
+#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl"
+#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl"
+#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap"
+#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor"
+#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient"
+#define CMD_SID_ATTR_FILL_HATCH ".uno:FillHatch"
+#define CMD_SID_ATTR_FILL_STYLE ".uno:FillStyle"
+#define CMD_SID_FM_FILTERCRIT ".uno:FilterCrit"
+#define CMD_SID_FM_RECORD_FIRST ".uno:FirstRecord"
+#define CMD_SID_ATTR_FLASH ".uno:Flash"
+#define CMD_SID_FM_FMEXPLORER_CONTROL ".uno:FmExplorerController"
+#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL ".uno:FmFilterNavigatorController"
+#define CMD_SID_CHAR_DLG ".uno:FontDialog"
+#define CMD_SID_ATTR_CHAR_FONTHEIGHT ".uno:FontHeight"
+#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT ".uno:FontHeighLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT ".uno:FontHeightCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL"
+#define CMD_SID_FONTWORK ".uno:FontWork"
+#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust"
+#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes"
+#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance"
+#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror"
+#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline"
+#define CMD_SID_FORMTEXT_SHADOW ".uno:FontWorkTextShadow"
+#define CMD_SID_FORMTEXT_SHDWCOLOR ".uno:FontWorkTextShadowColor"
+#define CMD_SID_FORMTEXT_SHDWXVAL ".uno:FontWorkTextShadowXVal"
+#define CMD_SID_FORMTEXT_SHDWYVAL ".uno:FontWorkTextShadowYVal"
+#define CMD_SID_FORMTEXT_START ".uno:FontWorkTextStart"
+#define CMD_SID_FORMTEXT_STYLE ".uno:FontWorkTextStyle"
+#define CMD_SID_ATTRIBUTES_AREA ".uno:FormatArea"
+#define CMD_SID_FORMTEXT_HIDEFORM ".uno:FormatFontWorkClose"
+#define CMD_SID_GROUP ".uno:FormatGroup"
+#define CMD_SID_ATTRIBUTES_LINE ".uno:FormatLine"
+#define CMD_SID_FM_FORMATTEDFIELD ".uno:FormattedField"
+#define CMD_SID_FM_SCROLLBAR ".uno:ScrollBar"
+#define CMD_SID_FM_SPINBUTTON ".uno:SpinButton"
+#define CMD_SID_INSERT_FORMATTEDFIELD ".uno:InsertFormattedField"
+#define CMD_SID_UNGROUP ".uno:FormatUngroup"
+#define CMD_SID_FM_FILTER_START ".uno:FormFilter"
+#define CMD_SID_FM_FORM_FILTERED ".uno:FormFiltered"
+#define CMD_SID_FM_FILTER_EXECUTE ".uno:FormFilterExecute"
+#define CMD_SID_FM_FILTER_EXIT ".uno:FormFilterExit"
+#define CMD_SID_FM_FILTER_NAVIGATOR ".uno:FormFilterNavigator"
+#define CMD_SID_FM_PROPERTIES ".uno:FormProperties"
+#define CMD_SID_DRAW_FREELINE ".uno:Freeline"
+#define CMD_SID_DRAW_FREELINE_NOFILL ".uno:Freeline_Unfilled"
+#define CMD_SID_ATTR_AUTO_COLOR_INVALID ".uno:AutoColorInvalid"
+#define CMD_SID_GALLERY ".uno:Gallery"
+#define CMD_SID_GALLERY_ENABLE_ADDCOPY ".uno:GalleryEnableAddCopy"
+#define CMD_SID_GETREDOSTRINGS ".uno:GetRedoStrings"
+#define CMD_SID_GETUNDOSTRINGS ".uno:GetUndoStrings"
+#define CMD_SID_ATTR_GRAF_CROP ".uno:GrafAttrCrop"
+#define CMD_SID_ATTR_GRAF_BLUE ".uno:GrafBlue"
+#define CMD_SID_ATTR_GRAF_CONTRAST ".uno:GrafContrast"
+#define CMD_SID_ATTR_GRAF_GAMMA ".uno:GrafGamma"
+#define CMD_SID_ATTR_GRAF_GREEN ".uno:GrafGreen"
+#define CMD_SID_ATTR_GRAF_INVERT ".uno:GrafInvert"
+#define CMD_SID_ATTR_GRAF_LUMINANCE ".uno:GrafLuminance"
+#define CMD_SID_ATTR_GRAF_MODE ".uno:GrafMode"
+#define CMD_SID_ATTR_GRAF_RED ".uno:GrafRed"
+#define CMD_SID_ATTR_GRAF_TRANSPARENCE ".uno:GrafTransparence"
+#define CMD_SID_GRFFILTER_INVERT ".uno:GraphicFilterInvert"
+#define CMD_SID_GRFFILTER_MOSAIC ".uno:GraphicFilterMosaic"
+#define CMD_SID_GRFFILTER_POPART ".uno:GraphicFilterPopart"
+#define CMD_SID_GRFFILTER_POSTER ".uno:GraphicFilterPoster"
+#define CMD_SID_GRFFILTER_EMBOSS ".uno:GraphicFilterRelief"
+#define CMD_SID_GRFFILTER_REMOVENOISE ".uno:GraphicFilterRemoveNoise"
+#define CMD_SID_GRFFILTER_SEPIA ".uno:GraphicFilterSepia"
+#define CMD_SID_GRFFILTER_SHARPEN ".uno:GraphicFilterSharpen"
+#define CMD_SID_GRFFILTER_SMOOTH ".uno:GraphicFilterSmooth"
+#define CMD_SID_GRFFILTER_SOBEL ".uno:GraphicFilterSobel"
+#define CMD_SID_GRFFILTER_SOLARIZE ".uno:GraphicFilterSolarize"
+#define CMD_SID_GRFFILTER ".uno:GraphicFilterToolbox"
+#define CMD_SID_FM_DBGRID ".uno:Grid"
+#define CMD_SID_GRID_USE ".uno:GridUse"
+#define CMD_SID_GRID_VISIBLE ".uno:GridVisible"
+#define CMD_SID_OUTLINE_MAKE ".uno:Group"
+#define CMD_SID_FM_GROUPBOX ".uno:GroupBox"
+#define CMD_SID_INSERT_GROUPBOX ".uno:Groupbox"
+#define CMD_SID_RULER_LR_MIN_MAX ".uno:HeaderFooterBorder"
+#define CMD_SID_HELPLINES_MOVE ".uno:HelplinesMove"
+#define CMD_SID_INSERT_HFIXEDLINE ".uno:HFixedLine"
+#define CMD_SID_OUTLINE_HIDE ".uno:HideDetail"
+#define CMD_SID_INSERT_HSCROLLBAR ".uno:HScrollbar"
+#define CMD_SID_HYPERLINK_GETLINK ".uno:Hyperlink"
+#define CMD_SID_FM_IMAGEBUTTON ".uno:Imagebutton"
+#define CMD_SID_FM_IMAGECONTROL ".uno:ImageControl"
+#define CMD_SID_INSERT_IMAGECONTROL ".uno:InsertImageControl"
+#define CMD_SID_IMAP ".uno:ImageMapDialog"
+#define CMD_SID_IMAP_EXEC ".uno:ImageMapExecute"
+#define CMD_SID_3D_INIT ".uno:Init3D"
+#define CMD_SID_OBJECTRESIZE ".uno:InPlaceObjectResize"
+#define CMD_SID_ENTER_STRING ".uno:EnterString"
+#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
+#define CMD_SID_SHOW_POSTIT ".uno:ShowAnnotations"
+#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
+#define CMD_SID_DELETE_POSTIT ".uno:DeleteAnnotation"
+#define CMD_SID_DELETEALL_POSTIT ".uno:DeleteAllAnnotation"
+#define CMD_SID_DELETEALLBYAUTHOR_POSTIT ".uno:DeleteAllAnnotationByAuthor"
+#define CMD_SID_NEXT_POSTIT ".uno:NextAnnotation"
+#define CMD_SID_PREVIOUS_POSTIT ".uno:PreviousAnnotation"
+#define CMD_SID_INSERT_APPLET ".uno:InsertApplet"
+#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
+#define CMD_SID_INSERT_IMAGE ".uno:InsertImage"
+#define CMD_SID_INSERT_MATH ".uno:InsertMath"
+#define CMD_SID_ATTR_INSERT ".uno:InsertMode"
+#define CMD_FN_NUM_NUMBERING_ON ".uno:DefaultNumbering"
+#define CMD_SID_INSERT_OBJECT ".uno:InsertObject"
+#define CMD_SID_INSERT_DIAGRAM ".uno:InsertObjectChart"
+#define CMD_SID_INSERT_PLUGIN ".uno:InsertPlugin"
+#define CMD_SID_INSERT_SOUND ".uno:InsertSound"
+#define CMD_SID_CHARMAP ".uno:InsertSymbol"
+#define CMD_SID_ATTR_TABLE ".uno:InsertSpreadsheet"
+#define CMD_SID_INSERT_TABLE ".uno:InsertTable"
+#define CMD_SID_INSERT_FRAME ".uno:InsertTextFrame"
+#define CMD_SID_INSERT_VIDEO ".uno:InsertVideo"
+#define CMD_SID_POLY_INTERSECT ".uno:Intersect"
+#define CMD_SID_ATTR_CHAR_POSTURE ".uno:Italic"
+#define CMD_SID_ATTR_CHAR_LATIN_POSTURE ".uno:ItalicLatin"
+#define CMD_SID_ATTR_CHAR_CJK_POSTURE ".uno:ItalicCJK"
+#define CMD_SID_ATTR_CHAR_CTL_POSTURE ".uno:ItalicCTL"
+#define CMD_SID_ATTR_PARA_ADJUST_BLOCK ".uno:JustifyPara"
+#define CMD_SID_INSERT_FIXEDTEXT ".uno:InsertFixedText"
+#define CMD_SID_FM_FIXEDTEXT ".uno:Label"
+#define CMD_SID_ATTR_CHAR_LANGUAGE ".uno:Language"
+#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE ".uno:LanguageLatin"
+#define CMD_SID_FM_RECORD_LAST ".uno:LastRecord"
+#define CMD_SID_FM_LEAVE_CREATE ".uno:LeaveFMCreateMode"
+#define CMD_SID_LEAVE_GROUP ".uno:LeaveGroup"
+#define CMD_SID_ATTR_PARA_ADJUST_LEFT ".uno:LeftPara"
+#define CMD_SID_ATTR_LRSPACE ".uno:LeftRightMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE ".uno:LeftRightParaMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL ".uno:LeftRightParaMargin_Vertical"
+#define CMD_SID_DRAW_LINE ".uno:Line"
+#define CMD_SID_DRAW_XLINE ".uno:Line_Diagonal"
+#define CMD_SID_FRAME_LINECOLOR ".uno:FrameLineColor"
+#define CMD_SID_ATTR_LINE_DASH ".uno:LineDash"
+#define CMD_SID_ATTR_LINEEND_STYLE ".uno:LineEndStyle"
+#define CMD_SID_ATTR_PARA_LINESPACE ".uno:LineSpacing"
+#define CMD_SID_FRAME_LINESTYLE ".uno:LineStyle"
+#define CMD_SID_ATTR_LINE_WIDTH ".uno:LineWidth"
+#define CMD_SID_FM_LISTBOX ".uno:ListBox"
+#define CMD_SID_INSERT_LISTBOX ".uno:InsertListbox"
+#define CMD_SID_POLY_MERGE ".uno:Merge"
+#define CMD_SID_BASICIDE_NEWJAVAMODULE ".uno:NewJavaModule"
+#define CMD_SID_FM_RECORD_NEW ".uno:NewRecord"
+#define CMD_SID_FM_RECORD_NEXT ".uno:NextRecord"
+#define CMD_SID_FM_NUMERICFIELD ".uno:NumericField"
+#define CMD_SID_INSERT_NUMERICFIELD ".uno:InsertNumericField"
+#define CMD_SID_OBJECT_ALIGN ".uno:ObjectAlign"
+#define CMD_SID_FRAME_DOWN ".uno:ObjectBackOne"
+#define CMD_SID_FRAME_UP ".uno:ObjectForwardOne"
+#define CMD_SID_FM_OPEN_READONLY ".uno:OpenReadOnly"
+#define CMD_SID_FM_ORDERCRIT ".uno:OrderCrit"
+#define CMD_SID_ATTR_PARA_ORPHANS ".uno:Orphan"
+#define CMD_SID_OUTLINE_BULLET ".uno:OutlineBullet"
+#define CMD_SID_OUTLINE_COLLAPSE ".uno:OutlineCollapse"
+#define CMD_SID_OUTLINE_COLLAPSE_ALL ".uno:OutlineCollapseAll"
+#define CMD_SID_OUTLINE_DOWN ".uno:OutlineDown"
+#define CMD_SID_OUTLINE_EXPAND ".uno:OutlineExpand"
+#define CMD_SID_OUTLINE_EXPAND_ALL ".uno:OutlineExpandAll"
+#define CMD_SID_ATTR_CHAR_CONTOUR ".uno:OutlineFont"
+#define CMD_SID_OUTLINE_FORMAT ".uno:OutlineFormat"
+#define CMD_SID_OUTLINE_LEFT ".uno:OutlineLeft"
+#define CMD_SID_OUTLINE_RIGHT ".uno:OutlineRight"
+#define CMD_SID_OUTLINE_UP ".uno:OutlineUp"
+#define CMD_SID_ATTR_PARA_PAGEBREAK ".uno:Pagebreak"
+#define CMD_SID_ATTR_PAGE_PAPERBIN ".uno:PagePaperBin"
+#define CMD_SID_ATTR_PAGE_SIZE ".uno:AttributePageSize"
+#define CMD_SID_ATTR_PARA_MODEL ".uno:AttributeParaModel"
+#define CMD_SID_ATTR_PAGE ".uno:AttributePage"
+#define CMD_SID_ATTR_CHAR_AUTOKERN ".uno:PairKerning"
+#define CMD_SID_PARA_DLG ".uno:ParagraphDialog"
+#define CMD_SID_ATTR_PARA_KEEP ".uno:ParaKeepTogether"
+#define CMD_SID_ATTR_PARA_SPLIT ".uno:ParaSplit"
+#define CMD_SID_INSERT_PATTERNFIELD ".uno:InsertPatternField"
+#define CMD_SID_FM_PATTERNFIELD ".uno:PatternField"
+#define CMD_SID_DRAW_PIE ".uno:Pie"
+#define CMD_SID_DRAW_PIE_NOFILL ".uno:Pie_Unfilled"
+#define CMD_SID_POLY_FORMEN ".uno:PolyFormen"
+#define CMD_SID_DRAW_XPOLYGON ".uno:Polygon_Diagonal"
+#define CMD_SID_DRAW_XPOLYGON_NOFILL ".uno:Polygon_Diagonal_Unfilled"
+#define CMD_SID_DRAW_POLYGON_NOFILL ".uno:Polygon_Unfilled"
+#define CMD_SID_ATTR_POSITION ".uno:Position"
+#define CMD_SID_INSERT_PREVIEW ".uno:Preview"
+#define CMD_SID_FM_RECORD_PREV ".uno:PrevRecord"
+#define CMD_SID_INSERT_PROGRESSBAR ".uno:ProgressBar"
+#define CMD_SID_FM_PROPERTY_CONTROL ".uno:PropertyController"
+#define CMD_SID_FM_PUSHBUTTON ".uno:Pushbutton"
+#define CMD_SID_INSERT_PUSHBUTTON ".uno:InsertPushbutton"
+#define CMD_SID_INSERT_RADIOBUTTON ".uno:Radiobutton"
+#define CMD_SID_FM_RADIOBUTTON ".uno:RadioButton"
+#define CMD_SID_READONLY_MODE ".uno:ReadOnlyMode"
+#define CMD_SID_FM_RECORD_FROM_TEXT ".uno:RecFromText"
+#define CMD_SID_FM_RECORD_SAVE ".uno:RecSave"
+#define CMD_SID_FM_SEARCH ".uno:RecSearch"
+#define CMD_SID_DRAW_RECT ".uno:Rect"
+#define CMD_SID_DRAW_RECT_ROUND ".uno:Rect_Rounded"
+#define CMD_SID_DRAW_RECT_ROUND_NOFILL ".uno:Rect_Rounded_Unfilled"
+#define CMD_SID_DRAW_RECT_NOFILL ".uno:Rect_Unfilled"
+#define CMD_SID_FM_RECORD_TEXT ".uno:RecText"
+#define CMD_SID_FM_RECORD_TOTAL ".uno:RecTotal"
+#define CMD_SID_FM_RECORD_UNDO ".uno:RecUndo"
+#define CMD_SID_FM_REFRESH ".uno:Refresh"
+#define CMD_SID_FM_REFRESH_FORM_CONTROL ".uno:RefreshFormControl"
+#define CMD_SID_FM_FILTER_REMOVE ".uno:RemoveFilter"
+#define CMD_SID_FM_REMOVE_FILTER_SORT ".uno:RemoveFilterSort"
+#define CMD_FID_SEARCH_REPLACESET ".uno:ReplaceSet"
+#define CMD_SID_ATTR_PARA_ADJUST_RIGHT ".uno:RightPara"
+#define CMD_SID_RULER_BORDER_DISTANCE ".uno:RulerBorderDistance"
+#define CMD_SID_RULER_BORDERS ".uno:RulerBorders"
+#define CMD_SID_RULER_BORDERS_VERTICAL ".uno:RulerBordersVertical"
+#define CMD_SID_RULER_NULL_OFFSET ".uno:RulerNullOffset"
+#define CMD_SID_RULER_PAGE_POS ".uno:RulerPagePos"
+#define CMD_SID_RULER_PROTECT ".uno:RulerProtect"
+#define CMD_SID_FM_EXECUTE ".uno:SbaExecuteSql"
+#define CMD_SID_FM_NATIVESQL ".uno:SbaNativeSql"
+#define CMD_SID_SCAN ".uno:Scan"
+#define CMD_SID_SC_EDITOPTIONS ".uno:ScEditOptions"
+#define CMD_SID_SCH_EDITOPTIONS ".uno:SchEditOptions"
+#define CMD_SID_SD_EDITOPTIONS ".uno:SdEditOptions"
+#define CMD_SID_SD_GRAPHIC_OPTIONS ".uno:SdGraphicOptions"
+#define CMD_FID_SEARCH_OFF ".uno:SearchOff"
+#define CMD_FID_SEARCH_ON ".uno:SearchOn"
+#define CMD_FID_SEARCH_SEARCHSET ".uno:SearchSet"
+#define CMD_SID_SELECT ".uno:Select"
+#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack"
+#define CMD_SID_SET_DEFAULT ".uno:SetDefault"
+#define CMD_SID_HYPERLINK_SETLINK ".uno:SetHyperlink"
+#define CMD_SID_ATTR_PARA_HYPHENZONE ".uno:SetHyphenZone"
+#define CMD_SID_ATTR_LONG_LRSPACE ".uno:SetLongLeftRightMargin"
+#define CMD_SID_ATTR_LONG_ULSPACE ".uno:SetLongTopBottomMargin"
+#define CMD_SID_OBJECT_HELL ".uno:SetObjectToBackground"
+#define CMD_SID_OBJECT_HEAVEN ".uno:SetObjectToForeground"
+#define CMD_SID_ATTR_PAGE_MAXSIZE ".uno:SetPageMaxSize"
+#define CMD_SID_ATTR_BORDER_SHADOW ".uno:BorderShadow"
+#define CMD_SID_ATTR_FILL_SHADOW ".uno:FillShadow"
+#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed"
+#define CMD_SID_OUTLINE_SHOW ".uno:ShowDetail"
+#define CMD_SID_FM_SHOW_FMEXPLORER ".uno:ShowFmExplorer"
+#define CMD_SID_SHOW_ITEMBROWSER ".uno:ShowItemBrowser"
+#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser"
+#define CMD_SID_FM_SHOW_PROPERTIES ".uno:ShowProperties"
+#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser"
+#define CMD_SID_RULER ".uno:ShowRuler"
+#define CMD_SID_SIM_EDITOPTIONS ".uno:SimEditOptions"
+#define CMD_SID_ATTR_SIZE ".uno:Size"
+#define CMD_SID_SM_EDITOPTIONS ".uno:SmEditOptions"
+#define CMD_SID_FM_SORTDOWN ".uno:SortDown"
+#define CMD_SID_FM_SORTUP ".uno:Sortup"
+#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1"
+#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
+#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2"
+#define CMD_SID_ATTR_CHAR_KERNING ".uno:Spacing"
+#define CMD_SID_AUTOSPELL_CHECK ".uno:SpellOnline"
+#define CMD_SID_INSERT_SPINBUTTON ".uno:Spinbutton"
+#define CMD_SID_DRAW_SQUARE ".uno:Square"
+#define CMD_SID_DRAW_SQUARE_ROUND ".uno:Square_Rounded"
+#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL ".uno:Square_Rounded_Unfilled"
+#define CMD_SID_DRAW_SQUARE_NOFILL ".uno:Square_Unfilled"
+#define CMD_SID_3D_STATE ".uno:State3D"
+#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout"
+#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript"
+#define CMD_SID_POLY_SUBSTRACT ".uno:Substract"
+#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript"
+#define CMD_SID_SW_EDITOPTIONS ".uno:SwEditOptions"
+#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog"
+#define CMD_SID_ATTR_TABSTOP ".uno:Tabstops"
+#define CMD_SID_ATTR_TABSTOP_VERTICAL ".uno:TabstopsVertical"
+#define CMD_SID_DIALOG_TESTMODE ".uno:TestMode"
+#define CMD_SID_ATTR_CHAR ".uno:Text"
+#define CMD_SID_DRAW_TEXT ".uno:DrawText"
+#define CMD_SID_DRAW_TEXT_MARQUEE ".uno:Text_Marquee"
+#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT ".uno:TextdirectionLeftToRight"
+#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM ".uno:TextdirectionTopToBottom"
+#define CMD_SID_ATTR_TEXT_FITTOSIZE ".uno:TextFitToSize"
+#define CMD_SID_THESAURUS ".uno:ThesaurusDialog"
+#define CMD_SID_INSERT_TIMEFIELD ".uno:InsertTimeField"
+#define CMD_SID_FM_TIMEFIELD ".uno:TimeField"
+#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode"
+#define CMD_SID_OBJECT_ROTATE ".uno:ToggleObjectRotateMode"
+#define CMD_SID_TEXTEDIT ".uno:ToolEdit"
+#define CMD_SID_OBJECT_SELECT ".uno:SelectObject"
+#define CMD_SID_ATTR_ULSPACE ".uno:TopBottomMargin"
+#define CMD_SID_ATTR_TRANSFORM ".uno:TransformDialog"
+#define CMD_SID_TWAIN_SELECT ".uno:TwainSelect"
+#define CMD_SID_TWAIN_TRANSFER ".uno:TwainTransfer"
+#define CMD_SID_ATTR_CHAR_UNDERLINE ".uno:Underline"
+#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline"
+#define CMD_SID_OUTLINE_REMOVE ".uno:Ungroup"
+#define CMD_SID_INSERT_URLBUTTON ".uno:URLButton"
+#define CMD_SID_FM_USE_WIZARDS ".uno:UseWizards"
+#define CMD_SID_DRAW_CAPTION_VERTICAL ".uno:VerticalCaption"
+#define CMD_SID_DRAW_TEXT_VERTICAL ".uno:VerticalText"
+#define CMD_SID_INSERT_VFIXEDLINE ".uno:VFixedLine"
+#define CMD_SID_FM_VIEW_AS_GRID ".uno:ViewFormAsGrid"
+#define CMD_SID_INSERT_VSCROLLBAR ".uno:VScrollbar"
+#define CMD_SID_ATTR_PARA_WIDOWS ".uno:Widow"
+#define CMD_SID_3D_WIN ".uno:Window3D"
+#define CMD_SID_ATTR_CHAR_WORDLINEMODE ".uno:WordMode"
+#define CMD_SID_ATTR_LINE_COLOR ".uno:XLineColor"
+#define CMD_SID_ATTR_LINE_STYLE ".uno:XLineStyle"
+#define CMD_SID_ATTR_ZOOM ".uno:Zoom"
+#define CMD_SID_SIZE_REAL ".uno:Zoom100Percent"
+#define CMD_SID_SIZE_OPTIMAL ".uno:ZoomObjects"
+#define CMD_SID_SIZE_ALL ".uno:ZoomOptimal"
+#define CMD_SID_SIZE_PAGE ".uno:ZoomPage"
+#define CMD_SID_SIZE_PAGE_WIDTH ".uno:ZoomPageWidth"
+#define CMD_SID_SIZE_VISAREA ".uno:ZoomVisArea"
+#define CMD_SID_FM_GRABCONTROLFOCUS ".uno:GrabControlFocus"
+#define CMD_SID_FM_CREATE_FIELDCONTROL ".uno:CreateFieldControl"
+#define CMD_SID_INSERT_SELECT ".uno:SelectMode"
+#define CMD_SID_PARA_VERTALIGN ".uno:VerticalParagraphAlignment"
+#define CMD_SID_ATTR_CHAR_RELIEF ".uno:CharacterRelief"
+#define CMD_SID_ATTR_BRUSH_CHAR ".uno:CharacterBackgroundPattern"
+#define CMD_SID_ATTR_CHAR_ROTATED ".uno:CharacterRotation"
+#define CMD_SID_ATTR_CHAR_SCALEWIDTH ".uno:CharacterWidthScalingFactor"
+#define CMD_SID_ATTR_NUMBERFORMAT_VALUE ".uno:NumberFormatValue"
+#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY ".uno:HorizontalJustification"
+#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY ".uno:VerticalJustification"
+#define CMD_SID_ATTR_ALIGN_INDENT ".uno:AlignmentIndent"
+#define CMD_SID_ATTR_ALIGN_HYPHENATION ".uno:AlignmentHyphenation"
+#define CMD_SID_ATTR_ALIGN_DEGREES ".uno:AlignmentRotation"
+#define CMD_SID_ATTR_ALIGN_LOCKPOS ".uno:AlignmentRotationMode"
+#define CMD_SID_ATTR_ALIGN_MARGIN ".uno:AlignmentMargin"
+#define CMD_SID_ATTR_ALIGN_STACKED ".uno:AlignmentStacked"
+#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT ".uno:ParaLeftToRight"
+#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT ".uno:ParaRightToLeft"
+#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT ".uno:TextRTL"
+#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor"
+#define CMD_SID_CTLFONT_STATE ".uno:CTLFontState"
+#define CMD_SID_VERTICALTEXT_STATE ".uno:VerticalTextState"
+#define CMD_SID_OPEN_XML_FILTERSETTINGS ".uno:OpenXMLFilterSettings"
+#define CMD_SID_HANGUL_HANJA_CONVERSION ".uno:HangulHanjaConversion"
+#define CMD_SID_CHINESE_CONVERSION ".uno:ChineseConversion"
+#define CMD_SID_SPELL_DIALOG ".uno:SpellDialog"
+#define CMD_SID_RULER_ROWS ".uno:RulerRows"
+#define CMD_SID_RULER_ROWS_VERTICAL ".uno:RulerRowsVertical"
+#define CMD_SID_ATTR_CHAR_FONTLIST ".uno:FontNameList"
+#define CMD_SID_EXTRUSION_TOOGLE ".uno:ExtrusionToggle"
+#define CMD_SID_EXTRUSION_TILT_DOWN ".uno:ExtrusionTiltDown"
+#define CMD_SID_EXTRUSION_TILT_UP ".uno:ExtrusionTiltUp"
+#define CMD_SID_EXTRUSION_TILT_LEFT ".uno:ExtrusionTiltLeft"
+#define CMD_SID_EXTRUSION_TILT_RIGHT ".uno:ExtrusionTiltRight"
+#define CMD_SID_EXTRUSION_DEPTH_FLOATER ".uno:ExtrusionDepthFloater"
+#define CMD_SID_EXTRUSION_DEPTH_DIALOG ".uno:ExtrusionDepthDialog"
+#define CMD_SID_EXTRUSION_DIRECTION_FLOATER ".uno:ExtrusionDirectionFloater"
+#define CMD_SID_EXTRUSION_LIGHTING_FLOATER ".uno:ExtrusionLightingFloater"
+#define CMD_SID_EXTRUSION_SURFACE_FLOATER ".uno:ExtrusionSurfaceFloater"
+#define CMD_SID_EXTRUSION_3D_COLOR ".uno:Extrusion3DColor"
+#define CMD_SID_EXTRUSION_DEPTH ".uno:ExtrusionDepth"
+#define CMD_SID_EXTRUSION_DIRECTION ".uno:ExtrusionDirection"
+#define CMD_SID_EXTRUSION_PROJECTION ".uno:ExtrusionProjection"
+#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION ".uno:ExtrusionLightingDirection"
+#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY ".uno:ExtrusionLightingIntensity"
+#define CMD_SID_EXTRUSION_SURFACE ".uno:ExtrusionSurface"
+#define CMD_SID_FONTWORK_GALLERY_FLOATER ".uno:FontworkGalleryFloater"
+#define CMD_SID_FONTWORK_SHAPE_TYPE ".uno:FontworkShapeType"
+#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS ".uno:FontworkSameLetterHeights"
+#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER ".uno:FontworkAlignmentFloater"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER ".uno:FontworkCharacterSpacingFloater"
+#define CMD_SID_FONTWORK_SHAPE ".uno:FontworkShape"
+#define CMD_SID_FONTWORK_ALIGNMENT ".uno:FontworkAlignment"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING ".uno:FontworkCharacterSpacing"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG ".uno:FontworkCharacterSpacingDialog"
+#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS ".uno:FontworkKernCharacterPairs"
+#define CMD_SID_GET_COLORTABLE ".uno:GetColorTable"
+#define CMD_SID_SPELLCHECKER_CHANGED ".uno:SpellCheckerChanged"
+#define CMD_SID_ATTR_YEAR2000 ".uno:Year2000"
+#define CMD_SID_INC_INDENT ".uno:IncrementIndent"
+#define CMD_SID_DEC_INDENT ".uno:DecrementIndent"
+#define CMD_SID_TABLE_CELL ".uno:StateTableCell"
+#define CMD_SID_OUTLINE_TO_IMPRESS ".uno:SendOutlineToImpress"
+#define CMD_SID_ATTR_DEFTABSTOP ".uno:DefTabStop"
+#define CMD_SID_ATTR_LANGUAGE ".uno:DocumentLanguage"
+#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE ".uno:DocumentLanguageCJK"
+#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE ".uno:DocumentLanguageCTL"
+#define CMD_SID_OPT_LOCALE_CHANGED ".uno:OptionsLocaleChanged"
+#define CMD_SID_SBA_BRW_INSERT ".uno:SbaBrwInsert"
+#define CMD_SID_DRAWTBX_CS_BASIC ".uno:BasicShapes"
+#define CMD_SID_DRAWTBX_CS_SYMBOL ".uno:SymbolShapes"
+#define CMD_SID_DRAWTBX_CS_ARROW ".uno:ArrowShapes"
+#define CMD_SID_DRAWTBX_CS_FLOWCHART ".uno:FlowChartShapes"
+#define CMD_SID_DRAWTBX_CS_CALLOUT ".uno:CalloutShapes"
+#define CMD_SID_DRAWTBX_CS_STAR ".uno:StarShapes"
+#define CMD_SID_DRAW_CS_ID ".uno:CustomShape"
+#define CMD_SID_DASH_LIST ".uno:DashListState"
+#define CMD_SID_LINEEND_LIST ".uno:LineEndListState"
+#define CMD_SID_COLOR_TABLE ".uno:ColorTableState"
+#define CMD_SID_GRADIENT_LIST ".uno:GradientListState"
+#define CMD_SID_HATCH_LIST ".uno:HatchListState"
+#define CMD_SID_BITMAP_LIST ".uno:BitmapListState"
+#define CMD_SID_ATTR_CHAR_EMPHASISMARK ".uno:EmphasisMark"
+#define CMD_SID_FM_SHOW_DATANAVIGATOR ".uno:ShowDataNavigator"
+#define CMD_SID_FM_DATANAVIGATOR_CONTROL ".uno:FmDataNavigatorController"
+#define CMD_SID_ALIGN_ANY_LEFT ".uno:CommonAlignLeft"
+#define CMD_SID_ALIGN_ANY_HCENTER ".uno:CommonAlignHorizontalCenter"
+#define CMD_SID_ALIGN_ANY_RIGHT ".uno:CommonAlignRight"
+#define CMD_SID_ALIGN_ANY_JUSTIFIED ".uno:CommonAlignJustified"
+#define CMD_SID_ALIGN_ANY_TOP ".uno:CommonAlignTop"
+#define CMD_SID_ALIGN_ANY_VCENTER ".uno:CommonAlignVerticalCenter"
+#define CMD_SID_ALIGN_ANY_BOTTOM ".uno:CommonAlignBottom"
+#define CMD_SID_ALIGN_ANY_HDEFAULT ".uno:CommonAlignHorizontalDefault"
+#define CMD_SID_ALIGN_ANY_VDEFAULT ".uno:CommonAlignVerticalDefault"
+#define CMD_SID_AVMEDIA_TOOLBOX ".uno:AVMediaToolBox"
+#define CMD_SID_BORDER_REDUCED_MODE ".uno:BorderReducedMode"
+#define CMD_SID_COLOR_SETTINGS ".uno:ColorSettings"
+#define CMD_SID_MAIL_EXPORT_FINISHED ".uno:MailExportFinished"
+#define CMD_SID_INSERT_ZWSP ".uno:InsertZWSP"
+#define CMD_SID_INSERT_ZWNBSP ".uno:InsertZWNBSP"
+#define CMD_SID_INSERT_LRM ".uno:InsertLRM"
+#define CMD_SID_INSERT_RLM ".uno:InsertRLM"
+#define CMD_FN_INSERT_SOFT_HYPHEN ".uno:InsertSoftHyphen"
+#define CMD_FN_INSERT_HARDHYPHEN ".uno:InsertHardHyphen"
+#define CMD_FN_INSERT_HARD_SPACE ".uno:InsertNonBreakingSpace"
+#define CMD_SID_BASICIDE_MANAGE_LANG ".uno:ManageLanguage"
+#define CMD_SID_BASICIDE_CURRENT_LANG ".uno:CurrentLanguage"
+#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells"
+#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell"
+#define CMD_SID_OPTIMIZE_TABLE ".uno:OptimizeTable"
+#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
+#define CMD_SID_TABLE_INSERT_ROW ".uno:InsertRows"
+#define CMD_SID_TABLE_INSERT_COL ".uno:InsertColumns"
+#define CMD_SID_TABLE_DELETE_ROW ".uno:DeleteRows"
+#define CMD_SID_TABLE_DELETE_COL ".uno:DeleteColumns"
+#define CMD_SID_TABLE_SELECT_ALL ".uno:SelectTable"
+#define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn"
+#define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow"
+#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog"
+#define CMD_SID_TABLE_AUTOSUM ".uno:AutoSum"
+#define CMD_SID_TABLE_SORT_DIALOG ".uno:TableSort"
+#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor"
+#define CMD_SID_ATTR_ZOOMSLIDER ".uno:ZoomSlider"
+#define CMD_SID_FONTNAMELIST ".uno:FontNameStringList"
+#define CMD_SID_LANGUAGE_STATUS ".uno:LanguageStatus"
+#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH ".uno:FontDialogForParagraph"
+#define CMD_SID_GROW_FONT_SIZE ".uno:Grow"
+#define CMD_SID_SHRINK_FONT_SIZE ".uno:Shrink"
+#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument"
+#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
+#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
+
+#endif
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 2024e4e46c..ca12b3bbc6 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -198,9 +198,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(ULONG nHelpId) = 0; + virtual void SetEditHelpId(const rtl::OString&) = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; @@ -246,7 +246,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -357,7 +357,7 @@ public: SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; - + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog const SfxItemSet& rCoreSet )=0; @@ -503,7 +503,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; }; #endif diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx index eef4adafca..1a79685b6a 100644 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx @@ -37,6 +37,7 @@ #define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS (1UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS) +//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS (3UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) #define ERRCODE_SVX_LINGU_HYPHENNOTEXISTS (4UL | ERRCODE_AREA_SVX | \ @@ -49,6 +50,7 @@ #define ERRCODE_SVX_GRAPHIC_NOTREADABLE (7UL | 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/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 03fe3a6abc..03fe3a6abc 100644 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index 543a5575a3..543a5575a3 100644 --- a/svx/inc/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx index 71fe439ef8..71fe439ef8 100644 --- a/svx/inc/swframeposstrings.hxx +++ b/svx/inc/svx/swframeposstrings.hxx diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx index ded6a1cda4..ded6a1cda4 100644 --- a/svx/inc/swframevalidation.hxx +++ b/svx/inc/svx/swframevalidation.hxx diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 34fba7567c..53e2cd899a 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <svtools/valueset.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <svx/dlgctrl.hxx> #include <svx/xsetit.hxx> diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 1e9830079b..1394bfc374 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/group.hxx> #include <svtools/stdctrl.hxx> #include <svx/svdpage.hxx> diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 6e97892565..6e97892565 100644 --- a/svx/inc/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index b06afcfe7e..b06afcfe7e 100644 --- a/svx/inc/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index e3a5c155fa..e3a5c155fa 100644 --- a/svx/inc/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 581d7ed52b..581d7ed52b 100644 --- a/svx/inc/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index 6ca407184b..6ca407184b 100644 --- a/svx/inc/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx index 80462b6aa2..80462b6aa2 100644 --- a/svx/inc/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx index 5baa6444f4..5baa6444f4 100644 --- a/svx/inc/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx index c40e276702..2f9a16b91c 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,4 +100,3 @@ SVX_DLLPUBLIC void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const r #endif // _SVX_UNOAPI_HXX_ -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx index 3f05501d0c..3f05501d0c 100644 --- a/svx/inc/unofill.hxx +++ b/svx/inc/svx/unofill.hxx diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx index e34ab41ed3..e34ab41ed3 100644 --- a/svx/inc/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx index d74003faf4..d74003faf4 100644 --- a/svx/inc/unopool.hxx +++ b/svx/inc/svx/unopool.hxx diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 711d317664..711d317664 100644 --- a/svx/inc/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 88db2f36b4..603857020b 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -91,6 +91,8 @@ public: void ChangeModel( SdrModel* pNewModel ); + void UpdateOutliner(); + private: SVX_DLLPRIVATE SvxTextEditSource( SvxTextEditSourceImpl* pImpl ); diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 0401ac43f3..0401ac43f3 100644 --- a/svx/inc/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 8270fb1091..8270fb1091 100644 --- a/svx/inc/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx index 30f9981804..30f9981804 100644 --- a/svx/inc/xattr.hxx +++ b/svx/inc/svx/xattr.hxx diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index 3b9f5c0cc1..6600a8e202 100644 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -37,7 +37,8 @@ |* \************************************************************************/ -#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 153, 204, 255 ) // blue 8 +#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 0xCF, 0xE7, 0xE5 ) +#define COL_DEFAULT_SHAPE_STROKE RGB_COLORDATA( 128, 128, 128 ) #define XATTR_START 1000 diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx index ae997866e0..ae997866e0 100644 --- a/svx/inc/xexch.hxx +++ b/svx/inc/svx/xexch.hxx diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index aa532d2388..aa532d2388 100644 --- a/svx/inc/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index 08e753adf6..08e753adf6 100644 --- a/svx/inc/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index 67c637f8cf..67c637f8cf 100644 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index f6da616aee..f6da616aee 100644 --- a/svx/inc/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index d531947f0d..d531947f0d 100644 --- a/svx/inc/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index 0b41e3fd8f..aedd8ff432 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -46,11 +46,7 @@ class OutputDevice; #define XPOLYPOLY_APPEND 0xFFFF #define XPOLY_APPEND 0xFFFF -#ifdef WIN // Windows 16 Bit -#define XPOLY_MAXPOINTS 8160 /* =0xFF00/sizeof(Point), also mit etwas Platz! */ -#else #define XPOLY_MAXPOINTS 0xFFF0 /* Auch fuer die 32-Bitter etwas Luft lassen */ -#endif /************************************************************************/ // Punktstile im XPolygon: diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index a377b6ece1..a377b6ece1 100644 --- a/svx/inc/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index 42dc766639..42dc766639 100644 --- a/svx/inc/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 9f75974886..536d7cc29f 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,4 +1,4 @@ -sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL +sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt 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 diff --git a/svx/prj/d.lst b/svx/prj/d.lst index d79e42172b..5bc91d5f4d 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -15,451 +15,21 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res mkdir: %_DEST%\inc%_EXT%\svx +..\inc\svx\svxcommands.h %_DEST%\inc%_EXT%\svx\svxcommands.h ..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi -..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx -..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx -..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx -..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx -..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx +..\inc\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx +..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h +..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.hrc + ..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx ..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx ..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc -..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx ..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc -..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc -..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx - -../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx -../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx -../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx -../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx -../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx -../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx -../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx - -..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx -..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx -..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx -..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx -..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx -..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx -..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx -..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc -..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx -..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx -..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx -..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx -..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx -..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx -..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx -..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx -..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx -..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx -..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx -..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx -..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx -..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx -..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx -..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx -..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc -..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx -..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx -..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx -..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx -..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx -..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx -..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx -..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx -..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx -..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx -..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx -..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx -..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx -..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx -..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx -..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx -..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx -..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx -..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx -..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx -..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx -..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx -..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx -..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx -..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx -..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx -..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx -..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx -..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx -..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx -..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx -..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx -..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx -..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc -..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx -..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx -..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx -..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx -..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx -..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx -..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx -..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx -..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx -..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx -..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx -..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx -..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx -..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx -..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx -..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx -..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx -..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx -..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx -..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx -..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx -..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx -..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx -..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx -..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx -..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx -..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx -..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx -..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx -..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx -..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx - -..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx -..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx -..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx -..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc -..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx -..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx -..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx -..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx -..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx -..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx -..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx -..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx -..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx -..\inc\svx\linkwarn.hxx %_DEST%\inc%_EXT%\svx\linkwarn.hxx -..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx -..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx -..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx -..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx -..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx -..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx -..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx -..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx -..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx -..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx -..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx -..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx -..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx -..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx -..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx -..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx -..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx -..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx -..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx -..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx -..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx -..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx -..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc -..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx -..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx -..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx -..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx -..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx -..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx -..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx -..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx -..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx -..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx -..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx -..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx -..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx -..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx -..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx -..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx -..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx -..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx -..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx -..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx -..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx -..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx -..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx -..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx -..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx -..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx -..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx -..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx -..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx -..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx -..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx -..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx -..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx -..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx -..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx -..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx -..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx -..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx -..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx -..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx -..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx -..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx -..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx -..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx -..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx -..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx -..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx -..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx -..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx -..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx -..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx -..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx -..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx -..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx -..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx -..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx -..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx -..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx -..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx -..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx -..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx -..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx -..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx -..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx -..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx -..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx -..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx -..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx -..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx -..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx -..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx -..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx -..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx -..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx -..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx -..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx -..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx -..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx -..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx -..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx -..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx -..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx -..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx -..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx -..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx -..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx -..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx -..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx -..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx -..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx -..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx -..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx -..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx -..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx -..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx -..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx -..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx -..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx -..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx -..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx -..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx -..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx -..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx -..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx -..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx -..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx -..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx -..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx -..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx -..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx -..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc -..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx -..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx -..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx -..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx -..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx -..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx -..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx -..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx -..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx -..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx -..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx -..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx -..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx -..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx -..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx -..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx -..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx -..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx -..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx -..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx -..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx -..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx -..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx -..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx -..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx -..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx -..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx -..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx -..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx -..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx -..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx -..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx -..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx -..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx -..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx -..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx -..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx -..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx -..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx -..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx -..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx -..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx -..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx -..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx -..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx -..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx -..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx -..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx -..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx -..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx -..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx -..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx -..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx -..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx -..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx -..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx -..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx -..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx -..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx -..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx -..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx -..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx -..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx -..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx -..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx -..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx -..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx -..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx -..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx -..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx -..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx -..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx -..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx -..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx -..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx -..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx -..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx -..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx -..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx -..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx -..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx -..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx -..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx -..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx -..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx -..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx -..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx -..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx -..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx -..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx -..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx -..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx -..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx -..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx -..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx -..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx -..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx -..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx -..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx -..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx -..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx -..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx -..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx -..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx -..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx -..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx - -..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx -..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx -..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx -..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx -..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx -..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx -..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx -..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx -..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx -..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx -..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx -..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx -..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx -..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx -..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx -..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx -..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx -..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx -..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx -..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx -..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx -..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx -..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx -..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc -..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx -..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx -..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx -..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx -..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx -..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx -..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx -..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx -..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx -..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx -..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx -..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx -..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx -..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx -..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx -..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx -..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx -..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx -..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx -..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h -..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx -..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx -..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx -..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx -..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx -..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx -..\inc\svx\sdrobjectfilter.hxx %_DEST%\inc%_EXT%\svx\sdrobjectfilter.hxx - -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx mkdir: %_DEST%\inc%_EXT%\svx\sdr mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties @@ -550,10 +120,11 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table ..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml ..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx +..\uiconfig\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\*.xml +..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml +..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* +..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component +..\%__SRC%\misc\svxcore.component %_DEST%\xml%_EXT%\svxcore.component +..\%__SRC%\misc\textconversiondlgs.component %_DEST%\xml%_EXT%\textconversiondlgs.component diff --git a/svx/prj/target_lib_svx.mk b/svx/prj/target_lib_svx.mk new file mode 100644 index 0000000000..e97c4aaaa5 --- /dev/null +++ b/svx/prj/target_lib_svx.mk @@ -0,0 +1,261 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svx)) + +$(eval $(call gb_Library_set_include,svx,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svx/ \ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/source/inc \ + -I$(SRCDIR)/svx/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svx,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ + -DSVX_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svx,\ + basegfx \ + sb \ + comphelper \ + cppuhelper \ + cppu \ + drawinglayer \ + editeng \ + i18nisolang1 \ + icuuc \ + sal \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ + xo \ + xcr \ + stl \ +)) + +# svx/source/unodialogs/textconversiondlgs/services \ +# svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ +# svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \ +# svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \ +# svx/source/unodialogs/textconversiondlgs/resid \ + + +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/unodraw/recoveryui \ + svx/source/unodraw/unoshcol \ + svx/source/unodraw/unoctabl \ + svx/source/unodraw/unopool \ + svx/source/unodraw/UnoNamespaceMap \ + svx/source/tbxctrls/layctrl \ + svx/source/tbxctrls/tbxcolor \ + svx/source/tbxctrls/formatpaintbrushctrl \ + svx/source/tbxctrls/colrctrl \ + svx/source/tbxctrls/itemwin \ + svx/source/tbxctrls/tbxalign \ + svx/source/tbxctrls/fillctrl \ + svx/source/tbxctrls/tbunocontroller \ + svx/source/tbxctrls/subtoolboxcontrol \ + svx/source/tbxctrls/grafctrl \ + svx/source/tbxctrls/linectrl \ + svx/source/tbxctrls/tbxdrctl \ + svx/source/tbxctrls/verttexttbxctrl \ + svx/source/tbxctrls/lboxctrl \ + svx/source/table/tablertfexporter \ + svx/source/table/tablertfimporter \ + svx/source/table/accessiblecell \ + svx/source/table/accessibletableshape \ + svx/source/table/tabledesign \ + svx/source/table/celleditsource \ + svx/source/svdraw/svdoimp \ + svx/source/svdraw/svdscrol \ + svx/source/svdraw/ActionDescriptionProvider \ + svx/source/svdraw/impgrfll \ + svx/source/items/SmartTagItem \ + svx/source/items/svxempty \ + svx/source/items/viewlayoutitem \ + svx/source/items/zoomslideritem \ + svx/source/items/hlnkitem \ + svx/source/items/numfmtsh \ + svx/source/items/algitem \ + svx/source/items/zoomitem \ + svx/source/items/ofaitem \ + svx/source/items/pageitem \ + svx/source/items/numinf \ + svx/source/items/postattr \ + svx/source/items/rotmodit \ + svx/source/items/svxerr \ + svx/source/form/databaselocationinput \ + svx/source/form/fmsrcimp \ + svx/source/form/filtnav \ + svx/source/form/tabwin \ + svx/source/form/fmsrccfg \ + svx/source/form/fmobjfac \ + svx/source/form/tbxform \ + svx/source/form/fmPropBrw \ + svx/source/form/dbcharsethelper \ + svx/source/stbctrls/pszctrl \ + svx/source/stbctrls/insctrl \ + svx/source/stbctrls/selctrl \ + svx/source/stbctrls/xmlsecctrl \ + svx/source/stbctrls/modctrl \ + svx/source/stbctrls/zoomsliderctrl \ + svx/source/stbctrls/zoomctrl \ + svx/source/gengal/gengal \ + svx/source/unogallery/unogaltheme \ + svx/source/unogallery/unogalitem \ + svx/source/unogallery/unogalthemeprovider \ + svx/source/mnuctrls/SmartTagCtl \ + svx/source/mnuctrls/fntctl \ + svx/source/mnuctrls/clipboardctl \ + svx/source/mnuctrls/fntszctl \ + svx/source/fmcomp/dbaobjectex \ + svx/source/smarttags/SmartTagMgr \ + svx/source/accessibility/AccessibleOLEShape \ + svx/source/accessibility/AccessibleShapeTreeInfo \ + svx/source/accessibility/DGColorNameLookUp \ + svx/source/accessibility/charmapacc \ + svx/source/accessibility/AccessibleShape \ + svx/source/accessibility/AccessibleTextHelper \ + svx/source/accessibility/svxrectctaccessiblecontext \ + svx/source/accessibility/AccessibleGraphicShape \ + svx/source/accessibility/AccessibleEmptyEditSource \ + svx/source/accessibility/ChildrenManagerImpl \ + svx/source/accessibility/AccessibleShapeInfo \ + svx/source/accessibility/DescriptionGenerator \ + svx/source/accessibility/ShapeTypeHandler \ + svx/source/accessibility/ChildrenManager \ + svx/source/accessibility/AccessibleControlShape \ + svx/source/accessibility/AccessibleTextEventQueue \ + svx/source/accessibility/AccessibleFrameSelector \ + svx/source/accessibility/SvxShapeTypes \ + svx/source/accessibility/GraphCtlAccessibleContext \ + svx/source/customshapes/tbxcustomshapes \ + svx/source/engine3d/float3d \ + svx/source/engine3d/volume3d \ + svx/source/engine3d/viewpt3d \ + svx/source/dialog/srchdlg \ + svx/source/dialog/rubydialog \ + svx/source/dialog/srchctrl \ + svx/source/dialog/paraprev \ + svx/source/dialog/fontwork \ + svx/source/dialog/framelinkarray \ + svx/source/dialog/svxbmpnumvalueset \ + svx/source/dialog/hyperdlg \ + svx/source/dialog/wrapfield \ + svx/source/dialog/svxruler \ + svx/source/dialog/ctredlin \ + svx/source/dialog/rulritem \ + svx/source/dialog/dialcontrol \ + svx/source/dialog/databaseregistrationui \ + svx/source/dialog/txencbox \ + svx/source/dialog/charmap \ + svx/source/dialog/passwd \ + svx/source/dialog/dlgctrl \ + svx/source/dialog/hdft \ + svx/source/dialog/frmdirlbox \ + svx/source/dialog/fntctrl \ + svx/source/dialog/docrecovery \ + svx/source/dialog/checklbx \ + svx/source/dialog/swframeposstrings \ + svx/source/dialog/svxgrahicitem \ + svx/source/dialog/relfld \ + svx/source/dialog/SpellDialogChildWindow \ + svx/source/dialog/strarray \ + svx/source/dialog/prtqry \ + svx/source/dialog/connctrl \ + svx/source/dialog/contwnd \ + svx/source/dialog/pfiledlg \ + svx/source/dialog/dlgctl3d \ + svx/source/dialog/hyprlink \ + svx/source/dialog/grfflt \ + svx/source/dialog/measctrl \ + svx/source/dialog/orienthelper \ + svx/source/dialog/frmsel \ + svx/source/dialog/swframeexample \ + svx/source/dialog/_bmpmask \ + svx/source/dialog/graphctl \ + svx/source/dialog/rlrcitem \ + svx/source/dialog/fontlb \ + svx/source/dialog/optgrid \ + svx/source/dialog/imapwnd \ + svx/source/dialog/pagectrl \ + svx/source/dialog/_contdlg \ + svx/source/dialog/txenctab \ + svx/source/dialog/imapdlg \ + svx/source/customshapes/EnhancedCustomShape3d \ + svx/source/customshapes/EnhancedCustomShapeHandle \ + svx/source/customshapes/EnhancedCustomShapeEngine \ + svx/source/customshapes/EnhancedCustomShapeFontWork \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportunx \ +)) +$(eval $(call gb_Library_add_linked_libs,svx,\ + dl \ + m \ + pthread \ +)) +else +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svx,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportw32 \ +)) +)) +else +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportgen \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,svx,\ + shell \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/svx/prj/target_lib_svxcore.mk b/svx/prj/target_lib_svxcore.mk new file mode 100644 index 0000000000..751e423986 --- /dev/null +++ b/svx/prj/target_lib_svxcore.mk @@ -0,0 +1,449 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svxcore)) + +$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots)) + +$(eval $(call gb_Library_set_include,svxcore,\ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/source/inc \ + -I$(SRCDIR)/svx/inc/pch \ + -I$(WORKDIR)/SdiTarget/svx/sdi \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svxcore,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ + -DSVX_DLLIMPLEMENTATION \ + -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ +)) + +$(eval $(call gb_Library_add_linked_libs,svxcore,\ + avmedia \ + basegfx \ + sb \ + comphelper \ + cppuhelper \ + cppu \ + drawinglayer \ + editeng \ + fwe \ + i18nisolang1 \ + icuuc \ + lng \ + sal \ + sfx \ + sot \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ + xo \ +)) + +$(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/sdr/animation/scheduler \ + svx/source/sdr/animation/objectanimator \ + svx/source/sdr/animation/animationstate \ + svx/source/sdr/attribute/sdrlinefillshadowtextattribute \ + svx/source/sdr/attribute/sdrfilltextattribute \ + svx/source/sdr/attribute/sdrshadowtextattribute \ + svx/source/sdr/attribute/sdrtextattribute \ + svx/source/sdr/attribute/sdrlineshadowtextattribute \ + svx/source/sdr/attribute/sdrformtextattribute \ + svx/source/sdr/attribute/sdrformtextoutlineattribute \ + svx/source/sdr/contact/viewobjectcontactofgroup \ + svx/source/sdr/contact/viewobjectcontactofsdrpage \ + svx/source/sdr/contact/viewcontactofpageobj \ + svx/source/sdr/contact/viewcontactofe3d \ + svx/source/sdr/contact/viewcontactofe3dcube \ + svx/source/sdr/contact/viewcontactofsdrmediaobj \ + svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \ + svx/source/sdr/contact/viewobjectcontactofpageobj \ + svx/source/sdr/contact/viewobjectcontactofe3dscene \ + svx/source/sdr/contact/viewcontactofgraphic \ + svx/source/sdr/contact/viewobjectcontactredirector \ + svx/source/sdr/contact/viewcontactofsdrcircobj \ + svx/source/sdr/contact/viewcontactofgroup \ + svx/source/sdr/contact/viewcontactofunocontrol \ + svx/source/sdr/contact/viewcontactofsdrobjcustomshape \ + svx/source/sdr/contact/viewcontactofsdrobj \ + svx/source/sdr/contact/objectcontact \ + svx/source/sdr/contact/viewcontactoftextobj \ + svx/source/sdr/contact/viewcontactofe3dlathe \ + svx/source/sdr/contact/viewcontactofsdrpage \ + svx/source/sdr/contact/viewcontactofe3dextrude \ + svx/source/sdr/contact/viewcontactofmasterpagedescriptor \ + svx/source/sdr/contact/viewcontact \ + svx/source/sdr/contact/viewcontactofsdrole2obj \ + svx/source/sdr/contact/displayinfo \ + svx/source/sdr/contact/objectcontacttools \ + svx/source/sdr/contact/viewcontactofe3dscene \ + svx/source/sdr/contact/viewcontactofsdrrectobj \ + svx/source/sdr/contact/viewobjectcontactofsdrole2obj \ + svx/source/sdr/contact/viewobjectcontactofunocontrol \ + svx/source/sdr/contact/viewobjectcontactofgraphic \ + svx/source/sdr/contact/sdrmediawindow \ + svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \ + svx/source/sdr/contact/viewcontactofsdrcaptionobj \ + svx/source/sdr/contact/viewcontactofvirtobj \ + svx/source/sdr/contact/viewcontactofe3dsphere \ + svx/source/sdr/contact/viewcontactofe3dpolygon \ + svx/source/sdr/contact/viewcontactofsdredgeobj \ + svx/source/sdr/contact/viewobjectcontact \ + svx/source/sdr/contact/viewobjectcontactofsdrobj \ + svx/source/sdr/contact/objectcontactofpageview \ + svx/source/sdr/contact/viewcontactofsdrpathobj \ + svx/source/sdr/contact/viewcontactofsdrmeasureobj \ + svx/source/sdr/contact/objectcontactofobjlistpainter \ + svx/source/sdr/contact/viewobjectcontactofe3d \ + svx/source/customshapes/EnhancedCustomShapeGeometry \ + svx/source/customshapes/EnhancedCustomShapeTypeNames \ + svx/source/customshapes/EnhancedCustomShape2d \ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ + svx/source/dialog/dialmgr \ + svx/source/dialog/dlgutil \ + svx/source/dialog/framelink \ + svx/source/dialog/langbox \ + svx/source/dialog/simptabl \ + svx/source/dialog/svxdlg \ + svx/source/dialog/stddlg \ + svx/source/engine3d/deflt3d \ + svx/source/engine3d/polysc3d \ + svx/source/engine3d/sphere3d \ + svx/source/engine3d/helperminimaldepth3d \ + svx/source/engine3d/obj3d \ + svx/source/engine3d/dragmt3d \ + svx/source/engine3d/scene3d \ + svx/source/engine3d/view3d \ + svx/source/engine3d/e3dsceneupdater \ + svx/source/engine3d/viewpt3d2 \ + svx/source/engine3d/svx3ditems \ + svx/source/engine3d/camera3d \ + svx/source/engine3d/e3dundo \ + svx/source/engine3d/objfac3d \ + svx/source/engine3d/lathe3d \ + svx/source/engine3d/polygn3d \ + svx/source/engine3d/view3d1 \ + svx/source/engine3d/cube3d \ + svx/source/engine3d/helperhittest3d \ + svx/source/engine3d/extrud3d \ + svx/source/sdr/event/eventhandler \ + svx/source/fmcomp/gridctrl \ + svx/source/fmcomp/xmlexchg \ + svx/source/fmcomp/trace \ + svx/source/fmcomp/fmgridcl \ + svx/source/fmcomp/gridcell \ + svx/source/fmcomp/dbaexchange \ + svx/source/fmcomp/gridcols \ + svx/source/fmcomp/fmgridif \ + svx/source/form/formfeaturedispatcher \ + svx/source/form/typeconversionclient \ + svx/source/form/fmpgeimp \ + svx/source/form/fmcontrolbordermanager \ + svx/source/form/fmshell \ + svx/source/form/fmundo \ + svx/source/form/ParseContext \ + svx/source/form/fmexpl \ + svx/source/form/fmtools \ + svx/source/form/fmexch \ + svx/source/form/formcontroller \ + svx/source/form/dataaccessdescriptor \ + svx/source/form/fmtextcontrolshell \ + svx/source/form/datalistener \ + svx/source/form/formcontrolfactory \ + svx/source/form/sdbdatacolumn \ + svx/source/form/fmview \ + svx/source/form/delayedevent \ + svx/source/form/fmservs \ + svx/source/form/fmobj \ + svx/source/form/fmdocumentclassification \ + svx/source/form/sqlparserclient \ + svx/source/form/fmshimp \ + svx/source/form/typemap \ + svx/source/form/fmscriptingenv \ + svx/source/form/dbtoolsclient \ + svx/source/form/fmpage \ + svx/source/form/stringlistresource \ + svx/source/form/fmmodel \ + svx/source/form/formtoolbars \ + svx/source/form/fmdpage \ + svx/source/form/fmitems \ + svx/source/form/navigatortreemodel \ + svx/source/form/fmvwimp \ + svx/source/form/fmtextcontrolfeature \ + svx/source/form/fmdmod \ + svx/source/form/fmcontrollayout \ + svx/source/form/fmtextcontroldialogs \ + svx/source/form/formdispatchinterceptor \ + svx/source/form/formcontrolling \ + svx/source/form/navigatortree \ + svx/source/form/datanavi \ + svx/source/form/legacyformcontroller \ + svx/source/form/xfm_addcondition \ + svx/source/gallery2/galexpl \ + svx/source/gallery2/galtheme \ + svx/source/gallery2/galctrl \ + svx/source/gallery2/gallery1 \ + svx/source/gallery2/galmisc \ + svx/source/gallery2/galobj \ + svx/source/gallery2/galbrws2 \ + svx/source/gallery2/galbrws \ + svx/source/gallery2/galbrws1 \ + svx/source/gallery2/codec \ + svx/source/items/drawitem \ + svx/source/items/chrtitem \ + svx/source/items/e3ditem \ + svx/source/items/grfitem \ + svx/source/items/clipfmtitem \ + svx/source/items/customshapeitem \ + svx/source/sdr/overlay/overlayline \ + svx/source/sdr/overlay/overlaycrosshair \ + svx/source/sdr/overlay/overlayrollingrectangle \ + svx/source/sdr/overlay/overlaytriangle \ + svx/source/sdr/overlay/overlayselection \ + svx/source/sdr/overlay/overlayhatchrect \ + svx/source/sdr/overlay/overlaybitmapex \ + svx/source/sdr/overlay/overlaymanagerbuffered \ + svx/source/sdr/overlay/overlayhelpline \ + svx/source/sdr/overlay/overlayanimatedbitmapex \ + svx/source/sdr/overlay/overlaypolypolygon \ + svx/source/sdr/overlay/overlayobjectcell \ + svx/source/sdr/overlay/overlaytools \ + svx/source/sdr/overlay/overlayprimitive2dsequenceobject \ + svx/source/sdr/overlay/overlayobject \ + svx/source/sdr/overlay/overlaymanager \ + svx/source/sdr/overlay/overlayobjectlist \ + svx/source/sdr/primitive2d/sdrellipseprimitive2d \ + svx/source/sdr/primitive2d/sdrprimitivetools \ + svx/source/sdr/primitive2d/sdrtextprimitive2d \ + svx/source/sdr/primitive2d/primitivefactory2d \ + svx/source/sdr/primitive2d/sdrolecontentprimitive2d \ + svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \ + svx/source/sdr/primitive2d/sdrgrafprimitive2d \ + svx/source/sdr/primitive2d/sdrole2primitive2d \ + svx/source/sdr/primitive2d/sdrpathprimitive2d \ + svx/source/sdr/primitive2d/sdrrectangleprimitive2d \ + svx/source/sdr/primitive2d/sdrcaptionprimitive2d \ + svx/source/sdr/primitive2d/sdrconnectorprimitive2d \ + svx/source/sdr/primitive2d/sdrmeasureprimitive2d \ + svx/source/sdr/primitive2d/sdrattributecreator \ + svx/source/sdr/primitive2d/sdrdecompositiontools \ + svx/source/sdr/primitive3d/sdrattributecreator3d \ + svx/source/sdr/properties/pageproperties \ + svx/source/sdr/properties/e3dsceneproperties \ + svx/source/sdr/properties/itemsettools \ + svx/source/sdr/properties/captionproperties \ + svx/source/sdr/properties/e3dextrudeproperties \ + svx/source/sdr/properties/e3dproperties \ + svx/source/sdr/properties/measureproperties \ + svx/source/sdr/properties/customshapeproperties \ + svx/source/sdr/properties/rectangleproperties \ + svx/source/sdr/properties/groupproperties \ + svx/source/sdr/properties/properties \ + svx/source/sdr/properties/e3dlatheproperties \ + svx/source/sdr/properties/graphicproperties \ + svx/source/sdr/properties/circleproperties \ + svx/source/sdr/properties/emptyproperties \ + svx/source/sdr/properties/e3dsphereproperties \ + svx/source/sdr/properties/defaultproperties \ + svx/source/sdr/properties/textproperties \ + svx/source/sdr/properties/attributeproperties \ + svx/source/sdr/properties/connectorproperties \ + svx/source/sdr/properties/e3dcompoundproperties \ + svx/source/sdr/properties/oleproperties \ + svx/source/svdraw/svdglev \ + svx/source/svdraw/svdhdl \ + svx/source/svdraw/svdomedia \ + svx/source/svdraw/svdedxv \ + svx/source/svdraw/svdoedge \ + svx/source/svdraw/svdundo \ + svx/source/svdraw/svdmrkv1 \ + svx/source/svdraw/svdotxfl \ + svx/source/svdraw/sdrcomment \ + svx/source/svdraw/svdcrtv \ + svx/source/svdraw/svdouno \ + svx/source/svdraw/svditer \ + svx/source/svdraw/svdotxln \ + svx/source/svdraw/svdxcgv \ + svx/source/svdraw/svdomeas \ + svx/source/svdraw/svdpntv \ + svx/source/svdraw/svdattr \ + svx/source/svdraw/svdotxdr \ + svx/source/svdraw/svdtext \ + svx/source/svdraw/svdedtv2 \ + svx/source/svdraw/svddrag \ + svx/source/svdraw/svdopage \ + svx/source/svdraw/svddrgmt \ + svx/source/svdraw/svdogrp \ + svx/source/svdraw/svdovirt \ + svx/source/svdraw/svddrgv \ + svx/source/svdraw/sdrpaintwindow \ + svx/source/svdraw/polypolygoneditor \ + svx/source/svdraw/svdpoev \ + svx/source/svdraw/svdotextpathdecomposition \ + svx/source/svdraw/svdmrkv \ + svx/source/svdraw/svdview \ + svx/source/svdraw/svdoashp \ + svx/source/svdraw/svdoutlinercache \ + svx/source/svdraw/svdetc \ + svx/source/svdraw/svdlayer \ + svx/source/svdraw/svdfmtf \ + svx/source/svdraw/gradtrns \ + svx/source/svdraw/svdotxed \ + svx/source/svdraw/svdhlpln \ + svx/source/svdraw/svdedtv \ + svx/source/svdraw/svdmodel \ + svx/source/svdraw/svdopath \ + svx/source/svdraw/svdtrans \ + svx/source/svdraw/svdpagv \ + svx/source/svdraw/svdorect \ + svx/source/svdraw/svdedtv1 \ + svx/source/svdraw/svdograf \ + svx/source/svdraw/sdrhittesthelper \ + svx/source/svdraw/svdglue \ + svx/source/svdraw/svdobj \ + svx/source/svdraw/svdsnpv \ + svx/source/svdraw/svdotext \ + svx/source/svdraw/svdoattr \ + svx/source/svdraw/svdviter \ + svx/source/svdraw/svdpage \ + svx/source/svdraw/svdoole2 \ + svx/source/svdraw/svdibrow \ + svx/source/svdraw/sdrmasterpagedescriptor \ + svx/source/svdraw/svdocapt \ + svx/source/svdraw/svdmark \ + svx/source/svdraw/svdocirc \ + svx/source/svdraw/selectioncontroller \ + svx/source/svdraw/clonelist \ + svx/source/svdraw/svdotxtr \ + svx/source/svdraw/svdoutl \ + svx/source/svdraw/sdrpagewindow \ + svx/source/svdraw/svdotxat \ + svx/source/svdraw/svdotextdecomposition \ + svx/source/table/tablecontroller \ + svx/source/table/tablerow \ + svx/source/table/tablelayouter \ + svx/source/table/tablecolumn \ + svx/source/table/tablemodel \ + svx/source/table/svdotable \ + svx/source/table/cellcursor \ + svx/source/table/propertyset \ + svx/source/table/tablecolumns \ + svx/source/table/viewcontactoftableobj \ + svx/source/table/cellrange \ + svx/source/table/tableundo \ + svx/source/table/tablerows \ + svx/source/table/tablehandles \ + svx/source/table/cell \ + svx/source/tbxctrls/fontworkgallery \ + svx/source/tbxctrls/extrusioncontrols \ + svx/source/tbxctrls/tbcontrl \ + svx/source/tbxctrls/toolbarmenu \ + svx/source/tbxctrls/tbxcolorupdate \ + svx/source/toolbars/fontworkbar \ + svx/source/toolbars/extrusionbar \ + svx/source/unodraw/unoshap4 \ + svx/source/unodraw/unomlstr \ + svx/source/unodraw/unoshtxt \ + svx/source/unodraw/gluepts \ + svx/source/unodraw/shapepropertynotifier \ + svx/source/unodraw/tableshape \ + svx/source/unodraw/unohtabl \ + svx/source/unodraw/unoshape \ + svx/source/unodraw/UnoGraphicExporter \ + svx/source/unodraw/unobtabl \ + svx/source/unodraw/XPropertyTable \ + svx/source/unodraw/unoshap3 \ + svx/source/unodraw/unottabl \ + svx/source/unodraw/UnoNameItemTable \ + svx/source/unodraw/unogtabl \ + svx/source/unodraw/unomod \ + svx/source/unodraw/unopage \ + svx/source/unodraw/unoprov \ + svx/source/unodraw/unomtabl \ + svx/source/unodraw/unoshap2 \ + svx/source/unodraw/unodtabl \ + svx/source/xml/xmlexport \ + svx/source/xml/xmlgrhlp \ + svx/source/xml/xmlxtimp \ + svx/source/xml/xmlxtexp \ + svx/source/xml/xmleohlp \ + svx/source/xoutdev/xtablend \ + svx/source/xoutdev/xattr \ + svx/source/xoutdev/xtabgrdt \ + svx/source/xoutdev/xtabhtch \ + svx/source/xoutdev/_xoutbmp \ + svx/source/xoutdev/xtabdash \ + svx/source/xoutdev/xtabbtmp \ + svx/source/xoutdev/xexch \ + svx/source/xoutdev/xtabcolr \ + svx/source/xoutdev/xattr2 \ + svx/source/xoutdev/xtable \ + svx/source/xoutdev/xattrbmp \ + svx/source/xoutdev/_xpoly \ + svx/source/xoutdev/xpool \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,svxcore,\ + dl \ + m \ + pthread \ + stl \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svxcore,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) + + +$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/sdi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svx/prj/target_module_svx.mk b/svx/prj/target_module_svx.mk new file mode 100644 index 0000000000..a0daefb15a --- /dev/null +++ b/svx/prj/target_module_svx.mk @@ -0,0 +1,52 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svx,\ + $(call gb_AllLangResTarget_get_target,svx) \ + $(call gb_Library_get_target,svxcore) \ + $(call gb_Library_get_target,svx) \ +)) + +$(eval $(call gb_Module_read_includes,svx,\ + lib_svx \ + lib_svxcore \ + res_svx \ +)) + +#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX +#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes +#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog +#todo: noopt for viewpt3d.cxx with MSVC and ICC +#todo: set -DENABLE_VBA in case $(ENABLE_VBA)="YES"; can we do it in gbuild.mk? +#todo: gengal +#todo: set -D... for ENABLE_GTK/KDE/KDE4 -> in gbuild.mk? +#todo: ibrwimp.lib in util/makefile.mk on Windows ?! +#todo: GENHID +#todo: uiconfig +#todo: exports from gallery (util/gal.dxp) and svx (svx.dxp) +#todo: resources, textconversion, packages + diff --git a/svx/prj/target_package_inc.mk b/svx/prj/target_package_inc.mk new file mode 100644 index 0000000000..dd836b286f --- /dev/null +++ b/svx/prj/target_package_inc.mk @@ -0,0 +1,154 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) + + + + + + + + + + + + + + + + + + + + diff --git a/svx/prj/target_res_svx.mk b/svx/prj/target_res_svx.mk new file mode 100644 index 0000000000..5075f4ee0e --- /dev/null +++ b/svx/prj/target_res_svx.mk @@ -0,0 +1,112 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svx)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx)) +#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw)) + +$(eval $(call gb_AllLangResTarget_add_srs,svx,\ + svx/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svx/res)) + +$(eval $(call gb_SrsTarget_set_include,svx/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svx/source/inc \ + -I$(SRCDIR)/svx/source/dialog \ + -I$(SRCDIR)/svx/inc/ \ + -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \ +)) + +#svx/source/src/errtxt.src +#svx/source/src/app.src + +#svx/source/intro/iso.src +#svx/source/intro/ooo.src + +#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src + +$(eval $(call gb_SrsTarget_add_files,svx/res,\ + svx/source/stbctrls/stbctrls.src \ + svx/source/dialog/passwd.src \ + svx/source/dialog/language.src \ + svx/source/dialog/bmpmask.src \ + svx/source/dialog/ucsubset.src \ + svx/source/dialog/hdft.src \ + svx/source/dialog/imapdlg.src \ + svx/source/dialog/swframeposstrings.src \ + svx/source/dialog/prtqry.src \ + svx/source/dialog/txenctab.src \ + svx/source/dialog/dlgctrl.src \ + svx/source/dialog/frmsel.src \ + svx/source/dialog/ctredlin.src \ + svx/source/dialog/sdstring.src \ + svx/source/dialog/ruler.src \ + svx/source/dialog/srchdlg.src \ + svx/source/dialog/optgrid.src \ + svx/source/dialog/langbox.src \ + svx/source/dialog/contdlg.src \ + svx/source/dialog/rubydialog.src \ + svx/source/dialog/fontwork.src \ + svx/source/dialog/docrecovery.src \ + svx/source/dialog/hyprlink.src \ + svx/source/dialog/svxbmpnumvalueset.src \ + svx/source/engine3d/string3d.src \ + svx/source/engine3d/float3d.src \ + svx/source/mnuctrls/mnuctrls.src \ + svx/source/tbxctrls/linectrl.src \ + svx/source/tbxctrls/colrctrl.src \ + svx/source/tbxctrls/extrusioncontrols.src \ + svx/source/tbxctrls/tbxdraw.src \ + svx/source/tbxctrls/grafctrl.src \ + svx/source/tbxctrls/lboxctrl.src \ + svx/source/tbxctrls/tbcontrl.src \ + svx/source/tbxctrls/fontworkgallery.src \ + svx/source/fmcomp/gridctrl.src \ + svx/source/form/fmexpl.src \ + svx/source/form/formshell.src \ + svx/source/form/fmstring.src \ + svx/source/form/datanavi.src \ + svx/source/form/filtnav.src \ + svx/source/unodraw/unodraw.src \ + svx/source/table/table.src \ + svx/source/toolbars/extrusionbar.src \ + svx/source/toolbars/fontworkbar.src \ + svx/source/gallery2/galtheme.src \ + svx/source/gallery2/gallery.src \ + svx/source/svdraw/svdstr.src \ + svx/source/accessibility/accessibility.src \ + svx/source/items/svxitems.src \ + svx/source/items/svxerr.src \ +)) + + diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl index 89369160bb..b26db6b7f9 100644 --- a/svx/qa/unoapi/knownissues.xcl +++ b/svx/qa/unoapi/knownissues.xcl @@ -85,3 +85,6 @@ svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleCo ### i111169 ### svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent + +### i114642 ### +svx.SvxUnoTextContent::com::sun::star::style::CharacterProperties diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk index be41593be7..ee8b0e638b 100644 --- a/svx/sdi/makefile.mk +++ b/svx/sdi/makefile.mk @@ -46,10 +46,10 @@ SVSDI1DEPEND= \ $(SOLARINCXDIR)$/sfx2/sfx.sdi \ $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ svxitems.sdi \ - fmslots.sdi \ - svx.sdi \ - xoitems.sdi \ - svxitems.sdi + fmslots.sdi \ + svx.sdi \ + xoitems.sdi \ + svxitems.sdi # --- Targets ------------------------------------------------------- .ENDIF diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index c5069ad2eb..cd23586cc6 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6205,33 +6205,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT ] //-------------------------------------------------------------------------- -SfxVoidItem InsertApplet SID_INSERT_APPLET -(SfxStringItem Class FN_PARAM_1, - SfxStringItem ClassLocation FN_PARAM_2, - SfxStringItem Commands FN_PARAM_3) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INSERT; -] - -//-------------------------------------------------------------------------- SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS () [ @@ -15135,3 +15108,31 @@ SfxVoidItem InsertRowDialog SID_TABLE_INSERT_ROW_DLG ToolBoxConfig = FALSE, GroupId = GID_TABLE; ] +//-------------------------------------------------------------------------- +SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* status: */ + SlotType = SfxBoolItem + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_EXPLORER; +] + diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index d3d181a273..4e5cd203d9 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/AccessibleControlShape.hxx> #include <svx/AccessibleShapeInfo.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> @@ -40,14 +40,14 @@ #include <comphelper/processfactory.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svx/svdouno.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/accessiblewrapper.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <algorithm> using namespace ::comphelper; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index fc696b5085..fd26727d91 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/AccessibleShape.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <rtl/uuid.h> @@ -48,13 +48,13 @@ #include <svx/unoshtxt.hxx> #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/uno/Exception.hpp> #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> #include "accessibility.hrc" -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 54c288a044..e6c245279b 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> @@ -51,12 +51,12 @@ // Includes for string resources. #include "accessibility.hrc" -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <tools/string.hxx> #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "accessibility.hrc" #include "DGColorNameLookUp.hxx" diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0e607651f6..21542a05eb 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -46,7 +46,7 @@ #include <toolkit/helper/convert.hxx> #include <svtools/colorcfg.hxx> #include <comphelper/accessibleeventnotifier.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //===== local includes ======================================================== #include <svx/ShapeTypeHandler.hxx> diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 9952496a8a..7d67430102 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -36,7 +36,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" using namespace ::rtl; diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk index 9ac9cff08a..506bb1a68b 100755 --- a/svx/source/accessibility/makefile.mk +++ b/svx/source/accessibility/makefile.mk @@ -39,26 +39,26 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES= \ - $(SLO)$/charmapacc.obj \ - $(SLO)$/svxrectctaccessiblecontext.obj \ - $(SLO)$/GraphCtlAccessibleContext.obj \ - $(SLO)$/ChildrenManager.obj \ - $(SLO)$/ChildrenManagerImpl.obj \ - $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleShape.obj \ - $(SLO)$/AccessibleGraphicShape.obj \ - $(SLO)$/AccessibleOLEShape.obj \ - $(SLO)$/AccessibleShapeInfo.obj \ - $(SLO)$/AccessibleShapeTreeInfo.obj \ - $(SLO)$/AccessibleTextHelper.obj \ - $(SLO)$/AccessibleEmptyEditSource.obj \ - $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/ShapeTypeHandler.obj \ - $(SLO)$/SvxShapeTypes.obj \ - $(SLO)$/AccessibleControlShape.obj \ - $(SLO)$/DGColorNameLookUp.obj \ - $(SLO)$/AccessibleFrameSelector.obj - + $(SLO)$/charmapacc.obj \ + $(SLO)$/svxrectctaccessiblecontext.obj \ + $(SLO)$/GraphCtlAccessibleContext.obj \ + $(SLO)$/ChildrenManager.obj \ + $(SLO)$/ChildrenManagerImpl.obj \ + $(SLO)$/DescriptionGenerator.obj \ + $(SLO)$/AccessibleShape.obj \ + $(SLO)$/AccessibleGraphicShape.obj \ + $(SLO)$/AccessibleOLEShape.obj \ + $(SLO)$/AccessibleShapeInfo.obj \ + $(SLO)$/AccessibleShapeTreeInfo.obj \ + $(SLO)$/AccessibleTextHelper.obj \ + $(SLO)$/AccessibleEmptyEditSource.obj \ + $(SLO)$/AccessibleTextEventQueue.obj \ + $(SLO)$/ShapeTypeHandler.obj \ + $(SLO)$/SvxShapeTypes.obj \ + $(SLO)$/AccessibleControlShape.obj \ + $(SLO)$/DGColorNameLookUp.obj \ + $(SLO)$/AccessibleFrameSelector.obj + SRS2NAME = accessibility SRC2FILES = accessibility.src diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index c6073aea39..0e88b287c5 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -78,44 +78,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const Sequence< OUString >& rServices) -{ - Reference< XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() ); - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 2dfdb50a47..e1a57d430b 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "EnhancedCustomShapeGeometry.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include <svx/EnhancedCustomShape2d.hxx> +#include <svx/EnhancedCustomShapeGeometry.hxx> +#include <svx/EnhancedCustomShapeTypeNames.hxx> #include <svx/svdoashp.hxx> #include <svx/svdtrans.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 6593e75745..0addf30c97 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -32,7 +32,7 @@ #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> #include <tools/poly.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svl/poolitem.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index fb6beaa98a..6ad0ec8db9 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeEngine.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include "EnhancedCustomShape3d.hxx" #include "EnhancedCustomShapeFontWork.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <svx/unoshape.hxx> #include "svx/unopage.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> @@ -48,7 +48,7 @@ #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "unopolyhelper.hxx" #include <uno/mapping.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 23cfd5b038..5846946452 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -39,7 +39,7 @@ #include <svx/sdasaitm.hxx> #include <svx/sdtfsitm.hxx> #include <vcl/virdev.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <vcl/metric.hxx> #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> @@ -47,7 +47,7 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/charscaleitem.hxx> -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> #include <editeng/outliner.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 1996f6b545..19b3eaf333 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include <rtl/ustring.hxx> #include <tools/fract.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 278246a308..0714bf2a56 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> /* static const SvxMSDffVertPair Vert[] = diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 6b2f8699b7..db094d5862 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "unoapi.hxx" +#include "svx/EnhancedCustomShape2d.hxx" +#include "svx/unoapi.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 9b266dcecd..8c4bea73e4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> #include <hash_map> diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk index 3feca8f250..e3182df47a 100644 --- a/svx/source/customshapes/makefile.mk +++ b/svx/source/customshapes/makefile.mk @@ -51,18 +51,18 @@ ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/EnhancedCustomShapeTypeNames.obj \ - $(SLO)$/EnhancedCustomShapeGeometry.obj \ - $(SLO)$/EnhancedCustomShape2d.obj \ - $(SLO)$/EnhancedCustomShapeFunctionParser.obj + $(SLO)$/EnhancedCustomShapeTypeNames.obj \ + $(SLO)$/EnhancedCustomShapeGeometry.obj \ + $(SLO)$/EnhancedCustomShape2d.obj \ + $(SLO)$/EnhancedCustomShapeFunctionParser.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/EnhancedCustomShapeEngine.obj \ - $(SLO)$/EnhancedCustomShape3d.obj \ - $(SLO)$/EnhancedCustomShapeFontWork.obj \ - $(SLO)$/EnhancedCustomShapeHandle.obj \ - $(SLO)$/tbxcustomshapes.obj + $(SLO)$/EnhancedCustomShapeEngine.obj \ + $(SLO)$/EnhancedCustomShape3d.obj \ + $(SLO)$/EnhancedCustomShapeFontWork.obj \ + $(SLO)$/EnhancedCustomShapeHandle.obj \ + $(SLO)$/tbxcustomshapes.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index bcaf8a6f80..c747685dfd 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -42,7 +42,7 @@ #include <sfx2/imagemgr.hxx> #include <vcl/svapp.hxx> -#include "tbxcustomshapes.hxx" +#include "svx/tbxcustomshapes.hxx" SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index dbf9eebfe0..db000ec4ce 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -51,7 +51,7 @@ #define _XOUTBMP_STATICS_ONLY #include <svx/dialmgr.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <svx/contdlg.hxx> @@ -60,7 +60,7 @@ #include "contwnd.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <vcl/svapp.hxx> /******************************************************************************/ diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index b92a3626a7..eeda969672 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -37,7 +37,7 @@ // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { - HelpId = SID_BMPMASK ; + HelpId = CMD_SID_BMPMASK ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_1 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_1 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 48 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_1 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 48 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_2 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_2 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 63 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_2 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 63 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_3 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_3 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3"; Border = TRUE ; Pos = MAP_APPFONT ( 58, 78 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_3 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 78 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_4 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_4 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 93 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_4 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 93 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_TRANS { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TabStop = TRUE ; @@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK PushButton BTN_EXEC { + HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC"; Pos = MAP_APPFONT ( 93 , 6 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK ListBox LB_TRANS { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 108 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -274,7 +289,7 @@ DockingWindow RID_SVXDLG_BMPMASK ImageBitmap = Bitmap { File = "sc10350.bmp" ; }; MASKCOLOR }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; }; }; }; @@ -285,7 +300,7 @@ DockingWindow RID_SVXDLG_BMPMASK Pos = MAP_APPFONT ( 22 , 6 ) ; Size = MAP_APPFONT ( 43 , 14 ) ; }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Color Replacer" ; Image IMG_PIPETTE { diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 986e73af24..3532ca6526 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -38,9 +38,9 @@ #include <svx/svdpage.hxx> // SdrObjList -#include "connctrl.hxx" +#include "svx/connctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" // #110094# #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index a5d9599aef..e50aae0056 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -33,6 +33,7 @@ // RID_SVXDLG_CONTOUR ---------------------------------------------------- FloatingWindow RID_SVXDLG_CONTOUR { + HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -169,13 +170,14 @@ FloatingWindow RID_SVXDLG_CONTOUR { Identifier = TBI_PIPETTE ; HelpId = HID_CONTDLG_PIPETTE ; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; AutoCheck = TRUE ; }; }; }; MetricField MTF_TOLERANCE { + HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index ed05b16915..b518d24431 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <contdlg.hrc> @@ -41,7 +41,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> // #i75482# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #define TRANSCOL Color( COL_WHITE ) diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index ce496d4272..9afc8a4598 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" // === includes (declaration) ============================================ -#include "databaseregistrationui.hxx" +#include "svx/databaseregistrationui.hxx" // === includes (project) ================================================ #include <svx/svxdlg.hxx> diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 5c235847fc..f7dba318e5 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" #include <math.h> #include <vcl/virdev.hxx> diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 02f1829409..6aa9579f3e 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> @@ -40,8 +40,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> -// ----------------------------------------------------------------------- - FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; @@ -49,11 +47,8 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else - { DBG_ERROR("Using fallback for field unit - field unit should be provided in ItemSet"); return SfxModule::GetCurrentFieldUnit(); - } - return eUnit; } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 876b4d6649..a940f22da3 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1568,7 +1568,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker( m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL(m_sSavePath, INET_PROT_FILE); xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE)); diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 2e4d03981d..594b863084 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -36,7 +36,7 @@ // TabDialog #define TABDLG_WIDTH 290 -#define TABDLG_HEIGHT 278 +#define TABDLG_HEIGHT 238 // TabPage CrashSave @@ -52,7 +52,7 @@ #define SAVE_WIDTH 290 -#define SAVE_HEIGHT 278 +#define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 #define SAVE_DESCRHEIGHT 48 #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 2da85bc8c5..1279d8b7fa 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE }; ListBox LB_SAVE_FILELIST { + HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST"; Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 ); Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT ); Border = TRUE; @@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER }; PushButton BTN_RECOV_NEXT { + HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Start Recovery >"; @@ -288,6 +290,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; ListBox LB_BROKEN_FILELIST { + HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 ); Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) ); Border = TRUE; @@ -301,12 +304,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; Edit ED_BROKEN_SAVEDIR { + HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; }; PushButton BTN_BROKEN_SAVEDIR { + HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Chan~ge..."; @@ -367,6 +372,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -425,6 +431,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_DOCTYPE { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -437,6 +444,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; MultiLineEdit ML_ERRSEND_USING { + HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) ); VScroll = TRUE; @@ -445,18 +453,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_ERRSEND_SHOWREP { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "Show ~Report"; }; PushButton BTN_ERRSEND_OPT { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Options..."; }; CheckBox CB_ERRSEND_CONTACT { + HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT ); Check = FALSE; @@ -470,6 +481,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_EMAILADDR { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR"; Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -481,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV"; Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -518,6 +531,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_SYSTEM { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~system settings"; @@ -525,6 +539,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_DIRECT { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~direct connection to the Internet"; @@ -532,6 +547,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_MANUAL { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~manual settings"; @@ -546,6 +562,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYSERVER { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER"; Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -560,6 +577,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYPORT { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT"; Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -606,6 +624,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW MultiLineEdit ML_ERRPREVIEW_CONTENT { + HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT"; Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 ); Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 ); VScroll = TRUE; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 8aa54eaba6..683fa038a8 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -211,10 +211,10 @@ inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const void FontPrevWin_Impl::_CheckScript() { aScriptText = aText; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { - aScriptChg.Remove( 0, nCnt ); + aScriptChg.clear(); aScriptType.Remove( 0, nCnt ); aTextWidth.Remove( 0, nCnt ); nCnt = 0; @@ -249,16 +249,16 @@ void FontPrevWin_Impl::_CheckScript() if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK || nType == U_COMBINING_SPACING_MARK ) { - aScriptChg.Insert( nChg - 1, nCnt ); + aScriptChg.push_back( nChg - 1 ); } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } aScriptType.Insert( nScript, nCnt ); aTextWidth.Insert( ULONG(0), nCnt++ ); @@ -288,7 +288,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter USHORT nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; @@ -367,7 +367,7 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, USHORT nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index d2223baa47..f8e3192572 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fontlb.hxx" +#include "svx/fontlb.hxx" #include <vcl/svapp.hxx> // ============================================================================ diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 45d91b4ca7..5f8f597a26 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -42,7 +42,7 @@ #include <svx/xtextit.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialogs.hrc> #include "fontwork.hrc" diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index 893674bf02..076f95a82e 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -34,7 +34,7 @@ // RID_SVXDLG_FONTWORK --------------------------------------------------- DockingWindow RID_SVXDLG_FONTWORK { - HelpId = SID_FONTWORK ; + HelpId = CMD_SID_FONTWORK ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_DISTANCE { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 85 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_TEXTSTART { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 100 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_X { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 144 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_Y { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 159 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; ListBox CLB_SHADOW_COLOR { + HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 174 ) ; Size = MAP_APPFONT ( 71 , 60 ) ; diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index c970269d67..e8d3fd5acf 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -40,12 +40,12 @@ #include <svx/graphctl.hxx> #include "GraphCtlAccessibleContext.hxx" -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/svxids.hrc> #include <svx/svdpage.hxx> // #i72889# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" /************************************************************************* |* diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 94206e1584..623aca3ead 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -343,5 +343,4 @@ void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) rSet.DisableItem( SID_GRFFILTER_SOLARIZE ); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 089bb4d8e4..673324b03f 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -49,9 +49,9 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <editeng/brshitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src index adb89ce3bf..f2f2f7c6d0 100644 --- a/svx/source/dialog/hdft.src +++ b/svx/source/dialog/hdft.src @@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Hea~der on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; @@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~Footer on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index e21927f0b9..353b5f19b5 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> -#include "hyperdlg.hxx" +#include "svx/hyperdlg.hxx" #include <svx/svxdlg.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index bd66b25d99..30a0d8e9f9 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -44,11 +44,11 @@ #include <sfx2/objsh.hxx> #include <comphelper/processfactory.hxx> -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" #include <svx/dialogs.hrc> #include "hyprlink.hrc" #include <svx/dialmgr.hxx> -#include "hyprlink.hxx" +#include "svx/hyprlink.hxx" #include "hyprdlg.hxx" using namespace ::rtl; diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src index 75d6775340..4554a5f0bd 100644 --- a/svx/source/dialog/hyprlink.src +++ b/svx/source/dialog/hyprlink.src @@ -98,7 +98,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_HYPERLINK_SETLINK ; + HelpID = CMD_SID_HYPERLINK_SETLINK ; Identifier = BTN_LINK ; Disable = TRUE ; DropDown = TRUE ; @@ -106,7 +106,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_CREATELINK ; + HelpID = CMD_SID_CREATELINK ; Identifier = BTN_INSERT_BOOKMARK ; Disable = TRUE ; Hide = TRUE; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 25d12c70c0..e4311628e1 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -63,7 +63,7 @@ #include <comphelper/processfactory.hxx> #define _IMAPDLG_PRIVATE -#include "imapdlg.hxx" +#include "svx/imapdlg.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -71,7 +71,7 @@ #include "imapdlg.hrc" #include "imapwnd.hxx" #include "imapimp.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index f71ac40484..08468d77b3 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -32,6 +32,7 @@ // RID_SVXDLG_IMAP ---------------------------------------------------- ModelessDialog RID_SVXDLG_IMAP { + HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP }; ComboBox CBB_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL"; Pos = MAP_APPFONT ( 39 , 23 ) ; Size = MAP_APPFONT ( 225 , 69 ) ; TabStop = TRUE ; @@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP }; Edit EDT_TEXT { + HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 39 , 41 ) ; @@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP // nur temporaer ComboBox RID_SVXCTL_CBB_TARGET { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 213 , 41 ) ; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 69d141abba..d452512546 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include <svtools/imappoly.hxx> #include <svl/urlbmk.hxx> -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 8edde7bdc4..c4cb6fd617 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 3805de953c..ff22b7e6f7 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -62,7 +62,7 @@ SRC1FILES = \ rubydialog.src\ ruler.src \ srchdlg.src \ - svxbmpnumvalueset.src \ + svxbmpnumvalueset.src \ swframeposstrings.src \ txenctab.src \ ucsubset.src \ diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 1ff587ac0b..6a706d9b98 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -34,9 +34,9 @@ #include <svx/svdomeas.hxx> #include <svx/svdmodel.hxx> -#include "measctrl.hxx" +#include "svx/measctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" /************************************************************************* |* diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 61824bbabe..8fbfdc2576 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -39,10 +39,10 @@ #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> -#include "optgrid.hxx" +#include "svx/optgrid.hxx" #include <svx/dialogs.hrc> #include "optgrid.hrc" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" // local functions void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) @@ -259,8 +259,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) aGridItem.nFldDrawX = (UINT32) nX; aGridItem.nFldDrawY = (UINT32) nY; - aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()); - aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()); + aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1); + aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1); rCoreSet.Put( aGridItem ); } @@ -286,12 +286,8 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); -// UINT32 nFineX = pGridAttr->nFldDivisionX; -// UINT32 nFineY = pGridAttr->nFldDivisionY; -// aNumFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 ); -// aNumFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 ); - aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX ); - aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY ); + aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 ); + aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 ); } ChangeGridsnapHdl_Impl( &aCbxUseGridsnap ); diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src index e427ddfd08..c2bb8ef1c4 100644 --- a/svx/source/dialog/optgrid.src +++ b/svx/source/dialog/optgrid.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_USE_GRIDSNAP { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_GRID_VISIBLE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_X { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 54 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_Y { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -129,12 +133,14 @@ TabPage RID_SVXPAGE_GRID }; NumericField NUM_FLD_DIVISION_X { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 54 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -144,16 +150,18 @@ TabPage RID_SVXPAGE_GRID { Pos = MAP_APPFONT ( 223 , 56 ) ; Size = MAP_APPFONT ( 29 , 8 ) ; - Text [ en-US ] = "point(s)" ; + Text [ en-US ] = "space(s)" ; }; NumericField NUM_FLD_DIVISION_Y { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 69 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -167,6 +175,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SYNCHRONIZE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 127 , 10 ) ; TabStop = TRUE ; @@ -182,6 +191,7 @@ TabPage RID_SVXPAGE_GRID CheckBox CBX_SNAP_HELPLINES { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -190,6 +200,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_BORDER { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER"; Hide = TRUE; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 125 ) ; @@ -198,6 +209,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_FRAME { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -206,6 +218,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_POINTS { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -221,6 +234,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_SNAP_AREA { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 167 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -252,6 +266,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -260,6 +275,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_BIGORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO"; Pos = MAP_APPFONT ( 136 , 125 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -268,6 +284,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ROTATE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE"; Pos = MAP_APPFONT ( 136 , 139 ) ; // 136, 111 Size = MAP_APPFONT ( 55 , 10 ) ; @@ -277,6 +294,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 137 ) ; // 190, 111 @@ -302,6 +320,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_BEZ_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 154 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 713ca089ba..a291fc94ff 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "orienthelper.hxx" +#include "svx/orienthelper.hxx" #include <vector> #include <utility> #include <vcl/button.hxx> -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index eae5fbb231..b4d9f2dcef 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -35,7 +35,7 @@ #define _SVX_PASSWD_CXX -#include "passwd.hxx" +#include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "passwd.hrc" diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src index 587150bc85..800c20c95d 100644 --- a/svx/source/dialog/passwd.src +++ b/svx/source/dialog/passwd.src @@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_OLD_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 14 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_NEW_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 43 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_REPEAT_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 59 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index e3bf589514..ae860ac5c5 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -36,7 +36,7 @@ #include <comphelper/processfactory.hxx> -#include "pfiledlg.hxx" +#include "svx/pfiledlg.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> @@ -275,11 +275,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId ) -{ - maFileDlg.SetDialogHelpId( _nHelpId ); -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 290a21ef8a..9708f14852 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/dialogs.hrc> -#include <prtqry.hxx> +#include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 9c2c15306b..6a6e4259ff 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <tools/ref.hxx> -#include "relfld.hxx" +#include "svx/relfld.hxx" // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index c988f8c4f7..37d7877b21 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -45,7 +45,7 @@ #include <editeng/tstpitem.hxx> #include "editeng/protitem.hxx" #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 85101aa21c..8e7c2fb9c1 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <rubydialog.hxx> +#include <svx/rubydialog.hxx> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src index b1537c1fa7..e44b68046c 100644 --- a/svx/source/dialog/rubydialog.src +++ b/svx/source/dialog/rubydialog.src @@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY Closeable = TRUE ; CheckBox CB_AUTO_DETECT { + HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT"; Pos = MAP_APPFONT ( 6, 6 ) ; Size = MAP_APPFONT ( 186 , 12 ) ; Text [ en-US ] = "Automatic detection"; @@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_LEFT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1"; Pos = MAP_APPFONT ( 6 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Hide = False; @@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_RIGHT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1"; Pos = MAP_APPFONT ( 109 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2"; Pos = MAP_APPFONT ( 6 , 42) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2"; Pos = MAP_APPFONT ( 109 , 42 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3"; Pos = MAP_APPFONT ( 6 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3"; Pos = MAP_APPFONT ( 109 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4"; Pos = MAP_APPFONT ( 109 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; @@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_ADJUST { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST"; Pos = MAP_APPFONT ( 6 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_POSITION { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION"; Pos = MAP_APPFONT ( 43 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_CHAR_STYLE { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE"; Pos = MAP_APPFONT ( 80 , 93) ; Size = MAP_APPFONT ( 89 , 60 ) ; DropDown = TRUE; @@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_STYLIST { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST"; Pos = MAP_APPFONT ( 171 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Styles"; @@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_CLOSE { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE"; Pos = MAP_APPFONT ( 118, 175 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Close"; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index e1dbcbbb2e..4bf1eca9ae 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -31,7 +31,7 @@ #include <tools/string.hxx> #include <svx/dialogs.hrc> -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 4a5be0d59a..08d52573a6 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -31,8 +31,8 @@ // Strings fuer die Draw-Dialoge -------------------------------------------- String RID_SVXSTR_SOLID { - /* ### ACHTUNG: Neuer Text in Resource? Durchgängig : Durchgõngig */ - /* ### ACHTUNG: Neuer Text in Resource? Durchgängig : Durchgõngig */ + /* ### ACHTUNG: Neuer Text in Resource? Durchg�ngig : Durchg�ngig */ + /* ### ACHTUNG: Neuer Text in Resource? Durchg�ngig : Durchg�ngig */ Text [ en-US ] = "Continuous" ; }; String RID_SVXSTR_GRADIENT @@ -66,8 +66,8 @@ String RID_SVXSTR_LINEEND String RID_SVXSTR_CLOSE { - /* ### ACHTUNG: Neuer Text in Resource? Schließen : Schlie˜en */ - /* ### ACHTUNG: Neuer Text in Resource? Schließen : Schlie˜en */ + /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */ + /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */ Text [ en-US ] = "Close" ; }; String RID_SVXSTR_BLACK @@ -80,14 +80,14 @@ String RID_SVXSTR_BLUE }; String RID_SVXSTR_GREEN { - /* ### ACHTUNG: Neuer Text in Resource? Grün : Gr³n */ - /* ### ACHTUNG: Neuer Text in Resource? Grün : Gr³n */ + /* ### ACHTUNG: Neuer Text in Resource? Gr�n : Gr�n */ + /* ### ACHTUNG: Neuer Text in Resource? Gr�n : Gr�n */ Text [ en-US ] = "Green" ; }; String RID_SVXSTR_CYAN { - /* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */ - /* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */ + /* ### ACHTUNG: Neuer Text in Resource? T�rkis : T�rkis */ + /* ### ACHTUNG: Neuer Text in Resource? T�rkis : T�rkis */ Text [ en-US ] = "Turquoise" ; }; String RID_SVXSTR_RED @@ -117,14 +117,14 @@ String RID_SVXSTR_LIGHTBLUE }; String RID_SVXSTR_LIGHTGREEN { - /* ### ACHTUNG: Neuer Text in Resource? Hellgrün : Hellgr³n */ - /* ### ACHTUNG: Neuer Text in Resource? Hellgrün : Hellgr³n */ + /* ### ACHTUNG: Neuer Text in Resource? Hellgr�n : Hellgr�n */ + /* ### ACHTUNG: Neuer Text in Resource? Hellgr�n : Hellgr�n */ Text [ en-US ] = "Light green" ; }; String RID_SVXSTR_LIGHTCYAN { - /* ### ACHTUNG: Neuer Text in Resource? Helltürkis : Hellt³rkis */ - /* ### ACHTUNG: Neuer Text in Resource? Helltürkis : Hellt³rkis */ + /* ### ACHTUNG: Neuer Text in Resource? Hellt�rkis : Hellt�rkis */ + /* ### ACHTUNG: Neuer Text in Resource? Hellt�rkis : Hellt�rkis */ Text [ en-US ] = "Light cyan" ; }; String RID_SVXSTR_LIGHTRED @@ -142,8 +142,8 @@ String RID_SVXSTR_YELLOW }; String RID_SVXSTR_WHITE { - /* ### ACHTUNG: Neuer Text in Resource? Weiß : Wei˜ */ - /* ### ACHTUNG: Neuer Text in Resource? Weiß : Wei˜ */ + /* ### ACHTUNG: Neuer Text in Resource? Wei� : Wei� */ + /* ### ACHTUNG: Neuer Text in Resource? Wei� : Wei� */ Text [ en-US ] = "White" ; }; String RID_SVXSTR_BLUEGREY diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 30d2c4214e..a3c1814d7b 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -151,7 +151,6 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId): InitHeaderBar( &aHeaderBar ); aHeaderBar.Show(); - SetWindowBits(WB_CLIPCHILDREN | WB_HSCROLL); SvHeaderTabListBox::Show(); } diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 6e215781e1..f6c9c4c118 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -41,7 +41,7 @@ #include "srchctrl.hxx" -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> // class SvxSearchFamilyControllerItem ----------------------------------- diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d3aaffb5b9..1f435856e3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <toolkit/unohlp.hxx> #define _SVX_SRCHDLG_CXX -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -70,7 +70,7 @@ #include <svx/pageitem.hxx> #include "srchctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <editeng/brshitem.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> @@ -428,7 +428,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) void SvxSearchDialog::Construct_Impl() { #if ENABLE_LAYOUT - SetHelpId (SID_SEARCH_DLG); + SetHelpId (".uno:SearchDialog"); #endif /* ENABLE_LAYOUT */ // temporary to avoid incompatibility @@ -1589,7 +1589,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, + AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, pSearchItem->GetTransliterationFlags() ); DBG_ASSERT(aDlg, "Dialogdiet fail!"); int nRet = aDlg->Execute(); @@ -2380,7 +2380,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, case FUNIT_100TH_MM: eMapUnit = SFX_MAPUNIT_100TH_MM; break; default: ;//prevent warning } - + ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); for ( USHORT i = 0; i < pList->Count(); ++i ) diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index f00a6c8093..c3ddec8bfb 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -29,6 +29,7 @@ #include <svx/dialogs.hrc> #include "srchdlg.hrc" +#include <sfx2/sfxcommands.h> #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; @@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE ModelessDialog RID_SVXDLG_SEARCH { - HelpId = SID_SEARCH_DLG ; + HelpId = CMD_SID_SEARCH_DLG ; OutputSize = TRUE ; Hide = TRUE ; SvLook = TRUE ; @@ -66,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_SEARCH { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH"; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -73,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_SEARCH { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -103,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_REPLACE { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE"; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -110,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -134,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH"; Pos = MAP_APPFONT ( 144 , 9 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find" ; @@ -142,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL"; Pos = MAP_APPFONT ( 144 , 26 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Find ~All" ; @@ -154,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE"; Pos = MAP_APPFONT ( 144 , 56 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -161,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL"; Pos = MAP_APPFONT ( 144 , 73 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Replace A~ll" ; @@ -174,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_1 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_2 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_MATCH_CASE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -195,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_WHOLE_WORDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Whole wor~ds only" ; @@ -207,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; MoreButton BTN_MORE { + HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE"; Pos = MAP_APPFONT ( 6 , 135 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -235,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SELECTIONS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS"; Pos = MAP_APPFONT ( 12 , 163 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "C~urrent selection only" ; @@ -243,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_BACKWARDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS"; Pos = MAP_APPFONT ( 12 , 176 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Bac~kwards" ; @@ -251,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_REGEXP { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP"; Pos = MAP_APPFONT ( 12 , 189 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Regular e~xpressions" ; @@ -259,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SIMILARITY { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY"; Pos = MAP_APPFONT ( 12 , 204 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "S~imilarity search" ; @@ -267,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_SIMILARITY { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY"; Pos = MAP_APPFONT ( 124 , 202 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -275,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_LAYOUTS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS"; Pos = MAP_APPFONT ( 12 , 219 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search for St~yles" ; @@ -283,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_NOTES { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -290,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH"; Pos = MAP_APPFONT ( 12 , 247 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -298,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_SOUNDS_LIKE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE"; Pos = MAP_APPFONT ( 12 , 260 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; TabStop = TRUE ; @@ -306,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_JAP_OPTIONS { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS"; Pos = MAP_APPFONT ( 124 , 258 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "..." ; @@ -314,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_ATTRIBUTE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE"; Pos = MAP_APPFONT ( 144 , 163 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Attri~butes..." ; @@ -322,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_FORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT"; Pos = MAP_APPFONT ( 144 , 180 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "For~mat..." ; @@ -330,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_NOFORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT"; Pos = MAP_APPFONT ( 144 , 197 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~No Format" ; @@ -351,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_CALC_SEARCHIN { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 283 ) ; Size = MAP_APPFONT ( 63 , 48 ) ; @@ -373,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_ROWS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS"; Pos = MAP_APPFONT ( 75 , 300 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Ro~ws" ; @@ -380,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_COLUMNS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS"; Pos = MAP_APPFONT ( 75 , 313 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Colu~mns" ; @@ -387,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_ALL_SHEETS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 326 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search in all sheets" ; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index f6950d1d4c..493743bf08 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -38,7 +38,7 @@ #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #include <svl/urihelper.hxx> #include <editeng/brshitem.hxx> #include <svl/intitem.hxx> @@ -46,14 +46,14 @@ #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> #include <editeng/flstitem.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #ifndef _XTABLE_HXX //autogen #include <svx/xtable.hxx> #endif -#include <drawitem.hxx> -#include <numvset.hxx> -#include <htmlmode.hxx> +#include <svx/drawitem.hxx> +#include <svx/numvset.hxx> +#include <svx/htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <editeng/unolingu.hxx> diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index f2e248e338..4fa6f6c689 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxgrahicitem.hxx" +#include "svx/svxgrahicitem.hxx" TYPEINIT1(SvxGraphicItem,SfxPoolItem); SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic ) : SfxPoolItem( _nWhich ), aGraphic( rGraphic ) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index bc3534b268..0c2bca9da4 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -49,7 +49,7 @@ #include <svx/dialmgr.hxx> #include <svx/ruler.hxx> #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" @@ -58,6 +58,28 @@ #define RULER_TAB_RTL ((USHORT)0x0010) #endif +#include <comphelper/uieventslogger.hxx> + +namespace +{ + void lcl_logRulerUse(const ::rtl::OUString& sURL) //#i99729# + { + using namespace ::com::sun::star; + util::URL aTargetURL; + aTargetURL.Complete = sURL; + aTargetURL.Main = sURL; + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# + { + ::rtl::OUString sAppName; + uno::Sequence<beans::PropertyValue> source; + ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler")); + ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source); + } + } +} + + + // STATIC DATA ----------------------------------------------------------- #define CTRL_ITEM_COUNT 14 @@ -2802,6 +2824,7 @@ void SvxRuler::Click() */ { + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click")); Ruler::Click(); if( bActive ) { @@ -3436,6 +3459,7 @@ long SvxRuler::StartDrag() */ { + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag")); BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if(!bValid) return FALSE; @@ -3555,6 +3579,7 @@ void SvxRuler::EndDrag() */ { + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag")); const BOOL bUndo = IsDragCanceled(); const long lPos = GetDragPos(); DrawLine_Impl(lTabPos, 6, bHorz); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index a9aff0893e..9e65330507 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -34,7 +34,7 @@ #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <svtools/colorcfg.hxx> -#include <swframeexample.hxx> +#include <svx/swframeexample.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index aa6b87a180..210b22dd35 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <swframeposstrings.hxx> +#include <svx/swframeposstrings.hxx> #include <tools/rc.hxx> #include <tools/debug.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src index 5455e736c4..8c092735d3 100644 --- a/svx/source/dialog/swframeposstrings.src +++ b/svx/source/dialog/swframeposstrings.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//the following defines have to match the (enum values + 1) in swframeposstrings.hxx! +//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx! #define STR_LEFT 1 #define STR_RIGHT 2 #define STR_FROMLEFT 3 diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 581f5f8f08..7c3205fb98 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "txencbox.hxx" -#include "txenctab.hxx" +#include "svx/txencbox.hxx" +#include "svx/txenctab.hxx" #include <svx/dialogs.hrc> #include "svx/dbcharsethelper.hxx" #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index b06f31ec4a..d211cf0ba1 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -31,7 +31,7 @@ #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE #include <svx/dialmgr.hxx> -#include "txenctab.hxx" +#include "svx/txenctab.hxx" #include <tools/shl.hxx> //------------------------------------------------------------------------ diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 2d4256d162..a965fdf341 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "wrapfield.hxx" +#include "svx/wrapfield.hxx" namespace svx { diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 444d031ee7..ac5ee3cd76 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/cube3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <svx/sdr/contact/viewcontactofe3dcube.hxx> diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 112606f89a..cf43b71af8 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/extrud3d.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d79c78d526..752822be50 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -38,7 +38,7 @@ #include <tools/shl.hxx> #include <svx/xflclit.hxx> #include <svx/svdmodel.hxx> -#include <globl3d.hxx> +#include <svx/globl3d.hxx> #include <svx/view3d.hxx> #include <svx/obj3d.hxx> #include <svx/sphere3d.hxx> @@ -49,9 +49,9 @@ #include <svx/polysc3d.hxx> #include <editeng/eeitem.hxx> #include <svl/style.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> #include <svx/viewpt3d.hxx> // ProjectionType @@ -61,7 +61,7 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #define GALLERY_THEME "3D" #include <svl/whiter.hxx> diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index fe559a493d..0beb61ffb3 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -27,6 +27,8 @@ #include <svx/dialogs.hrc> #include "float3d.hrc" +#include <svx/svxcommands.h> + #define WIDTH 158 #define HEIGHT 209 #define BORDER 3 @@ -64,7 +66,7 @@ DockingWindow RID_SVXFLOAT_3D { - HelpID = SID_3D_WIN ; + HelpID = CMD_SID_3D_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -81,6 +83,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_GEO { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO"; Pos = MAP_APPFONT ( 4 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -93,6 +96,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_REPRESENTATION { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION"; Pos = MAP_APPFONT ( 22 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -105,6 +109,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT"; Pos = MAP_APPFONT ( 40 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -117,6 +122,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEXTURE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE"; Pos = MAP_APPFONT ( 58 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; ButtonImage = Image @@ -129,6 +135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MATERIAL { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL"; Pos = MAP_APPFONT ( 76 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -142,6 +149,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_UPDATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -154,6 +162,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_ASSIGN { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -167,6 +176,7 @@ DockingWindow RID_SVXFLOAT_3D // Unterer Teil ImageButton BTN_CHANGE_TO_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -180,6 +190,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LATHE_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ"; Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -193,6 +204,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_PERSPECTIVE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE"; Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -232,6 +244,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_PERCENT_DIAGONAL { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -252,6 +265,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_BACKSCALE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -273,6 +287,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_END_ANGLE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -295,6 +310,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DEPTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ; @@ -326,6 +342,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_HORIZONTAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -345,6 +362,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_VERTICAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -365,6 +383,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -377,6 +396,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_FLAT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -389,6 +409,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_SPHERE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -401,6 +422,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_INVERT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -413,6 +435,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TWO_SIDED_LIGHTING { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; @@ -426,6 +449,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_DOUBLE_SIDED { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -446,6 +470,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_SHADEMODE { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 30 ) ; Size = MAP_APPFONT ( 83 , 100 ) ; @@ -466,6 +491,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SHADOW_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D"; Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -486,6 +512,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_SLANT { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT"; Border = TRUE ; Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -513,6 +540,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DISTANCE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 - 2 ) ; @@ -537,6 +565,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_FOCAL_LENGTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ; @@ -568,6 +597,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_1 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -580,6 +610,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_2 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2"; Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -592,6 +623,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_3 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3"; Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -604,6 +636,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_4 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4"; Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -616,6 +649,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_5 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -628,6 +662,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_6 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6"; Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -640,6 +675,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_7 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7"; Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -652,6 +688,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_8 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8"; Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -664,6 +701,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_1 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -672,6 +710,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_2 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -680,6 +719,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_3 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -688,6 +728,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_4 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -696,6 +737,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_5 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -704,6 +746,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_6 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -712,6 +755,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_7 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -720,6 +764,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_8 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -728,6 +773,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -746,6 +792,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_AMBIENTLIGHT { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -754,6 +801,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_AMBIENT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -780,6 +828,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_LUMINANCE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -793,6 +842,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -812,6 +862,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_REPLACE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -825,6 +876,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_MODULATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -838,6 +890,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_BLEND { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -857,6 +910,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -870,6 +924,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -883,6 +938,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -902,6 +958,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -915,6 +972,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -928,6 +986,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -947,6 +1006,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_FILTER { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -974,6 +1034,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_FAVORITES { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; @@ -998,6 +1059,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_COLOR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -1007,6 +1069,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MAT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1026,6 +1089,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_EMISSION { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -1035,6 +1099,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_EMISSION_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1061,6 +1126,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_SPECULAR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -1069,6 +1135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SPECULAR_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR"; Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; ButtonImage = Image @@ -1087,6 +1154,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_MAT_SPECULAR_INTENSITY { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ; @@ -1102,6 +1170,8 @@ DockingWindow RID_SVXFLOAT_3D Last = 100 ; SpinSize = 1 ; }; + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES"; + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR"; FixedLine FL_MATERIAL { Pos = TOP_FIXED_LINE_POS; diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index a7177f1cc0..c7f461ded8 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -33,7 +33,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <svx/svdpage.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> #include <svx/sdr/contact/viewcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 681520a145..97240bb366 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -29,11 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <tools/poly.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/lathe3d.hxx> #include <svx/xpoly.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk index 71916df4a8..bb9cca92a7 100644 --- a/svx/source/engine3d/makefile.mk +++ b/svx/source/engine3d/makefile.mk @@ -41,36 +41,36 @@ ENABLE_EXCEPTIONS=TRUE LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/e3dsceneupdater.obj \ - $(SLO)$/helperminimaldepth3d.obj \ - $(SLO)$/helperhittest3d.obj \ - $(SLO)$/obj3d.obj \ - $(SLO)$/scene3d.obj \ - $(SLO)$/polysc3d.obj \ - $(SLO)$/cube3d.obj \ - $(SLO)$/sphere3d.obj \ + $(SLO)$/e3dsceneupdater.obj \ + $(SLO)$/helperminimaldepth3d.obj \ + $(SLO)$/helperhittest3d.obj \ + $(SLO)$/obj3d.obj \ + $(SLO)$/scene3d.obj \ + $(SLO)$/polysc3d.obj \ + $(SLO)$/cube3d.obj \ + $(SLO)$/sphere3d.obj \ $(SLO)$/extrud3d.obj \ $(SLO)$/lathe3d.obj \ - $(SLO)$/polygn3d.obj \ - $(SLO)$/svx3ditems.obj \ - $(SLO)$/deflt3d.obj \ + $(SLO)$/polygn3d.obj \ + $(SLO)$/svx3ditems.obj \ + $(SLO)$/deflt3d.obj \ $(SLO)$/e3dundo.obj \ - $(SLO)$/viewpt3d2.obj \ - $(SLO)$/camera3d.obj \ - $(SLO)$/objfac3d.obj \ - $(SLO)$/dragmt3d.obj \ - $(SLO)$/view3d.obj \ + $(SLO)$/viewpt3d2.obj \ + $(SLO)$/camera3d.obj \ + $(SLO)$/objfac3d.obj \ + $(SLO)$/dragmt3d.obj \ + $(SLO)$/view3d.obj \ $(SLO)$/view3d1.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/float3d.obj + $(SLO)$/float3d.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) SRS1NAME=engine3d SRC1FILES=\ - string3d.src \ - float3d.src + string3d.src \ + float3d.src .INCLUDE : target.mk diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 5516022c17..c8ab23123d 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdview.hxx> #include <svx/svdattr.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" -#include "globl3d.hxx" +#include "svx/svditer.hxx" +#include "svx/globl3d.hxx" #include <svx/camera3d.hxx> #include <svx/scene3d.hxx> #include <svx/polysc3d.hxx> diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 0244032b1f..f7d4d4f551 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> #include <svx/polygn3d.hxx> -#include "objfac3d.hxx" +#include "svx/objfac3d.hxx" #include <svx/svdobj.hxx> /************************************************************************* diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 4dd347c544..e2512d071f 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/polygn3d.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 86e251a9c3..65bd0a3e97 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -31,14 +31,14 @@ #include <svx/xfillit.hxx> #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdetc.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <svx/svdpool.hxx> #include <svl/style.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/xlnclit.hxx> #include <svl/metitem.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 0988535b16..8fab22d248 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" -#include "svditer.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svditer.hxx" #if defined( UNX ) || defined( ICC ) #include <stdlib.h> #endif -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdpage.hxx> #include <svl/style.hxx> #include <svx/scene3d.hxx> @@ -242,7 +242,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) #endif // Fuer WIN95/NT die FP-Exceptions abschalten -#if defined(WNT) || defined(WIN) +#if defined(WNT) #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) SC_FPEXCEPTIONS_OFF(); diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 7ee6a34618..d707fcac99 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -29,11 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/sphere3d.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 185d5ed098..f00e03524c 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -33,7 +33,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdorect.hxx> #include <svx/svdmodel.hxx> @@ -44,7 +44,7 @@ #include <svx/svdview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/lathe3d.hxx> #include <svx/sphere3d.hxx> @@ -65,7 +65,7 @@ #include <svx/xlnwtit.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 8e34e7e997..16ae78fe90 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> @@ -38,7 +38,7 @@ #include <svx/fmview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> #include <svx/e3ditem.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 0f31ea49ed..eef2006d54 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,12 +29,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dbexch.hrc" -#include "fmgridif.hxx" +#include "svx/dbexch.hrc" +#include "svx/fmgridif.hxx" #include "fmitems.hxx" #include "fmprop.hrc" #include "svx/fmtools.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmurl.hxx" #include "formcontrolfactory.hxx" diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index a2e62f7274..08d35f6874 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmgridif.hxx" +#include "svx/fmgridif.hxx" #include "fmprop.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" @@ -39,6 +39,7 @@ #include "sdbdatacolumn.hxx" #include "svx/fmgridcl.hxx" #include "svx/svxids.hrc" +#include <tools/urlobj.hxx> /** === begin UNO includes === **/ #include <com/sun/star/awt/PosSize.hpp> @@ -1164,7 +1165,7 @@ void FmXGridPeer::Create(Window* pParent, WinBits nStyle) // want to hear about row selections pWin->setGridListener( m_pGridListener ); - // Init muß immer aufgerufen werden + // Init mu� immer aufgerufen werden pWin->Init(); pWin->SetComponentInterface(this); @@ -1973,14 +1974,10 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - String sHelpURL(::comphelper::getString(Value)); - String sPattern; - sPattern.AssignAscii("HID:"); - if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - { - String sID = sHelpURL.Copy(sPattern.Len()); - pGrid->SetHelpId(sID.ToInt32()); - } + INetURLObject aHID( ::comphelper::getString(Value) ); + DBG_ASSERT( aHID.GetProtocol() == INET_PROT_HID, "Wrong HelpURL!" ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + pGrid->SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index a5148cac09..fd81a7bc6b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -31,7 +31,7 @@ #include <sal/macros.h> #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" #include "gridcell.hxx" #include "gridcols.hxx" @@ -1654,11 +1654,14 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) namespace { - void setCheckBoxStyle( Window* _pWindow, USHORT nStyle ) + void setCheckBoxStyle( Window* _pWindow, bool bMono ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - aStyleSettings.SetCheckBoxStyle( nStyle ); + if( bMono ) + aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO ); + else + aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) ); aSettings.SetStyleSettings( aStyleSettings ); _pWindow->SetSettings( aSettings ); } @@ -1684,8 +1687,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) sal_Int16 nStyle = awt::VisualEffect::LOOK3D; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle ); - setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); - setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); + setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ); + setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ); sal_Bool bTristate = sal_True; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate ); @@ -2954,13 +2957,13 @@ sal_Bool DbFilterField::commitControl() case ::com::sun::star::form::FormComponentType::CHECKBOX: return sal_True; case ::com::sun::star::form::FormComponentType::LISTBOX: + aText.Erase(); if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount()) { sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos(); - aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos]; + if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) ) + aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos]; } - else - aText.Erase(); if (m_aText != aText) { @@ -3093,7 +3096,7 @@ void DbFilterField::Update() Reference< ::com::sun::star::container::XNameAccess > xFieldNames = xSupCol->getColumns(); if (!xFieldNames->hasByName(aName)) return; - + Reference< ::com::sun::star::container::XNameAccess > xTablesNames = xSupTab->getTables(); Reference< ::com::sun::star::beans::XPropertySet > xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 4fd1290637..941059c0ca 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -58,7 +58,7 @@ #include <vcl/sound.hxx> #include <vcl/menu.hxx> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <tools/shl.hxx> diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index f6e4c16404..611df77f0b 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -25,10 +25,12 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include "globlmn.hrc" #include "fmhelp.hrc" +#include <svx/svxcommands.h> + Menu RID_SVXMNU_ROWS { ItemList = @@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS MenuItem { Identifier = SID_FM_DELETEROWS ; - HelpID = SID_FM_DELETEROWS ; + HelpId = HID_FM_DELETEROWS ; Text [ en-US ] = "Delete Rows" ; }; MenuItem { Identifier = SID_FM_RECORD_SAVE ; - HelpID = SID_FM_RECORD_SAVE ; + HelpId = CMD_SID_FM_RECORD_SAVE ; Text [ en-US ] = "Save Record" ; }; MenuItem { Identifier = SID_FM_RECORD_UNDO ; - HelpID = SID_FM_RECORD_UNDO ; + HelpId = CMD_SID_FM_RECORD_UNDO ; Text [ en-US ] = "Undo: Data entry" ; }; }; @@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_INSERTCOL ; - HelpID = SID_FM_INSERTCOL ; + HelpId = HID_FM_INSERTCOL ; Text [ en-US ] = "Insert ~Column" ; SubMenu = Menu { @@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_EDIT ; - HelpID = SID_FM_EDIT ; + HelpId = CMD_SID_FM_EDIT ; Text [ en-US ] = "Text Box" ; }; MenuItem { Identifier = SID_FM_CHECKBOX ; - HelpID = SID_FM_CHECKBOX ; + HelpId = CMD_SID_FM_CHECKBOX ; Text [ en-US ] = "Check Box" ; }; MenuItem { Identifier = SID_FM_COMBOBOX ; - HelpID = SID_FM_COMBOBOX ; + HelpId = CMD_SID_FM_COMBOBOX ; Text [ en-US ] = "Combo Box" ; }; MenuItem { Identifier = SID_FM_LISTBOX ; - HelpID = SID_FM_LISTBOX ; + HelpId = CMD_SID_FM_LISTBOX ; Text [ en-US ] = "List Box" ; }; MenuItem { Identifier = SID_FM_DATEFIELD ; - HelpID = SID_FM_DATEFIELD ; + HelpId = CMD_SID_FM_DATEFIELD ; Text [ en-US ] = "Date Field" ; }; MenuItem { Identifier = SID_FM_TIMEFIELD ; - HelpID = SID_FM_TIMEFIELD ; + HelpId = CMD_SID_FM_TIMEFIELD ; Text [ en-US ] = "Time Field" ; }; MenuItem { Identifier = SID_FM_NUMERICFIELD ; - HelpID = SID_FM_NUMERICFIELD ; + HelpId = CMD_SID_FM_NUMERICFIELD ; Text [ en-US ] = "Numeric Field" ; }; MenuItem { Identifier = SID_FM_CURRENCYFIELD ; - HelpID = SID_FM_CURRENCYFIELD ; + HelpId = CMD_SID_FM_CURRENCYFIELD ; Text [ en-US ] = "Currency Field" ; }; MenuItem { Identifier = SID_FM_PATTERNFIELD ; - HelpID = SID_FM_PATTERNFIELD ; + HelpId = CMD_SID_FM_PATTERNFIELD ; Text [ en-US ] = "Pattern Field" ; }; MenuItem { Identifier = SID_FM_FORMATTEDFIELD ; - HelpID = SID_FM_FORMATTEDFIELD ; + HelpId = CMD_SID_FM_FORMATTEDFIELD ; Text [ en-US ] = "Formatted Field" ; }; MenuItem @@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_CHANGECOL ; - HelpID = SID_FM_CHANGECOL ; + HelpId = HID_FM_CHANGECOL ; Text [ en-US ] = "~Replace with" ; }; MenuItem { Identifier = SID_FM_DELETECOL ; - HelpID = SID_FM_DELETECOL ; + HelpId = HID_FM_DELETECOL ; Text [ en-US ] = "Delete Column" ; }; MenuItem { Identifier = SID_FM_HIDECOL ; - HelpID = SID_FM_HIDECOL ; + HelpId = HID_FM_HIDECOL ; Text [ en-US ] = "~Hide Column"; }; MenuItem { Identifier = SID_FM_SHOWCOLS ; - HelpID = SID_FM_SHOWCOLS ; + HelpId = HID_FM_SHOWCOLS ; SubMenu = Menu { ItemList = @@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWCOLS_MORE ; - HelpID = SID_FM_SHOWCOLS_MORE ; + HelpId = HID_FM_SHOWCOLS_MORE ; Text [ en-US ] = "~More..."; }; MenuItem @@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWALLCOLS ; - HelpID = SID_FM_SHOWALLCOLS ; + HelpId = HID_FM_SHOWALLCOLS ; Text [ en-US ] = "~All"; }; }; @@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Column..." ; }; }; diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk index aa4e9eaba1..da4733643b 100644 --- a/svx/source/fmcomp/makefile.mk +++ b/svx/source/fmcomp/makefile.mk @@ -46,18 +46,18 @@ SRC1FILES= \ LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/dbaexchange.obj \ - $(SLO)$/gridcols.obj \ - $(SLO)$/gridctrl.obj \ - $(SLO)$/gridcell.obj \ - $(SLO)$/fmgridcl.obj \ - $(SLO)$/fmgridif.obj \ - $(SLO)$/trace.obj \ - $(SLO)$/xmlexchg.obj + $(SLO)$/dbaexchange.obj \ + $(SLO)$/gridcols.obj \ + $(SLO)$/gridctrl.obj \ + $(SLO)$/gridcell.obj \ + $(SLO)$/fmgridcl.obj \ + $(SLO)$/fmgridif.obj \ + $(SLO)$/trace.obj \ + $(SLO)$/xmlexchg.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/dbaobjectex.obj + $(SLO)$/dbaobjectex.obj .INCLUDE : target.mk diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index c1d1bc43aa..a04aedb430 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <tools/debug.hxx> diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index d49d9bb36b..107afe0106 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -30,9 +30,9 @@ #include "precompiled_svx.hxx" #include <sal/macros.h> -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include "stringlistresource.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index ce6842e9b8..19fc170b93 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -32,7 +32,7 @@ #include "svx/databaselocationinput.hxx" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 345df16414..85e19cf86c 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -34,12 +34,12 @@ #include "fmservs.hxx" #include "datanavi.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> @@ -352,7 +352,7 @@ namespace svxform WinBits nBits = WB_BORDER | WB_TABSTOP | WB_HIDESELECTION | WB_NOINITIALSELECTION; if ( DGTInstance == m_eGroup || DGTSubmission == m_eGroup ) nBits |= WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT; - m_aItemList.SetWindowBits( m_aItemList.GetStyle() | nBits ); + m_aItemList.SetStyle( m_aItemList.GetStyle() | nBits ); m_aItemList.Show(); ItemSelectHdl( &m_aItemList ); } diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 904d2fefb9..1040d3af19 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -27,13 +27,14 @@ #include "datanavi.hrc" #include "globlmn.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; TabPage RID_SVX_XFORMS_TABPAGES { + HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES"; Hide = TRUE ; DialogControl = TRUE; Size = MAP_APPFONT ( 63 , 100 ) ; @@ -336,6 +337,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -349,12 +351,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_DEFAULT { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; }; PushButton PB_DEFAULT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT"; Pos = MAP_APPFONT ( 160 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -376,6 +380,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; ListBox LB_DATATYPE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE"; Pos = MAP_APPFONT ( 78 , 55 ) ; Size = MAP_APPFONT ( 96 , 45 ) ; Border = TRUE ; @@ -383,6 +388,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_REQUIRED { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED"; Pos = MAP_APPFONT ( 6 , 72 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -390,6 +396,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_REQUIRED { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED"; Pos = MAP_APPFONT ( 78 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -397,6 +404,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_RELEVANT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT"; Pos = MAP_APPFONT ( 6 , 89 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -404,6 +412,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_RELEVANT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT"; Pos = MAP_APPFONT ( 78 , 87 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -411,6 +420,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CONSTRAINT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -418,6 +428,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CONSTRAINT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT"; Pos = MAP_APPFONT ( 78 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -425,6 +436,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_READONLY { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY"; Pos = MAP_APPFONT ( 6 , 123 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -432,6 +444,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_READONLY { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY"; Pos = MAP_APPFONT ( 78 , 121 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -439,6 +452,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CALCULATE { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE"; Pos = MAP_APPFONT ( 6 , 140 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -446,6 +460,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CALCULATE { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE"; Pos = MAP_APPFONT ( 78 , 138 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -562,6 +577,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; MultiLineEdit ED_CONDITION { + HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 198 , 34 ) ; @@ -587,6 +603,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; PushButton PB_EDIT_NAMESPACES { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES"; Pos = MAP_APPFONT ( 132 , 102 ) ; Size = MAP_APPFONT ( 72 , 14 ) ; TabStop = TRUE ; @@ -643,6 +660,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_ADD_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -650,6 +668,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_EDIT_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -657,6 +676,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_DELETE_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -713,6 +733,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_PREFIX { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE; @@ -726,6 +747,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_URL { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL"; Pos = MAP_APPFONT ( 54 , 14 ) ; Size = MAP_APPFONT ( 150 , 12 ) ; Border = TRUE; @@ -783,6 +805,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -796,6 +819,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_ACTION { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -809,6 +833,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_METHOD { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD"; Pos = MAP_APPFONT ( 78 , 44 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -823,12 +848,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_REF { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF"; Pos = MAP_APPFONT ( 78 , 60 ) ; Size = MAP_APPFONT ( 79, 12 ) ; Border = TRUE ; }; PushButton PB_SUBMIT_REF { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF"; Pos = MAP_APPFONT ( 159 , 59 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -843,6 +870,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_BIND { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND"; Pos = MAP_APPFONT ( 78 , 75 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -857,6 +885,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE"; Pos = MAP_APPFONT ( 78 , 90 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -937,12 +966,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 114 , 12 ) ; Border = TRUE ; }; CheckBox CB_MODIFIES_DOCUMENT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT"; Pos = MAP_APPFONT( 6, 32 ); Size = MAP_APPFONT( 168, 16 ); Top = TRUE; @@ -1003,6 +1034,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 144 , 12 ) ; Border = TRUE ; @@ -1016,6 +1048,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; ComboBox ED_INST_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL"; Pos = MAP_APPFONT ( 60 , 29 ) ; Size = MAP_APPFONT ( 127 , 48 ) ; DropDown = TRUE ; @@ -1023,6 +1056,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; PushButton PB_FILEPICKER { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER"; Pos = MAP_APPFONT ( 190 , 28 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -1030,6 +1064,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; CheckBox CB_INST_LINKINST { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST"; Pos = MAP_APPFONT ( 6 , 44 ) ; Size = MAP_APPFONT ( 198 , 10 ) ; TabStop = TRUE ; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 36b6aca066..a61d88b596 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -35,7 +35,8 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" +#include "gridcell.hxx" /** === begin UNO includes === **/ #include <com/sun/star/awt/XControlModel.hpp> diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 36c12a001e..dc4e64388b 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,7 +26,9 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" +#include "fmhelp.hrc" + Menu RID_FM_FILTER_MENU { ItemList = @@ -34,54 +36,27 @@ Menu RID_FM_FILTER_MENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; + HelpId = HID_FM_DELETE; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_FILTER_EDIT ; - HelpID = SID_FM_FILTER_EDIT ; + HelpId = HID_FM_FILTER_EDIT; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NULL ; - HelpID = SID_FM_FILTER_IS_NULL ; + HelpId = HID_FM_FILTER_IS_NULL; Text [ en-US ] = "~Is Null" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NOT_NULL ; - HelpID = SID_FM_FILTER_IS_NOT_NULL ; + HelpId = HID_FM_FILTER_IS_NOT_NULL; Text [ en-US ] = "I~s not Null" ; }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 8f52296bba..6c59eaf7cf 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -34,7 +34,7 @@ #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmpgeimp.hxx" diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 565611f61b..f3e62bee6e 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include <sot/storage.hxx> #include <svl/itempool.hxx> -#include <dbexch.hrc> +#include <svx/dbexch.hrc> #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 6505bc9628..15f2d6d710 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" @@ -45,7 +45,7 @@ #include "fmprop.hrc" #include <svx/dialmgr.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <fmundo.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index fb7ea13d99..f4d56d3240 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -26,9 +26,12 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" +#include <svx/svxcommands.h> +#include "fmhelp.hrc" + Menu RID_FMEXPLORER_POPUPMENU { ItemList = @@ -36,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW ; - HelpID = SID_FM_NEW ; + HelpId = HID_FM_NEW ; Text [ en-US ] = "~New" ; SubMenu = Menu { @@ -45,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW_FORM ; - HelpID = SID_FM_NEW_FORM ; + HelpId = HID_FM_NEW_FORM ; Text [ en-US ] = "Form" ; }; MenuItem { Identifier = SID_FM_NEW_HIDDEN ; - HelpID = SID_FM_NEW_HIDDEN ; + HelpId = HID_FM_NEW_HIDDEN ; Text [ en-US ] = "Hidden Control" ; }; }; @@ -60,7 +63,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_CHANGECONTROLTYPE ; - HelpID = SID_FM_CHANGECONTROLTYPE ; + HelpId = CMD_SID_FM_CHANGECONTROLTYPE ; Text [ en-US ] = "Replace with"; }; MenuItem { ITEM_EDIT_CUT }; @@ -69,37 +72,37 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; + HelpId = HID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_TAB_DIALOG ; - HelpID = SID_FM_TAB_DIALOG ; + HelpId = CMD_SID_FM_TAB_DIALOG ; Text [ en-US ] = "Tab Order..." ; }; MenuItem { Identifier = SID_FM_RENAME_OBJECT ; - HelpID = SID_FM_RENAME_OBJECT ; + HelpId = HID_FM_RENAME_OBJECT ; Text [ en-US ] = "~Rename" ; }; MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Propert~ies" ; }; MenuItem { Identifier = SID_FM_OPEN_READONLY ; - HelpID = SID_FM_OPEN_READONLY ; + HelpId = CMD_SID_FM_OPEN_READONLY ; Text [ en-US ] = "Open in Design Mode" ; }; MenuItem { Identifier = SID_FM_AUTOCONTROLFOCUS ; - HelpID = SID_FM_AUTOCONTROLFOCUS ; + HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ; Text [ en-US ] = "Automatic Control Focus"; }; }; @@ -112,140 +115,140 @@ Menu RID_FMSHELL_CONVERSIONMENU MenuItem { Identifier = SID_FM_CONVERTTO_EDIT ; - HelpID = SID_FM_CONVERTTO_EDIT ; + HelpId = CMD_SID_FM_CONVERTTO_EDIT ; Command = ".uno:ConvertToEdit" ; Text [ en-US ] = "~Text Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_BUTTON ; - HelpID = SID_FM_CONVERTTO_BUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_BUTTON ; Command = ".uno:ConvertToButton" ; Text [ en-US ] = "~Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FIXEDTEXT ; - HelpID = SID_FM_CONVERTTO_FIXEDTEXT ; + HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ; Command = ".uno:ConvertToFixed" ; Text [ en-US ] = "La~bel field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_GROUPBOX ; - HelpID = SID_FM_CONVERTTO_GROUPBOX ; + HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ; Command = ".uno:ConvertToGroup" ; Text [ en-US ] = "G~roup Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_LISTBOX ; - HelpID = SID_FM_CONVERTTO_LISTBOX ; + HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ; Command = ".uno:ConvertToList" ; Text [ en-US ] = "L~ist Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CHECKBOX ; - HelpID = SID_FM_CONVERTTO_CHECKBOX ; + HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ; Command = ".uno:ConvertToCheckBox" ; Text [ en-US ] = "~Check Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_RADIOBUTTON ; - HelpID = SID_FM_CONVERTTO_RADIOBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ; Command = ".uno:ConvertToRadio" ; Text [ en-US ] = "~Radio Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_COMBOBOX ; - HelpID = SID_FM_CONVERTTO_COMBOBOX ; + HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ; Command = ".uno:ConvertToCombo" ; Text [ en-US ] = "Combo Bo~x"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ; - HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ; Command = ".uno:ConvertToImageBtn" ; Text [ en-US ] = "I~mage Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FILECONTROL ; - HelpID = SID_FM_CONVERTTO_FILECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ; Command = ".uno:ConvertToFileControl" ; Text [ en-US ] = "~File Selection"; }; MenuItem { Identifier = SID_FM_CONVERTTO_DATE ; - HelpID = SID_FM_CONVERTTO_DATE ; + HelpId = CMD_SID_FM_CONVERTTO_DATE ; Command = ".uno:ConvertToDate" ; Text [ en-US ] = "~Date Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_TIME ; - HelpID = SID_FM_CONVERTTO_TIME ; + HelpId = CMD_SID_FM_CONVERTTO_TIME ; Command = ".uno:ConvertToTime" ; Text [ en-US ] = "Tim~e Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NUMERIC ; - HelpID = SID_FM_CONVERTTO_NUMERIC ; + HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ; Command = ".uno:ConvertToNumeric" ; Text [ en-US ] = "~Numerical Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CURRENCY ; - HelpID = SID_FM_CONVERTTO_CURRENCY ; + HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ; Command = ".uno:ConvertToCurrency" ; Text [ en-US ] = "C~urrency Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_PATTERN ; - HelpID = SID_FM_CONVERTTO_PATTERN ; + HelpId = CMD_SID_FM_CONVERTTO_PATTERN ; Command = ".uno:ConvertToPattern" ; Text [ en-US ] = "~Pattern Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGECONTROL ; - HelpID = SID_FM_CONVERTTO_IMAGECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ; Command = ".uno:ConvertToImageControl" ; Text [ en-US ] = "Ima~ge Control"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FORMATTED ; - HelpID = SID_FM_CONVERTTO_FORMATTED ; + HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ; Command = ".uno:ConvertToFormatted" ; Text [ en-US ] = "Fo~rmatted Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SCROLLBAR ; - HelpID = SID_FM_CONVERTTO_SCROLLBAR ; + HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ; Command = ".uno:ConvertToScrollBar" ; Text [ en-US ] = "Scroll bar"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SPINBUTTON; - HelpID = SID_FM_CONVERTTO_SPINBUTTON; + HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON; Command = ".uno:ConvertToSpinButton" ; Text [ en-US ] = "Spin Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR; - HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR; + HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR; Command = ".uno:ConvertToNavigationBar" ; Text [ en-US ] = "Navigation Bar" ; }; @@ -297,6 +300,7 @@ ImageList RID_SVXIMGLIST_FMEXPL ModalDialog RID_SVXDLG_SETFORM { + HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; @@ -335,6 +339,7 @@ ModalDialog RID_SVXDLG_SETFORM }; DockingWindow RID_SVX_FMEXPLORER { + HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 236d587ccd..aa1ca489da 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -32,7 +32,7 @@ #include "fmprop.hrc" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmview.hxx" #include "svx/fmglob.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 6114115171..da018bc0a6 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -33,7 +33,7 @@ #include "svx/fmtools.hxx" #include "fmservs.hxx" -#include "fmobjfac.hxx" +#include "svx/fmobjfac.hxx" #include <svx/fmglob.hxx> @@ -46,7 +46,7 @@ #include "tbxform.hxx" #include <tools/resid.hxx> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 562566419a..4bab1507eb 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -43,7 +43,7 @@ #endif #ifndef SVX_LIGHT -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> @@ -55,7 +55,7 @@ #ifndef SVX_LIGHT #include <sfx2/objsh.hxx> #endif -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index eed59d1a27..7aeeccc51e 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include "fmpgeimp.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" @@ -37,8 +37,8 @@ #include "fmservs.hxx" #include "fmobj.hxx" #include "formcontrolfactory.hxx" -#include "svditer.hxx" -#include "fmresids.hrc" +#include "svx/svditer.hxx" +#include "svx/fmresids.hrc" #include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index e39a17813b..ff0a210fc1 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -243,6 +243,7 @@ namespace svxform if ( _rEvent.ScriptType.equals(vbaInterOp) ) return; // not handled here + if ( impl_isDisposed_nothrow() ) return; @@ -497,6 +498,7 @@ namespace svxform if ( m_bDisposed ) return; + // SfxObjectShellRef is good here since the model controls the lifetime of the object SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell(); if( !xObjectShell.Is() ) return; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index fb12f03e00..66626f5aed 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -61,12 +61,12 @@ #include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexch.hxx" #include <svx/fmglob.hxx> #include <svl/eitem.hxx> @@ -94,6 +94,8 @@ #include "svx/sdrobjectfilter.hxx" +#include "svx/sdrobjectfilter.hxx" + #define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ try \ { \ @@ -279,7 +281,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView) } //------------------------------------------------------------------------ -sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) +sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/) { if ( GetImpl()->didPrepareClose() ) // we already did a PrepareClose for the current modifications of the current form @@ -311,10 +313,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) if ( bModified && bUI ) { QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED)); - if (bForBrowsing) - aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK, - BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON); - switch (aQry.Execute()) { case RET_NO: @@ -1427,7 +1425,7 @@ namespace ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const { ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter; - + if ( !i_rView.IsDesignMode() ) pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index aa36fa53b5..45bcfc11db 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -35,7 +35,7 @@ #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" @@ -44,7 +44,7 @@ #include "fmvwimp.hxx" #include "formtoolbars.hxx" #include "gridcols.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/dialmgr.hxx" #include "svx/dialogs.hrc" #include "svx/fmglob.hxx" @@ -540,7 +540,6 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun //------------------------------------------------------------------------------ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldStepInto" ); if (_rContainer == m_xStartingPoint) // would be quite stupid to step over the root .... return sal_True; @@ -551,7 +550,6 @@ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& //------------------------------------------------------------------------------ sal_Bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldHandleElement" ); if (!_rElement.is()) // NULL element return sal_False; @@ -677,7 +675,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) ,m_bPreparedClose( sal_False ) ,m_bFirstActivation( sal_True ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::FmXFormShell" ); DBG_CTOR(FmXFormShell,NULL); m_aMarkTimer.SetTimeout(100); m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut)); @@ -709,7 +706,6 @@ FmXFormShell::~FmXFormShell() //------------------------------------------------------------------ Reference< XModel > FmXFormShell::getContextDocument() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getContextDocument" ); Reference< XModel > xModel; // determine the type of document we live in @@ -731,14 +727,12 @@ Reference< XModel > FmXFormShell::getContextDocument() const //------------------------------------------------------------------ bool FmXFormShell::isEnhancedForm() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isEnhancedForm" ); return getDocumentType() == eEnhancedForm; } //------------------------------------------------------------------ bool FmXFormShell::impl_checkDisposed() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_checkDisposed" ); if ( !m_pShell ) { OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" ); @@ -750,7 +744,6 @@ bool FmXFormShell::impl_checkDisposed() const //------------------------------------------------------------------ ::svxform::DocumentType FmXFormShell::getDocumentType() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getDocumentType" ); if ( m_eDocumentType != eUnknownDocumentType ) return m_eDocumentType; @@ -771,7 +764,6 @@ bool FmXFormShell::impl_checkDisposed() const //------------------------------------------------------------------ bool FmXFormShell::IsReadonlyDoc() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsReadonlyDoc" ); if ( impl_checkDisposed() ) return true; @@ -784,19 +776,16 @@ bool FmXFormShell::IsReadonlyDoc() const //------------------------------------------------------------------ Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::queryInterface" ); return FmXFormShell_BASE::queryInterface(type); } //------------------------------------------------------------------------------ Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getTypes" ); return FmXFormShell_BASE::getTypes(); } //------------------------------------------------------------------------------ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getImplementationId" ); static ::cppu::OImplementationId* pId = 0; if (! pId) { @@ -813,7 +802,6 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" ); impl_checkDisposed(); if (m_xActiveController == e.Source) @@ -853,7 +841,6 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::propertyChange" ); if ( impl_checkDisposed() ) return; @@ -890,7 +877,6 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw //------------------------------------------------------------------------------ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::invalidateFeatures" ); if ( impl_checkDisposed() ) return; @@ -920,7 +906,6 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formActivated" ); if ( impl_checkDisposed() ) return; @@ -932,7 +917,6 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formDeactivated" ); if ( impl_checkDisposed() ) return; @@ -943,7 +927,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru //------------------------------------------------------------------------------ void FmXFormShell::disposing() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" ); impl_checkDisposed(); FmXFormShell_BASE::disposing(); @@ -1021,7 +1004,6 @@ void FmXFormShell::disposing() //------------------------------------------------------------------------------ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateSlot" ); if ( impl_checkDisposed() ) return; @@ -1043,7 +1025,6 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) //------------------------------------------------------------------------------ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::InvalidateSlot" ); if ( impl_checkDisposed() ) return; @@ -1052,7 +1033,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) { m_arrInvalidSlots.Insert(nId, m_arrInvalidSlots.Count()); BYTE nFlags = ( bWithId ? 0x01 : 0 ); - m_arrInvalidSlots_Flags.Insert(nFlags, m_arrInvalidSlots_Flags.Count()); + m_arrInvalidSlots_Flags.push_back(nFlags); } else if (nId) @@ -1064,7 +1045,6 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) //------------------------------------------------------------------------------ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LockSlotInvalidation" ); if ( impl_checkDisposed() ) return; @@ -1090,7 +1070,7 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) ::osl::MutexGuard aGuard(m_aInvalidationSafety); m_nInvalidationEvent = 0; - DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.Count(), + DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.size(), "FmXFormShell::OnInvalidateSlots : inconsistent slot arrays !"); BYTE nFlags; for (sal_Int16 i=0; i<m_arrInvalidSlots.Count(); ++i) @@ -1104,14 +1084,13 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) } m_arrInvalidSlots.Remove(0, m_arrInvalidSlots.Count()); - m_arrInvalidSlots_Flags.Remove(0, m_arrInvalidSlots_Flags.Count()); + m_arrInvalidSlots_Flags.clear(); return 0L; } //------------------------------------------------------------------------------ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForceUpdateSelection" ); if ( impl_checkDisposed() ) return; @@ -1133,8 +1112,6 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) //------------------------------------------------------------------------------ PopupMenu* FmXFormShell::GetConversionMenu() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" ); - PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU )); ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) ); @@ -1150,7 +1127,6 @@ PopupMenu* FmXFormShell::GetConversionMenu() //------------------------------------------------------------------------------ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isControlConversionSlot" ); for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) if (nConvertSlots[i] == nSlotId) return true; @@ -1160,7 +1136,6 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) //------------------------------------------------------------------------------ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" ); OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" ); InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin(); if ( aSelectedElement == m_aCurrentSelection.end() ) @@ -1172,7 +1147,6 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) //------------------------------------------------------------------------------ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" ); if ( impl_checkDisposed() ) return false; @@ -1379,7 +1353,6 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent //------------------------------------------------------------------------------ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::canConvertCurrentSelectionToControl" ); if ( m_aCurrentSelection.empty() ) return false; @@ -1418,7 +1391,6 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo //------------------------------------------------------------------------------ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::checkControlConversionSlotsForCurrentSelection" ); for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i) // der Context ist schon von einem Typ, der dem Eitnrag entspricht -> disable rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) ); @@ -1427,7 +1399,6 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) //------------------------------------------------------------------------------ void FmXFormShell::LoopGrids(sal_Int16 nWhat) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LoopGrids" ); if ( impl_checkDisposed() ) return; @@ -1497,7 +1468,6 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat) //------------------------------------------------------------------------------ Reference< XControlContainer > FmXFormShell::getControlContainerForView() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getControlContainerForView" ); if ( impl_checkDisposed() ) return NULL; @@ -1515,7 +1485,6 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView() //------------------------------------------------------------------------------ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTabOrderDialog" ); if ( impl_checkDisposed() ) return; @@ -1564,7 +1533,6 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > //------------------------------------------------------------------------------ void FmXFormShell::ExecuteSearch() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteSearch" ); if ( impl_checkDisposed() ) return; @@ -1711,7 +1679,6 @@ void FmXFormShell::ExecuteSearch() //------------------------------------------------------------------------------ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetY2KState" ); if ( impl_checkDisposed() ) return sal_False; @@ -1751,7 +1718,6 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) //------------------------------------------------------------------------------ void FmXFormShell::SetY2KState(sal_uInt16 n) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetY2KState" ); if ( impl_checkDisposed() ) return; @@ -1826,7 +1792,6 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) //------------------------------------------------------------------------------ void FmXFormShell::CloseExternalFormViewer() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CloseExternalFormViewer" ); if ( impl_checkDisposed() ) return; @@ -1848,7 +1813,6 @@ void FmXFormShell::CloseExternalFormViewer() //------------------------------------------------------------------------------ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" ); if ( impl_checkDisposed() ) return NULL; @@ -1864,7 +1828,6 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet //------------------------------------------------------------------------------ Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" ); if ( impl_checkDisposed() ) return NULL; @@ -1893,7 +1856,6 @@ namespace //------------------------------------------------------------------------------ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsFormSlotEnabled" ); const ::svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() @@ -1909,7 +1871,6 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete //------------------------------------------------------------------------------ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteFormSlot" ); const ::svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() @@ -1945,7 +1906,6 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) //------------------------------------------------------------------------------ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_switchActiveControllerListening" ); Reference< XComponent> xComp( m_xActiveController, UNO_QUERY ); if ( !xComp.is() ) return; @@ -1959,7 +1919,6 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) //------------------------------------------------------------------------------ void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setActiveController" ); if ( impl_checkDisposed() ) return; @@ -2068,14 +2027,12 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle //------------------------------------------------------------------------------ void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getCurrentSelection" ); _rSelection = m_aCurrentSelection; } //------------------------------------------------------------------------------ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelectionFromMark" ); m_aLastKnownMarkedControls.clear(); if ( ( _rMarkList.GetMarkCount() > 0 ) && isControlList( _rMarkList ) ) @@ -2087,14 +2044,12 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) //------------------------------------------------------------------------------ bool FmXFormShell::selectLastMarkedControls() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectLastMarkedControls" ); return setCurrentSelection( m_aLastKnownMarkedControls ); } //------------------------------------------------------------------------------ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelection" ); if ( impl_checkDisposed() ) return false; @@ -2176,14 +2131,12 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) //------------------------------------------------------------------------------ bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isSolelySelected" ); return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject ); } //------------------------------------------------------------------------------ void FmXFormShell::forgetCurrentForm() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::forgetCurrentForm" ); if ( !m_xCurrentForm.is() ) return; @@ -2198,7 +2151,6 @@ void FmXFormShell::forgetCurrentForm() //------------------------------------------------------------------------------ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_updateCurrentForm" ); if ( impl_checkDisposed() ) return; @@ -2217,7 +2169,6 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo //------------------------------------------------------------------------------ void FmXFormShell::startListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startListening" ); if ( impl_checkDisposed() ) return; @@ -2297,7 +2248,6 @@ void FmXFormShell::startListening() //------------------------------------------------------------------------------ void FmXFormShell::stopListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopListening" ); if ( impl_checkDisposed() ) return; @@ -2321,7 +2271,6 @@ void FmXFormShell::stopListening() //------------------------------------------------------------------------------ void FmXFormShell::ShowSelectionProperties( sal_Bool bShow ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ShowSelectionProperties" ); if ( impl_checkDisposed() ) return; @@ -2652,7 +2601,6 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn //------------------------------------------------------------------------------ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementInserted" ); if ( impl_checkDisposed() ) return; @@ -2666,7 +2614,6 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun:: //------------------------------------------------------------------------------ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementReplaced" ); if ( impl_checkDisposed() ) return; @@ -2680,7 +2627,6 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun:: //------------------------------------------------------------------------------ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementRemoved" ); if ( impl_checkDisposed() ) return; @@ -2693,7 +2639,6 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s //------------------------------------------------------------------------------ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateForms" ); if ( impl_checkDisposed() ) return; @@ -2719,7 +2664,6 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) //------------------------------------------------------------------------------ void FmXFormShell::AddElement(const Reference< XInterface>& _xElement) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::AddElement" ); if ( impl_checkDisposed() ) return; impl_AddElement_nothrow(_xElement); @@ -2752,7 +2696,6 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element //------------------------------------------------------------------------------ void FmXFormShell::RemoveElement(const Reference< XInterface>& Element) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::RemoveElement" ); if ( impl_checkDisposed() ) return; impl_RemoveElement_nothrow(Element); @@ -2789,7 +2732,6 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem //------------------------------------------------------------------------------ void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectionChanged" ); if ( impl_checkDisposed() ) return; @@ -2831,7 +2773,6 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------ void FmXFormShell::SetSelectionDelayed() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelectionDelayed" ); if ( impl_checkDisposed() ) return; @@ -2842,7 +2783,6 @@ void FmXFormShell::SetSelectionDelayed() //------------------------------------------------------------------------ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelection" ); if ( impl_checkDisposed() ) return; @@ -2853,7 +2793,6 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) //------------------------------------------------------------------------ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DetermineSelection" ); if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() ) ShowSelectionProperties( sal_True ); } @@ -2861,7 +2800,6 @@ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList) //------------------------------------------------------------------------------ sal_Bool FmXFormShell::IsPropBrwOpen() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsPropBrwOpen" ); if ( impl_checkDisposed() ) return sal_False; @@ -2898,7 +2836,6 @@ public: //------------------------------------------------------------------------------ void FmXFormShell::SetDesignMode(sal_Bool bDesign) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetDesignMode" ); if ( impl_checkDisposed() ) return; @@ -3031,7 +2968,6 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< String >& _out_rNames ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_collectFormSearchContexts_nothrow" ); try { Reference< XIndexAccess> xContainer( _rxStartingPoint, UNO_QUERY ); @@ -3086,7 +3022,6 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt //------------------------------------------------------------------------------ void FmXFormShell::startFiltering() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startFiltering" ); if ( impl_checkDisposed() ) return; @@ -3103,12 +3038,14 @@ void FmXFormShell::startFiltering() else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow( xContainer ); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController> >& rControllerList = (*i)->GetList(); - for (::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin(); - j != rControllerList.end(); ++j) + const ::std::vector< Reference< runtime::XFormController> >& rControllerList = pAdapter->GetList(); + for ( ::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin(); + j != rControllerList.end(); + ++j + ) { Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) @@ -3161,7 +3098,6 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController) //------------------------------------------------------------------------------ void FmXFormShell::stopFiltering(sal_Bool bSave) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopFiltering" ); if ( impl_checkDisposed() ) return; @@ -3179,10 +3115,10 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController > >& rControllerList = (*i)->GetList(); + const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList(); ::std::vector < ::rtl::OUString > aOriginalFilters; ::std::vector < sal_Bool > aOriginalApplyFlags; @@ -3223,7 +3159,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } if (bSave) // execute the filter { - const ::std::vector< Reference< runtime::XFormController > > & rControllers = (*i)->GetList(); + const ::std::vector< Reference< runtime::XFormController > > & rControllers = pAdapter->GetList(); for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllers.begin(); j != rControllers.end(); ++j) { @@ -3300,7 +3236,6 @@ void clearFilter(const Reference< runtime::XFormController >& _rxController) //------------------------------------------------------------------------------ void FmXFormShell::clearFilter() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::clearFilter" ); if ( impl_checkDisposed() ) return; @@ -3316,12 +3251,14 @@ void FmXFormShell::clearFilter() else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController > > & rControllerList = (*i)->GetList(); - for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin(); - j != rControllerList.end(); ++j) + const ::std::vector< Reference< runtime::XFormController > > & rControllerList = pAdapter->GetList(); + for ( ::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin(); + j != rControllerList.end(); + ++j + ) { ::clearFilter(*j); } @@ -3331,7 +3268,6 @@ void FmXFormShell::clearFilter() //------------------------------------------------------------------------------ void FmXFormShell::CreateExternalView() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CreateExternalView" ); if ( impl_checkDisposed() ) return; @@ -3746,7 +3682,6 @@ void FmXFormShell::CreateExternalView() //------------------------------------------------------------------------ void FmXFormShell::implAdjustConfigCache() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::implAdjustConfigCache" ); // get (cache) the wizard usage flag Sequence< ::rtl::OUString > aNames(1); aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled")); @@ -3758,7 +3693,6 @@ void FmXFormShell::implAdjustConfigCache() //------------------------------------------------------------------------ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::Notify" ); if ( impl_checkDisposed() ) return; @@ -3779,7 +3713,6 @@ void FmXFormShell::Commit() //------------------------------------------------------------------------ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetWizardUsing" ); m_bUseWizards = _bUseThem; Sequence< ::rtl::OUString > aNames(1); @@ -3792,7 +3725,6 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) //------------------------------------------------------------------------ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" ); if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() ) { @@ -3864,7 +3796,6 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ ) //------------------------------------------------------------------------ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" ); FmFormPage* pPage = _rCurrentView.GetCurPage(); @@ -3913,7 +3844,6 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi //------------------------------------------------------------------------------ void FmXFormShell::impl_defaultCurrentForm_nothrow() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_defaultCurrentForm_nothrow" ); if ( impl_checkDisposed() ) return; @@ -3944,7 +3874,6 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow() //------------------------------------------------------------------------------ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::smartControlReset" ); if (!_rxModels.is()) { DBG_ERROR("FmXFormShell::smartControlReset: invalid container!"); @@ -4052,7 +3981,6 @@ namespace //------------------------------------------------------------------------ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::loadForms" ); DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) ) != ( FORMS_ASYNC | FORMS_UNLOAD ), "FmXFormShell::loadForms: async loading not supported - this will heavily fail!" ); @@ -4130,41 +4058,35 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour / //------------------------------------------------------------------------ void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTextAttribute" ); m_pTextShell->ExecuteTextAttribute( _rReq ); } //------------------------------------------------------------------------ void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetTextAttributeState" ); m_pTextShell->GetTextAttributeState( _rSet ); } //------------------------------------------------------------------------ bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsActiveControl" ); return m_pTextShell->IsActiveControl( _bCountRichTextOnly ); } //------------------------------------------------------------------------ void FmXFormShell::ForgetActiveControl() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForgetActiveControl" ); m_pTextShell->ForgetActiveControl(); } //------------------------------------------------------------------------ void FmXFormShell::SetControlActivationHandler( const Link& _rHdl ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetControlActivationHandler" ); m_pTextShell->SetControlActivationHandler( _rHdl ); } //------------------------------------------------------------------------ void FmXFormShell::handleShowPropertiesRequest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleShowPropertiesRequest" ); if ( onlyControlsAreMarked() ) ShowSelectionProperties( sal_True ); } @@ -4172,7 +4094,6 @@ void FmXFormShell::handleShowPropertiesRequest() //------------------------------------------------------------------------ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleMouseButtonDown" ); // catch simple double clicks if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) ) { @@ -4284,7 +4205,6 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI //------------------------------------------------------------------------------ ControlConversionMenuController::~ControlConversionMenuController() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ControlConversionMenuController::~ControlConversionMenuController" ); m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL); delete m_pConversionMenu; } diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 287b92ef56..263cf3b138 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index af644117a4..3112c8be89 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/wldcrd.hxx> @@ -58,7 +58,7 @@ #include "fmprop.hrc" #include "fmservs.hxx" -#include "fmsrcimp.hxx" +#include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> #include <comphelper/numbers.hxx> @@ -77,11 +77,6 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::beans; using namespace ::svxform; -// *************************************************************************************************** - -// *************************************************************************************************** - -SV_IMPL_OBJARR(SvInt32Array, sal_Int32); //======================================================================== // = FmSearchThread @@ -844,7 +839,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) // analyze the fields // additionally, create the mapping: because the list of used columns can be shorter than the list // of columns of the cursor, we need a mapping: "used column numer n" -> "cursor column m" - m_arrFieldMapping.Remove(0, m_arrFieldMapping.Count()); + m_arrFieldMapping.clear(); // important: The case of the columns does not need to be exact - for instance: // - a user created a form which works on a table, for which the driver returns a column name "COLUMN" @@ -907,8 +902,8 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) } // set the field selection back to the first pFieldNames = seqFieldNames.getArray();; - DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Es wurden ungueltige Feldnamen angegeben !"); - m_arrFieldMapping.Insert(nFoundIndex, m_arrFieldMapping.Count()); + DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Invalid field name were given !"); + m_arrFieldMapping.push_back(nFoundIndex); } } catch(Exception&) @@ -1269,18 +1264,21 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) return; // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) - DBG_ASSERT((nFieldIndex >= -1) && (nFieldIndex<m_arrFieldMapping.Count()), "FmSearchEngine::RebuildUsedFields : nFieldIndex ist ungueltig !"); + DBG_ASSERT((nFieldIndex == -1) || + ((nFieldIndex >= 0) && + (static_cast<size_t>(nFieldIndex) < m_arrFieldMapping.size())), + "FmSearchEngine::RebuildUsedFields : nFieldIndex is invalid!"); // alle Felder, die ich durchsuchen muss, einsammeln m_arrUsedFields.clear(); if (nFieldIndex == -1) { Reference< ::com::sun::star::container::XIndexAccess > xFields; - for (sal_uInt16 i=0; i<m_arrFieldMapping.Count(); ++i) + for (size_t i=0; i<m_arrFieldMapping.size(); ++i) { Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); - BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject(i)); + BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[i]); } } else @@ -1289,7 +1287,7 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); - BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject((sal_uInt16)nFieldIndex)); + BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[static_cast< size_t >(nFieldIndex)]); } m_nCurrentFieldIndex = nFieldIndex; diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 89771f126b..cd7dda730c 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /* Strings fuer Uebersetzung */ String RID_ERR_CONTEXT_ADDFORM { diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c725eb4554..d5e2b85761 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -34,7 +34,7 @@ #include <editeng/eeitem.hxx> -#include "flagsdef.hxx" +#include "svx/flagsdef.hxx" #include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e66820a11b..6f7e0ac3eb 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 0fdd52ae5b..0ce93b30ee 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -33,10 +33,10 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" #include "svx/fmmodel.hxx" diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b8f328a80f..4a58d025dc 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -51,7 +51,7 @@ #include <basic/sbx.hxx> #include "fmitems.hxx" #include "fmobj.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> #include <svx/fmview.hxx> @@ -77,7 +77,7 @@ #include <vcl/stdtext.hxx> #include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -140,9 +140,7 @@ void FmFormView::Init() const SfxPoolItem *pItem=0; if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - Sequence< PropertyValue > aSeq; - ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq; - ::comphelper::NamedValueCollection aComponentData( aSeq ); + ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 329d7e273d..ee69b5c5b4 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -33,15 +33,15 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "svx/fmtools.hxx" #include "fmundo.hxx" #include "fmvwimp.hxx" #include "formcontrolfactory.hxx" -#include "sdrpaintwindow.hxx" -#include "svditer.hxx" +#include "svx/sdrpaintwindow.hxx" +#include "svx/svditer.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dialmgr.hxx" #include "svx/fmglob.hxx" @@ -52,7 +52,7 @@ #include "svx/sdrpagewindow.hxx" #include "svx/svdogrp.hxx" #include "svx/svdpagv.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> @@ -174,20 +174,19 @@ public: }; //======================================================================== -DBG_NAME(FmXPageViewWinRec) +DBG_NAME(FormViewPageWindowAdapter) //------------------------------------------------------------------------ -FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) +FormViewPageWindowAdapter::FormViewPageWindowAdapter( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) : m_xControlContainer( _rWindow.GetControlContainer() ), m_aContext( _rContext ), m_pViewImpl( _pViewImpl ), m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::FmXPageViewWinRec" ); - DBG_CTOR(FmXPageViewWinRec,NULL); + DBG_CTOR(FormViewPageWindowAdapter,NULL); // create an XFormController for every form FmFormPage* pFormPage = dynamic_cast< FmFormPage* >( _rWindow.GetPageView().GetPage() ); - DBG_ASSERT( pFormPage, "FmXPageViewWinRec::FmXPageViewWinRec: no FmFormPage found!" ); + DBG_ASSERT( pFormPage, "FormViewPageWindowAdapter::FormViewPageWindowAdapter: no FmFormPage found!" ); if ( pFormPage ) { try @@ -208,15 +207,14 @@ FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rCo } } // ----------------------------------------------------------------------------- -FmXPageViewWinRec::~FmXPageViewWinRec() +FormViewPageWindowAdapter::~FormViewPageWindowAdapter() { - DBG_DTOR(FmXPageViewWinRec,NULL); + DBG_DTOR(FormViewPageWindowAdapter,NULL); } //------------------------------------------------------------------ -void FmXPageViewWinRec::dispose() +void FormViewPageWindowAdapter::dispose() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::dispose" ); for ( ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); i != m_aControllerList.end(); ++i @@ -250,39 +248,34 @@ void FmXPageViewWinRec::dispose() //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXPageViewWinRec::hasElements(void) throw( RuntimeException ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::hasElements" ); return getCount() != 0; } //------------------------------------------------------------------------------ -Type SAL_CALL FmXPageViewWinRec::getElementType(void) throw( RuntimeException ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getElementType" ); return ::getCppuType((const Reference< XFormController>*)0); } // XEnumerationAccess //------------------------------------------------------------------------------ -Reference< XEnumeration > SAL_CALL FmXPageViewWinRec::createEnumeration(void) throw( RuntimeException ) +Reference< XEnumeration > SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::createEnumeration" ); return new ::comphelper::OEnumerationByIndex(this); } // XIndexAccess //------------------------------------------------------------------------------ -sal_Int32 SAL_CALL FmXPageViewWinRec::getCount(void) throw( RuntimeException ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getCount" ); return m_aControllerList.size(); } //------------------------------------------------------------------------------ -Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getByIndex" ); if (nIndex < 0 || nIndex >= getCount()) throw IndexOutOfBoundsException(); @@ -293,7 +286,7 @@ Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBo } //------------------------------------------------------------------------ -void SAL_CALL FmXPageViewWinRec::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) +void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -332,9 +325,8 @@ Reference< XFormController > getControllerSearchChilds( const Reference< XIndex // Search the according controller //------------------------------------------------------------------------ -Reference< XFormController > FmXPageViewWinRec::getController( const Reference< XForm > & xForm ) const +Reference< XFormController > FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getController" ); Reference< XTabControllerModel > xModel(xForm, UNO_QUERY); for (::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); i != m_aControllerList.end(); i++) @@ -351,9 +343,9 @@ Reference< XFormController > FmXPageViewWinRec::getController( const Reference< } //------------------------------------------------------------------------ -void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController ) +void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController ) { - DBG_ASSERT( xForm.is(), "FmXPageViewWinRec::setController: there should be a form!" ); + DBG_ASSERT( xForm.is(), "FormViewPageWindowAdapter::setController: there should be a form!" ); Reference< XIndexAccess > xFormCps(xForm, UNO_QUERY); if (!xFormCps.is()) return; @@ -411,10 +403,9 @@ void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Re } //------------------------------------------------------------------------ -void FmXPageViewWinRec::updateTabOrder( const Reference< XForm >& _rxForm ) +void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::updateTabOrder" ); - OSL_PRECOND( _rxForm.is(), "FmXPageViewWinRec::updateTabOrder: illegal argument!" ); + OSL_PRECOND( _rxForm.is(), "FormViewPageWindowAdapter::updateTabOrder: illegal argument!" ); if ( !_rxForm.is() ) return; @@ -458,13 +449,11 @@ FmXFormView::FmXFormView(const ::comphelper::ComponentContext& _rContext, FmForm ,m_bFirstActivation( true ) ,m_isTabOrderUpdateSuspended( false ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::FmXFormView" ); } //------------------------------------------------------------------------ void FmXFormView::cancelEvents() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::cancelEvents" ); if ( m_nActivationEvent ) { Application::RemoveUserEvent( m_nActivationEvent ); @@ -493,7 +482,6 @@ void FmXFormView::cancelEvents() //------------------------------------------------------------------------ void FmXFormView::notifyViewDying( ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::notifyViewDying" ); DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" ); m_pView = NULL; cancelEvents(); @@ -502,7 +490,17 @@ void FmXFormView::notifyViewDying( ) //------------------------------------------------------------------------ FmXFormView::~FmXFormView() { - DBG_ASSERT(m_aWinList.size() == 0, "FmXFormView::~FmXFormView: Window list not empty!"); + DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" ); + if ( !m_aPageWindowAdapters.empty() ) + { + for ( PageWindowAdapterList::const_iterator loop = m_aPageWindowAdapters.begin(); + loop != m_aPageWindowAdapters.end(); + ++loop + ) + { + (*loop)->dispose(); + } + } cancelEvents(); @@ -514,7 +512,6 @@ FmXFormView::~FmXFormView() //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::disposing" ); if ( m_xWindow.is() && Source.Source == m_xWindow ) removeGridWindowListening(); } @@ -523,7 +520,6 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formActivated" ); if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formActivated( rEvent ); } @@ -531,7 +527,6 @@ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( Runti //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formDeactivated" ); if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent ); } @@ -540,7 +535,6 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementInserted" ); try { Reference< XControlContainer > xControlContainer( evt.Source, UNO_QUERY_THROW ); @@ -555,11 +549,9 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run } else { - FmWinRecList::iterator pos = findWindow( xControlContainer ); - if ( pos != m_aWinList.end() ) - { - (*pos)->updateTabOrder( xForm ); - } + PFormViewPageWindowAdapter pAdapter = findWindow( xControlContainer ); + if ( pAdapter.is() ) + pAdapter->updateTabOrder( xForm ); } } catch( const Exception& ) @@ -571,92 +563,80 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementReplaced" ); elementInserted(evt); } //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementRemoved" ); } //------------------------------------------------------------------------------ -FmWinRecList::const_iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) const +PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" ); - for (FmWinRecList::const_iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) - { - if ( _rxCC == (*i)->getControlContainer() ) - return i; - } - return m_aWinList.end(); -} - -//------------------------------------------------------------------------------ -FmWinRecList::iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" ); - for (FmWinRecList::iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) + for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { if ( _rxCC == (*i)->getControlContainer() ) - return i; + return *i; } - return m_aWinList.end(); + return NULL; } //------------------------------------------------------------------------------ void FmXFormView::addWindow(const SdrPageWindow& rWindow) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::addWindow" ); FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() ); if ( !pFormPage ) return; Reference< XControlContainer > xCC = rWindow.GetControlContainer(); - if ( xCC.is() && findWindow( xCC ) == m_aWinList.end()) + if ( xCC.is() + && ( !findWindow( xCC ).is() ) + ) { - FmXPageViewWinRec *pFmRec = new FmXPageViewWinRec( m_aContext, rWindow, this ); - pFmRec->acquire(); - - m_aWinList.push_back(pFmRec); + PFormViewPageWindowAdapter pAdapter = new FormViewPageWindowAdapter( m_aContext, rWindow, this ); + m_aPageWindowAdapters.push_back( pAdapter ); // Am ControlContainer horchen um Aenderungen mitzbekommen Reference< XContainer > xContainer( xCC, UNO_QUERY ); - if (xContainer.is()) - xContainer->addContainerListener(this); + if ( xContainer.is() ) + xContainer->addContainerListener( this ); } } //------------------------------------------------------------------------------ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeWindow" ); // Wird gerufen, wenn // - in den Design-Modus geschaltet wird // - ein Window geloescht wird, waehrend man im Design-Modus ist // - der Control-Container fuer ein Window entfernt wird, waehrend // der aktive Modus eingeschaltet ist. - FmWinRecList::iterator i = findWindow( _rxCC ); - if (i != m_aWinList.end()) + + for ( PageWindowAdapterList::iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { - // Am ControlContainer horchen um Aenderungen mitzbekommen + if ( _rxCC != (*i)->getControlContainer() ) + continue; + Reference< XContainer > xContainer( _rxCC, UNO_QUERY ); - if (xContainer.is()) - xContainer->removeContainerListener(this); + if ( xContainer.is() ) + xContainer->removeContainerListener( this ); (*i)->dispose(); - (*i)->release(); - m_aWinList.erase(i); + m_aPageWindowAdapters.erase( i ); + break; } } //------------------------------------------------------------------------------ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::displayAsyncErrorMessage" ); DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); // This should not happen - usually, the PostUserEvent is faster than any possible user // interaction which could trigger a new error. If it happens, we need a queue for the events. @@ -675,7 +655,6 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------------ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onFirstViewActivation" ); if ( _pDocModel && _pDocModel->GetAutoControlFocus() ) m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) ); } @@ -683,7 +662,6 @@ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) //------------------------------------------------------------------------------ void FmXFormView::suspendTabOrderUpdate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::suspendTabOrderUpdate" ); OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" ); m_isTabOrderUpdateSuspended = true; } @@ -691,7 +669,6 @@ void FmXFormView::suspendTabOrderUpdate() //------------------------------------------------------------------------------ void FmXFormView::resumeTabOrderUpdate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::resumeTabOrderUpdate" ); OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" ); m_isTabOrderUpdateSuspended = false; @@ -701,8 +678,8 @@ void FmXFormView::resumeTabOrderUpdate() ++container ) { - FmWinRecList::iterator pos = findWindow( container->first ); - if ( pos == m_aWinList.end() ) + PFormViewPageWindowAdapter pAdapter = findWindow( container->first ); + if ( !pAdapter.is() ) continue; for ( SetOfForms::const_iterator form = container->second.begin(); @@ -710,7 +687,7 @@ void FmXFormView::resumeTabOrderUpdate() ++form ) { - (*pos)->updateTabOrder( *form ); + pAdapter->updateTabOrder( *form ); } } m_aNeedTabOrderUpdate.clear(); @@ -731,41 +708,42 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) { Window* pWindow = const_cast<Window*>(static_cast<const Window*>(m_pView->GetActualOutDev())); - FmXPageViewWinRec* pFmRec = m_aWinList.size() ? m_aWinList[0] : NULL; - for (FmWinRecList::const_iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) + PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; + for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { - if (pWindow == (*i)->getWindow()) - pFmRec =*i; + if ( pWindow == (*i)->getWindow() ) + pAdapter =*i; } - if (pFmRec) + if ( pAdapter.get() ) { - for (::std::vector< Reference< XFormController > >::const_iterator i = pFmRec->GetList().begin(); - i != pFmRec->GetList().end(); i++) + for ( ::std::vector< Reference< XFormController > >::const_iterator i = pAdapter->GetList().begin(); + i != pAdapter->GetList().end(); + ++i + ) { const Reference< XFormController > & xController = *i; - if (xController.is()) + if ( !xController.is() ) + continue; + + // only database forms are to be activated + Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY); + if ( !xForm.is() || !OStaticDataAccessTools().getRowSetConnection( xForm ).is() ) + continue; + + Reference< XPropertySet > xFormSet( xForm, UNO_QUERY ); + ENSURE_OR_CONTINUE( xFormSet.is(), "FmXFormView::OnActivate: a form which does not have properties?" ); + + const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); + if ( aSource.getLength() ) { - // Nur bei Datenbankformularen erfolgt eine aktivierung - Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY); - if (xForm.is() && OStaticDataAccessTools().getRowSetConnection(xForm).is()) - { - Reference< XPropertySet > xFormSet(xForm, UNO_QUERY); - if (xFormSet.is()) - { - // wenn es eine Datenquelle gibt, dann als aktive ::com::sun::star::form setzen - ::rtl::OUString aSource = ::comphelper::getString(xFormSet->getPropertyValue(FM_PROP_COMMAND)); - if (aSource.getLength()) - { - // benachrichtigung der Shell - FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); - if (pShImpl) - pShImpl->setActiveController(xController); - break; - } - } - } + FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); + if ( pShImpl ) + pShImpl->setActiveController( xController ); + break; } } } @@ -776,7 +754,6 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------------ void FmXFormView::Activate(sal_Bool bSync) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Activate" ); if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); @@ -794,7 +771,6 @@ void FmXFormView::Activate(sal_Bool bSync) //------------------------------------------------------------------------------ void FmXFormView::Deactivate(BOOL bDeactivateController) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Deactivate" ); if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); @@ -809,13 +785,11 @@ void FmXFormView::Deactivate(BOOL bDeactivateController) //------------------------------------------------------------------------------ FmFormShell* FmXFormView::GetFormShell() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::GetFormShell" ); return m_pView ? m_pView->GetFormShell() : NULL; } // ----------------------------------------------------------------------------- void FmXFormView::AutoFocus( sal_Bool _bSync ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::AutoFocus" ); if (m_nAutoFocusEvent) Application::RemoveUserEvent(m_nAutoFocusEvent); @@ -928,18 +902,20 @@ namespace // ----------------------------------------------------------------------------- Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::getFormController" ); Reference< XFormController > xController; - for ( FmWinRecList::const_iterator rec = m_aWinList.begin(); rec != m_aWinList.end(); ++rec ) + for ( PageWindowAdapterList::const_iterator pos = m_aPageWindowAdapters.begin(); + pos != m_aPageWindowAdapters.end(); + ++pos + ) { - const FmXPageViewWinRec* pViewWinRec( *rec ); - OSL_ENSURE( pViewWinRec, "FmXFormView::getFormController: invalid PageViewWinRec!" ); - if ( !pViewWinRec || ( pViewWinRec->getWindow() != &_rDevice ) ) + const PFormViewPageWindowAdapter pAdapter( *pos ); + ENSURE_OR_CONTINUE( pAdapter.get(), "FmXFormView::getFormController: invalid page window adapter!" ); + if ( pAdapter->getWindow() != &_rDevice ) // wrong device continue; - xController = pViewWinRec->getController( _rxForm ); + xController = pAdapter->getController( _rxForm ); if ( xController.is() ) break; } @@ -961,12 +937,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL; Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() ); - const FmXPageViewWinRec* pViewWinRec = m_aWinList.size() ? m_aWinList[0] : NULL; - const Window* pWindow = pViewWinRec ? pViewWinRec->getWindow() : NULL; + const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; + const Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; - OSL_ENSURE( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" ); - if ( !xForms.is() || !pWindow ) - return 0L; + ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L ); try { @@ -974,7 +948,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) if ( !xForms->getCount() ) break; Reference< XForm > xForm( xForms->getByIndex( 0 ), UNO_QUERY_THROW ); - Reference< XTabController > xTabController( pViewWinRec->getController( xForm ), UNO_QUERY_THROW ); + Reference< XTabController > xTabController( pAdapter->getController( xForm ), UNO_QUERY_THROW ); // go for the first control of the controller Sequence< Reference< XControl > > aControls( xTabController->getControls() ); @@ -1025,7 +999,6 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) // ----------------------------------------------------------------------------- void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" ); FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL; FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : NULL; OSL_ENSURE( pShellImpl, "FmXFormView::onCreatedFormObject: no form shell!" ); @@ -1156,7 +1129,6 @@ namespace // ----------------------------------------------------------------------------- SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateFieldControl" ); // not if we're in design mode if ( !m_pView->IsDesignMode() ) return NULL; @@ -1388,7 +1360,6 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // ----------------------------------------------------------------------------- SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateXFormsControl" ); // not if we're in design mode if ( !m_pView->IsDesignMode() ) return NULL; @@ -1524,7 +1495,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" ); if ( !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, NULL, NULL, NULL, _rpLabel, _rpControl ) @@ -1552,7 +1522,6 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" ); sal_Int32 nDataType = 0; ::rtl::OUString sFieldName; Any aFieldName; @@ -1718,7 +1687,6 @@ void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const S //------------------------------------------------------------------------------ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::ObjectRemovedInAliveMode" ); // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht, // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen) @@ -1741,7 +1709,6 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) //------------------------------------------------------------------------------ void FmXFormView::stopMarkListWatching() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::stopMarkListWatching" ); if ( m_pWatchStoredList ) { m_pWatchStoredList->EndListeningAll(); @@ -1753,7 +1720,6 @@ void FmXFormView::stopMarkListWatching() //------------------------------------------------------------------------------ void FmXFormView::startMarkListWatching() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::startMarkListWatching" ); if ( !m_pWatchStoredList ) { m_pWatchStoredList = new ObjectRemoveListener( this ); @@ -1770,7 +1736,6 @@ void FmXFormView::startMarkListWatching() //------------------------------------------------------------------------------ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::saveMarkList" ); if ( m_pView ) { m_aMark = m_pView->GetMarkedObjectList(); @@ -1829,7 +1794,6 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj ) //------------------------------------------------------------------------------ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::restoreMarkList" ); if ( !m_pView ) return; @@ -1917,7 +1881,6 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) // ----------------------------------------------------------------------------- void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusGained" ); if ( m_xWindow.is() && m_pView ) { m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() ); @@ -1926,7 +1889,6 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime // ----------------------------------------------------------------------------- void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusLost" ); // when switch the focus outside the office the mark didn't change // so we can not remove us as focus listener if ( m_xWindow.is() && m_pView ) @@ -1937,7 +1899,6 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx // ----------------------------------------------------------------------------- void FmXFormView::removeGridWindowListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeGridWindowListening" ); if ( m_xWindow.is() ) { m_xWindow->removeFocusListener(this); @@ -1952,7 +1913,6 @@ void FmXFormView::removeGridWindowListening() // ----------------------------------------------------------------------------- DocumentType FmXFormView::impl_getDocumentType() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::impl_getDocumentType" ); if ( GetFormShell() && GetFormShell()->GetImpl() ) return GetFormShell()->GetImpl()->getDocumentType(); return eUnknownDocumentType; diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index d9c3d88b2f..f5a419597f 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -32,7 +32,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" #include "svx/svdouno.hxx" diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index dd638cad27..ad956e76ba 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +36,7 @@ #include "formcontrolling.hxx" #include "fmprop.hrc" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" @@ -63,6 +62,7 @@ #include <com/sun/star/sdb/RowChangeAction.hpp> #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/form/runtime/FormOperations.hpp> #include <com/sun/star/form/runtime/FormFeature.hpp> @@ -81,6 +81,7 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/scopeguard.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/controls/unocontrol.hxx> @@ -209,6 +210,7 @@ namespace svxform namespace FocusChangeReason = ::com::sun::star::awt::FocusChangeReason; namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction; namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; + namespace DataType = ::com::sun::star::sdbc::DataType; //============================================================================== // ColumnInfo @@ -584,6 +586,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB ,m_bAttachEvents(sal_True) ,m_bDetachEvents(sal_True) ,m_bAttemptedHandlerCreation( false ) + ,m_bSuspendFilterTextListening( false ) { DBG_CTOR( FormController, NULL ); @@ -783,6 +786,9 @@ namespace // ----------------------------------------------------------------------------- void FormController::impl_setTextOnAllFilter_throw() { + m_bSuspendFilterTextListening = true; + ::comphelper::FlagGuard aResetFlag( m_bSuspendFilterTextListening ); + // reset the text for all controls ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), ResetComponentText() ); @@ -856,32 +862,38 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( rRow.empty() ) continue; - if ( aFilter.getLength() ) - aFilter.appendAscii( " OR " ); - - aFilter.appendAscii( "( " ); + ::rtl::OUStringBuffer aRowFilter; for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition ) { // get the field of the controls map Reference< XControl > xControl( condition->first, UNO_QUERY_THROW ); Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW ); Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW ); - if ( condition != rRow.begin() ) - aFilter.appendAscii( " AND " ); ::rtl::OUString sFilterValue( condition->second ); ::rtl::OUString sErrorMsg, sCriteria; - ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); + const ::rtl::Reference< ISQLParseNode > xParseNode = + predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" ); if ( xParseNode.is() ) { // don't use a parse context here, we need it unlocalized xParseNode->parseNodeToStr( sCriteria, xConnection, NULL ); - aFilter.append( sCriteria ); + if ( condition != rRow.begin() ) + aRowFilter.appendAscii( " AND " ); + aRowFilter.append( sCriteria ); } } - aFilter.appendAscii( " )" ); + if ( aRowFilter.getLength() > 0 ) + { + if ( aFilter.getLength() ) + aFilter.appendAscii( " OR " ); + + aFilter.appendAscii( "( " ); + aFilter.append( aRowFilter.makeStringAndClear() ); + aFilter.appendAscii( " )" ); + } } } catch( const Exception& ) @@ -1495,50 +1507,54 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - if (m_bFiltering) + if ( !m_bFiltering ) { - Reference< XTextComponent > xText(e.Source,UNO_QUERY); - ::rtl::OUString aText = xText->getText(); - - if ( m_aFilterRows.empty() ) - appendEmptyDisjunctiveTerm(); + impl_onModify(); + return; + } - // Suchen der aktuellen Row - if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) - { - OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); - return; - } + if ( m_bSuspendFilterTextListening ) + return; - FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ]; + Reference< XTextComponent > xText(e.Source,UNO_QUERY); + ::rtl::OUString aText = xText->getText(); - // do we have a new filter - if (aText.getLength()) - rRow[xText] = aText; - else - { - // do we have the control in the row - FmFilterRow::iterator iter = rRow.find(xText); - // erase the entry out of the row - if (iter != rRow.end()) - rRow.erase(iter); - } + if ( m_aFilterRows.empty() ) + appendEmptyDisjunctiveTerm(); - // multiplex the event to our FilterControllerListeners - FilterEvent aEvent; - aEvent.Source = *this; - aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin(); - aEvent.DisjunctiveTerm = getActiveTerm(); - aEvent.PredicateExpression = aText; + // Suchen der aktuellen Row + if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) + { + OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); + return; + } - aGuard.clear(); - // <-- SYNCHRONIZED + FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ]; - // notify the changed filter expression - m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent ); - } + // do we have a new filter + if (aText.getLength()) + rRow[xText] = aText; else - impl_onModify(); + { + // do we have the control in the row + FmFilterRow::iterator iter = rRow.find(xText); + // erase the entry out of the row + if (iter != rRow.end()) + rRow.erase(iter); + } + + // multiplex the event to our FilterControllerListeners + FilterEvent aEvent; + aEvent.Source = *this; + aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin(); + aEvent.DisjunctiveTerm = getActiveTerm(); + aEvent.PredicateExpression = aText; + + aGuard.clear(); + // <-- SYNCHRONIZED + + // notify the changed filter expression + m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent ); } // XItemListener @@ -4316,5 +4332,3 @@ void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) thr } } // namespace svxform - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index f92b762b84..5b9312a674 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -25,12 +25,13 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> #include "globlmn.hrc" #include "helpid.hrc" +#include "fmhelp.hrc" Menu RID_FM_TEXTATTRIBUTE_MENU { @@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_STYLE; - HelpID = MENU_FM_TEXTATTRIBITES_STYLE; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE; Text [ en-US ] = "St~yle"; SubMenu = Menu { @@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT; - HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT; Text [ en-US ] = "~Alignment"; RadioCheck = TRUE; SubMenu = Menu @@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_SPACING; - HelpID = MENU_FM_TEXTATTRIBITES_SPACING; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING; Text [ en-US ] = "~Line Spacing"; _MenuItemFlags = MIB_RADIOCHECK; SubMenu = Menu diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk index 44bcd53d23..b3603636e7 100644 --- a/svx/source/form/makefile.mk +++ b/svx/source/form/makefile.mk @@ -44,58 +44,54 @@ ENABLE_EXCEPTIONS=TRUE CDEFS+=-DENABLE_VBA .ENDIF -.IF "$(ENABLE_VBA)"=="YES" - CDEFS+=-DENABLE_VBA -.ENDIF - SRS1NAME=form SRC1FILES= \ - fmexpl.src \ - filtnav.src \ - fmstring.src \ - formshell.src \ - datanavi.src + fmexpl.src \ + filtnav.src \ + fmstring.src \ + formshell.src \ + datanavi.src LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/formtoolbars.obj \ - $(SLO)$/fmdocumentclassification.obj \ - $(SLO)$/fmcontrolbordermanager.obj \ - $(SLO)$/fmcontrollayout.obj \ - $(SLO)$/fmtextcontroldialogs.obj \ - $(SLO)$/fmtextcontrolfeature.obj \ - $(SLO)$/fmtextcontrolshell.obj \ - $(SLO)$/ParseContext.obj \ - $(SLO)$/typeconversionclient.obj \ - $(SLO)$/dbtoolsclient.obj \ - $(SLO)$/sqlparserclient.obj \ - $(SLO)$/dataaccessdescriptor.obj \ - $(SLO)$/fmpage.obj \ - $(SLO)$/fmundo.obj \ - $(SLO)$/fmmodel.obj \ - $(SLO)$/navigatortree.obj \ - $(SLO)$/navigatortreemodel.obj \ - $(SLO)$/fmexpl.obj \ - $(SLO)$/formcontroller.obj \ - $(SLO)$/fmpgeimp.obj \ - $(SLO)$/fmvwimp.obj \ - $(SLO)$/fmdpage.obj \ - $(SLO)$/fmitems.obj \ - $(SLO)$/fmobj.obj \ - $(SLO)$/fmdmod.obj \ - $(SLO)$/fmservs.obj \ - $(SLO)$/typemap.obj \ - $(SLO)$/fmexch.obj \ - $(SLO)$/fmtools.obj \ - $(SLO)$/fmshimp.obj \ - $(SLO)$/fmshell.obj \ - $(SLO)$/fmview.obj \ - $(SLO)$/sdbdatacolumn.obj \ - $(SLO)$/formcontrolling.obj \ - $(SLO)$/formfeaturedispatcher.obj \ - $(SLO)$/formdispatchinterceptor.obj \ - $(SLO)$/datanavi.obj \ - $(SLO)$/xfm_addcondition.obj \ + $(SLO)$/formtoolbars.obj \ + $(SLO)$/fmdocumentclassification.obj \ + $(SLO)$/fmcontrolbordermanager.obj \ + $(SLO)$/fmcontrollayout.obj \ + $(SLO)$/fmtextcontroldialogs.obj \ + $(SLO)$/fmtextcontrolfeature.obj \ + $(SLO)$/fmtextcontrolshell.obj \ + $(SLO)$/ParseContext.obj \ + $(SLO)$/typeconversionclient.obj \ + $(SLO)$/dbtoolsclient.obj \ + $(SLO)$/sqlparserclient.obj \ + $(SLO)$/dataaccessdescriptor.obj \ + $(SLO)$/fmpage.obj \ + $(SLO)$/fmundo.obj \ + $(SLO)$/fmmodel.obj \ + $(SLO)$/navigatortree.obj \ + $(SLO)$/navigatortreemodel.obj \ + $(SLO)$/fmexpl.obj \ + $(SLO)$/formcontroller.obj \ + $(SLO)$/fmpgeimp.obj \ + $(SLO)$/fmvwimp.obj \ + $(SLO)$/fmdpage.obj \ + $(SLO)$/fmitems.obj \ + $(SLO)$/fmobj.obj \ + $(SLO)$/fmdmod.obj \ + $(SLO)$/fmservs.obj \ + $(SLO)$/typemap.obj \ + $(SLO)$/fmexch.obj \ + $(SLO)$/fmtools.obj \ + $(SLO)$/fmshimp.obj \ + $(SLO)$/fmshell.obj \ + $(SLO)$/fmview.obj \ + $(SLO)$/sdbdatacolumn.obj \ + $(SLO)$/formcontrolling.obj \ + $(SLO)$/formfeaturedispatcher.obj \ + $(SLO)$/formdispatchinterceptor.obj \ + $(SLO)$/datanavi.obj \ + $(SLO)$/xfm_addcondition.obj \ $(SLO)$/datalistener.obj \ $(SLO)$/fmscriptingenv.obj \ $(SLO)$/stringlistresource.obj \ @@ -105,14 +101,14 @@ LIB1OBJFILES= \ LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/dbcharsethelper.obj \ - $(SLO)$/fmPropBrw.obj \ - $(SLO)$/tbxform.obj \ - $(SLO)$/fmobjfac.obj \ - $(SLO)$/fmsrccfg.obj \ - $(SLO)$/tabwin.obj \ - $(SLO)$/filtnav.obj \ - $(SLO)$/fmsrcimp.obj \ + $(SLO)$/dbcharsethelper.obj \ + $(SLO)$/fmPropBrw.obj \ + $(SLO)$/tbxform.obj \ + $(SLO)$/fmobjfac.obj \ + $(SLO)$/fmsrccfg.obj \ + $(SLO)$/tabwin.obj \ + $(SLO)$/filtnav.obj \ + $(SLO)$/fmsrcimp.obj \ $(SLO)$/databaselocationinput.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b9d486eabd..59a3dc9c82 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -33,12 +33,12 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmundo.hxx" @@ -58,7 +58,7 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index cb9024d974..792a968d4c 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -33,7 +33,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/fmglob.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> @@ -43,7 +43,7 @@ #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmobj.hxx" #include <sfx2/objsh.hxx> diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index ba8ebe4aac..f50e67d9ca 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "sqlparserclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" //........................................................................ namespace svxform diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 4748609b5e..8661280935 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -55,7 +55,7 @@ #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> #include <tools/shl.hxx> #include <svx/svdpagv.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index d533d9c052..c664be6330 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -44,10 +44,10 @@ #include <vcl/sound.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxctl.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" #include "tbxform.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmitems.hxx" #include "fmhelp.hrc" #include <sfx2/viewfrm.hxx> diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index dfb5a1b79f..ee6002ac34 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -38,7 +38,7 @@ #include <editeng/cntritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> -#include "clipfmtitem.hxx" +#include "svx/clipfmtitem.hxx" #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" #include <editeng/charreliefitem.hxx> diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 4797e4ecbb..421f1dba31 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -39,7 +39,7 @@ #include "svx/gallery1.hxx" #include "galbrws1.hxx" #include "galbrws2.hxx" -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ------------------- // - GallerySplitter - diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 1b29274dd0..265b85b0bb 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -36,7 +36,7 @@ #include <sfx2/app.hxx> #include "helpid.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include "galbrws1.hxx" #include <com/sun/star/util/DateTime.hpp> diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index fba8a8323d..7f4862cda7 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -31,7 +31,7 @@ #include <vcl/menu.hxx> #include <svl/lstner.hxx> #include <vector> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ----------------- // - GalleryButton - diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 3c3460d211..0ae9f47fae 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -45,11 +45,11 @@ #include "svtools/filter.hxx" #include <editeng/brshitem.hxx> #include "helpid.hrc" -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galctrl.hxx" +#include "svx/galtheme.hxx" +#include "svx/galctrl.hxx" #include "svx/galmisc.hxx" #include "galbrws2.hxx" #include "gallery.hrc" diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index d249ba8736..7dcc9705ea 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -35,9 +35,9 @@ #include <avmedia/mediaplayer.hxx> #include "helpid.hrc" #include "galbrws2.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" -#include "galctrl.hxx" +#include "svx/galctrl.hxx" #include "editeng/AccessibleStringWrap.hxx" #include <editeng/svxfont.hxx> #include "galobj.hxx" diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index e2050d36b8..6c5eb97ac8 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -32,9 +32,9 @@ #include <unotools/pathoptions.hxx> #include <sfx2/viewfrm.hxx> #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galbrws.hxx" -#include "gallery.hxx" +#include "svx/galtheme.hxx" +#include "svx/galbrws.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" // ----------- diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 6ac9839b0f..bb440ec46b 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -35,7 +35,7 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER { - HelpId = SID_GALLERY; + HelpId = "SVX_HID_GALLERY_BROWSER" ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -71,8 +71,6 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER }; }; -/******************************************************************************/ - String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS { Text [ en-US ] = "Update"; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index d03b67b485..155ccb5dfd 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -36,10 +36,10 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfile.hxx> -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "gallery.hrc" #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index d431707fd3..6239691a40 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -52,7 +52,7 @@ #include "codec.hxx" #include "gallery.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 944020828e..a2f6b01cb7 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -53,7 +53,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -1594,7 +1594,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) return rTheme.ReadData( rIn ); } -void GalleryTheme::ImplSetModified( BOOL bModified ) +void GalleryTheme::ImplSetModified( BOOL bModified ) { pThm->SetModified( bModified ); } const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk index 7f1a3bb7a7..6acf537950 100644 --- a/svx/source/gallery2/makefile.mk +++ b/svx/source/gallery2/makefile.mk @@ -38,8 +38,8 @@ TARGET=gal SRS1NAME=$(TARGET) SRC1FILES = \ - gallery.src \ - galtheme.src + gallery.src \ + galtheme.src SLOFILES = \ $(EXCEPTIONSFILES) \ diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 49f887da7e..d6fcfada66 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -68,7 +68,7 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <galtheme.hxx> +#include <svx/galtheme.hxx> #include <svx/gallery1.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk index eefe8679a1..d9bd941617 100644 --- a/svx/source/gengal/makefile.mk +++ b/svx/source/gengal/makefile.mk @@ -54,15 +54,15 @@ APP1TARGET= $(TARGET).bin APP1OBJS= $(OBJFILES) APP1STDLIBS=$(TOOLSLIB) \ - $(SO2LIB) \ - $(SVLLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VCLLIB) \ - $(UCBHELPERLIB) \ - $(SVXCORELIB) + $(SO2LIB) \ + $(SVLLIB) \ + $(COMPHELPERLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(VCLLIB) \ + $(UCBHELPERLIB) \ + $(SVXCORELIB) #.IF "$(COM)"=="GCC" #ADDOPTFILES=$(OBJ)$/gengal.obj @@ -74,12 +74,12 @@ APP1STDLIBS=$(TOOLSLIB) \ .INCLUDE : target.mk ALLTAR : \ - $(SCRIPTFILES)\ - $(BIN)/gengalrc + $(SCRIPTFILES)\ + $(BIN)/gengalrc $(SCRIPTFILES) : $$(@:f:+".sh") - @tr -d "\015" < $(@:f:+".sh") > $@ + @tr -d "\015" < $(@:f:+".sh") > $@ $(BIN)/%: %.in - cp $< $@ + cp $< $@ diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 66c70cbb4e..214752a19c 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx new file mode 100644 index 0000000000..fad4aaa3bf --- /dev/null +++ b/svx/source/inc/fmgroup.hxx @@ -0,0 +1,120 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 _SVX_FMGROUP_HXX +#define _SVX_FMGROUP_HXX + +#ifndef _SVX_FMCPONT_HXX +#include "fmcpont.hxx" +#endif + +#ifndef __DBFORM_HXX +#include <dbform.hxx> +#endif + +DECLARE_LIST( FmCtrlModelList, XInterface* ); + +struct FmXGroupModel_Impl; + +//================================================================== +// FmXGroupModel +//================================================================== +class FmXGroupModel : public XBoundControl, + public XLoadListener, + public XPropertyChangeListener, + public XGroup, + public FmXControlModel +{ + FmFormControlMap aControlMap; + + friend Reflection* FmXGroupModel_getReflection(); + FmXGroupModel_Impl* pGroupModelData; // Properties + +public: + FmXGroupModel(); + virtual ~FmXGroupModel(); + + // UNO Anbindung + SMART_UNO_DECLARATION( FmXGroupModel, FmXControlModel ); + virtual XInterface* queryInterface(UsrUik); + virtual XIdlClassRef getIdlClass(); + + // XGroup + virtual INT32 getFormControlCount(); + virtual XFormControlRef getFormControlByName( const XubString& sName ) const; + virtual XFormControlRef getFormControlByIndex( INT32 Index ) const; + virtual void appendFormControl( const XFormControlRef& FormControl ); + virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl ); + + // XFormControl + virtual void setParent( const XFormRef& Parent ); + + // XEventListener + virtual void disposing( const EventObject& Source ); + + // XPropertiesChangeListener + virtual void propertyChange( const PropertyChangeEvent& evt ); + + // XLoadListener + virtual void loaded( const EventObject& rEvent ); + virtual void unloaded( const EventObject& rEvent ); + + // XBoundControl + virtual void addBoundControlListener( const XBoundControlListenerRef& l ); + virtual void removeBoundControlListener( const XBoundControlListenerRef& l ); + + // XPersistObject + virtual XubString getServiceName( void ) const; + virtual void write( const XObjectOutputStreamRef& OutStream ); + virtual void read( const XObjectInputStreamRef& InStream ); + + // PropertySetInterface + virtual FmXPropertySetInfo* createPropertySetInfo() const; + virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName, + const UsrAny& aValue, + PropertyChangeEventSequence* pSeq, + INT32 nIndex ); + virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const; + virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); + virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); +}; + +//================================================================== +// FmXGroupModelInfo +// Properties: +//================================================================== +class FmXGroupModelInfo : public FmXControlModelInfo +{ + friend class FmXGroupModel; + +protected: + FmXGroupModelInfo( const FmXGroupModel* pCp ); + virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const; +}; + + +#endif // _SVX_FMGROUP_HXX + diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index c08554409f..ea5d594795 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -64,7 +64,7 @@ #include <svl/svstdarr.hxx> #include <sfx2/mnuitem.hxx> #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <cppuhelper/component.hxx> diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 33f82ceb6b..b2813ed043 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -52,6 +52,7 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/componentcontext.hxx> +#include <rtl/ref.hxx> //class SdrPageViewWinRec; class SdrPageWindow; @@ -80,13 +81,13 @@ namespace svx { } //================================================================== -// FmXPageViewWinRec +// FormViewPageWindowAdapter //================================================================== typedef ::cppu::WeakImplHelper2 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::form::runtime::XFormControllerContext - > FmXPageViewWinRec_Base; + > FormViewPageWindowAdapter_Base; -class FmXPageViewWinRec : public FmXPageViewWinRec_Base +class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base { friend class FmXFormView; @@ -97,10 +98,10 @@ class FmXPageViewWinRec : public FmXPageViewWinRec_Base Window* m_pWindow; protected: - ~FmXPageViewWinRec(); + ~FormViewPageWindowAdapter(); public: - FmXPageViewWinRec( const ::comphelper::ComponentContext& _rContext, + FormViewPageWindowAdapter( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow&, FmXFormView* pView); //const SdrPageViewWinRec*, FmXFormView* pView); @@ -131,7 +132,8 @@ protected: Window* getWindow() const {return m_pWindow;} }; -typedef ::std::vector<FmXPageViewWinRec*> FmWinRecList; +typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; +typedef ::std::vector< PFormViewPageWindowAdapter > PageWindowAdapterList; typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > , ::comphelper::OInterfaceCompare< ::com::sun::star::form::XForm > > SetOfForms; @@ -151,7 +153,7 @@ class FmXFormView : public ::cppu::WeakImplHelper3< friend class FmFormView; friend class FmFormShell; friend class FmXFormShell; - friend class FmXPageViewWinRec; + friend class FormViewPageWindowAdapter; class ObjectRemoveListener; friend class ObjectRemoveListener; @@ -169,7 +171,8 @@ class FmXFormView : public ::cppu::WeakImplHelper3< ::com::sun::star::sdb::SQLErrorEvent m_aAsyncError; // error event which is to be displayed asyn. See m_nErrorMessageEvent. - FmWinRecList m_aWinList; // to be filled in alive mode only + PageWindowAdapterList + m_aPageWindowAdapters; // to be filled in alive mode only MapControlContainerToSetOfForms m_aNeedTabOrderUpdate; @@ -216,8 +219,7 @@ public: virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); FmFormView* getView() const {return m_pView;} - FmWinRecList::const_iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const; - const FmWinRecList& getWindowList() const {return m_aWinList;} + PFormViewPageWindowAdapter findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const; ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; @@ -247,7 +249,6 @@ public: ); private: - FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); //void addWindow(const SdrPageViewWinRec*); void addWindow(const SdrPageWindow&); void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 8d364a9890..8a4a7f518d 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -215,7 +215,8 @@ namespace svxform sal_Bool m_bFiltering : 1; sal_Bool m_bAttachEvents : 1; sal_Bool m_bDetachEvents : 1; - sal_Bool m_bAttemptedHandlerCreation : 1; + bool m_bAttemptedHandlerCreation : 1; + bool m_bSuspendFilterTextListening; // no bit field, passed around as reference // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 946f11d6aa..41027e998d 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -30,7 +30,7 @@ #define SVX_SQLPARSERCLIENT_HXX #include "svx/dbtoolsclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> //........................................................................ diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index be0ec5d20c..7b62c84e0e 100644 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src @@ -58,6 +58,7 @@ String RID_BUILDVERSION ModalDialog RID_DEFAULTABOUT { + HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 245 , 260 ) ; Moveable = TRUE ; @@ -78,6 +79,7 @@ ModalDialog RID_DEFAULTABOUT }; MultiLineEdit ABOUT_FTXT_COPYRIGHT { + HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 25 ) ; Size = MAP_APPFONT ( 168 , 51 ) ; diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk index 4d0686baac..22cb3fd8dc 100644 --- a/svx/source/intro/makefile.mk +++ b/svx/source/intro/makefile.mk @@ -42,12 +42,12 @@ LOCALIZE_ME=intro_tmpl.hrc SRS1NAME= iso SRC1FILES= \ - $(SRS1NAME).src + $(SRS1NAME).src RESLIB1NAME=$(SRS1NAME) RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= \ - $(SRS)$/$(SRS1NAME).srs + $(SRS)$/$(SRS1NAME).srs # Version "OpenOffice.org" SRS2NAME= ooo diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index 07f3daab9f..c8798511bb 100644 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src @@ -1,4 +1,4 @@ -/************************************************************************* +/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -64,6 +64,7 @@ String RID_BUILDVERSION ModalDialog RID_DEFAULTABOUT { + HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 245 , 280 ) ; Moveable = TRUE ; @@ -86,7 +87,8 @@ ModalDialog RID_DEFAULTABOUT }; MultiLineEdit ABOUT_FTXT_COPYRIGHT { - Border = FALSE ; + HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; + Border = TRUE ; Pos = MAP_APPFONT ( 54 , 25 ) ; Size = MAP_APPFONT ( 168 , 71 ) ; IgnoreTab = TRUE ; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 951ecb4e1c..1103ef63a0 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -43,7 +43,7 @@ #include <float.h> #include <rtl/math.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 0868a34f35..42a4d10792 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -33,7 +33,7 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipfmtitem.hxx> #include <com/sun/star/frame/status/ClipboardFormats.hpp> struct SvxClipboardFmtItem_Impl diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index e366934035..b498fcc1ce 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -61,7 +61,7 @@ size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustom return (size_t)r1.first.hashCode() + r1.second.hashCode(); }; -TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem(0)); +TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem); SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) {} diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 05269deeea..1d0e219379 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -34,7 +34,7 @@ #include <svx/svxids.hrc> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/xtable.hxx> using namespace ::com::sun::star; diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 414c0fd7ba..f046145859 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -37,7 +37,7 @@ #include <svl/memberid.hrc> #include <basic/sbxvar.hxx> -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" // ----------------------------------------------------------------------- diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 1c021c0b8b..1c28b8b699 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ofaitem.hxx" +#include "svx/ofaitem.hxx" OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr ) : SfxPoolItem( _nWhich ), pPtr( _pPtr ) diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 8f8516204a..21b27d7fb3 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #define _SVX_POSTATTR_CXX -#include "postattr.hxx" +#include "svx/postattr.hxx" #include <editeng/itemtype.hxx> #include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 4e54a19d57..d7e86f807b 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/table/CellOrientation.hpp> #include <com/sun/star/table/CellAddress.hpp> -#include "rotmodit.hxx" +#include "svx/rotmodit.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index e02c30a767..37b02b906d 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index a55291de29..f8475ea17a 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -26,7 +26,7 @@ ************************************************************************/ // include --------------------------------------------------------------- #define __RSC -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialogs.hrc> #include <editeng/editerr.hxx> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 97ee979548..e766e8d4be 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -37,8 +37,8 @@ #include <sot/exchange.hxx> #include <svl/eitem.hxx> #include <vcl/toolbox.hxx> -#include <clipboardctl.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipboardctl.hxx> +#include <svx/clipfmtitem.hxx> #include <svtools/insdlg.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 5f3a75779c..d76533f607 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -44,7 +44,7 @@ #include "editeng/fontitem.hxx" #include "editeng/flstitem.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #define LOGIC OutputDevice::LogicToLogic diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk index 9c208d9a78..268ab50ee5 100644 --- a/svx/source/mnuctrls/makefile.mk +++ b/svx/source/mnuctrls/makefile.mk @@ -44,21 +44,21 @@ TARGET=mnuctrls SRS1NAME=$(TARGET) SRC1FILES = \ - mnuctrls.src + mnuctrls.src SLOFILES= \ - $(SLO)$/clipboardctl.obj \ - $(SLO)$/fntctl.obj \ - $(SLO)$/fntszctl.obj \ - $(SLO)$/SmartTagCtl.obj + $(SLO)$/clipboardctl.obj \ + $(SLO)$/fntctl.obj \ + $(SLO)$/fntszctl.obj \ + $(SLO)$/SmartTagCtl.obj HXX1TARGET=mnuctrls HXX1EXT= hxx HXX1EXCL= -E:*include* HXX1DEPN=\ - $(INC)$/clipboardctl.hxx \ - $(INC)$/fntctl.hxx \ - $(INC)$/fntszctl.hxx \ + $(INC)$/svx/clipboardctl.hxx \ + $(INC)$/fntctl.hxx \ + $(INC)$/fntszctl.hxx \ $(INC)$/SmartTagCtl.hxx EXCEPTIONSFILES= \ diff --git a/svx/source/sdr/animation/makefile.mk b/svx/source/sdr/animation/makefile.mk index a6750647f5..28b52c6c69 100644 --- a/svx/source/sdr/animation/makefile.mk +++ b/svx/source/sdr/animation/makefile.mk @@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/animationstate.obj \ - $(SLO)$/objectanimator.obj \ - $(SLO)$/scheduler.obj + $(SLO)$/animationstate.obj \ + $(SLO)$/objectanimator.obj \ + $(SLO)$/scheduler.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk index 177654ff1e..45549ae416 100644 --- a/svx/source/sdr/attribute/makefile.mk +++ b/svx/source/sdr/attribute/makefile.mk @@ -43,8 +43,8 @@ SLOFILES=\ $(SLO)$/sdrlinefillshadowtextattribute.obj \ $(SLO)$/sdrlineshadowtextattribute.obj \ $(SLO)$/sdrshadowtextattribute.obj \ - $(SLO)$/sdrtextattribute.obj \ - $(SLO)$/sdrformtextattribute.obj \ - $(SLO)$/sdrformtextoutlineattribute.obj + $(SLO)$/sdrtextattribute.obj \ + $(SLO)$/sdrformtextattribute.obj \ + $(SLO)$/sdrformtextoutlineattribute.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index f0f79f28cd..83f369f5c8 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -101,6 +101,26 @@ namespace drawinglayer { } + SdrFormTextOutlineAttribute& SdrFormTextOutlineAttribute::operator=(const SdrFormTextOutlineAttribute& rCandidate) + { + if(rCandidate.mpSdrFormTextOutlineAttribute != mpSdrFormTextOutlineAttribute) + { + if(mpSdrFormTextOutlineAttribute->mnRefCount) + { + mpSdrFormTextOutlineAttribute->mnRefCount--; + } + else + { + delete mpSdrFormTextOutlineAttribute; + } + + mpSdrFormTextOutlineAttribute = rCandidate.mpSdrFormTextOutlineAttribute; + mpSdrFormTextOutlineAttribute->mnRefCount++; + } + + return *this; + } + SdrFormTextOutlineAttribute::SdrFormTextOutlineAttribute() : mpSdrFormTextOutlineAttribute(ImpSdrFormTextOutlineAttribute::get_global_default()) { @@ -130,26 +150,6 @@ namespace drawinglayer return mpSdrFormTextOutlineAttribute == ImpSdrFormTextOutlineAttribute::get_global_default(); } - SdrFormTextOutlineAttribute& SdrFormTextOutlineAttribute::operator=(const SdrFormTextOutlineAttribute& rCandidate) - { - if(rCandidate.mpSdrFormTextOutlineAttribute != mpSdrFormTextOutlineAttribute) - { - if(mpSdrFormTextOutlineAttribute->mnRefCount) - { - mpSdrFormTextOutlineAttribute->mnRefCount--; - } - else - { - delete mpSdrFormTextOutlineAttribute; - } - - mpSdrFormTextOutlineAttribute = rCandidate.mpSdrFormTextOutlineAttribute; - mpSdrFormTextOutlineAttribute->mnRefCount++; - } - - return *this; - } - bool SdrFormTextOutlineAttribute::operator==(const SdrFormTextOutlineAttribute& rCandidate) const { if(rCandidate.mpSdrFormTextOutlineAttribute == mpSdrFormTextOutlineAttribute) @@ -164,7 +164,7 @@ namespace drawinglayer return (*rCandidate.mpSdrFormTextOutlineAttribute == *mpSdrFormTextOutlineAttribute); } - + const LineAttribute& SdrFormTextOutlineAttribute::getLineAttribute() const { return mpSdrFormTextOutlineAttribute->getLineAttribute(); diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk index 9e4356c4aa..a8a0513f4d 100644 --- a/svx/source/sdr/contact/makefile.mk +++ b/svx/source/sdr/contact/makefile.mk @@ -40,53 +40,53 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- EXCEPTIONSFILES=\ - $(SLO)$/viewobjectcontactofunocontrol.obj + $(SLO)$/viewobjectcontactofunocontrol.obj SLOFILES=\ $(EXCEPTIONSFILES) \ - $(SLO)$/displayinfo.obj \ - $(SLO)$/viewcontact.obj \ - $(SLO)$/viewcontactofe3d.obj \ - $(SLO)$/viewcontactofsdrobj.obj \ - $(SLO)$/viewcontactofvirtobj.obj \ - $(SLO)$/viewcontactoftextobj.obj \ - $(SLO)$/viewcontactofsdrrectobj.obj \ - $(SLO)$/viewcontactofsdrpathobj.obj \ - $(SLO)$/viewcontactofsdrole2obj.obj \ - $(SLO)$/viewcontactofsdrcircobj.obj \ - $(SLO)$/viewcontactofsdrcaptionobj.obj \ - $(SLO)$/viewcontactofsdrmeasureobj.obj \ - $(SLO)$/viewcontactofsdredgeobj.obj \ - $(SLO)$/viewcontactofsdrpage.obj \ - $(SLO)$/viewcontactofmasterpagedescriptor.obj \ - $(SLO)$/viewcontactofgroup.obj \ - $(SLO)$/viewcontactofe3dscene.obj \ - $(SLO)$/viewcontactofe3dcube.obj \ - $(SLO)$/viewcontactofe3dextrude.obj \ - $(SLO)$/viewcontactofe3dlathe.obj \ - $(SLO)$/viewcontactofe3dsphere.obj \ - $(SLO)$/viewcontactofe3dpolygon.obj \ - $(SLO)$/viewcontactofpageobj.obj \ - $(SLO)$/viewcontactofgraphic.obj \ - $(SLO)$/viewcontactofsdrobjcustomshape.obj \ - $(SLO)$/viewcontactofsdrmediaobj.obj \ - $(SLO)$/viewcontactofunocontrol.obj \ - $(SLO)$/objectcontact.obj \ - $(SLO)$/objectcontacttools.obj \ - $(SLO)$/objectcontactofobjlistpainter.obj \ - $(SLO)$/objectcontactofpageview.obj \ - $(SLO)$/viewobjectcontact.obj \ - $(SLO)$/viewobjectcontactofe3d.obj \ - $(SLO)$/viewobjectcontactredirector.obj \ - $(SLO)$/viewobjectcontactofsdrmediaobj.obj \ - $(SLO)$/viewobjectcontactofgroup.obj \ - $(SLO)$/viewobjectcontactofe3dscene.obj \ - $(SLO)$/viewobjectcontactofsdrpage.obj \ - $(SLO)$/viewobjectcontactofsdrobj.obj \ - $(SLO)$/viewobjectcontactofpageobj.obj \ - $(SLO)$/viewobjectcontactofsdrole2obj.obj \ - $(SLO)$/viewobjectcontactofgraphic.obj \ - $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj \ - $(SLO)$/sdrmediawindow.obj - + $(SLO)$/displayinfo.obj \ + $(SLO)$/viewcontact.obj \ + $(SLO)$/viewcontactofe3d.obj \ + $(SLO)$/viewcontactofsdrobj.obj \ + $(SLO)$/viewcontactofvirtobj.obj \ + $(SLO)$/viewcontactoftextobj.obj \ + $(SLO)$/viewcontactofsdrrectobj.obj \ + $(SLO)$/viewcontactofsdrpathobj.obj \ + $(SLO)$/viewcontactofsdrole2obj.obj \ + $(SLO)$/viewcontactofsdrcircobj.obj \ + $(SLO)$/viewcontactofsdrcaptionobj.obj \ + $(SLO)$/viewcontactofsdrmeasureobj.obj \ + $(SLO)$/viewcontactofsdredgeobj.obj \ + $(SLO)$/viewcontactofsdrpage.obj \ + $(SLO)$/viewcontactofmasterpagedescriptor.obj \ + $(SLO)$/viewcontactofgroup.obj \ + $(SLO)$/viewcontactofe3dscene.obj \ + $(SLO)$/viewcontactofe3dcube.obj \ + $(SLO)$/viewcontactofe3dextrude.obj \ + $(SLO)$/viewcontactofe3dlathe.obj \ + $(SLO)$/viewcontactofe3dsphere.obj \ + $(SLO)$/viewcontactofe3dpolygon.obj \ + $(SLO)$/viewcontactofpageobj.obj \ + $(SLO)$/viewcontactofgraphic.obj \ + $(SLO)$/viewcontactofsdrobjcustomshape.obj \ + $(SLO)$/viewcontactofsdrmediaobj.obj \ + $(SLO)$/viewcontactofunocontrol.obj \ + $(SLO)$/objectcontact.obj \ + $(SLO)$/objectcontacttools.obj \ + $(SLO)$/objectcontactofobjlistpainter.obj \ + $(SLO)$/objectcontactofpageview.obj \ + $(SLO)$/viewobjectcontact.obj \ + $(SLO)$/viewobjectcontactofe3d.obj \ + $(SLO)$/viewobjectcontactredirector.obj \ + $(SLO)$/viewobjectcontactofsdrmediaobj.obj \ + $(SLO)$/viewobjectcontactofgroup.obj \ + $(SLO)$/viewobjectcontactofe3dscene.obj \ + $(SLO)$/viewobjectcontactofsdrpage.obj \ + $(SLO)$/viewobjectcontactofsdrobj.obj \ + $(SLO)$/viewobjectcontactofpageobj.obj \ + $(SLO)$/viewobjectcontactofsdrole2obj.obj \ + $(SLO)$/viewobjectcontactofgraphic.obj \ + $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj \ + $(SLO)$/sdrmediawindow.obj + .INCLUDE : target.mk diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 283bbd4a10..0b331bf4ca 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -38,7 +38,7 @@ #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -122,7 +122,7 @@ namespace sdr aViewRange, GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)), 0.0, - 0); + com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D @@ -152,6 +152,25 @@ namespace sdr } } + // VirtualDevice? + bool ObjectContactOfObjListPainter::isOutputToVirtualDevice() const + { + return (OUTDEV_VIRDEV == mrTargetOutputDevice.GetOutDevType()); + } + + // recording MetaFile? + bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const + { + GDIMetaFile* pMetaFile = mrTargetOutputDevice.GetConnectMetaFile(); + return (pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause()); + } + + // pdf export? + bool ObjectContactOfObjListPainter::isOutputToPDFFile() const + { + return (0 != mrTargetOutputDevice.GetPDFWriter()); + } + OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const { return &mrTargetOutputDevice; diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 49052fbf74..94da0ae0d1 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -39,13 +39,13 @@ #include <svx/sdr/animation/objectanimator.hxx> #include <svx/sdr/event/eventhandler.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -242,7 +242,7 @@ namespace sdr aViewRange, GetXDrawPageForSdrPage(GetSdrPage()), fCurrentTime, - 0); + uno::Sequence<beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 4397b7ec48..c53ea6cf10 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -45,8 +45,8 @@ #include <svx/sdr/event/eventhandler.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> -#include "svdstr.hrc" -#include <svdglob.hxx> +#include "svx/svdstr.hrc" +#include <svx/svdglob.hxx> #include <vcl/svapp.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> @@ -297,7 +297,7 @@ namespace sdr // decompose immediately with neutral ViewInformation. This will // layout the text to more simple TextPrimitives from drawinglayer - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( xRetval, diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 05b0f1a3d8..cba1eac035 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -41,7 +41,7 @@ #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/primitive2d/sdrprimitivetools.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 8d0a1d5504..d0532060d4 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -32,7 +32,7 @@ #include <svx/svdoashp.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 1ad45c22c3..d567a81ce7 100644 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx @@ -87,7 +87,7 @@ namespace sdr const SfxItemSet& rItemSet = GetOle2Obj().GetMergedItemSet(); const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute( - rItemSet, + rItemSet, GetOle2Obj().getText(0))); // #i102063# embed OLE content in an own primitive; this will be able to decompose accessing @@ -104,8 +104,8 @@ namespace sdr GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion() )); - // create primitive. Use Ole2 primitive here. Prepare attribute settings, will - // be used soon anyways. Always create primitives to allow the decomposition of + // create primitive. Use Ole2 primitive here. Prepare attribute settings, will + // be used soon anyways. Always create primitives to allow the decomposition of // SdrOle2Primitive2D to create needed invisible elements for HitTest and/or BoundRect const drawinglayer::primitive2d::Primitive2DSequence xOLEContent(&xOleContent, 1); const drawinglayer::primitive2d::Primitive2DReference xReference( diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 1e754d5db4..fdc6dcd8e0 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -46,6 +46,11 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> +#include <vcl/lazydelete.hxx> +#include <svx/svdstr.hrc> +#include <svx/svdglob.hxx> +#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> +#include <drawinglayer/attribute/sdrfillattribute.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -132,31 +137,54 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence() const { + static bool bUseOldPageShadow(false); const SdrPage& rPage = getPage(); basegfx::B2DHomMatrix aPageMatrix; aPageMatrix.set(0, 0, (double)rPage.GetWdt()); aPageMatrix.set(1, 1, (double)rPage.GetHgt()); - // create page shadow polygon - const double fPageBorderFactor(1.0 / 256.0); - basegfx::B2DPolygon aPageShadowPolygon; - aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0)); - aPageShadowPolygon.setClosed(true); - aPageShadowPolygon.transform(aPageMatrix); - - // We have only the page information, not the view information. Use the - // svtools::FONTCOLOR color for initialisation - const svtools::ColorConfig aColorConfig; - const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); - const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor()); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageShadowPolygon), aRGBShadowColor)); - - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + if(bUseOldPageShadow) + { + // create page shadow polygon + const double fPageBorderFactor(1.0 / 256.0); + basegfx::B2DPolygon aPageShadowPolygon; + aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0)); + aPageShadowPolygon.setClosed(true); + aPageShadowPolygon.transform(aPageMatrix); + + // We have only the page information, not the view information. Use the + // svtools::FONTCOLOR color for initialisation + const svtools::ColorConfig aColorConfig; + const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); + const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor()); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( + basegfx::B2DPolyPolygon(aPageShadowPolygon), + aRGBShadowColor)); + + return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + } + else + { + static vcl::DeleteOnDeinit<drawinglayer::primitive2d::DiscreteShadow> + aDiscreteShadow(new drawinglayer::primitive2d::DiscreteShadow( + BitmapEx(ResId(SIP_SA_PAGESHADOW35X35, *ImpGetResMgr())))); + if (aDiscreteShadow.get() != NULL) + { + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::DiscreteShadowPrimitive2D( + aPageMatrix, + *aDiscreteShadow.get())); + + return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + } + return drawinglayer::primitive2d::Primitive2DSequence(); + } } ViewContactOfPageShadow::ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage) diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index ac3d10c271..6404472290 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/awt/XWindow2.hpp> /** === end UNO includes === **/ -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <tools/diagnose_ex.h> #include <vcl/pdfextoutdevdata.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index cb746f5318..f686333174 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -178,7 +178,7 @@ namespace sdr if(rGrafObj.IsLinkedGraphic()) { // update graphic link - rGrafObj.ImpUpdateGraphicLink(); + rGrafObj.ImpUpdateGraphicLink( sal_False ); } else { @@ -197,7 +197,7 @@ namespace sdr rGrafObj.mbInsidePaint = sal_True; rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = sal_False; - } + } bRetval = true; } @@ -253,19 +253,27 @@ namespace sdr // prepare primitive generation with evtl. loading the graphic when it's swapped out SdrGrafObj& rGrafObj = const_cast< ViewObjectContactOfGraphic* >(this)->getSdrGrafObj(); bool bDoAsynchronGraphicLoading(rGrafObj.GetModel() && rGrafObj.GetModel()->IsSwapGraphics()); - static bool bSuppressAsynchLoading(false); bool bSwapInDone(false); + bool bSwapInExclusive(false); - if(bDoAsynchronGraphicLoading - && rGrafObj.IsSwappedOut() - && rGrafObj.GetPage() - && rGrafObj.GetPage()->IsMasterPage()) + if( bDoAsynchronGraphicLoading && rGrafObj.IsSwappedOut() ) { - // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation - bDoAsynchronGraphicLoading = false; + // sometimes it is needed that each graphic is completely available and swapped in + // for these cases a ForceSwapIn is called later at the graphic object + if ( rGrafObj.GetPage() && rGrafObj.GetPage()->IsMasterPage() ) + { + // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation + bDoAsynchronGraphicLoading = false; + } + else if ( GetObjectContact().isOutputToPrinter() + || GetObjectContact().isOutputToRecordingMetaFile() + || GetObjectContact().isOutputToPDFFile() ) + { + bDoAsynchronGraphicLoading = false; + bSwapInExclusive = true; + } } - - if(bDoAsynchronGraphicLoading && !bSuppressAsynchLoading) + if( bDoAsynchronGraphicLoading ) { bSwapInDone = const_cast< ViewObjectContactOfGraphic* >(this)->impPrepareGraphicWithAsynchroniousLoading(); } @@ -294,10 +302,8 @@ namespace sdr } } - // if swap in was forced only for printing, swap out again - const bool bSwapInExclusiveForPrinting(bSwapInDone && GetObjectContact().isOutputToPrinter()); - - if(bSwapInExclusiveForPrinting) + // if swap in was forced only for printing metafile and pdf, swap out again + if( bSwapInDone && bSwapInExclusive ) { rGrafObj.ForceSwapOut(); } diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index d4622546d3..f92863ceca 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -39,7 +39,7 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index af7eeeb220..e92136f987 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -40,7 +40,7 @@ #include <avmedia/mediaitem.hxx> #include "sdrmediawindow.hxx" #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 84ad73d2df..aae0fa90e9 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -321,6 +321,12 @@ namespace sdr return false; } + // no page shadow for high contrast mode + if(GetObjectContact().isDrawModeHighContrast()) + { + return false; + } + return true; } } // end of namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 5fad80797f..6f792a98c9 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" /** === begin UNO includes === **/ #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk index ff379af6be..6b50d5faa9 100644 --- a/svx/source/sdr/event/makefile.mk +++ b/svx/source/sdr/event/makefile.mk @@ -39,6 +39,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/eventhandler.obj + $(SLO)$/eventhandler.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk index 155053826f..654031d6dc 100644 --- a/svx/source/sdr/overlay/makefile.mk +++ b/svx/source/sdr/overlay/makefile.mk @@ -38,22 +38,22 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/overlayanimatedbitmapex.obj \ - $(SLO)$/overlaybitmapex.obj \ - $(SLO)$/overlaycrosshair.obj \ - $(SLO)$/overlayhatchrect.obj \ - $(SLO)$/overlayhelpline.obj \ - $(SLO)$/overlayline.obj \ - $(SLO)$/overlaymanager.obj \ - $(SLO)$/overlaymanagerbuffered.obj \ - $(SLO)$/overlayobject.obj \ - $(SLO)$/overlayobjectcell.obj \ - $(SLO)$/overlayobjectlist.obj \ - $(SLO)$/overlaypolypolygon.obj \ - $(SLO)$/overlayprimitive2dsequenceobject.obj \ - $(SLO)$/overlayrollingrectangle.obj \ - $(SLO)$/overlayselection.obj \ - $(SLO)$/overlaytools.obj \ - $(SLO)$/overlaytriangle.obj + $(SLO)$/overlayanimatedbitmapex.obj \ + $(SLO)$/overlaybitmapex.obj \ + $(SLO)$/overlaycrosshair.obj \ + $(SLO)$/overlayhatchrect.obj \ + $(SLO)$/overlayhelpline.obj \ + $(SLO)$/overlayline.obj \ + $(SLO)$/overlaymanager.obj \ + $(SLO)$/overlaymanagerbuffered.obj \ + $(SLO)$/overlayobject.obj \ + $(SLO)$/overlayobjectcell.obj \ + $(SLO)$/overlayobjectlist.obj \ + $(SLO)$/overlaypolypolygon.obj \ + $(SLO)$/overlayprimitive2dsequenceobject.obj \ + $(SLO)$/overlayrollingrectangle.obj \ + $(SLO)$/overlayselection.obj \ + $(SLO)$/overlaytools.obj \ + $(SLO)$/overlaytriangle.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index b71c55934e..00c7b20308 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -139,7 +139,7 @@ namespace sdr mnStripeLengthPixel(5), maDrawinglayerOpt(), maViewTransformation(), - maViewInformation2D(0), + maViewInformation2D(), mfDiscreteOne(0.0) { // set Property 'ReducedDisplayQuality' to true to allow simpler interaction diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk index 078bc4bc97..67e95c29ed 100644 --- a/svx/source/sdr/primitive2d/makefile.mk +++ b/svx/source/sdr/primitive2d/makefile.mk @@ -38,20 +38,20 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/primitivefactory2d.obj \ - $(SLO)$/sdrdecompositiontools.obj \ - $(SLO)$/sdrattributecreator.obj \ - $(SLO)$/sdrellipseprimitive2d.obj \ - $(SLO)$/sdrrectangleprimitive2d.obj \ - $(SLO)$/sdrcustomshapeprimitive2d.obj \ - $(SLO)$/sdrcaptionprimitive2d.obj \ - $(SLO)$/sdrgrafprimitive2d.obj \ - $(SLO)$/sdrole2primitive2d.obj \ - $(SLO)$/sdrolecontentprimitive2d.obj \ - $(SLO)$/sdrpathprimitive2d.obj \ - $(SLO)$/sdrprimitivetools.obj \ - $(SLO)$/sdrmeasureprimitive2d.obj \ - $(SLO)$/sdrconnectorprimitive2d.obj \ - $(SLO)$/sdrtextprimitive2d.obj + $(SLO)$/primitivefactory2d.obj \ + $(SLO)$/sdrdecompositiontools.obj \ + $(SLO)$/sdrattributecreator.obj \ + $(SLO)$/sdrellipseprimitive2d.obj \ + $(SLO)$/sdrrectangleprimitive2d.obj \ + $(SLO)$/sdrcustomshapeprimitive2d.obj \ + $(SLO)$/sdrcaptionprimitive2d.obj \ + $(SLO)$/sdrgrafprimitive2d.obj \ + $(SLO)$/sdrole2primitive2d.obj \ + $(SLO)$/sdrolecontentprimitive2d.obj \ + $(SLO)$/sdrpathprimitive2d.obj \ + $(SLO)$/sdrprimitivetools.obj \ + $(SLO)$/sdrmeasureprimitive2d.obj \ + $(SLO)$/sdrconnectorprimitive2d.obj \ + $(SLO)$/sdrtextprimitive2d.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 8ef1f85dd9..d1eed0201e 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -31,7 +31,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/sdr/contact/viewcontact.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 5cd9529c1b..d493c1969c 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -36,7 +36,7 @@ #include <editeng/editobj.hxx> #include <editeng/flditem.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/source/sdr/primitive3d/makefile.mk index c845cadc90..1630e682ad 100644 --- a/svx/source/sdr/primitive3d/makefile.mk +++ b/svx/source/sdr/primitive3d/makefile.mk @@ -37,6 +37,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/sdrattributecreator3d.obj + $(SLO)$/sdrattributecreator3d.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 2c981128cb..8e1f8c48fa 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -33,7 +33,7 @@ #include <svl/whiter.hxx> #include <svx/svddef.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index a60661a8aa..e19fa7a116 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -35,7 +35,7 @@ #include <vector> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// // class to remember broadcast start positions diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk index 5296765769..2b4a29fa3e 100644 --- a/svx/source/sdr/properties/makefile.mk +++ b/svx/source/sdr/properties/makefile.mk @@ -39,27 +39,27 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES=\ - $(SLO)$/properties.obj \ - $(SLO)$/emptyproperties.obj \ - $(SLO)$/pageproperties.obj \ - $(SLO)$/defaultproperties.obj \ - $(SLO)$/attributeproperties.obj \ - $(SLO)$/textproperties.obj \ - $(SLO)$/customshapeproperties.obj \ - $(SLO)$/rectangleproperties.obj \ + $(SLO)$/properties.obj \ + $(SLO)$/emptyproperties.obj \ + $(SLO)$/pageproperties.obj \ + $(SLO)$/defaultproperties.obj \ + $(SLO)$/attributeproperties.obj \ + $(SLO)$/textproperties.obj \ + $(SLO)$/customshapeproperties.obj \ + $(SLO)$/rectangleproperties.obj \ $(SLO)$/oleproperties.obj \ - $(SLO)$/captionproperties.obj \ - $(SLO)$/circleproperties.obj \ - $(SLO)$/connectorproperties.obj \ - $(SLO)$/e3dproperties.obj \ - $(SLO)$/e3dcompoundproperties.obj \ - $(SLO)$/e3dextrudeproperties.obj \ - $(SLO)$/e3dlatheproperties.obj \ - $(SLO)$/e3dsceneproperties.obj \ - $(SLO)$/e3dsphereproperties.obj \ - $(SLO)$/graphicproperties.obj \ - $(SLO)$/groupproperties.obj \ - $(SLO)$/measureproperties.obj \ - $(SLO)$/itemsettools.obj + $(SLO)$/captionproperties.obj \ + $(SLO)$/circleproperties.obj \ + $(SLO)$/connectorproperties.obj \ + $(SLO)$/e3dproperties.obj \ + $(SLO)$/e3dcompoundproperties.obj \ + $(SLO)$/e3dextrudeproperties.obj \ + $(SLO)$/e3dlatheproperties.obj \ + $(SLO)$/e3dsceneproperties.obj \ + $(SLO)$/e3dsphereproperties.obj \ + $(SLO)$/graphicproperties.obj \ + $(SLO)$/groupproperties.obj \ + $(SLO)$/measureproperties.obj \ + $(SLO)$/itemsettools.obj .INCLUDE : target.mk diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 80c5035e0e..0046765553 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -32,7 +32,7 @@ #include <svx/sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src new file mode 100644 index 0000000000..a8089830df --- /dev/null +++ b/svx/source/src/errtxt.src @@ -0,0 +1,515 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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. + * + ************************************************************************/ + +#define __RSC +#include <svtools/svtools.hrc> +#include <svtools/sfxecode.hxx> + +// pragma ---------------------------------------------------------------- +Resource RID_ERRCTX +{ + String ERRCTX_ERROR + { + Text [ en-US ] = "Error" ; + }; + String ERRCTX_WARNING + { + Text [ en-US ] = "Warning" ; + }; + String ERRCTX_SFX_LOADTEMPLATE + { + Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ; + }; + String ERRCTX_SFX_SAVEDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_SAVEASDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_DOCINFO + { + Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ; + }; + String ERRCTX_SFX_DOCTEMPLATE + { + Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ; + }; + String ERRCTX_SFX_MOVEORCOPYCONTENTS + { + Text [ en-US ] = "$(ERR) copying or moving document contents" ; + }; + String ERRCTX_SFX_DOCMANAGER + { + Text [ en-US ] = "$(ERR) starting the Document Manager" ; + }; + String ERRCTX_SFX_OPENDOC + { + Text [ en-US ] = "$(ERR) loading document $(ARG1)" ; + }; + String ERRCTX_SFX_NEWDOCDIRECT + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_NEWDOC + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_CREATEOBJSH + { + Text [ en-US ] = "$(ERR) expanding entry" ; + }; + String ERRCTX_SFX_LOADBASIC + { + Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ; + }; + String ERRCTX_SFX_SEARCHADDRESS + { + Text [ en-US ] = "$(ERR) searching for an address"; + }; +}; +Resource RID_ERRHDL +{ + String ERRCODE_CLASS_ABORT + { + Text [ en-US ] = "Abort" ; + }; + String ERRCODE_CLASS_NOTEXISTS + { + Text [ en-US ] = "Nonexistent object" ; + }; + String ERRCODE_CLASS_ALREADYEXISTS + { + Text [ en-US ] = "Object already exists" ; + }; + String ERRCODE_CLASS_ACCESS + { + Text [ en-US ] = "Object not accessible" ; + }; + String ERRCODE_CLASS_PATH + { + Text [ en-US ] = "Inadmissible path" ; + }; + String ERRCODE_CLASS_LOCKING + { + Text [ en-US ] = "Locking problem" ; + }; + String ERRCODE_CLASS_PARAMETER + { + Text [ en-US ] = "Wrong parameter" ; + }; + String ERRCODE_CLASS_SPACE + { + Text [ en-US ] = "Resource exhausted" ; + }; + String ERRCODE_CLASS_NOTSUPPORTED + { + Text [ en-US ] = "Action not supported" ; + }; + String ERRCODE_CLASS_READ + { + Text [ en-US ] = "Read-Error" ; + }; + String ERRCODE_CLASS_WRITE + { + Text [ en-US ] = "Write Error" ; + }; + String ERRCODE_CLASS_UNKNOWN + { + Text [ en-US ] = "unknown" ; + }; + String ERRCODE_CLASS_VERSION + { + Text [ en-US ] = "Version Incompatibility" ; + }; + String ERRCODE_CLASS_GENERAL + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_CLASS_FORMAT + { + Text [ en-US ] = "Incorrect format" ; + }; + String ERRCODE_CLASS_CREATE + { + Text [ en-US ] = "Error creating object" ; + }; + String ERRCODE_CLASS_SBX + { + Text [ en-US ] = "Inadmissible value or data type" ; + }; + String ERRCODE_CLASS_RUNTIME + { + Text [ en-US ] = "BASIC runtime error" ; + }; + String ERRCODE_CLASS_COMPILER + { + Text [ en-US ] = "BASIC syntax error" ; + }; + String 1 + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_IO_GENERAL + { + Text [ en-US ] = "General input/output error." ; + }; + String ERRCODE_IO_MISPLACEDCHAR + { + Text [ en-US ] = "Invalid file name." ; + }; + String ERRCODE_IO_NOTEXISTS + { + Text [ en-US ] = "Nonexistent file." ; + }; + String ERRCODE_IO_ALREADYEXISTS + { + Text [ en-US ] = "File already exists." ; + }; + String ERRCODE_IO_NOTADIRECTORY + { + Text [ en-US ] = "The object is not a directory." ; + }; + String ERRCODE_IO_NOTAFILE + { + Text [ en-US ] = "The object is not a file." ; + }; + String ERRCODE_IO_INVALIDDEVICE + { + Text [ en-US ] = "The specified device is invalid." ; + }; + String ERRCODE_IO_ACCESSDENIED + { + Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ; + }; + String ERRCODE_IO_LOCKVIOLATION + { + Text [ en-US ] = "Sharing violation while accessing the object." ; + }; + String ERRCODE_IO_OUTOFSPACE + { + Text [ en-US ] = "No more space on device." ; + }; + String ERRCODE_IO_ISWILDCARD + { + Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ; + }; + String ERRCODE_IO_NOTSUPPORTED + { + Text [ en-US ] = "This operation is not supported on this operating system." ; + }; + String ERRCODE_IO_TOOMANYOPENFILES + { + Text [ en-US ] = "There are too many files open." ; + }; + String ERRCODE_IO_CANTREAD + { + Text [ en-US ] = "Data could not be read from the file." ; + }; + String ERRCODE_IO_CANTWRITE + { + Text [ en-US ] = "The file could not be written." ; + }; + String ERRCODE_IO_OUTOFMEMORY + { + Text [ en-US ] = "The operation could not be run due to insufficient memory." ; + }; + String ERRCODE_IO_CANTSEEK + { + Text [ en-US ] = "The seek operation could not be run." ; + }; + String ERRCODE_IO_CANTTELL + { + Text [ en-US ] = "The tell operation could not be run." ; + }; + String ERRCODE_IO_WRONGVERSION + { + Text [ en-US ] = "Incorrect file version." ; + }; + String ERRCODE_IO_WRONGFORMAT + { + Text [ en-US ] = "Incorrect file format." ; + }; + String ERRCODE_IO_INVALIDCHAR + { + Text [ en-US ] = "The file name contains invalid characters." ; + }; + String ERRCODE_IO_UNKNOWN + { + Text [ en-US ] = "An unknown I/O error has occurred." ; + }; + String ERRCODE_IO_INVALIDACCESS + { + Text [ en-US ] = "An invalid attempt was made to access the file." ; + }; + String ERRCODE_IO_CANTCREATE + { + Text [ en-US ] = "The file could not be created." ; + }; + String ERRCODE_IO_INVALIDPARAMETER + { + Text [ en-US ] = "The operation was started under an invalid parameter." ; + }; + String ERRCODE_IO_ABORT + { + Text [ en-US ] = "The operation on the file was aborted." ; + }; + String ERRCODE_IO_NOTEXISTSPATH + { + Text [ en-US ] = "Path to the file does not exist." ; + }; + String ERRCODE_IO_RECURSIVE + { + Text [ en-US ] = "An object cannot be copied into itself." ; + }; + String ERRCODE_SFX_NOSTDTEMPLATE + { + Text [ en-US ] = "The default template could not be opened." ; + }; + String ERRCODE_SFX_TEMPLATENOTFOUND + { + Text [ en-US ] = "The specified template could not be found." ; + }; + String ERRCODE_SFX_NOTATEMPLATE + { + Text [ en-US ] = "The file cannot be used as template." ; + }; + String ERRCODE_SFX_CANTREADDOCINFO + { + Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ; + }; + String ERRCODE_SFX_ALREADYOPEN + { + Text [ en-US ] = "This document has already been opened for editing." ; + }; + String ERRCODE_SFX_WRONGPASSWORD + { + Text [ en-US ] = "The wrong password has been entered." ; + }; + String ERRCODE_SFX_DOLOADFAILED + { + Text [ en-US ] = "Error reading file." ; + }; + String ERRCODE_SFX_DOCUMENTREADONLY + { + Text [ en-US ] = "The document was opened as read-only." ; + }; + String ERRCODE_SFX_OLEGENERAL + { + Text [ en-US ] = "General OLE Error." ; + }; + String ERRCODE_INET_NAME_RESOLVE + { + Text [ en-US ] = "The host name $(ARG1) could not be resolved." ; + }; + String ERRCODE_INET_CONNECT + { + Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ; + }; + String ERRCODE_INET_READ + { + Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_WRITE + { + Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_GENERAL + { + Text [ en-US ] = "General Internet error has occurred." ; + }; + String ERRCODE_INET_OFFLINE + { + Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; + }; + String ERRCODE_SFXMSG_STYLEREPLACE + { + ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; + Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; + }; + String ERRCODE_SFX_NOFILTER + { + Text [ en-US ] = "A filter has not been found." ; + }; + String ERRCODE_SFX_CANTFINDORIGINAL + { + Text [ en-US ] = "The original could not be determined." ; + }; + String ERRCODE_SFX_CANTCREATECONTENT + { + Text [ en-US ] = "The contents could not be created." ; + }; + String ERRCODE_SFX_CANTCREATELINK + { + Text [ en-US ] = "The link could not be created." ; + }; + String ERRCODE_SFX_WRONGBMKFORMAT + { + Text [ en-US ] = "The link format is invalid." ; + }; + String ERRCODE_SFX_WRONGICONFILE + { + Text [ en-US ] = "The configuration of the icon display is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEICONFILE + { + Text [ en-US ] = "The configuration of the icon display can not be saved." ; + }; + String ERRCODE_SFX_CANTDELICONFILE + { + Text [ en-US ] = "The configuration of the icon display could not be deleted." ; + }; + String ERRCODE_SFX_CANTRENAMECONTENT + { + Text [ en-US ] = "Contents cannot be renamed." ; + }; + String ERRCODE_SFX_INVALIDBMKPATH + { + Text [ en-US ] = "The bookmark folder is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEURLCFGFILE + { + Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ; + }; + String ERRCODE_SFX_WRONGURLCFGFORMAT + { + Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ; + }; + String ERRCODE_SFX_NODOCUMENT + { + Text [ en-US ] = "This action cannot be applied to a document that does not exist." ; + }; + String ERRCODE_SFX_INVALIDLINK + { + Text [ en-US ] = "The link refers to an invalid target." ; + }; + String ERRCODE_SFX_INVALIDTRASHPATH + { + Text [ en-US ] = "The Recycle Bin path is invalid." ; + }; + String ERRCODE_SFX_NOTRESTORABLE + { + Text [ en-US ] = "The entry could not be restored." ; + }; + String ERRCODE_IO_NAMETOOLONG + { + Text [ en-US ] = "The file name is too long for the target file system." ; + }; + String ERRCODE_SFX_CONSULTUSER + { + Text [ en-US ] = "The details for running the function are incomplete." ; + }; + String ERRCODE_SFX_INVALIDSYNTAX + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTCREATEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTRENAMEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_WRONG_CDF_FORMAT + { + Text [ en-US ] = "The channel document has an invalid format." ; + }; + String ERRCODE_SFX_EMPTY_SERVER + { + Text [ en-US ] = "The server must not be empty." ; + }; + String ERRCODE_SFX_NO_ABOBOX + { + Text [ en-US ] = "A subscription folder is required to install a Channel." ; + }; + String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT + { + Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; + }; + String ERRCODE_SFX_TARGETFILECORRUPTED + { + Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)."; + }; + String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED + { + Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; + }; + String ERRCODE_SFX_CANTCREATEBACKUP + { + Text [ en-US ] = "Could not create backup copy." ; + }; + String ERRCODE_SFX_MACROS_SUPPORT_DISABLED + { + Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; + }; + String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED + { + Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; + }; + String ERRCODE_SFX_BROKENSIGNATURE + { + Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + String ERRCODE_SFX_INCOMPLETE_ENCRYPTION + { + Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + + String ERRCODE_IO_INVALIDLENGTH + { + Text [ en-US ] = "Invalid data length." ; + }; + String ERRCODE_IO_CURRENTDIR + { + Text [ en-US ] = "Function not possible: path contains current directory." ; + }; + String ERRCODE_IO_NOTSAMEDEVICE + { + Text [ en-US ] = "Function not possible: device (drive) not identical." ; + }; + String ERRCODE_IO_DEVICENOTREADY + { + Text [ en-US ] = "Device (drive) not ready." ; + }; + String ERRCODE_IO_BADCRC + { + Text [ en-US ] = "Wrong check amount." ; + }; + String ERRCODE_IO_WRITEPROTECTED + { + Text [ en-US ] = "Function not possible: write protected." ; + }; + String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE + { + Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; + }; +}; + +// eof ------------------------------------------------------------------------ + diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk index fb96866ca0..1de6524dbb 100644 --- a/svx/source/src/makefile.mk +++ b/svx/source/src/makefile.mk @@ -38,10 +38,8 @@ TARGET=ofa .INCLUDE : $(PRJ)$/util$/makefile.pmk RES1FILELIST=\ - $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/svtools.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs \ - $(SOLARCOMMONRESDIR)$/basic.srs + $(SRS)$/app.srs \ + $(SOLARCOMMONRESDIR)$/basic.srs RESLIB1NAME=$(TARGET) RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src @@ -51,7 +49,8 @@ RESLIB1SRSFILES=$(RES1FILELIST) SRS1NAME= app SRC1FILES= \ - app.src + app.src \ + errtxt.src .INCLUDE : target.mk diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 95175b8163..dee1a7cc8f 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -40,7 +40,7 @@ #include <svx/dialogs.hrc> -#include "insctrl.hxx" +#include "svx/insctrl.hxx" #include <svx/dialmgr.hxx> #define PAINT_OFFSET 5 @@ -56,7 +56,6 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - rStb.SetHelpId( _nId, _nSlotId ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk index ac9445d982..5678b0967b 100644 --- a/svx/source/stbctrls/makefile.mk +++ b/svx/source/stbctrls/makefile.mk @@ -43,30 +43,30 @@ AUTOSEG=true SRS1NAME=$(TARGET) SRC1FILES = \ - stbctrls.src + stbctrls.src SLOFILES= \ $(EXCEPTIONSFILES) EXCEPTIONSFILES= \ - $(SLO)$/insctrl.obj \ - $(SLO)$/modctrl.obj \ - $(SLO)$/pszctrl.obj \ - $(SLO)$/selctrl.obj \ + $(SLO)$/insctrl.obj \ + $(SLO)$/pszctrl.obj \ + $(SLO)$/selctrl.obj \ + $(SLO)$/modctrl.obj \ $(SLO)$/xmlsecctrl.obj \ $(SLO)$/zoomctrl.obj \ - $(SLO)$/zoomsliderctrl.obj + $(SLO)$/zoomsliderctrl.obj HXX1TARGET=stbctrls HXX1EXT= hxx HXX1EXCL= -E:*include* HXX1DEPN=\ - $(INC)$/insctrl.hxx \ - $(INC)$/zoomctrl.hxx \ - $(INC)$/pszctrl.hxx \ - $(INC)$/selctrl.hxx \ - $(INC)$/modctrl.hxx \ - $(INC)$/xmlsecctrl.hxx \ + $(INC)$/svx/insctrl.hxx \ + $(INC)$/svx/zoomctrl.hxx \ + $(INC)$/svx/pszctrl.hxx \ + $(INC)$/svx/selctrl.hxx \ + $(INC)$/svx/modctrl.hxx \ + $(INC)$/svx/xmlsecctrl.hxx \ $(INC)$/zoomsliderctrl.hxx \ # --- Targets ------------------------------------------------------- diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index ca6cd0ed6d..2c5d5a97d0 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -30,15 +30,13 @@ #include "precompiled_svx.hxx" // include --------------------------------------------------------------- - -#include "modctrl.hxx" - #include <vcl/status.hxx> #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> +#include <svx/modctrl.hxx> #include <svx/dialmgr.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 6c6171534a..d810f2d6c8 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -46,13 +46,13 @@ #include <svl/intitem.hxx> #define _SVX_PSZCTRL_CXX -#include "pszctrl.hxx" +#include "svx/pszctrl.hxx" #define PAINT_OFFSET 5 #include <editeng/sizeitem.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include "stbctrls.h" #include "sfx2/module.hxx" @@ -175,6 +175,10 @@ struct SvxPosSizeStatusBarControl_Impl Images fu"r die Position und Gro"sse laden. */ +#define STR_POSITION ".uno:Position" +#define STR_TABLECELL ".uno:StateTableCell" +#define STR_FUNC ".uno:StatusBarFunc" + SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& rStb ) : @@ -189,9 +193,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" ))); + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -232,7 +236,14 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - GetStatusBar().SetHelpId( GetId(), nSID ); + + switch ( nSID ) + { + case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break; + case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break; + case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break; + default: break; + } if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 0b7e1851fb..7f5e34bd77 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -38,7 +38,7 @@ #define _SVX_SELCTRL_CXX -#include "selctrl.hxx" +#include "svx/selctrl.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 4667d17b37..2e4d9fbdfc 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -46,7 +46,7 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "xmlsecctrl.hxx" +#include "svx/xmlsecctrl.hxx" #include <tools/urlobj.hxx> #define PAINT_OFFSET 5 @@ -81,12 +81,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() delete mpImpl; } -void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) { - GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - - GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ? - if( SFX_ITEM_AVAILABLE != eState ) { mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index f311eed28e..b3d9770579 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -36,7 +36,7 @@ #include <svx/dialogs.hrc> -#include "zoomctrl.hxx" +#include "svx/zoomctrl.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" #include <svx/dialmgr.hxx> diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index 91a79d0123..95a5018695 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ActionDescriptionProvider.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/ActionDescriptionProvider.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType , const ::rtl::OUString& rObjectName ) diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk index 514c5b6d2c..44a3a6b6a5 100644 --- a/svx/source/svdraw/makefile.mk +++ b/svx/source/svdraw/makefile.mk @@ -79,7 +79,7 @@ LIB1OBJFILES= \ $(SLO)$/svdopage.obj \ $(SLO)$/svdoutl.obj \ $(SLO)$/svdovirt.obj \ - $(SLO)$/svdoutlinercache.obj \ + $(SLO)$/svdoutlinercache.obj \ $(SLO)$/gradtrns.obj \ $(SLO)$/svdattr.obj \ $(SLO)$/svddrag.obj \ @@ -103,11 +103,11 @@ LIB1OBJFILES= \ $(SLO)$/svdpoev.obj \ $(SLO)$/svdtrans.obj \ $(SLO)$/svdundo.obj \ - $(SLO)$/svdviter.obj \ + $(SLO)$/svdviter.obj \ $(SLO)$/clonelist.obj \ - $(SLO)$/svdedtv.obj \ - $(SLO)$/selectioncontroller.obj \ - $(SLO)$/polypolygoneditor.obj \ + $(SLO)$/svdedtv.obj \ + $(SLO)$/selectioncontroller.obj \ + $(SLO)$/polypolygoneditor.obj \ $(SLO)$/svdibrow.obj \ $(SLO)$/svdomedia.obj diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 5153fb702f..cbac92782c 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -40,7 +40,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <osl/mutex.hxx> @@ -193,6 +193,10 @@ void SdrPageWindow::PrePaint() } } +void SdrPageWindow::PostPaint() +{ +} + void SdrPageWindow::PrepareRedraw(const Region& rReg) { // evtl. give OC the chance to do ProcessDisplay preparations diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index ba77883b38..17ccfde01d 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 2d27a3586b..d4ddb308a6 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -55,11 +55,11 @@ #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer DEGREE_CHAR #include <svx/svdtrans.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" #include <svx/sdgcpitm.hxx> #include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index eb4be6e1e0..9ed6a352b8 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdcrtv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung #include <svx/svdoedge.hxx> @@ -46,7 +46,7 @@ #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include "fmobj.hxx" #include <svx/svdocirc.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index ba6a225238..b30bd8f37e 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -38,7 +38,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -46,8 +46,8 @@ #include <svx/svdmark.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svddrgv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -60,7 +60,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> @@ -69,7 +69,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdopath.hxx> #include <svx/polypolygoneditor.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -903,6 +903,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const bool SdrDragMovHdl::BeginSdrDrag() { + if( !GetDragHdl() ) + return false; + DragStat().Ref1()=GetDragHdl()->GetPos(); DragStat().SetShown(!DragStat().IsShown()); SdrHdlKind eKind=GetDragHdl()->GetKind(); @@ -932,7 +935,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) { Point aPnt(rNoSnapPnt); - if (DragStat().CheckMinMoved(rNoSnapPnt)) + if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt)) { if (GetDragHdl()->GetKind()==HDL_MIRX) { @@ -1043,22 +1046,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) { - switch (GetDragHdl()->GetKind()) + if( GetDragHdl() ) { - case HDL_REF1: - Ref1()=DragStat().GetNow(); - break; + switch (GetDragHdl()->GetKind()) + { + case HDL_REF1: + Ref1()=DragStat().GetNow(); + break; - case HDL_REF2: - Ref2()=DragStat().GetNow(); - break; + case HDL_REF2: + Ref2()=DragStat().GetNow(); + break; - case HDL_MIRX: - Ref1()+=DragStat().GetNow()-DragStat().GetStart(); - Ref2()+=DragStat().GetNow()-DragStat().GetStart(); - break; + case HDL_MIRX: + Ref1()+=DragStat().GetNow()-DragStat().GetStart(); + Ref2()+=DragStat().GetNow()-DragStat().GetStart(); + break; - default: break; + default: break; + } } return true; @@ -1067,7 +1073,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) void SdrDragMovHdl::CancelSdrDrag() { Hide(); - GetDragHdl()->SetPos(DragStat().GetRef1()); + + SdrHdl* pHdl = GetDragHdl(); + if( pHdl ) + pHdl->SetPos(DragStat().GetRef1()); + SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX); if(pHM) diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index e3efdcaa66..c640941f08 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svddrgv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -39,12 +39,12 @@ #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> #include <svx/svdoedge.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svddrgm1.hxx" #include <svx/obj3d.hxx> #include <svx/svdoashp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polypolygoneditor.hxx> diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 693f933e5e..1359512b7b 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -41,8 +41,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdpoev.hxx> // fuer die PolyPossiblities -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/e3dsceneupdater.hxx> // #i13033# @@ -1040,46 +1040,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef WIN -void SdrEditView::BegUndo() // Undo-Klammerung auf -{ - pMod->BegUndo(); -} - -void SdrEditView::BegUndo(const String& rComment) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment); -} - -void SdrEditView::BegUndo(const String& rComment, const String& rObjDescr, - SdrRepeatFunc eFunc) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment,rObjDescr,eFunc); -} - -void SdrEditView::BegUndo(SdrUndoGroup* pUndoGrp) // Undo-Klammerung auf -{ - pMod->BegUndo(pUndoGrp); -} - -void SdrEditView::AddUndo(SdrUndoAction* pUndo) // Action hinzufuegen -{ - pMod->AddUndo(pUndo); -} - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: -void SdrEditView::SetUndoComment(const String& rComment) -{ - pMod->SetUndoComment(rComment); -} - - -void SdrEditView::SetUndoComment(const String& rComment, - const String& rObjDescr) -{ - pMod->SetUndoComment(rComment,rObjDescr); -} -#endif - bool SdrEditView::IsUndoEnabled() const { return pMod->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index f85ccb5765..f2a23d057e 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -41,8 +41,8 @@ #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // fuer SID_ATTR_TRANSFORM_... #include <svx/svdattr.hxx> // fuer Get/SetGeoAttr -#include "svditext.hxx" -#include "svditer.hxx" +#include "svx/svditext.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdpage.hxx> @@ -51,8 +51,8 @@ #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr #include <svx/svdetc.hxx> // fuer SearchOutlinerItems #include <svx/svdopath.hxx> // fuer Crook -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 9bcee46734..2cb23fa7c7 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -37,11 +37,11 @@ #include <svx/svdopath.hxx> // fuer CombineObjects #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdograf.hxx> // fuer Possibilities #include <svx/svdoole2.hxx> // und Mtf-Import -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include "svdfmtf.hxx" #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index a5c7351684..5e6e85c125 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -50,12 +50,12 @@ #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> #include <editeng/scripttypeitem.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpage.hxx" #include "svx/svdetc.hxx" // fuer GetDraftFillColor @@ -67,16 +67,16 @@ #include <svx/svdoutl.hxx> #include <svx/svddrgv.hxx> // fuer SetSolidDragging() -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "globl3d.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/globl3d.hxx" #include <editeng/outliner.hxx> #include <editeng/adjitem.hxx> // #98988# #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> //add CHINA001 -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 5acd912a3d..8cf973c29a 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -32,12 +32,12 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdtrans.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "svdviter.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 1984b654db..4cadf74a1d 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -58,7 +58,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 368ff3db61..33da2f1e3f 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -33,8 +33,8 @@ #include <math.h> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdglue.hxx> #include <svx/svdtrans.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index fc5b07ccfc..f49cfb63cb 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -42,8 +42,8 @@ #include <vcl/bmpacc.hxx> #include <svx/sxekitm.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include "gradtrns.hxx" @@ -63,7 +63,7 @@ #include <svx/sdr/overlay/overlaytriangle.hxx> #include <svx/sdr/overlay/overlayhatchrect.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <vcl/svapp.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <vcl/lazydelete.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 97509fde30..bef31da91d 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -37,7 +37,7 @@ #define _STDLIB_H #endif -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> @@ -67,7 +67,7 @@ #include <svl/rectitem.hxx> #include <svl/rngitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -951,7 +951,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem XubString aCommentStr; INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding)); - INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L Ä C H E", aTextEncoding)); + INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L � C H E", aTextEncoding)); INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding)); INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding)); INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding)); diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 5b1baa75ec..99f9a673ad 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpage.hxx> #include <svx/svdogrp.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 7ac1a2ced7..357087ca34 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -32,8 +32,8 @@ #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> // fuer Broadcasting -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource //////////////////////////////////////////////////////////////////////////////////////////////////// // SetOfByte diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 5b60131ed0..c7db1cb014 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -35,13 +35,13 @@ #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> // zur Abschaltung #include <svx/svdogrp.hxx> // des Cache bei #include <svx/svdorect.hxx> // GetMarkDescription -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache //////////////////////////////////////////////////////////////////////////////////////////////////// #include <svx/obj3d.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 1daf585836..efe03bcf6b 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -50,12 +50,12 @@ #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> @@ -66,8 +66,8 @@ #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include "svdoutlinercache.hxx" @@ -208,6 +208,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe else nDefTextHgt = SdrEngineDefaults::GetFontHeight(); + pItemPool->SetPoolDefaultItem( SdrTextWordWrapItem( sal_False ) ); + SetTextDefaults(); pLayerAdmin=new SdrLayerAdmin; pLayerAdmin->SetModel(this); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 30bc0892a7..630432b4dc 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -32,8 +32,8 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" -#include "svditext.hxx" +#include "svx/svdglob.hxx" +#include "svx/svditext.hxx" #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -49,14 +49,14 @@ #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/svdundo.hxx> #include <svx/svdopath.hxx> #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index a038801e15..9716288bc5 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -32,7 +32,7 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" +#include "svx/svdglob.hxx" #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include "svddrgm1.hxx" diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b1c7e952e0..59009a81d5 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoashp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unoshape.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> @@ -53,22 +53,22 @@ #include <svx/xpoly.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> -#include "../customshapes/EnhancedCustomShapeGeometry.hxx" -#include "../customshapes/EnhancedCustomShapeTypeNames.hxx" -#include "../customshapes/EnhancedCustomShape2d.hxx" +#include "../svx/EnhancedCustomShapeGeometry.hxx" +#include "../svx/EnhancedCustomShapeTypeNames.hxx" +#include "../svx/EnhancedCustomShape2d.hxx" #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index d692ffe9ce..60338b62bd 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -31,7 +31,7 @@ #include <svx/svdoattr.hxx> #include <svx/xpool.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdattr.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3a754534fb..5cce225a69 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -48,8 +48,7 @@ #include <svx/svdpage.hxx> #include <svx/svdovirt.hxx> // Fuer Add/Del Ref #include <svx/svdview.hxx> // fuer Dragging (Ortho abfragen) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include <svx/svdstr.hrc> // Objektname #include <svx/svdogrp.hxx> // Factory #include <svx/svdopath.hxx> // Factory #include <svx/svdoedge.hxx> // Factory @@ -75,7 +74,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> -#include "svditer.hxx" +#include <svx/svditer.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xfltrit.hxx> @@ -89,6 +88,7 @@ #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdpool.hxx> +#include <svx/svdglob.hxx> #include <editeng/editeng.hxx> #include <vcl/salbtype.hxx> // FRound #include <svl/whiter.hxx> @@ -932,7 +932,7 @@ void SdrObject::RecalcBoundRect() if(xPrimitives.hasElements()) { // use neutral ViewInformation and get the range of the primitives - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D)); if(!aRange.isEmpty()) @@ -1194,7 +1194,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D); @@ -2423,7 +2423,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 9045a8bec9..7cc2020e0d 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -42,8 +42,8 @@ #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> // fuer RectSnap -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/xflhtit.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index ee5bcb009c..d0fecc5036 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -48,8 +48,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> // fuer die Objektkonvertierung #include <svx/svdview.hxx> // Zum Draggen (Ortho) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> @@ -172,10 +172,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; -#ifndef WIN // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) if (meCircleKind!=OBJ_CIRC) bNeed = true; -#endif const SfxItemSet& rSet = GetObjectItemSet(); if(!bNeed) diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index f4f8853723..c94c92fa29 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -44,8 +44,8 @@ #include <svx/svdhdl.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> @@ -971,21 +971,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } else if (nMainCase==2) { // Fall 2: if (bHor1) { // beide waagerecht - /* 9 Moeglichkeiten: ù ù ù */ - /* 2.1 Gegenueber, Ueberschneidung à ´ ù */ - /* nur auf der Y-Achse ù ù ù */ - /* 2.2, 2.3 Gegenueber, vertikal versetzt. à ù ù ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse ù ù ù à ù ù */ - /* 2.4, 2.5 Untereinander, ù à ù ù ù ù */ - /* Ueberschneidung ù ´ ù ù ´ ù */ - /* nur auf X-Achse ù ù ù ù à ù */ - /* 2.6, 2.7 Gegeneinander, vertikal versetzt. ù ù à ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse. ù ù ù ù ù à */ - /* 2.8 Gegeneinander. ù ù ù */ - /* Ueberschneidung nur ù ´ à */ - /* auf der Y-Achse. ù ù ù */ + /* 9 Moeglichkeiten: � � � */ + /* 2.1 Gegenueber, Ueberschneidung � � � */ + /* nur auf der Y-Achse � � � */ + /* 2.2, 2.3 Gegenueber, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse � � � � � � */ + /* 2.4, 2.5 Untereinander, � � � � � � */ + /* Ueberschneidung � � � � � � */ + /* nur auf X-Achse � � � � � � */ + /* 2.6, 2.7 Gegeneinander, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse. � � � � � � */ + /* 2.8 Gegeneinander. � � � */ + /* Ueberschneidung nur � � � */ + /* auf der Y-Achse. � � � */ /* 2.9 Die BewareRects der Objekte ueberschneiden */ /* sich auf X- und Y-Achse. */ /* Die Faelle gelten entsprechend umgesetzt auch fuer */ @@ -1113,39 +1113,39 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } } else if (nMainCase==3) { // Fall 3: Einer waagerecht und der andere senkrecht. Sehr viele Fallunterscheidungen - /* Kleine Legende: ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú à ú ù -> Selbe Hoehe */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* Linienaustritte links ´, rechts Ã, oben Á und unten Â. */ + /* Kleine Legende: � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Selbe Hoehe */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* Linienaustritte links �, rechts �, oben � und unten �. */ /* Insgesamt sind 96 Konstellationen moeglich, wobei einige nicht einmal */ /* eindeutig einem Fall und damit einer Behandlungsmethode zugeordnet werden */ /* koennen. */ /* 3.1: Hierzu moegen alle Konstellationen zaehlen, die durch den */ /* Default-MeetingPoint zufriedenstellend abgedeckt sind (20+12). */ - /*    ú Á Á ú    Diese 12 ù ú ù  ù ù ú ù ú ù ù  ù ú ù ù ú ù ú ù */ - /* ú ú ú ú Á Á ú ú ú ú Konstel. ú ú ú ú ú ú ú ú ú  ú ú ú ú ú  ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à ú Á ù ú à ú  Á ú ´ ú ù  ú ´ ú ù */ - /* ú ú ú ú   ú ú ú ú nur zum ú ú ú ú Á ú ú ú ú ú Á ú ú ú ú ú ú ú ú ú */ - /* Á Á Á ú   ú Á Á Á Teil: ù ú ù Á ù ù ú ù ú ù ù Á ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 12 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* Letztere 16 Faelle scheiden aus, sobald sich die Objekte offen */ /* gegenueberstehen (siehe Fall 3.2). */ /* 3.2: Die Objekte stehen sich offen gegenueber und somit ist eine */ /* Verbindung mit lediglich 2 Linien moeglich (4+20). */ /* Dieser Fall hat 1. Prioritaet. */ - /* ù ú ù ú   ú ù ú ù Diese 20 ù ú ù  ù ù  ù ú ù ù ú ù ú ù ù ú ù ú ù */ - /* ú ú ú ú ú ú ú ú ú ú Konstel. ú ú ú     ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à Á Á Á Á ´ ú ù ù ú à     ´ ú ù */ - /* ú ú ú ú ú ú ú ú ú ú nur zum ú ú ú Á Á Á Á ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú ù ú Á Á ú ù ú ù Teil: ù ú ù Á ù ù Á ù ú ù ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 20 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* 3.3: Die Linienaustritte zeigen vom anderen Objekt weg bzw. hinter */ /* dessen Ruecken vorbei (52+4). */ - /* Á Á Á Á ù ù Á Á Á Á ù ú ú ú ù ù ú ù ú ù Diese 4 ù ú ù ú ù ù ú ù ú ù */ - /* Á Á Á Á ú ú Á Á Á Á    ú ú ú ú    Konstel. ú ú ú  ú ú  ú ú ú */ - /* Á Á à ú ù ù ú ´ Á Á   à ú ù ù ú ´   jedoch ù ú à ú ù ù ú ´ ú ù */ - /* Á Á Á ú ú ú ú Á Á Á     ú ú     nur zum ú ú ú Á ú ú Á ú ú ú */ - /* ù ú ù ú ù ù ú ù ú ù     ù ù     Teil: ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � � � � � � � � � � � Diese 4 � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Konstel. � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � jedoch � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � nur zum � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Teil: � � � � � � � � � � */ // Fall 3.2 Rectangle aTmpR1(aBewareRect1); @@ -1243,8 +1243,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec else if (nPntAnz==4) { // Z oder U if (nAngle1==nAngle2) cForm='U'; else cForm='Z'; - } else if (nPntAnz==4) { /* Ú-¿ Ú-¿ */ - /* ... -Ù -Ù */ + } else if (nPntAnz==4) { /* �-� �-� */ + /* ... -� -� */ } else if (nPntAnz==6) { // S oder C oder ... if (nAngle1!=nAngle2) { // Fuer Typ S hat Linie2 dieselbe Richtung wie Linie4. @@ -1502,17 +1502,17 @@ Normalisiert auf 1. Austrittswinkel nach rechts bleiben dann noch 31. Dann noch eine vertikale Spiegelung wegnormalisiert bleiben noch 16 characteristische Verlaufszuege mit 1-5 Linien: Mit 1 Linie (Typ 'I'): -- -Mit 2 Linien (Typ 'L'): -Ù -Mit 3 Linien (Typ 'U'): -¿ (Typ 'Z'): Ú- - -Ù -Ù +Mit 2 Linien (Typ 'L'): -� +Mit 3 Linien (Typ 'U'): -� (Typ 'Z'): �- + -� -� Mit 4 Linien: 1 ist nicht plausibel, 3 ist=2 (90deg Drehung). Verbleibt 2,4 - Ú-Ù Ú¿ À¿ Ú¿ Ú¿ Ú-¿ - -Ù -Ù -Ù -Ù -Ù -Ù + �-� Ú¿ � Ú¿ Ú¿ �-� + -� -� -� -� -� -� Mit 5 Linien: nicht plausibel sind 1,2,4,5. 7 ist identisch mit 3 (Richtungsumkehr) Bleibt also 3,6 und 8. '4' 'S' 'C' - ¿ Ú -¿ Ú- Ú-¿ Ú- - Ú-Ù Ú-Ù Ú-¿ Ú-¿ À¿ À¿ -Ù ³ Ú-¿ Ú-¿ À¿ Ú-¿ - -Ù -Ù -Ù Ù -Ù À- -Ù -Ù --Ù À Ù -Ù Ù -Ù À Ù + � � -� �- �-� �- + �-� �-� �-� �-� � � -� � �-� �-� � �-� + -� -� -� � -� �- -� -� --� � � -� � -� � � Insgesamt sind also 9 Grundtypen zu unterscheiden die den 400 Konstellationen aus Objektposition und Austrittswinkeln zuzuordnen sind. 4 der 9 Grundtypen haben eine 'Mittellinie'. Die Anzahl der zu Objektabstaende diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5718a9c1e5..8419994c8a 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -46,15 +46,16 @@ #include <vcl/svapp.hxx> #include <sfx2/linkmgr.hxx> +#include <sfx2/docfile.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include "svtools/filter.hxx" #include <svx/svdograf.hxx> @@ -70,6 +71,8 @@ #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <osl/thread.hxx> +#include <osl/mutex.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -81,13 +84,48 @@ using namespace ::com::sun::star::io; #define GRAFSTREAMPOS_INVALID 0xffffffff #define SWAPGRAPHIC_TIMEOUT 5000 + // ------------------ // - SdrGraphicLink - // ------------------ + +const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilterName ) +{ + Graphic aGraphic; + + SfxMedium xMed( rFileName, STREAM_STD_READ, TRUE ); + xMed.DownLoad(); + + SvStream* pInStrm = xMed.GetInStream(); + if ( pInStrm ) + { + pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + + const USHORT nFilter = rFilterName.Len() && pGF->GetImportFormatCount() + ? pGF->GetImportFormatNumber( rFilterName ) + : GRFILTER_FORMAT_DONTKNOW; + + String aEmptyStr; + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 ); + + // Room for improvment: + // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. + // But this link is required by some filters to access the native graphic (pdf export/ms export), + // there we should create a new service to provide this data if needed + aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); + aFilterData[ 0 ].Value = Any( sal_True ); + pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); + } + return aGraphic; +} + +class SdrGraphicUpdater; class SdrGraphicLink : public sfx2::SvBaseLink { SdrGrafObj* pGrafObj; + SdrGraphicUpdater* pGraphicUpdater; public: SdrGraphicLink(SdrGrafObj* pObj); @@ -96,16 +134,87 @@ public: virtual void Closed(); virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); + void DataChanged( const Graphic& rGraphic ); BOOL Connect() { return 0 != GetRealObject(); } - void UpdateSynchron(); + void UpdateAsynchron(); + void RemoveGraphicUpdater(); }; +class SdrGraphicUpdater : public ::osl::Thread +{ +public: + SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& ); + virtual ~SdrGraphicUpdater( void ); + + void SAL_CALL Terminate( void ); + + sal_Bool GraphicLinkChanged( const String& rFileName ){ return mrFileName != rFileName; }; + +protected: + + /** is called from the inherited create method and acts as the + main function of this thread. + */ + virtual void SAL_CALL run(void); + + /** Called after the thread is terminated via the terminate + method. Used to kill the thread by calling delete on this. + */ + virtual void SAL_CALL onTerminated(void); + +private: + + ::osl::Mutex maMutex; + const String& mrFileName; + const String& mrFilterName; + SdrGraphicLink& mrGraphicLink; + + volatile bool mbIsTerminated; +}; + +SdrGraphicUpdater::SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& rGraphicLink ) +: mrFileName( rFileName ) +, mrFilterName( rFilterName ) +, mrGraphicLink( rGraphicLink ) +, mbIsTerminated( sal_False ) +{ + create(); +} + +SdrGraphicUpdater::~SdrGraphicUpdater( void ) +{ +} + +void SdrGraphicUpdater::Terminate() +{ + ::osl::MutexGuard aGuard( maMutex ); + mbIsTerminated = sal_True; +} + +void SAL_CALL SdrGraphicUpdater::onTerminated(void) +{ + delete this; +} + +void SAL_CALL SdrGraphicUpdater::run(void) +{ + Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) ); + ::osl::MutexGuard aGuard(maMutex); + SolarMutexGuard aSolarGuard; + if ( !mbIsTerminated ) + { + mrGraphicLink.DataChanged( aGraphic ); + mrGraphicLink.RemoveGraphicUpdater(); + } +} + // ----------------------------------------------------------------------------- -SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj): - ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), - pGrafObj(pObj) +SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) +: ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ) +, pGrafObj( pObj ) +, pGraphicUpdater( NULL ) { SetSynchron( FALSE ); } @@ -114,6 +223,22 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj): SdrGraphicLink::~SdrGraphicLink() { + if ( pGraphicUpdater ) + pGraphicUpdater->Terminate(); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) +{ + pGrafObj->ImpSetLinkedGraphic( rGraphic ); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::RemoveGraphicUpdater() +{ + pGraphicUpdater = NULL; } // ----------------------------------------------------------------------------- @@ -136,9 +261,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType, } else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != sfx2::LinkManager::RegisterStatusInfoId() ) { - // only repaint, no objectchange - pGrafObj->ActionChanged(); - // pGrafObj->BroadcastObjectChange(); + // broadcasting, to update slidesorter + pGrafObj->BroadcastObjectChange(); } } } @@ -156,14 +280,20 @@ void SdrGraphicLink::Closed() // ----------------------------------------------------------------------------- -void SdrGraphicLink::UpdateSynchron() +void SdrGraphicLink::UpdateAsynchron() { if( GetObj() ) { - String aMimeType( SotExchange::GetFormatMimeType( GetContentType() )); - ::com::sun::star::uno::Any aValue; - GetObj()->GetData( aValue, aMimeType, TRUE ); - DataChanged( aMimeType, aValue ); + if ( pGraphicUpdater ) + { + if ( pGraphicUpdater->GraphicLinkChanged( pGrafObj->GetFileName() ) ) + { + pGraphicUpdater->Terminate(); + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); + } + } + else + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); } } @@ -448,8 +578,10 @@ void SdrGrafObj::ForceSwapIn() const const_cast< SdrGrafObj* >( this )->mbIsPreview = sal_False; } - - pGraphic->FireSwapInRequest(); + if ( pGraphicLink && pGraphic->IsSwappedOut() ) + ImpUpdateGraphicLink( sal_False ); + else + pGraphic->FireSwapInRequest(); if( pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE ) || @@ -559,24 +691,36 @@ UINT16 SdrGrafObj::GetObjIdentifier() const // ----------------------------------------------------------------------------- -sal_Bool SdrGrafObj::ImpUpdateGraphicLink() const +/* The graphic of the GraphicLink will be loaded. If it is called with + bAsynchron = true then the graphic will be set later via DataChanged +*/ +sal_Bool SdrGrafObj::ImpUpdateGraphicLink( sal_Bool bAsynchron ) const { - sal_Bool bRet = sal_False; - + sal_Bool bRet = sal_False; if( pGraphicLink ) { - const sal_Bool bIsChanged = pModel->IsChanged(); - pGraphicLink->UpdateSynchron(); - pModel->SetChanged( bIsChanged ); - + if ( bAsynchron ) + pGraphicLink->UpdateAsynchron(); + else + pGraphicLink->DataChanged( ImpLoadLinkedGraphic( aFileName, aFilterName ) ); bRet = sal_True; } - return bRet; } // ----------------------------------------------------------------------------- +void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) +{ + const sal_Bool bIsChanged = GetModel()->IsChanged(); + NbcSetGraphic( rGraphic ); + ActionChanged(); + BroadcastObjectChange(); + GetModel()->SetChanged( bIsChanged ); +} + +// ----------------------------------------------------------------------------- + void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { switch( pGraphic->GetType() ) @@ -1096,7 +1240,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) if( ( pGraphic->HasUserData() || pGraphicLink ) && ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) ) { - pRet = NULL; + pRet = GRFMGR_AUTOSWAPSTREAM_LINK; } else if( nSwapMode & SDR_SWAPGRAPHICSMODE_TEMP ) { @@ -1181,7 +1325,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) } } } - else if( !ImpUpdateGraphicLink() ) + else if( !ImpUpdateGraphicLink( sal_False ) ) { pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 6d36fd1b60..6d1e36e50e 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -46,14 +46,14 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svxids.hrc> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 8934c2f470..24f4b276f3 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -31,7 +31,7 @@ #include <svx/svdomeas.hxx> #include <math.h> -#include "svditext.hxx" // +#include "svx/svditext.hxx" // #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdhdl.hxx> @@ -41,8 +41,8 @@ #include <svx/svdattrx.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index a7f3e5bff9..18e45af4b5 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -32,8 +32,8 @@ #include <vcl/svapp.hxx> #include <svx/svdomedia.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <avmedia/mediawindow.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index eaf7a2496d..858c67981a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,8 +78,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 81ffba500f..ce9ddb478a 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <svx/svdopage.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 23e4084877..370030148c 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -42,8 +42,8 @@ #include <svx/svdpage.hxx> #include <svx/svdhdl.hxx> #include <svx/svdview.hxx> // fuer MovCreate bei Freihandlinien -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #ifdef _MSC_VER #pragma optimize ("",off) diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index cdce360858..df1aebd96e 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -46,8 +46,8 @@ #include <svx/svdview.hxx> // das #include <svx/svdundo.hxx> // Macro-Beispiel #include <svx/svdopath.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 06692aef43..ebb0c61f81 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdpagv.hxx> // fuer Abfrage im Paint, ob das #include <svx/svdview.hxx> // Objekt gerade editiert wird #include <svx/svdpage.hxx> // und fuer AnimationHandler (Laufschrift) #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> // OutlinerDefaults -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> @@ -1492,8 +1492,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint bool bContourFrame=IsContourTextFrame(); - ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); - if( GetModel() ) { MapMode aMapMode(GetModel()->GetScaleUnit(), Point(0,0), @@ -1501,6 +1499,8 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint GetModel()->GetScaleFraction()); rOutl.SetRefMapMode(aMapMode); } + + ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 60a6903517..621e2591e8 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -54,7 +54,7 @@ #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index b419403d0d..04b5a925b6 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -65,7 +65,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <editeng/editstat.hxx> -#include <unoapi.hxx> +#include <svx/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 12f47689bd..e374e6aab2 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -31,7 +31,7 @@ #include <svl/style.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 76ebf0c19e..4401bbf5b5 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -34,8 +34,8 @@ #include <svx/svddrag.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdoashp.hxx> #include <tools/bigint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index e679d76bca..d44d631a82 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> #include <editeng/outliner.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index a59d31bf99..262f5beaec 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -35,7 +35,7 @@ #include <ucbhelper/contentbroker.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 2896dbf359..06b4a4972c 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> @@ -42,7 +42,7 @@ #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/xflclit.hxx> @@ -346,7 +346,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const if(xSequence.hasElements()) { // create an extractor with neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D); // extract text as polygons diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 0b3c7074ab..d986326333 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -48,17 +48,17 @@ #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <rtl/ref.hxx> #include <set> #include <memory> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index ad035f4155..4998ad7df7 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -50,7 +50,7 @@ #include <svx/svdograf.hxx> // fuer SwapInAll() #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdmodel.hxx> #include <svx/svdlayer.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 6f5c4247be..d138746228 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -48,7 +48,7 @@ #include <svx/svdouno.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdtypes.hxx> @@ -67,7 +67,7 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> TYPEINIT1(SdrPageView, SfxListener); DBG_NAME(SdrPageView); @@ -359,6 +359,21 @@ void SdrPageView::PrePaint() } } +void SdrPageView::PostPaint() +{ + const sal_uInt32 nCount(PageWindowCount()); + + for(sal_uInt32 a(0); a < nCount; a++) + { + SdrPageWindow* pCandidate = GetPageWindow(a); + + if(pCandidate) + { + pCandidate->PostPaint(); + } + } +} + void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) @@ -581,10 +596,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C rOut.SetLineColor( aColor ); bool bMap0=rOut.IsMapModeEnabled(); -#ifdef WIN // SetPixel-Profiling fuer Windows - COLORREF aWinColRef=PALETTERGB(aColor.GetRed()>>8,aColor.GetGreen()>>8,aColor.GetBlue()>>8); - HDC aWinhDC=Sysdepen::GethDC(rOut); -#endif long nWrX=0;//aWriterPageOffset.X(); long nWrY=0;//aWriterPageOffset.Y(); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index e55e4adc50..098996cd5d 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -5,7 +5,7 @@ * * Copyright 2000, 2010 Oracle and/or its affiliates. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * * This file is part of OpenOffice.org. * @@ -31,7 +31,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <svx/svdpntv.hxx> #include <vcl/msgbox.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svtools/grfmgr.hxx> #include <svx/svdmodel.hxx> @@ -55,7 +55,7 @@ #include <svx/svdograf.hxx> #include <svx/svdattrx.hxx> #include "svdibrow.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> @@ -734,6 +734,14 @@ void SdrPaintView::PrePaint() } } +void SdrPaintView::PostPaint() +{ + if(mpPageView) + { + mpPageView->PostPaint(); + } +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // #define SVX_REPAINT_TIMER_TEST diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 13bd3956ed..f0b72c4633 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -35,8 +35,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index e67e36402d..50dd8647bb 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -36,13 +36,13 @@ #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlaycrosshair.hxx> #include <svx/sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // #114409#-1 Migrate PageOrigin diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 05f00c9f3f..1140ab68a0 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ /* StarView resource file */ -#include "svdstr.hrc" +#include "svx/svdstr.hrc" // Ab hier gecachte Strings String STR_ObjNameSingulNONE { @@ -2745,6 +2745,11 @@ String SIP_SA_GRAFRESERVE4 { Text = "" ; }; String SIP_SA_GRAFRESERVE5 { Text = "" ; }; String SIP_SA_GRAFRESERVE6 { Text = "" ; }; +Bitmap SIP_SA_PAGESHADOW35X35 +{ + File = "pageshadow35x35.png"; +}; + Bitmap SIP_SA_MARKERS { File = "markers.png"; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index abc6558020..5516404da0 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdundo.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/scene3d.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> @@ -48,7 +48,7 @@ #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 9ed21088d0..bdfed9e872 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <editeng/eeitem.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdedxv.hxx> @@ -56,7 +56,7 @@ #include <tools/tenccvt.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> @@ -986,8 +986,6 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints()) return Pointer(POINTER_NULL); - OSL_TRACE("SdrView::GetPreferedPointer(%lx) %lx\n", this, mpCurrentSdrDragMethod); - return mpCurrentSdrDragMethod->GetSdrDragPointer(); } if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW); diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index e23fbeb78d..a331aa8b55 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -37,7 +37,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> #include <svl/brdcst.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index eac330f67d..e605c8e58b 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -31,11 +31,11 @@ #include <vector> #include <editeng/editeng.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -46,9 +46,9 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "xoutbmp.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/xoutbmp.hxx" #include <vcl/metaact.hxx> #include <svl/poolitem.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 9c8b0edb85..bb73444cd6 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -31,7 +31,7 @@ #include <accessiblecell.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 4eca7365de..c1f6ac6ddc 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -34,8 +34,8 @@ #include "tablelayouter.hxx" #include "cell.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index 3ee05610b9..5fea647594 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -56,7 +56,7 @@ #include "svx/svdpage.hxx" #include "editeng/editeng.hxx" #include "editeng/unotext.hxx" -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" //------------------------------------------------------------------------ diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk index 1eaaef12aa..d97a0e8e94 100644 --- a/svx/source/table/makefile.mk +++ b/svx/source/table/makefile.mk @@ -44,30 +44,30 @@ ENABLE_EXCEPTIONS=TRUE; LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/propertyset.obj\ - $(SLO)$/cell.obj\ - $(SLO)$/cellrange.obj\ - $(SLO)$/cellcursor.obj\ - $(SLO)$/tablerow.obj\ - $(SLO)$/tablerows.obj\ - $(SLO)$/tablecolumn.obj\ - $(SLO)$/tablecolumns.obj\ - $(SLO)$/tablemodel.obj\ - $(SLO)$/svdotable.obj\ - $(SLO)$/viewcontactoftableobj.obj\ - $(SLO)$/tablelayouter.obj\ - $(SLO)$/tablehandles.obj\ - $(SLO)$/tablecontroller.obj\ - $(SLO)$/tableundo.obj + $(SLO)$/propertyset.obj\ + $(SLO)$/cell.obj\ + $(SLO)$/cellrange.obj\ + $(SLO)$/cellcursor.obj\ + $(SLO)$/tablerow.obj\ + $(SLO)$/tablerows.obj\ + $(SLO)$/tablecolumn.obj\ + $(SLO)$/tablecolumns.obj\ + $(SLO)$/tablemodel.obj\ + $(SLO)$/svdotable.obj\ + $(SLO)$/viewcontactoftableobj.obj\ + $(SLO)$/tablelayouter.obj\ + $(SLO)$/tablehandles.obj\ + $(SLO)$/tablecontroller.obj\ + $(SLO)$/tableundo.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/celleditsource.obj \ - $(SLO)$/tabledesign.obj \ - $(SLO)$/accessibletableshape.obj \ - $(SLO)$/accessiblecell.obj \ - $(SLO)$/tablertfexporter.obj \ - $(SLO)$/tablertfimporter.obj + $(SLO)$/celleditsource.obj \ + $(SLO)$/tabledesign.obj \ + $(SLO)$/accessibletableshape.obj \ + $(SLO)$/accessiblecell.obj \ + $(SLO)$/tablertfexporter.obj \ + $(SLO)$/tablertfimporter.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 13818a9ea4..ab74a5cdf5 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -64,8 +64,8 @@ #include "svx/framelink.hxx" #include "svx/sdr/table/tabledesign.hxx" #include "svx/svdundo.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "editeng/writingmodeitem.hxx" #include "editeng/frmdiritem.hxx" #include "svx/xflhtit.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index a6cdedec47..73fd948eda 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -60,15 +60,15 @@ #include "svx/sdrpagewindow.hxx" #include <svx/selectioncontroller.hxx> #include <svx/svdmodel.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <svx/svxdlg.hxx> #include <editeng/boxitem.hxx> #include "cell.hxx" #include <editeng/borderline.hxx> #include <editeng/colritem.hxx> #include "editeng/bolnitem.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svx/svdpage.hxx" #include "tableundo.hxx" #include "tablelayouter.hxx" diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index a1501aa78c..c626e6abe0 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -43,7 +43,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index a3e4340d1e..138b665735 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -45,8 +45,8 @@ #include "editeng/borderline.hxx" #include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index baa1c0269b..6e7b6643b3 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -47,8 +47,8 @@ #include "tableundo.hxx" #include "svx/svdotable.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" //#define PLEASE_DEBUG_THE_TABLES 1 diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index f07784520d..af072230f1 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -41,12 +41,12 @@ #include <svx/colrctrl.hxx> #include <svx/svdview.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <editeng/colritem.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <vcl/svapp.hxx> SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL ) diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 2279095aa9..f72a7ac4cf 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ public: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -136,7 +136,7 @@ public: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -187,8 +187,8 @@ public: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + using svt::PopupWindowController::createPopupWindow; }; @@ -227,7 +227,7 @@ public: // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 4d3d1f5d4f..e0303bbc6a 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -32,6 +32,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -144,9 +145,10 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION Text [ en-US ] = "Extrusion South-East"; }; }; - + DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -207,6 +209,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -379,6 +382,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -439,6 +443,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; @@ -456,6 +461,7 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH }; MetricField MTR_DEPTH { + //HelpId = HID_SD_CTL_FAVORITES ; Border = FALSE ; Pos = MAP_APPFONT ( 3 , 14 ) ; Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 742406b37e..f097be75b4 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -45,8 +45,8 @@ #define TMP_STR_BEGIN '[' #define TMP_STR_END ']' -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/fillctrl.hxx> #include <svx/itemwin.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ec222b0b10..c1c445abdd 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -54,10 +54,10 @@ #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> -#include "gallery.hxx" -#include <dlgutil.hxx> +#include "svx/gallery.hxx" +#include <svx/dlgutil.hxx> -#include "fontworkgallery.hxx" +#include <svx/fontworkgallery.hxx> #include "fontworkgallery.hrc" #include <algorithm> @@ -803,5 +803,4 @@ sal_Int32 FontworkCharacterSpacingDialog::getScale() const } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index 34164876e1..26e624e596 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -37,6 +37,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; @@ -94,6 +95,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -179,6 +181,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -221,6 +224,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 139 , 64 ) ; @@ -256,6 +260,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING }; MetricField MF_VALUE { + HelpID = "svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE"; Border = FALSE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index a06289269d..1fc16fd080 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "formatpaintbrushctrl.hxx" +#include "svx/formatpaintbrushctrl.hxx" // header for class SfxBoolItem #include <svl/eitem.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index af6fcc2a24..ce9c9953cb 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -61,8 +61,8 @@ #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> #include <svx/svdtrans.hxx> -#include "grafctrl.hxx" -#include "tbxcolor.hxx" +#include "svx/grafctrl.hxx" +#include "svx/tbxcolor.hxx" // namespaces using ::rtl::OUString; @@ -311,7 +311,7 @@ public: ImplGrafControl::ImplGrafControl( Window* pParent, - USHORT nSlotId, + USHORT /* nSlotId */, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) @@ -346,8 +346,7 @@ ImplGrafControl::ImplGrafControl( maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index addec7eb18..9760266026 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ #include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> #include <svx/xtable.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/itemwin.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svtools/colorcfg.hxx> #include "linectrl.hrc" @@ -269,6 +269,7 @@ void SvxLineBox::FillControl() if ( pItem ) Fill( pItem->GetDashList() ); } + } //======================================================================== diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 390a5cd10b..b012821b40 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -39,7 +39,7 @@ #include <sfx2/app.hxx> #include <svx/dialogs.hrc> -#include "layctrl.hxx" +#include "svx/layctrl.hxx" #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> #include <svtools/colorcfg.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index e228682088..766fe2d68a 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -47,7 +47,7 @@ #include <svl/slstitm.hxx> #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> -#include <lboxctrl.hxx> +#include <svx/lboxctrl.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src index 149627ef16..b82be11fb5 100644 --- a/svx/source/tbxctrls/lboxctrl.src +++ b/svx/source/tbxctrls/lboxctrl.src @@ -40,6 +40,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL ListBox LB_SVXTBX_UNDO_REDO_CTRL { + HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL"; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 100 , 85 ) ; Border = TRUE ; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 03e1ea6abe..f28f3c2342 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -41,10 +41,10 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk index a9ea745f3c..a405b6856b 100644 --- a/svx/source/tbxctrls/makefile.mk +++ b/svx/source/tbxctrls/makefile.mk @@ -41,25 +41,25 @@ ENABLE_EXCEPTIONS=TRUE LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/fontworkgallery.obj\ - $(SLO)$/extrusioncontrols.obj \ - $(SLO)$/tbcontrl.obj \ + $(SLO)$/fontworkgallery.obj\ + $(SLO)$/extrusioncontrols.obj \ + $(SLO)$/tbcontrl.obj \ $(SLO)$/tbxcolorupdate.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ $(SLO)$/formatpaintbrushctrl.obj\ - $(SLO)$/colrctrl.obj \ - $(SLO)$/fillctrl.obj \ - $(SLO)$/grafctrl.obj \ - $(SLO)$/itemwin.obj \ - $(SLO)$/layctrl.obj \ - $(SLO)$/lboxctrl.obj \ - $(SLO)$/linectrl.obj \ - $(SLO)$/tbxalign.obj \ + $(SLO)$/colrctrl.obj \ + $(SLO)$/fillctrl.obj \ + $(SLO)$/grafctrl.obj \ + $(SLO)$/itemwin.obj \ + $(SLO)$/layctrl.obj \ + $(SLO)$/lboxctrl.obj \ + $(SLO)$/linectrl.obj \ + $(SLO)$/tbxalign.obj \ $(SLO)$/tbxdrctl.obj \ $(SLO)$/verttexttbxctrl.obj \ - $(SLO)$/subtoolboxcontrol.obj \ + $(SLO)$/subtoolboxcontrol.obj \ $(SLO)$/tbxcolor.obj \ $(SLO)$/tbunocontroller.obj \ $(SLO)$/tbunosearchcontrollers.obj @@ -68,15 +68,14 @@ SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) SRS1NAME=$(TARGET) SRC1FILES = \ - fontworkgallery.src \ - extrusioncontrols.src \ - colrctrl.src \ - lboxctrl.src \ - linectrl.src \ - tbcontrl.src \ + fontworkgallery.src \ + extrusioncontrols.src \ + colrctrl.src \ + lboxctrl.src \ + linectrl.src \ + tbcontrl.src \ tbunosearchcontrollers.src \ - tbxdraw.src \ - grafctrl.src + grafctrl.src # --- Targets ------------------------------------------------------- diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 326ec3e6dc..4e8c1147ad 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -74,7 +74,7 @@ #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> #include "helpid.hrc" -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <svx/xtable.hxx> #include "editeng/fontitem.hxx" #include <editeng/fhgtitem.hxx> @@ -83,9 +83,9 @@ #include <editeng/colritem.hxx> #include "editeng/flstitem.hxx" #include "editeng/bolnitem.hxx" -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/tbcontrl.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #include "colorwindow.hxx" #include <memory> @@ -1816,8 +1816,7 @@ struct SvxStyleToolBoxControl::Impl static const sal_Char* aCalcStyles[] = { "Default", - "Heading 1", - "Heading 2", + "Heading1", "Result", "Result2" }; @@ -1829,12 +1828,15 @@ struct SvxStyleToolBoxControl::Impl { try { - Reference< beans::XPropertySet > xStyle; - xCellStyles->getByName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] )) >>= xStyle; - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")))>>= sName; - if( sName.getLength() ) - aDefaultStyles.push_back(sName); + const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) ); + if( xCellStyles->hasByName( sStyleName ) ) + { + Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW ); + ::rtl::OUString sName; + xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName; + if( sName.getLength() ) + aDefaultStyles.push_back(sName); + } } catch( const uno::Exception& ) {} diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index bf1d01592c..68840b1e7b 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -33,8 +33,8 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxalign.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxalign.hxx" +#include "svx/tbxdraw.hxx" #include "tbxdraw.hrc" #include <tools/shl.hxx> #include <sfx2/imagemgr.hxx> diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 24008a9384..206903d080 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxcolor.hxx" #include <sfx2/viewfrm.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src deleted file mode 100644 index e4c7c1d296..0000000000 --- a/svx/source/tbxctrls/tbxdraw.src +++ /dev/null @@ -1,265 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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. - * - ************************************************************************/ - // include --------------------------------------------------------------- -#include "tbxdraw.hrc" -#include <svx/dialogs.hrc> -#include "helpid.hrc" -#include <svx/svxids.hrc> - // pragma ---------------------------------------------------------------- - - // ----------------------------------------------------------------------- -#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } -FloatingWindow RID_SVXTBX_DRAW -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_DRAWTOOL_TBX ; - ToolBox TBX_DRAW - { - HelpId = HID_SVXTBX_DRAW ; - SVLook = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Selection" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Line" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Rectangle" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Polygon" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Curve"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Freeform Line"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - RadioCheck = TRUE ; - Text [ en-US ] = "Arc" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse Pie" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Circle Segment" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT ; - HelpID = SID_DRAW_TEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_VERTICAL ; - HelpID = SID_DRAW_TEXT_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Text"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Animation" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpID = SID_DRAW_CAPTION ; - RadioCheck = TRUE ; - Text [ en-US ] = "Callouts" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpID = SID_DRAW_CAPTION_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Callout"; - }; - }; - }; - Text [ en-US ] = "Draw Functions" ; -}; -FloatingWindow RID_SVXTBX_ALIGNMENT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - HelpID = HID_ALIGN_TBX ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox TBX_ALIGNMENT - { - HelpId = HID_SVXTBX_ALIGNMENT ; - SVLook = TRUE ; - HelpID = SID_OBJECT_ALIGN ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_LEFT ; - HelpID = SID_OBJECT_ALIGN_LEFT ; - Text [ en-US ] = "Left" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_CENTER ; - HelpID = SID_OBJECT_ALIGN_CENTER ; - Text [ en-US ] = "Center" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_RIGHT ; - HelpID = SID_OBJECT_ALIGN_RIGHT ; - Text [ en-US ] = "Right" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_UP ; - HelpID = SID_OBJECT_ALIGN_UP ; - Text [ en-US ] = "Top" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_MIDDLE ; - HelpID = SID_OBJECT_ALIGN_MIDDLE ; - Text [ en-US ] = "Centered" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_DOWN ; - HelpID = SID_OBJECT_ALIGN_DOWN ; - Text [ en-US ] = "Bottom" ; - }; - }; - }; -}; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 87533e56b9..1418d9e92c 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -43,9 +43,9 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxctl.hxx" -#include "tbxdraw.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" +#include "svx/tbxcolor.hxx" #include "tbxdraw.hrc" #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index e6846ea62a..282798fc6c 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -31,7 +31,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <verttexttbxctrl.hxx> +#include <svx/verttexttbxctrl.hxx> #include <svl/languageoptions.hxx> #include <sfx2/app.hxx> #include <svl/eitem.hxx> diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 06296ac02f..2becd0da86 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -47,7 +47,7 @@ #include <svx/dialogs.hrc> #include <svx/svdview.hxx> #include <editeng/colritem.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" #include <svx/extrusionbar.hxx> #include "extrusiondepthdialog.hxx" diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src index 3e6c6ad7e5..dd6f3066a5 100644 --- a/svx/source/toolbars/extrusionbar.src +++ b/svx/source/toolbars/extrusionbar.src @@ -1,65 +1,6 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -ToolBox RID_SVX_EXTRUSION_BAR -{ - HelpId = RID_SVX_EXTRUSION_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_EXTRUSION_TOOGLE ; - HelpID = SID_EXTRUSION_TOOGLE ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_DOWN ; - HelpID = SID_EXTRUSION_TILT_DOWN ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_UP ; - HelpID = SID_EXTRUSION_TILT_UP ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_LEFT ; - HelpID = SID_EXTRUSION_TILT_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_RIGHT ; - HelpID = SID_EXTRUSION_TILT_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DEPTH_FLOATER ; - HelpID = SID_EXTRUSION_DEPTH_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DIRECTION_FLOATER ; - HelpID = SID_EXTRUSION_DIRECTION_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_LIGHTING_FLOATER ; - HelpID = SID_EXTRUSION_LIGHTING_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_SURFACE_FLOATER ; - HelpID = SID_EXTRUSION_SURFACE_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_3D_COLOR ; - HelpID = SID_EXTRUSION_3D_COLOR ; - }; - }; -}; - String RID_SVX_EXTRUSION_BAR { Text [ en-US ] = "Extrusion"; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 719e8ebf5d..3f0005f823 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -33,7 +33,7 @@ #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewsh.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <svx/dialmgr.hxx> @@ -47,11 +47,11 @@ #include <editeng/eeitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/kernitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxids.hrc> #include <svx/fontworkbar.hxx> -#include "fontworkgallery.hxx" +#include "svx/fontworkgallery.hxx" using ::rtl::OUString; @@ -348,7 +348,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem } } -#include "gallery.hxx" +#include "svx/gallery.hxx" #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src index ed9b152fe4..a3a686b51a 100644 --- a/svx/source/toolbars/fontworkbar.src +++ b/svx/source/toolbars/fontworkbar.src @@ -27,40 +27,6 @@ #include <svx/dialogs.hrc> -ToolBox RID_SVX_FONTWORK_BAR -{ - HelpId = RID_SVX_FONTWORK_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_FONTWORK_GALLERY_FLOATER ; - HelpID = SID_FONTWORK_GALLERY_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SHAPE_TYPE ; - HelpID = SID_FONTWORK_SHAPE_TYPE ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ; - HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - }; - }; -}; - String RID_SVX_FONTWORK_BAR { Text [ en-US ] = "Fontwork"; diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk index 40c7f2ccb7..2ceafc91c4 100644 --- a/svx/source/toolbars/makefile.mk +++ b/svx/source/toolbars/makefile.mk @@ -43,12 +43,12 @@ ENABLE_EXCEPTIONS=TRUE; SRS1NAME=toolbars SRC1FILES = \ - extrusionbar.src \ - fontworkbar.src + extrusionbar.src \ + fontworkbar.src SLOFILES= \ - $(SLO)$/extrusionbar.obj \ - $(SLO)$/fontworkbar.obj + $(SLO)$/extrusionbar.obj \ + $(SLO)$/fontworkbar.obj # --- Targets ------------------------------------------------------- diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index a0f5474c38..595e1cdfdc 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -113,7 +113,7 @@ String DictionaryList::makeTabString( const DictionaryEntry& rEntry ) const void DictionaryList::initDictionaryControl( const Reference< linguistic2::XConversionDictionary>& xDictionary , ListBox* pPropertyTypeNameListBox ) { - SetWindowBits( WB_VSCROLL ); + SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); SetBorderStyle( WINDOW_BORDER_MONO ); SetHighlightRange(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 2a0c9b2f28..4c6b76c2ae 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -66,6 +66,7 @@ ModalDialog DLG_CHINESEDICTIONARY { + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -79,6 +80,7 @@ ModalDialog DLG_CHINESEDICTIONARY CheckBox CB_REVERSE { + HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_TERM { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; Border = TRUE ; Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -107,6 +110,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_MAPPING { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -120,6 +124,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; ListBox LB_PROPERTY { + HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; Border = TRUE ; Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -154,6 +159,7 @@ ModalDialog DLG_CHINESEDICTIONARY PushButton PB_ADD { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; Pos = MAP_APPFONT( COL_4, ROW_5 ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -161,6 +167,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_MODIFY { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; Pos = MAP_APPFONT( COL_4, ROW_5a ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -168,6 +175,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_DELETE { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; Pos = MAP_APPFONT( COL_4, ROW_5b ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 52dfd00909..714e0a407e 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -58,6 +58,7 @@ ModalDialog DLG_CHINESETRANSLATION { + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -78,6 +79,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_USE_VARIANTS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; Pos = MAP_APPFONT( COL_3, ROW_4 ); Size = MAP_APPFONT ( FULL_WIDTH - COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_TRANSLATE_COMMONTERMS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; Pos = MAP_APPFONT( COL_2, ROW_6 ); Size = MAP_APPFONT ( COL_4 - COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -101,6 +104,7 @@ ModalDialog DLG_CHINESETRANSLATION PushButton PB_EDITTERMS { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; Pos = MAP_APPFONT( COL_4, ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); Size = MAP_APPFONT( EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk index b5013ca9d1..ec0cdca262 100644 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk @@ -88,3 +88,11 @@ $(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc $(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc + +ALLTAR : $(MISC)/textconversiondlgs.component + +$(MISC)/textconversiondlgs.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 1035c41d1a..2ecf1be3d0 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -54,13 +54,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation ); -} -//================================================================================================== void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component new file mode 100644 index 0000000000..1847435836 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> + <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> + </implementation> +</component> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 946aaa1a75..0427596780 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionContinuation.hpp> +#include <comphelper/interaction.hxx> #include <framework/interaction.hxx> #include <com/sun/star/drawing/GraphicFilterRequest.hpp> #include <com/sun/star/util/URL.hpp> @@ -66,9 +67,9 @@ #include <editeng/numitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdograf.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include "svtools/filter.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/fmview.hxx> @@ -1066,15 +1067,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes { Any aInteraction; Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1); - ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove(); + ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove(); lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY); GraphicFilterRequest aErrorCode; aErrorCode.ErrCode = nStatus; aInteraction <<= aErrorCode; - framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations ); - Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY ); - aSettings.mxInteractionHandler->handle( xRequest ); + aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) ); } return nStatus == GRFILTER_OK; } diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 1b5009e138..596fd70596 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -40,7 +40,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; @@ -201,11 +201,11 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons // if it is not in our own sets, modify the pool! sal_Bool bFound = sal_False; - USHORT nSurrogate; - USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogate; + sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement, mnMemberId ); @@ -238,12 +238,12 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) { const String aSearchName( aName ); NameOrIndex *pItem; - sal_Int32 nSurrogate; + sal_uInt32 nSurrogate; - sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) && (pItem->GetName() == aSearchName) ) { @@ -266,11 +266,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) NameOrIndex *pItem; OUString aApiName; - const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; - sal_Int32 nSurrogate; + const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( !isValid( pItem ) ) continue; @@ -305,14 +305,14 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) return sal_False; const String aSearchName( aName ); - USHORT nSurrogate; + sal_uInt32 nSurrogate; const NameOrIndex *pItem; - USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) && (pItem->GetName() == aSearchName) ) return sal_True; } @@ -327,11 +327,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) const NameOrIndex *pItem; - sal_Int32 nSurrogate; - const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogate; + const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) ) return sal_True; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index ff12910777..ccab088399 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -31,7 +31,7 @@ #include <set> -#include "UnoNamespaceMap.hxx" +#include "svx/UnoNamespaceMap.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -40,7 +40,7 @@ #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> #include <svl/itempool.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "editeng/xmlcnitm.hxx" @@ -117,8 +117,8 @@ namespace svx sal_uInt16* mpWhichId; - sal_uInt16 mnItemCount; - sal_uInt16 mnItem; + sal_uInt32 mnItemCount; + sal_uInt32 mnItem; const SvXMLAttrContainerItem* mpCurrentAttr; sal_uInt16 mnCurrentAttr; @@ -144,7 +144,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool mpWhichId = pWhichIds; mnItem = 0; - mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0; + mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; } sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ) @@ -164,7 +164,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& const SfxPoolItem* pItem = 0; // look for the next available item in the current pool - while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem( *mpWhichId, mnItem ) ) ) ) + while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem2( *mpWhichId, mnItem ) ) ) ) mnItem++; // are we finished with the current whichid? @@ -176,7 +176,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& if( 0 != *mpWhichId ) { mnItem = 0; - mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0; + mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; return next( rPrefix, rURL ); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index e2f63cce8b..d75ec8eaac 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -43,7 +43,7 @@ #include "unopolyhelper.hxx" #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk index 6815f28f4c..1eaec53375 100644 --- a/svx/source/unodraw/makefile.mk +++ b/svx/source/unodraw/makefile.mk @@ -41,41 +41,41 @@ ENABLE_EXCEPTIONS=TRUE LIB1TARGET= $(SLB)$/$(TARGET)-core.lib LIB1OBJFILES= \ - $(SLO)$/UnoGraphicExporter.obj \ - $(SLO)$/XPropertyTable.obj \ - $(SLO)$/UnoNameItemTable.obj \ - $(SLO)$/unoshape.obj \ - $(SLO)$/unoshap2.obj \ - $(SLO)$/unoshap3.obj \ - $(SLO)$/unoshap4.obj \ - $(SLO)$/unopage.obj \ - $(SLO)$/unoshtxt.obj \ - $(SLO)$/unoprov.obj \ - $(SLO)$/unomod.obj \ - $(SLO)$/unomlstr.obj \ - $(SLO)$/unogtabl.obj \ - $(SLO)$/unohtabl.obj \ - $(SLO)$/unobtabl.obj \ - $(SLO)$/unottabl.obj \ - $(SLO)$/unomtabl.obj \ - $(SLO)$/unodtabl.obj \ - $(SLO)$/gluepts.obj \ - $(SLO)$/tableshape.obj \ - $(SLO)$/shapepropertynotifier.obj + $(SLO)$/UnoGraphicExporter.obj \ + $(SLO)$/XPropertyTable.obj \ + $(SLO)$/UnoNameItemTable.obj \ + $(SLO)$/unoshape.obj \ + $(SLO)$/unoshap2.obj \ + $(SLO)$/unoshap3.obj \ + $(SLO)$/unoshap4.obj \ + $(SLO)$/unopage.obj \ + $(SLO)$/unoshtxt.obj \ + $(SLO)$/unoprov.obj \ + $(SLO)$/unomod.obj \ + $(SLO)$/unomlstr.obj \ + $(SLO)$/unogtabl.obj \ + $(SLO)$/unohtabl.obj \ + $(SLO)$/unobtabl.obj \ + $(SLO)$/unottabl.obj \ + $(SLO)$/unomtabl.obj \ + $(SLO)$/unodtabl.obj \ + $(SLO)$/gluepts.obj \ + $(SLO)$/tableshape.obj \ + $(SLO)$/shapepropertynotifier.obj LIB2TARGET= $(SLB)$/$(TARGET).lib LIB2OBJFILES= \ - $(SLO)$/UnoNamespaceMap.obj \ - $(SLO)$/unopool.obj \ - $(SLO)$/unoctabl.obj \ - $(SLO)$/unoshcol.obj \ - $(SLO)$/recoveryui.obj + $(SLO)$/UnoNamespaceMap.obj \ + $(SLO)$/unopool.obj \ + $(SLO)$/unoctabl.obj \ + $(SLO)$/unoshcol.obj \ + $(SLO)$/recoveryui.obj SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) SRS1NAME=unodraw SRC1FILES = \ - unodraw.src + unodraw.src # --- Tagets ------------------------------------------------------- diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index d5512ebe61..4511795432 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -37,10 +37,10 @@ #include <svx/xbtmpit.hxx> #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <editeng/memberids.hrc> using namespace ::com::sun::star; @@ -120,5 +120,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( Sdr { return *new SvxUnoBitmapTable(pModel); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index e9ac802095..a6542b0f5c 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -36,9 +36,9 @@ #include "../customshapes/EnhancedCustomShapeEngine.hxx" #include <svx/xtable.hxx> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include "recoveryui.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "tbunocontroller.hxx" #include "tbunosearchcontrollers.hxx" @@ -262,60 +262,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - registry::XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const uno::Sequence< OUString >& rServices) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, SvxShapeCollection::getImplementationName_Static(), SvxShapeCollection::getSupportedServiceNames_Static() ); - writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() ); - writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() ); - writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() ); - writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); - writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - - writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); - - // XPrimitiveFactory2D - writeInfo( pKey, - drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), - drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); -// writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 8fe41f3836..31bc9c28a9 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -39,7 +39,7 @@ #include <svx/xdash.hxx> #include <svx/svdmodel.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 243b6bc445..a6f7562138 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -37,7 +37,7 @@ #include <svx/svdmodel.hxx> #include <svx/xdef.hxx> #include <svx/xflgrit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 17a03e652e..971f9c7d69 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -38,7 +38,7 @@ #include <svx/xdef.hxx> #include <svx/xflhtit.hxx> #include <svx/unomid.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index be28dadd76..d1d22d8775 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -42,17 +42,17 @@ #include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> -#include <unofill.hxx> +#include <svx/unofill.hxx> #include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <sfx2/sfx.hrc> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdmodel.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdtypes.hxx> #include <svx/unoprov.hxx> #include <svx/unopage.hxx> diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index c675dd56cf..3d6fd2a0c0 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -51,9 +51,9 @@ #include <vcl/svapp.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; @@ -276,11 +276,11 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const // if it is not in our own sets, modify the pool! sal_Bool bFound = sal_False; - USHORT nSurrogate; - const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; + const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement ); @@ -289,10 +289,10 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const } } - const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement ); @@ -310,10 +310,10 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, USHORT nWhich, uno::Any& rAny ) { NameOrIndex *pItem; - const sal_Int32 nSurrogateCount = pPool ? (sal_Int32)pPool->GetItemCount( nWhich ) : 0; - for( sal_Int32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) + const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0; + for( sal_uInt32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate ); if( pItem && pItem->GetName() == rSearchName ) { @@ -357,15 +357,15 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet ) { - const sal_Int32 nSuroCount = pPool->GetItemCount( nWhich ); - sal_Int32 nSurrogate; + const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich ); + sal_uInt32 nSurrogate; - NameOrIndex *pItem; + NameOrIndex* pItem; OUString aName; for( nSurrogate = 0; nSurrogate < nSuroCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate ); if( pItem == NULL || pItem->GetName().Len() == 0 ) continue; @@ -415,20 +415,20 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) NameOrIndex *pItem; SvxUnogetInternalNameForItem( XATTR_LINESTART, aName, aSearchName ); - USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; - USHORT nSurrogate; + sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) return sal_True; } SvxUnogetInternalNameForItem( XATTR_LINEEND, aName, aSearchName ); - USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) return sal_True; } @@ -450,19 +450,19 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) NameOrIndex *pItem; - const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; - USHORT nSurrogate; + const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName().Len() != 0 ) return sal_True; } - const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName().Len() != 0 ) return sal_True; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index bdd14ecd7c..6d101577c3 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -50,11 +50,11 @@ #include <svx/svdpagv.hxx> #include <svx/unopage.hxx> #include "shapeimpl.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/unoprov.hxx> #include <svx/svdopath.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdomeas.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> @@ -438,7 +438,7 @@ namespace //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen -// SdrPageView. Dies muß nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () { @@ -462,7 +462,7 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen -// SdrPageView. Dies muß nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw() { diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index bcfc40c055..3f1712fab7 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -35,7 +35,7 @@ #include <rtl/uuid.h> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include "unopool.hxx" +#include "svx/unopool.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpool.hxx> #include <svx/unoprov.hxx> @@ -47,7 +47,7 @@ #include <svx/svdetc.hxx> #include <editeng/editeng.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <memory> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 6a8344aa36..72c24a59a1 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -43,17 +43,17 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <hash_map> -#include <vcl/fldunit.hxx> #include <tools/shl.hxx> +#include <tools/fldunit.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unotext.hxx> #include <svx/unoshprp.hxx> #include <editeng/editeng.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/dialogs.hrc> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> @@ -649,10 +649,9 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, // #i112587# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, + { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, {0,0,0,0,0,0} - }; return aControlPropertyMap_Impl; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index c5f89e96fc..e88025811e 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -66,7 +66,7 @@ #include "unopolyhelper.hxx" // #i29181# -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -1801,6 +1801,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const { case OWN_ATTR_VALUE_FILLBITMAP: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const Graphic& rGraphic = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic(); if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE) @@ -1819,6 +1820,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const aDestStrm.GetEndOfData()); rValue <<= aSeq; } + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } @@ -1830,10 +1833,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const } else { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true); OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); aURL += OUString::createFromAscii( rGrafObj.GetUniqueID().GetBuffer() ); rValue <<= aURL; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); } break; } @@ -1848,8 +1854,11 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const case OWN_ATTR_VALUE_GRAPHIC: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() ); rValue <<= xGraphic; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index a9be7f6cc6..c750b2436f 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -46,7 +46,7 @@ #include <svx/unopage.hxx> #include <editeng/unoprnms.hxx> #include <svx/polysc3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/lathe3d.hxx> @@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue ) } //---------------------------------------------------------------------- -#include <svditer.hxx> +#include <svx/svditer.hxx> struct ImpRememberTransAndRect { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 4c16c8ed1f..be5281656d 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -59,11 +59,11 @@ #include <svx/unoshprp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdpagv.hxx" #include "svx/svdview.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" /////////////////////////////////////////////////////////////////////// diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 83dcf5bbcb..391d706bed 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -62,7 +62,7 @@ #include "svx/svdogrp.hxx" #include "svx/scene3d.hxx" #include "svx/svdmodel.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include "svx/fmglob.hxx" #include "svx/unopage.hxx" #include "svx/view3d.hxx" @@ -73,7 +73,7 @@ #include "svx/unoshprp.hxx" #include "svx/sxciaitm.hxx" // todo: remove #include "svx/svdograf.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdomeas.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpool.hxx" @@ -91,9 +91,9 @@ #include "svx/xlnedit.hxx" #include "svx/xlnstit.hxx" #include "svx/xlndsit.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "unomaster.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/unomaster.hxx" #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -1686,12 +1686,12 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN const SfxItemPool* pPool = rSet.GetPool(); const String aSearchName( aName ); - const USHORT nCount = pPool->GetItemCount((USHORT)nWID); - const NameOrIndex *pItem; + const sal_uInt32 nCount = pPool->GetItemCount2((USHORT)nWID); + const NameOrIndex* pItem; - for( USHORT nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem((USHORT)nWID, nSurrogate); + pItem = (NameOrIndex*)pPool->GetItem2((USHORT)nWID, nSurrogate); if( pItem && ( pItem->GetName() == aSearchName ) ) { rSet.Put( *pItem ); diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 14e32c0a09..6d82c989b0 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/document/EventObject.hpp> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include <svx/unoprov.hxx> #include <comphelper/serviceinfohelper.hxx> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index ae97b5b6b4..1a7b3455c7 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> using namespace ::osl; using namespace ::rtl; @@ -122,7 +122,6 @@ private: SvxDrawOutlinerViewForwarder* CreateViewForwarder(); void SetupOutliner(); - void UpdateOutliner(); sal_Bool HasView() const { return mpView ? sal_True : sal_False; } sal_Bool IsEditMode() const @@ -168,6 +167,8 @@ public: virtual void ObjectInDestruction(const SdrObject& rObject); void ChangeModel( SdrModel* pNewModel ); + + void UpdateOutliner(); }; //------------------------------------------------------------------------ @@ -1148,4 +1149,9 @@ void SvxTextEditSource::ChangeModel( SdrModel* pNewModel ) mpImpl->ChangeModel( pNewModel ); } +void SvxTextEditSource::UpdateOutliner() +{ + mpImpl->UpdateOutliner(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index e20263cf92..463ed92d27 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -36,7 +36,7 @@ #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> #include "UnoNameItemTable.hxx" diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk index 113bd70db0..56d9eb8557 100755 --- a/svx/source/unogallery/makefile.mk +++ b/svx/source/unogallery/makefile.mk @@ -39,9 +39,9 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES= \ - $(SLO)$/unogalthemeprovider.obj \ - $(SLO)$/unogaltheme.obj \ - $(SLO)$/unogalitem.obj + $(SLO)$/unogalthemeprovider.obj \ + $(SLO)$/unogaltheme.obj \ + $(SLO)$/unogalitem.obj # --- Target ------------------------------------------------------- diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 015c3c1cf4..ad78ee4766 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -31,7 +31,7 @@ #include "unogalitem.hxx" #include "unogaltheme.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> #include <rtl/uuid.h> diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 9e5a1e8bc2..a1ec703c82 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -33,7 +33,7 @@ #include "unogaltheme.hxx" #include "unogalitem.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk index 02e6f3ae1f..47651f905c 100644 --- a/svx/source/xml/makefile.mk +++ b/svx/source/xml/makefile.mk @@ -38,11 +38,11 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES = \ - $(SLO)$/xmlexport.obj \ - $(SLO)$/xmlxtimp.obj \ - $(SLO)$/xmlxtexp.obj \ - $(SLO)$/xmlgrhlp.obj \ - $(SLO)$/xmleohlp.obj + $(SLO)$/xmlexport.obj \ + $(SLO)$/xmlxtimp.obj \ + $(SLO)$/xmlxtexp.obj \ + $(SLO)$/xmlgrhlp.obj \ + $(SLO)$/xmleohlp.obj # --- Targets -------------------------------------------------------------- diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index b23e252f80..1675a81a19 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -53,7 +53,7 @@ #include <sot/clsids.hxx> #include <map> -#include "xmleohlp.hxx" +#include "svx/xmleohlp.hxx" // ----------- // - Defines - diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index e61e21ef17..c73b888975 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -45,8 +45,8 @@ #include <unotools/streamwrap.hxx> #include <sot/storage.hxx> #include <svx/svdmodel.hxx> -#include <xmleohlp.hxx> -#include <xmlgrhlp.hxx> +#include <svx/xmleohlp.hxx> +#include <svx/xmlgrhlp.hxx> #include <svx/unomodel.hxx> diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index c1e87b5bb6..95df12fcf2 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -47,7 +47,7 @@ #include <tools/zcodec.hxx> #include "svtools/filter.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include <algorithm> @@ -707,8 +707,8 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s else { const String aGraphicObjectId( aPictureStreamName ); - const GraphicObject aGrfObject( ByteString( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US ) ); - + const ByteString aAsciiObjectID( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US ); + const GraphicObject aGrfObject( aAsciiObjectID ); if( aGrfObject.GetType() != GRAPHIC_NONE ) { String aStreamName( aGraphicObjectId ); @@ -782,6 +782,15 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s rURLPair.second = sPictures; rURLPair.second += aStreamName; } +#if OSL_DEBUG_LEVEL > 0 + else + { + ByteString sMessage = "graphic object with ID '"; + sMessage += aAsciiObjectID; + sMessage += "' has an unknown type"; + OSL_ENSURE( false, sMessage.GetBuffer() ); + } +#endif } maURLSet.insert( aURLString ); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 14b8797556..0571a8e94b 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmlxtexp.hxx" diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index f4fb0ae416..e61a00084e 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -59,7 +59,7 @@ #include "xmloff/ImageStyle.hxx" #include "xmloff/MarkerStyle.hxx" #include <xmloff/xmlictxt.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmloff/attrlist.hxx" #include "xmlxtimp.hxx" diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index a371addc95..5ad4aff8e1 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -39,7 +39,7 @@ #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svtools/FilterConfigItem.hxx> #include <svtools/filter.hxx> diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk index 1ed48bc71f..1b1408b3cf 100644 --- a/svx/source/xoutdev/makefile.mk +++ b/svx/source/xoutdev/makefile.mk @@ -41,19 +41,19 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- SLOFILES= \ - $(SLO)$/xattr.obj \ - $(SLO)$/xattr2.obj \ - $(SLO)$/xattrbmp.obj \ - $(SLO)$/xpool.obj \ - $(SLO)$/xtable.obj \ - $(SLO)$/xtabcolr.obj \ - $(SLO)$/xtablend.obj \ - $(SLO)$/xtabdash.obj \ - $(SLO)$/xtabhtch.obj \ - $(SLO)$/xtabgrdt.obj \ - $(SLO)$/xtabbtmp.obj \ + $(SLO)$/xattr.obj \ + $(SLO)$/xattr2.obj \ + $(SLO)$/xattrbmp.obj \ + $(SLO)$/xpool.obj \ + $(SLO)$/xtable.obj \ + $(SLO)$/xtabcolr.obj \ + $(SLO)$/xtablend.obj \ + $(SLO)$/xtabdash.obj \ + $(SLO)$/xtabhtch.obj \ + $(SLO)$/xtabgrdt.obj \ + $(SLO)$/xtabbtmp.obj \ $(SLO)$/xexch.obj \ - $(SLO)$/_xpoly.obj \ - $(SLO)$/_xoutbmp.obj + $(SLO)$/_xpoly.obj \ + $(SLO)$/_xoutbmp.obj .INCLUDE : target.mk diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index d4512f0990..31c455088a 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -45,15 +45,15 @@ #include <editeng/memberids.hrc> #include <tools/stream.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svl/style.hxx> #include "unopolyhelper.hxx" #include <tools/bigint.hxx> #include <svl/itemset.hxx> #include <svx/dialogs.hrc> -#include "svdstr.hrc" -#include "xattr.hxx" +#include "svx/svdstr.hrc" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> @@ -219,12 +219,12 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn if( aUniqueName.Len() && pPool1 ) { - const sal_uInt16 nCount = pPool1->GetItemCount( nWhich ); + const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich ); const NameOrIndex *pItem; - for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate ); + pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) ) { @@ -301,11 +301,11 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn if( (aUniqueName.Len() == 0) && pPool1 ) { - const sal_uInt16 nCount = pPool1->GetItemCount( nWhich ); + const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich ); const NameOrIndex *pItem; - for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate ); + pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); if( pItem && pItem->GetName().Len() ) { @@ -1840,16 +1840,16 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const // 2. if we have a name check if there is already an item with the // same name in the documents pool with a different line end or start - sal_uInt16 nCount, nSurrogate; + sal_uInt32 nCount, nSurrogate; const SfxItemPool* pPool1 = &pModel->GetItemPool(); if( aUniqueName.Len() && pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1867,11 +1867,11 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1892,10 +1892,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; if( aUniqueName.Len() && pPool2) { - nCount = pPool2->GetItemCount( XATTR_LINESTART ); + nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1913,10 +1913,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool2->GetItemCount( XATTR_LINEEND ); + nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1946,12 +1946,12 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); - sal_uInt16 nSurrogate2; + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); + sal_uInt32 nSurrogate2; for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -1971,10 +1971,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const } } - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -2207,11 +2207,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool1 = &pModel->GetItemPool(); if( aUniqueName.Len() && pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2229,11 +2229,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2254,10 +2254,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; if( aUniqueName.Len() && pPool2) { - nCount = pPool2->GetItemCount( XATTR_LINESTART ); + nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2275,10 +2275,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool2->GetItemCount( XATTR_LINEEND ); + nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2308,12 +2308,12 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); - sal_uInt16 nSurrogate2; + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); + sal_uInt32 nSurrogate2; for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -2333,10 +2333,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const } } - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 2a6fca4a1e..fe303bed81 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Any.hxx> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index deb7e51a27..0a1f1cc7a0 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -39,13 +39,13 @@ #include <editeng/memberids.hrc> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdmodel.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 5335967f37..4407b41590 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -37,10 +37,9 @@ #include <svx/xfillit0.hxx> #include <svl/itempool.hxx> #include <svl/whiter.hxx> -#include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svx/xdef.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream ); diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 36abdb07cf..69438a5093 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/xtable.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> @@ -53,8 +53,8 @@ XOutdevItemPool::XOutdevItemPool( const XubString aNullStr; const Bitmap aNullBmp; const basegfx::B2DPolyPolygon aNullPol; - const Color aNullLineCol(RGB_Color(COL_BLACK)); - const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); // "Blue 8" + const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE)); + const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY)); const XDash aNullDash; const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE)); diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 83145d7a52..b5ae9e952e 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -32,7 +32,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 0404fe8825..e6681161ec 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -32,7 +32,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index db11b5b071..41e0cdb82a 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index d58b8a9a76..b4ce642edb 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index a35389ee8f..d002baea1b 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> @@ -51,7 +51,7 @@ #include <svx/dialmgr.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index cd0c844687..3c97a96964 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/util/cui.dxp b/svx/util/cui.dxp deleted file mode 100644 index cfee3729bf..0000000000 --- a/svx/util/cui.dxp +++ /dev/null @@ -1 +0,0 @@ -CreateDialogFactory diff --git a/svx/util/cui.flt b/svx/util/cui.flt deleted file mode 100644 index 8ab7afd3bf..0000000000 --- a/svx/util/cui.flt +++ /dev/null @@ -1,139 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -DialogsResMgr -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -+ImpGetResStr -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridControl -+FmXGridPeer -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -___CT -_alloc -_CT -exception::exception -_TI2 -___CT diff --git a/svx/util/dl.flt b/svx/util/dl.flt deleted file mode 100644 index 8ab7afd3bf..0000000000 --- a/svx/util/dl.flt +++ /dev/null @@ -1,139 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -DialogsResMgr -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -+ImpGetResStr -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridControl -+FmXGridPeer -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -___CT -_alloc -_CT -exception::exception -_TI2 -___CT diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index 227006cc4e..e8f2e0a948 100644 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp @@ -17,5 +17,4 @@ Gallery_InsertSdrObj Gallery_GetThemeNameFromId Gallery_BeginLocking Gallery_EndLocking -component_writeInfo component_getFactory diff --git a/svx/util/hidother.src b/svx/util/hidother.src index f00cb22137..a0be09063f 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -#include "hidother.hrc" -#include <svx/svxids.hrc> #include "../inc/fmhelp.hrc" /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ @@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST { HelpID = HID_GRID_TRAVEL_LAST ;}; hidspecial HID_GRID_TRAVEL_NEW { HelpID = HID_GRID_TRAVEL_NEW ;}; hidspecial HID_GRID_TRAVEL_NEXT { HelpID = HID_GRID_TRAVEL_NEXT ;}; hidspecial HID_GRID_TRAVEL_PREV { HelpID = HID_GRID_TRAVEL_PREV ;}; -hidspecial HID_INTERFACE_BASIDE_VIEWSH { HelpID = HID_INTERFACE_BASIDE_VIEWSH; }; hidspecial HID_POPUP_COLOR { HelpID = HID_POPUP_COLOR; }; hidspecial HID_POPUP_COLOR_CTRL { HelpID = HID_POPUP_COLOR_CTRL; }; hidspecial HID_POPUP_FRAME { HelpID = HID_POPUP_FRAME; }; @@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; }; -hidspecial SID_DSBROWSER_EXPLORER { HelpID = SID_DSBROWSER_EXPLORER ;}; -hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; }; hidspecial UID_FORMPROPBROWSER_FRAME { HelpID = UID_FORMPROPBROWSER_FRAME ;}; diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 2e756b5aa3..e2f8238592 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -46,58 +46,62 @@ SHL1IMPLIB= isvxcore SHL1USE_EXPORTS=name SHL1OBJS= \ - $(SLO)$/coreservices.obj + $(SLO)$/coreservices.obj SHL1LIBS= \ $(SLB)$/animation.lib \ $(SLB)$/attribute.lib \ - $(SLB)$/contact.lib \ - $(SLB)$/customshapes-core.lib \ - $(SLB)$/dialogs-core.lib \ - $(SLB)$/engine3d-core.lib \ - $(SLB)$/event.lib \ - $(SLB)$/fmcomp-core.lib \ - $(SLB)$/form-core.lib \ - $(SLB)$/gal.lib \ + $(SLB)$/contact.lib \ + $(SLB)$/customshapes-core.lib \ + $(SLB)$/dialogs-core.lib \ + $(SLB)$/engine3d-core.lib \ + $(SLB)$/event.lib \ + $(SLB)$/fmcomp-core.lib \ + $(SLB)$/form-core.lib \ + $(SLB)$/gal.lib \ $(SLB)$/items-core.lib \ - $(SLB)$/overlay.lib \ - $(SLB)$/primitive2d.lib \ - $(SLB)$/primitive3d.lib \ - $(SLB)$/properties.lib \ - $(SLB)$/svdraw-core.lib \ - $(SLB)$/table-core.lib \ - $(SLB)$/tbxctrls-core.lib \ - $(SLB)$/toolbars.lib \ - $(SLB)$/unodraw-core.lib \ - $(SLB)$/xml.lib \ - $(SLB)$/xout.lib + $(SLB)$/overlay.lib \ + $(SLB)$/primitive2d.lib \ + $(SLB)$/primitive3d.lib \ + $(SLB)$/properties.lib \ + $(SLB)$/svdraw-core.lib \ + $(SLB)$/table-core.lib \ + $(SLB)$/tbxctrls-core.lib \ + $(SLB)$/toolbars.lib \ + $(SLB)$/unodraw-core.lib \ + $(SLB)$/xml.lib \ + $(SLB)$/xout.lib SHL1STDLIBS= \ - $(EDITENGLIB) \ - $(AVMEDIALIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(LNGLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(AVMEDIALIB) \ + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(EDITENGLIB) \ + $(FWELIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(I18NPAPERLIB) \ + $(ICUUCLIB) \ + $(LNGLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ + SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) @@ -110,50 +114,51 @@ SHL2USE_EXPORTS=name SHL2DEPN=$(SHL1TARGETN) SHL2LIBS= \ - $(SLB)$/svdraw.lib \ - $(SLB)$/form.lib \ - $(SLB)$/items.lib \ - $(SLB)$/dialogs.lib \ - $(SLB)$/mnuctrls.lib \ - $(SLB)$/stbctrls.lib \ - $(SLB)$/tbxctrls.lib \ + $(SLB)$/svdraw.lib \ + $(SLB)$/form.lib \ + $(SLB)$/items.lib \ + $(SLB)$/dialogs.lib \ + $(SLB)$/mnuctrls.lib \ + $(SLB)$/stbctrls.lib \ + $(SLB)$/tbxctrls.lib \ $(SLB)$/smarttags.lib \ - $(SLB)$/unodraw.lib \ - $(SLB)$/unogallery.lib\ - $(SLB)$/accessibility.lib \ - $(SLB)$/customshapes.lib \ - $(SLB)$/fmcomp.lib \ - $(SLB)$/engine3d.lib \ - $(SLB)$/table.lib + $(SLB)$/unodraw.lib \ + $(SLB)$/unogallery.lib\ + $(SLB)$/accessibility.lib \ + $(SLB)$/customshapes.lib \ + $(SLB)$/fmcomp.lib \ + $(SLB)$/engine3d.lib \ + $(SLB)$/table.lib .IF "(GUIBASE)" == "WIN" SHL2LIBS+=$(SLB)$/ibrwimp.lib .ENDIF # (WIN) SHL2STDLIBS= \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(ICUUCLIB) + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(EDITENGLIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(ICUUCLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(SVXCORELIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(XMLOFFLIB) \ + $(XMLSCRIPTLIB) \ + .IF "$(GUI)"=="WNT" SHL2STDLIBS+=$(SHELLLIB) @@ -184,8 +189,7 @@ SRSFILELIST=\ $(SRS)$/unodraw.srs \ $(SRS)$/accessibility.srs \ $(SRS)$/table.srs \ - $(SRS)$/toolbars.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/toolbars.srs RESLIB1NAME=svx RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw @@ -195,3 +199,17 @@ RESLIB1SRSFILES= $(SRSFILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component + +$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svx.component + +$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svxcore.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svxcore.component diff --git a/svx/util/svx.component b/svx/util/svx.component new file mode 100644 index 0000000000..5907d69fef --- /dev/null +++ b/svx/util/svx.component @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Draw.GraphicExporter"> + <service name="com.sun.star.drawing.GraphicExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"> + <service name="com.sun.star.gallery.GalleryThemeProvider"/> + </implementation> + <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"> + <service name="com.sun.star.graphic.PrimitiveFactory2D"/> + </implementation> + <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"> + <service name="com.sun.star.comp.svx.FindbarDispatcher"/> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.svx.RecoveryUI"> + <service name="com.sun.star.dialog.RecoveryUI"/> + </implementation> + <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"> + <service name="com.sun.star.drawing.CustomShapeEngine"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxShapeCollection"> + <service name="com.sun.star.drawing.ShapeCollection"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxUnoColorTable"> + <service name="com.sun.star.drawing.ColorTable"/> + </implementation> + <implementation name="com.sun.star.svx.DownSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FindTextToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FontHeightToolBoxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.UpSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index 9630d7e067..f0e1c69934 100644 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/svx/util/svx.flt b/svx/util/svx.flt deleted file mode 100644 index 26520493b8..0000000000 --- a/svx/util/svx.flt +++ /dev/null @@ -1,134 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridPeer -+FmXGridControl -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -__CT -union_impl -alternative diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component new file mode 100644 index 0000000000..2f829cb52a --- /dev/null +++ b/svx/util/svxcore.component @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionDirectionController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionLightingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index 3f1a898da8..11f80e4101 100644 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <thread.hxx> #include <sysdep.hxx> -#if defined(WNT) || defined (WIN) +#if defined(WNT) #include <svwin.h> #endif #include <tlintl.hxx> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx new file mode 100644 index 0000000000..2692a0e9d8 --- /dev/null +++ b/svx/workben/edittest.cxx @@ -0,0 +1,1795 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svx.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 <editeng/flditem.hxx> +#include <tools/urlobj.hxx> +#include <svx/svxacorr.hxx> +#include <tools/fsys.hxx> +#include <svx/xpoly.hxx> +#include <svtools/filedlg.hxx> + +#include <vcl/window.hxx> +#include <vcl/svapp.hxx> +#include <vcl/font.hxx> +#include <vcl/sound.hxx> +#include <vcl/print.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/help.hxx> +#include <vcl/scrbar.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/msgbox.hxx> + +#include <dialdll.hxx> + + +#define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry" +#include <comphelper/processfactory.hxx> +#include <comphelper/regpathhelper.hxx> +#include <cppuhelper/servicefactory.hxx> +#include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> +#include <sfx2/sfxuno.hxx> + +// SVX +#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 +#include <svl/undo.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svtools/printdlg.hxx> + +#include <osl/file.hxx> +#include <osl/process.h> +#include <rtl/bootstrap.hxx> + +#define TB_LEFT 1 +#define TB_RIGHT 2 +#define TB_CENTER 3 +#define TB_UNDO 4 +#define TB_REDO 5 +#define TB_FONT1 6 +#define TB_FONT2 7 +#define TB_ITALIC 8 +#define TB_BOLD 9 +#define TB_UNDERLINE 10 +#define TB_BLACK 11 +#define TB_GREEN 12 +#define TB_OPEN 13 +#define TB_SAVE 14 +#define TB_SBL 15 +#define TB_SBSA 16 +#define TB_LR 17 +#define TB_DRAW 18 +#define TB_DEFTAB 19 +#define TB_OPEN2 20 +#define TB_SAVE2 21 +#define TB_STDSEL 33 +#define TB_MOVE 34 +#define TB_PARATTR1 35 +#define TB_ROTATE 38 +#define TB_RED 43 +#define TB_FLAT 46 +#define TB_BINOBJ1 47 +#define TB_BINOBJ3 49 +#define TB_BINOBJ4 50 +#define TB_BINOBJ1b 51 +#define TB_BINOBJ2b 52 +#define TB_ATTRIBS 54 +#define TB_IDLE 55 +#define TB_BLOCK 56 +#define TB_CLONEBIN 57 +#define TB_INSERT 58 +#define TB_PKERN 59 +#define TB_KERN 60 +#define TB_SUPER 61 +#define TB_SUB 62 +#define TB_PRINT 63 +#define TB_FONT 64 +#define TB_COLORS 65 +#define TB_WLM 66 +#define TB_OUTL 67 +#define TB_INSFLD 68 +#define TB_UPDFLD 69 +#define TB_ONLINESPELL 70 +#define TB_REDLINES 71 +#define TB_AUTOCORRECT 72 +#define TB_POLY 73 +#define TB_HYPH 74 + +// VARS... +short nRotation = 0; +USHORT nZoom = 100; +BOOL bURLClicked = FALSE; + +using namespace ::com::sun::star::connection; +using namespace ::vos; +using namespace ::rtl; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; +using namespace ::com::sun::star::lang; + + + +Reference< XMultiServiceFactory > createApplicationServiceManager() +{ + Reference< XMultiServiceFactory > xMS; + try + { + Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); + if ( xComponentContext.is() ) + xMS = xMS.query( xComponentContext->getServiceManager() ); + } + catch( ::com::sun::star::uno::Exception& ) + { + } + + return xMS; +} + +// --- class EditApp ------------------------------------------------- + +SV_DECL_PTRARR_DEL( StringList, String*, 0, 4 ); +SV_IMPL_PTRARR( StringList, String* ); +StringList aSimpleHistory; + +class EditApp : public Application +{ +public: + virtual void Main(); +}; + +class MyEditEngine : public EditEngine +{ +public: + MyEditEngine( SfxItemPool* pPool ) : EditEngine( pPool ) { ; } + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); +}; + +XubString __EXPORT MyEditEngine::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ) +{ + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return String( RTL_CONSTASCII_USTRINGPARAM( "<Empty>" ) ); + + if ( pField->ISA( SvxDateField ) ) + return ((const SvxDateField*)pField)->GetFormatted( LANGUAGE_SYSTEM, LANGUAGE_SYSTEM ); + else if ( pField->ISA( SvxURLField ) ) + { + const SvxURLField* pURL = (const SvxURLField*)pField; + if ( !bURLClicked ) + { + delete rpTxtColor; + rpTxtColor = new Color( COL_BLUE ); + } + else + { + delete rpTxtColor; + rpTxtColor = new Color( COL_RED ); + delete rpFldColor; + rpFldColor = new Color( COL_YELLOW ); + } + if ( pURL->GetFormat() == SVXURLFORMAT_URL ) + return pURL->GetURL(); + return pURL->GetRepresentation(); + } + return String( RTL_CONSTASCII_USTRINGPARAM( "???" ) ); +} + +void __EXPORT MyEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ) +{ + EditEngine::FieldClicked( rField, nPara, nPos ); // Falls URL + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return; + + if ( pField->ISA( SvxURLField ) ) + { + bURLClicked = TRUE; + UpdateFields(); + } + else + Sound::Beep(); +} + +void __EXPORT MyEditEngine::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ) +{ + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return; + + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "Feld selektiert!" ) ) ).Execute(); +} + + +class MyView : public WorkWindow +{ +private: + EditEngine* pEditEngine; + EditView* pEditView; + +public: + MyView( Window* pParent, EditEngine* pEditEngine ); + ~MyView(); + + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + BOOL Drop( const DropEvent& rEvt ); + BOOL QueryDrop( DropEvent& rEvt ); +}; + +MyView::MyView( Window* pParent, EditEngine* pEE ) : WorkWindow( pParent, WinBits( WB_STDWORK ) ) +{ + pEditEngine = pEE; + pEditView = new EditView( pEditEngine, this ); + pEditEngine->InsertView( pEditView ); + SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Another View..." ) ) ); +// EnableDrop(); + SetBackgroundBrush( Brush( Color( COL_LIGHTBLUE ) ) ); + Show(); +} + +MyView::~MyView() +{ + pEditEngine->RemoveView( pEditView ); + delete pEditView; +} + +void __EXPORT MyView::Paint( const Rectangle& rRec ) +{ + pEditView->Paint( rRec ); +} + +void __EXPORT MyView::Resize() +{ + Size aPaperSz( GetOutputSize() ); +// aPaperSz.Width() /= 2; +// aPaperSz.Height() /= 2; + pEditView->SetOutputArea( Rectangle( Point( 0,0 ), aPaperSz ) ); + pEditView->SetVisArea( Rectangle( Point( 0,0 ), aPaperSz ) ); + Invalidate(); + pEditView->ShowCursor(); +} + + // --- MyView::KeyInput() -------------------------------------- +void __EXPORT MyView::KeyInput( const KeyEvent& rKEvt ) +{ + pEditView->PostKeyEvent( rKEvt ); +} + +void __EXPORT MyView::MouseMove( const MouseEvent& rMEvt ) +{ + Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); + if ( pEditView->GetOutputArea().IsInside( aPos ) ) + SetPointer( pEditView->GetPointer() ); + else + SetPointer( Pointer() ); + + + pEditView->MouseMove( rMEvt ); +} + +void __EXPORT MyView::MouseButtonDown( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonDown( rMEvt ); +} + +void __EXPORT MyView::MouseButtonUp( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonUp( rMEvt ); +} + +void __EXPORT MyView::Command( const CommandEvent& rCEvt ) +{ + if ( rCEvt.GetCommand() == COMMAND_STARTDRAG ) + pEditView->Command(rCEvt); +} + +BOOL __EXPORT MyView::Drop( const DropEvent& rEvt ) +{ + return pEditView->Drop( rEvt ); +} + +BOOL __EXPORT MyView::QueryDrop( DropEvent& rEvt ) +{ + return pEditView->QueryDrop( rEvt ); +} + +// --- class EditMainWindow -------------------------------------------- +DECLARE_LIST( ViewList, MyView* ); + +class EditViewWindow : public Window +{ +private: + MyEditEngine* pEditEngine; + EditView* pEditView; + Pointer aStdPtr; + Pointer aURLPtr; + WorkWindow* pTmpWindow; + ViewList aViewList; + + XubString aTestStr; + + +public: + EditViewWindow( Window* pParent ); + ~EditViewWindow(); + + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + void MarkOutputArea(); + BOOL Drop( const DropEvent& rEvt ); + BOOL QueryDrop( DropEvent& rEvt ); + + EditView* GetEditView() { return pEditView; } +}; + +class EditMainWindow : public WorkWindow +{ +private: + ToolBox aToolBox; + ScrollBar aHScrollBar; + ScrollBar aVScrollBar; + EditViewWindow aViewWin; + Printer* pPrinter; + + WorkWindow* pTmpWindow; + + EditTextObject* pRTFObj; + EditTextObject* pBinObj; + + FileDialog* pFileDialogBox; + FileDialog* pFileDialogBox2; + + +protected: + void SetScrollBars(); + void SetScrollBarRanges(); + void CreatePolygon(); + + virtual void GetFocus(); + +public: + EditMainWindow(); + ~EditMainWindow(); + + virtual void Resize(); + + DECL_LINK( TBSelect, ToolBox * ); + void UpdateToolBox(); + + DECL_LINK( HScrollHdl, ScrollBar * ); + DECL_LINK( VScrollHdl, ScrollBar * ); + DECL_LINK( ShowStatus, EditStatus * ); + void SetTitle(); +}; + + +EditMainWindow::~EditMainWindow() +{ + delete pRTFObj; + delete pBinObj; + delete pFileDialogBox; + delete pFileDialogBox2; + delete pTmpWindow; + delete pPrinter; +} + +EditMainWindow::EditMainWindow() : + WorkWindow( NULL, WB_APP | WB_STDWORK | WB_SVLOOK | WB_CLIPCHILDREN ) , + aViewWin( this ), + aToolBox( this, WinBits( WB_BORDER | WB_SVLOOK | WB_SCROLL | WB_LINESPACING ) ), + aHScrollBar( this, WinBits( WB_HSCROLL | WB_DRAG ) ), + aVScrollBar( this, WinBits( WB_VSCROLL | WB_DRAG ) ) +{ + pRTFObj = 0; + pBinObj = 0; + + pFileDialogBox = new FileDialog( this, WinBits( WB_OPEN | WB_SVLOOK ) ); + pFileDialogBox->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" )), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm;*.html" ) ) ); + pFileDialogBox->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) ); + + pFileDialogBox2 = new FileDialog( this, WinBits( WB_SAVEAS| WB_SVLOOK ) ); + pFileDialogBox2->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm" ) ) ); + pFileDialogBox2->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) ); + + pPrinter = new Printer; + pPrinter->SetMapMode( MAP_100TH_MM ); + aViewWin.SetMapMode( pPrinter->GetMapMode() ); + aViewWin.GetEditView()->GetEditEngine()->SetRefDevice( pPrinter ); + + + + pTmpWindow = new WorkWindow( this, WB_STDWORK ); + + aToolBox.SetButtonType( BUTTON_TEXT ); + aToolBox.SetLineCount( 4 ); + + { + aToolBox.InsertItem( TB_OPEN, String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) ); + aToolBox.InsertItem( TB_SAVE, String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) ); + aToolBox.InsertItem( TB_PRINT, String( RTL_CONSTASCII_USTRINGPARAM( "Print" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_LEFT, String( RTL_CONSTASCII_USTRINGPARAM( "L" ) ) ); + aToolBox.InsertItem( TB_CENTER, String( RTL_CONSTASCII_USTRINGPARAM( "C" ) ) ); + aToolBox.InsertItem( TB_RIGHT, String( RTL_CONSTASCII_USTRINGPARAM( "R" ) ) ); + aToolBox.InsertItem( TB_BLOCK, String( RTL_CONSTASCII_USTRINGPARAM( "B" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_UNDO, String( RTL_CONSTASCII_USTRINGPARAM( "Undo" ) ) ); + aToolBox.InsertItem( TB_REDO, String( RTL_CONSTASCII_USTRINGPARAM( "Redo" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_FONT1, String( RTL_CONSTASCII_USTRINGPARAM( "Font1" ) ) ); + aToolBox.InsertItem( TB_FONT2, String( RTL_CONSTASCII_USTRINGPARAM( "Font2" ) ) ); + aToolBox.InsertItem( TB_DEFTAB, String( RTL_CONSTASCII_USTRINGPARAM( "DefTab" ) ) ); + aToolBox.InsertBreak(); + aToolBox.InsertItem( TB_OPEN2, String( RTL_CONSTASCII_USTRINGPARAM( "Read" ) ) ); + aToolBox.InsertItem( TB_SAVE2, String( RTL_CONSTASCII_USTRINGPARAM( "Write" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_FONT, String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ) ); + aToolBox.InsertItem( TB_ITALIC, String( RTL_CONSTASCII_USTRINGPARAM( "K" ) ) ); + aToolBox.InsertItem( TB_BOLD, String( RTL_CONSTASCII_USTRINGPARAM( "F" ) ) ); + aToolBox.InsertItem( TB_UNDERLINE, String( RTL_CONSTASCII_USTRINGPARAM( "U" ) ) ); + aToolBox.InsertItem( TB_SUPER, String( RTL_CONSTASCII_USTRINGPARAM( "SP" ) ) ); + aToolBox.InsertItem( TB_SUB, String( RTL_CONSTASCII_USTRINGPARAM( "SB" ) ) ); + aToolBox.InsertItem( TB_PKERN, String( RTL_CONSTASCII_USTRINGPARAM( "PK" ) ) ); + aToolBox.InsertItem( TB_KERN, String( RTL_CONSTASCII_USTRINGPARAM( "TK" ) ) ); + aToolBox.InsertItem( TB_WLM, String( RTL_CONSTASCII_USTRINGPARAM( "W!" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BLACK, String( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) ); + aToolBox.InsertItem( TB_GREEN, String( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) ); + aToolBox.InsertItem( TB_RED, String( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_SBL, String( RTL_CONSTASCII_USTRINGPARAM( "SBL" ) ) ); + aToolBox.InsertItem( TB_SBSA, String( RTL_CONSTASCII_USTRINGPARAM( "SBSA" ) ) ); + aToolBox.InsertItem( TB_LR, String( RTL_CONSTASCII_USTRINGPARAM( "LR" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_DRAW, String( RTL_CONSTASCII_USTRINGPARAM( "Draw!" ) ) ); + aToolBox.InsertItem( TB_ROTATE, String( RTL_CONSTASCII_USTRINGPARAM( "Rotate!" ) ) ); + aToolBox.InsertItem( TB_MOVE, String( RTL_CONSTASCII_USTRINGPARAM( "Move->2" ) ) ); + aToolBox.InsertItem( TB_PARATTR1, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAttr0" ) ) ); + aToolBox.InsertItem( TB_ATTRIBS, String( RTL_CONSTASCII_USTRINGPARAM( "GetAttribs" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_INSFLD, String( RTL_CONSTASCII_USTRINGPARAM( "InsFld" ) ) ); + aToolBox.InsertItem( TB_UPDFLD, String( RTL_CONSTASCII_USTRINGPARAM( "UpdFld" ) ) ); + } + aToolBox.InsertBreak(); + { + aToolBox.InsertItem( TB_ONLINESPELL, String( RTL_CONSTASCII_USTRINGPARAM( "Spell" ) ) ); + aToolBox.InsertItem( TB_REDLINES, String( RTL_CONSTASCII_USTRINGPARAM( "RedLine" ) ) ); + aToolBox.InsertItem( TB_AUTOCORRECT, String( RTL_CONSTASCII_USTRINGPARAM( "Auto*" ) ) ); + aToolBox.InsertItem( TB_HYPH, String( RTL_CONSTASCII_USTRINGPARAM( "Hyph" ) ) ); + aToolBox.InsertItem( TB_STDSEL, String( RTL_CONSTASCII_USTRINGPARAM( "StdSel" ) ) ); + aToolBox.InsertItem( TB_FLAT, String( RTL_CONSTASCII_USTRINGPARAM( "FlatMode" ) ) ); + aToolBox.InsertItem( TB_OUTL, String( RTL_CONSTASCII_USTRINGPARAM( "Ocomphelper" ) ) ); + aToolBox.InsertItem( TB_POLY, String( RTL_CONSTASCII_USTRINGPARAM( "Poly" ) ) ); + aToolBox.InsertItem( TB_COLORS, String( RTL_CONSTASCII_USTRINGPARAM( "Colors" ) )); + aToolBox.InsertItem( TB_IDLE, String( RTL_CONSTASCII_USTRINGPARAM( "Idle!" ) ) ); + aToolBox.InsertItem( TB_INSERT, String( RTL_CONSTASCII_USTRINGPARAM( "Insert" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BINOBJ1, String( RTL_CONSTASCII_USTRINGPARAM( ">BINObj" ) ) ); + aToolBox.InsertItem( TB_BINOBJ1b, String( RTL_CONSTASCII_USTRINGPARAM( ">>BINObj" ) ) ); + aToolBox.InsertItem( TB_BINOBJ2b, String( RTL_CONSTASCII_USTRINGPARAM( "<<BINObj" ) ) ); + aToolBox.InsertItem( TB_CLONEBIN, String( RTL_CONSTASCII_USTRINGPARAM( "Clone" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BINOBJ3, String( RTL_CONSTASCII_USTRINGPARAM( "StoreBin" ) ) ); + aToolBox.InsertItem( TB_BINOBJ4, String( RTL_CONSTASCII_USTRINGPARAM( "CreatBin" ) ) ); + } + + aToolBox.SetPosPixel( Point( 0, 0 ) ); + aToolBox.SetSelectHdl( LINK( this, EditMainWindow, TBSelect ) ); + + SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + + SetPen( PEN_NULL ); + Show(); + + aVScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, VScrollHdl ) ); + aVScrollBar.SetLineSize( 300 ); + aVScrollBar.SetPageSize( 2000 ); + aHScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, HScrollHdl ) ); + aHScrollBar.SetLineSize( 300 ); + aHScrollBar.SetPageSize( 2000 ); + aHScrollBar.Enable(); + aVScrollBar.Enable(); + + aViewWin.GetEditView()->GetEditEngine()->SetStatusEventHdl( LINK( this, EditMainWindow, ShowStatus ) ); + + SetTitle(); + + UpdateToolBox(); + aToolBox.Show(); + aViewWin.Show(); +} + +void EditMainWindow::SetTitle() +{ + String aHeading( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit! - Zoom " ) ) ); + aHeading += String::CreateFromInt32(nZoom); + aHeading += '%'; + EditEngine* pEditEngine = aViewWin.GetEditView()->GetEditEngine(); + if ( pEditEngine->GetControlWord() & EE_CNTRL_STRETCHING ) + { + USHORT nX, nY; + pEditEngine->GetGlobalCharStretching( nX, nY ); + aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", Stretch=(" ) ); + aHeading += String::CreateFromInt32(nX); + aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aHeading += String::CreateFromInt32(nY); + aHeading += ')'; + } + SetText( aHeading ); +} + +void EditMainWindow::UpdateToolBox() +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + SfxItemSet aCurSet( pEditView->GetAttribs() ); + + ULONG nControl = pEditEngine->GetControlWord(); + aToolBox.EnableItem( TB_UNDO, (BOOL)pEditEngine->GetUndoManager().GetUndoActionCount() ); + aToolBox.EnableItem( TB_REDO, (BOOL)pEditEngine->GetUndoManager().GetRedoActionCount() ); + aToolBox.EnableItem( TB_BINOBJ2b, (BOOL)(long)pBinObj ); + aToolBox.EnableItem( TB_MOVE, pEditEngine->GetParagraphCount() > 3 ); + aToolBox.CheckItem( TB_ONLINESPELL, nControl & EE_CNTRL_ONLINESPELLING ? TRUE : FALSE ); + aToolBox.CheckItem( TB_AUTOCORRECT, nControl & EE_CNTRL_AUTOCORRECT ? TRUE : FALSE ); +// aToolBox.CheckItem( TB_HYPH, nControl & EE_CNTRL_HYPHENATE ? TRUE : FALSE ); + aToolBox.CheckItem( TB_REDLINES, nControl & EE_CNTRL_NOREDLINES ? FALSE : TRUE ); + aToolBox.CheckItem( TB_STDSEL, pEditView->GetSelectionMode() == EE_SELMODE_STD ); + aToolBox.CheckItem( TB_FLAT, pEditEngine->IsFlatMode() ); + aToolBox.CheckItem( TB_OUTL, ( nControl & EE_CNTRL_OUTLINER ) ? TRUE : FALSE ); + aToolBox.CheckItem( TB_POLY, pEditEngine->GetPolygon() ? TRUE : FALSE ); + aToolBox.CheckItem( TB_COLORS, ( nControl & EE_CNTRL_NOCOLORS ) ? FALSE : TRUE ); + aToolBox.CheckItem( TB_IDLE, pEditEngine->IsIdleFormatterEnabled() ); + aToolBox.CheckItem( TB_INSERT, pEditView->IsInsertMode() ); + + for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++) + { +// if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) +// ; +// else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE ) +// ; +// else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON ) + { + const SfxPoolItem& rItem = aCurSet.Get( nWhich ); + switch ( nWhich ) + { + case EE_PARA_HYPHENATE: + aToolBox.CheckItem( TB_HYPH, ((SfxBoolItem&)rItem).GetValue() != 0 ); + break; + case EE_PARA_LRSPACE: + aToolBox.CheckItem( TB_LR, ((SvxLRSpaceItem&)rItem).GetTxtLeft() != 0 ); + break; + case EE_PARA_ULSPACE: + aToolBox.CheckItem( TB_SBSA, ((SvxULSpaceItem&)rItem).GetUpper() != 0 ); + break; + case EE_PARA_SBL: + aToolBox.CheckItem( TB_SBL, ((SvxLineSpacingItem&)rItem).GetPropLineSpace() != 100 ); + break; + case EE_PARA_JUST: + { + SvxAdjust e = ((SvxAdjustItem&)rItem).GetAdjust(); + aToolBox.CheckItem( TB_LEFT, e == SVX_ADJUST_LEFT ); + aToolBox.CheckItem( TB_RIGHT, e == SVX_ADJUST_RIGHT); + aToolBox.CheckItem( TB_CENTER, e == SVX_ADJUST_CENTER); + aToolBox.CheckItem( TB_BLOCK, e == SVX_ADJUST_BLOCK ); + } + break; + case EE_PARA_TABS: + break; + case EE_CHAR_COLOR: + { + Color aColor( ((SvxColorItem&)rItem).GetValue() ); + aToolBox.CheckItem( TB_BLACK, aColor == COL_BLACK ); + aToolBox.CheckItem( TB_GREEN, aColor == COL_GREEN ); + aToolBox.CheckItem( TB_RED, aColor == COL_RED ); + } + break; + case EE_CHAR_FONTINFO: + { + FontFamily e = ((SvxFontItem&)rItem).GetFamily(); + aToolBox.CheckItem( TB_FONT1, e == FAMILY_ROMAN ); + aToolBox.CheckItem( TB_FONT2, e == FAMILY_SWISS ); + } + break; + case EE_CHAR_FONTHEIGHT: + break; + case EE_CHAR_WEIGHT: + { + FontWeight e = ((SvxWeightItem&)rItem).GetWeight(); + aToolBox.CheckItem( TB_BOLD, e == WEIGHT_BOLD ); + } + break; + case EE_CHAR_UNDERLINE: + { + aToolBox.CheckItem( TB_UNDERLINE, ((SvxUnderlineItem&)rItem).GetLineStyle() ); + } + break; + case EE_CHAR_WLM: + { + aToolBox.CheckItem( TB_WLM, ((SvxWordLineModeItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_PAIRKERNING: + { + aToolBox.CheckItem( TB_PKERN, ((SvxAutoKernItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_KERNING: + { + aToolBox.CheckItem( TB_KERN, (BOOL)((SvxKerningItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_ESCAPEMENT: + { + aToolBox.CheckItem( TB_SUPER, ((SvxEscapementItem&)rItem).GetEsc() > 0 ); + aToolBox.CheckItem( TB_SUB, ((SvxEscapementItem&)rItem).GetEsc() < 0 ); + } + break; + case EE_CHAR_STRIKEOUT: + break; + case EE_CHAR_ITALIC: + { + FontItalic e = ((SvxPostureItem&)rItem).GetPosture(); + aToolBox.CheckItem( TB_ITALIC, e == ITALIC_NORMAL ); + } + break; + case EE_CHAR_OUTLINE: + break; + case EE_CHAR_SHADOW: + break; + } + } + } +} + +IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p ) +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + USHORT nId = aToolBox.GetCurItemId(); + BOOL bChecked = aToolBox.IsItemChecked( nId ); + SfxPoolItem* pNewItem = 0; + switch ( nId ) + { + case TB_LEFT: pNewItem = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ); + break; + case TB_RIGHT: pNewItem = new SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ); + break; + case TB_CENTER: pNewItem = new SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ); + break; + case TB_BLOCK: pNewItem = new SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST ); + break; + case TB_HYPH: pNewItem = new SfxBoolItem( EE_PARA_HYPHENATE, !bChecked ); + break; + case TB_UNDO: pEditView->Undo(); + pEditView->ShowCursor(); + break; + case TB_REDO: pEditView->Redo(); + pEditView->ShowCursor(); + break; + case TB_ONLINESPELL: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl & ~EE_CNTRL_ONLINESPELLING; + else + nControl = nControl | EE_CNTRL_ONLINESPELLING; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_REDLINES: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( !bChecked ) + nControl = nControl & ~EE_CNTRL_NOREDLINES; + else + nControl = nControl | EE_CNTRL_NOREDLINES; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_AUTOCORRECT: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl & ~EE_CNTRL_AUTOCORRECT; + else + nControl = nControl | EE_CNTRL_AUTOCORRECT; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_STDSEL: if ( bChecked ) + pEditView->SetSelectionMode( EE_SELMODE_TXTONLY ); + else + pEditView->SetSelectionMode( EE_SELMODE_STD ); + break; + case TB_FLAT: pEditEngine->SetFlatMode( !pEditEngine->IsFlatMode() ); + break; + case TB_COLORS: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl | EE_CNTRL_NOCOLORS; + else + nControl = nControl & ~EE_CNTRL_NOCOLORS; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } +// aViewWin.Invalidate(); + pEditView->GetEditEngine()->Draw( pEditView->GetWindow(), pEditView->GetOutputArea(), pEditView->GetVisArea().TopLeft() ); + break; + case TB_OUTL: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( !bChecked ) + nControl = nControl | EE_CNTRL_OUTLINER; + else + nControl = nControl & ~EE_CNTRL_OUTLINER; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_POLY: { + if ( !bChecked ) + CreatePolygon(); + else + pEditView->GetEditEngine()->ClearPolygon(); + } + break; + case TB_IDLE: pEditEngine->EnableIdleFormatter( !pEditEngine->IsIdleFormatterEnabled() ); + break; + case TB_INSFLD: { + static BYTE nFld = 0; + if ( nFld > 2 ) + nFld = 0; + if ( nFld == 0 ) + { + SvxFieldItem aFld( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Bla" ) ), SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ); + pEditView->InsertField( aFld ); + } + else if ( nFld == 1 ) + pEditView->InsertField( SvxFieldItem( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Morgenpost" ) ), SVXURLFORMAT_URL ), EE_FEATURE_FIELD ) ); + else if ( nFld == 2 ) + pEditView->InsertField( SvxFieldItem( SvxDateField( Date( 1,1,1995 ), SVXDATETYPE_FIX, SVXDATEFORMAT_D ), EE_FEATURE_FIELD ) ); + + nFld++; + } + break; + case TB_UPDFLD: pEditEngine->UpdateFields(); + break; + case TB_INSERT: pEditView->SetInsertMode( !pEditView->IsInsertMode() ); + break; + case TB_FONT1: pNewItem = new SvxFontItem( FAMILY_ROMAN, String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ); + break; + case TB_FONT2: pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ); + break; +/* + case TB_FONT: + { + FontDialog* pDlg = new FontDialog( this, WB_SVLOOK ); + pDlg->SetPrinter( pPrinter ); + Font aFont = pEditEngine->CreateFontFromItemSet( pEditView->GetAttribs() ); + MapMode aPntMode( MAP_POINT ); + MapMode aCurrent( aViewWin.GetMapMode() ); + Size aSz( aViewWin.LogicToLogic( aFont.GetSize(), &aCurrent, &aPntMode ) ); + aSz.Width() *= 10; + aSz.Height() *= 10; + aFont.SetSize( aSz ); + pDlg->SetSelectFont( aFont ); + if ( pDlg->Execute() ) + { + Font aNewFont( pDlg->GetSelectFont() ); + aSz = aViewWin.LogicToLogic( aNewFont.GetSize(), &aPntMode, &aCurrent ); + aSz.Width() /= 10; + aSz.Height() /= 10; + aNewFont.SetSize( aSz ); + + SfxItemSet aSet( pEditEngine->GetEmptyItemSet() ); + + pEditEngine->SetFontInfoInItemSet( aSet, aNewFont ); + pEditView->SetAttribs( aSet ); + } + delete pDlg; + } + break; +*/ + case TB_BOLD: if ( bChecked ) + pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT); + else + pNewItem = new SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT); + break; + case TB_ITALIC: if ( bChecked ) + pNewItem = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ); + else + pNewItem = new SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC ); + break; + case TB_UNDERLINE: if ( bChecked ) + pNewItem = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE ); + else + pNewItem = new SvxUnderlineItem( UNDERLINE_SINGLE, EE_CHAR_UNDERLINE ); + break; + case TB_WLM: pNewItem = new SvxWordLineModeItem( !bChecked, EE_CHAR_WLM ); + break; + case TB_PKERN: pNewItem = new SvxAutoKernItem( !bChecked, EE_CHAR_PAIRKERNING ); + break; + case TB_KERN: if ( bChecked ) + pNewItem = new SvxKerningItem( 0, EE_CHAR_KERNING ); + else + pNewItem = new SvxKerningItem( 100, EE_CHAR_KERNING); + break; + case TB_SUPER: if ( bChecked ) + pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT); + else +// pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT); + pNewItem = new SvxEscapementItem( 50, 100, EE_CHAR_ESCAPEMENT ); + break; + case TB_SUB: if ( bChecked ) + pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT); + else +// pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT); + pNewItem = new SvxEscapementItem( -50, 100, EE_CHAR_ESCAPEMENT ); + break; + case TB_GREEN: pNewItem = new SvxColorItem( Color(COL_GREEN), EE_CHAR_COLOR); + break; + case TB_RED: pNewItem = new SvxColorItem( Color(COL_RED), EE_CHAR_COLOR); + break; + case TB_BLACK: pNewItem = new SvxColorItem( Color(COL_BLACK), EE_CHAR_COLOR); + break; + case TB_SBL: pNewItem = new SvxLineSpacingItem( 0, EE_PARA_SBL ); + if ( bChecked ) + { + ((SvxLineSpacingItem*)pNewItem)->SetInterLineSpace( 0 ); + } + else + { + ((SvxLineSpacingItem*)pNewItem)->SetPropLineSpace( 150 ); + } + break; + case TB_SBSA: pNewItem = new SvxULSpaceItem( EE_PARA_ULSPACE ); + if ( !bChecked ) + { + ((SvxULSpaceItem*)pNewItem)->SetUpper( 400 ); + ((SvxULSpaceItem*)pNewItem)->SetLower( 400 ); + } + break; + case TB_LR: pNewItem = new SvxLRSpaceItem( EE_PARA_LRSPACE ); + if ( !bChecked ) + { + ((SvxLRSpaceItem*)pNewItem)->SetTxtLeft( 1000 ); + ((SvxLRSpaceItem*)pNewItem)->SetTxtFirstLineOfst( -500 ); + ((SvxLRSpaceItem*)pNewItem)->SetRight( 500 ); + } + break; + case TB_DEFTAB: if ( bChecked ) + pEditEngine->SetDefTab( 2000 ); + else + pEditEngine->SetDefTab( 600 ); + pEditView->ShowCursor(); + aToolBox.CheckItem( nId, !bChecked ); + break; + case TB_DRAW: { + pTmpWindow->SetMapMode( aViewWin.GetMapMode() ); + pTmpWindow->SetBackgroundBrush( Brush( Color( COL_GRAY ) ) ); + pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->Show(); + pTmpWindow->Invalidate(); + pTmpWindow->Update(); + pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) ); + Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) ); + pTmpWindow->DrawRect( aRect ); + pEditEngine->Draw( pTmpWindow, aRect, Point( 0, 0 ) ); + nRotation = 0; + } + break; + case TB_ROTATE: { + nRotation += 100; + if ( nRotation == 3600 ) + nRotation = 0; + pTmpWindow->SetMapMode( aViewWin.GetMapMode() ); + pTmpWindow->SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->Show(); + pTmpWindow->Invalidate(); + pTmpWindow->Update(); + pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) ); + Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) ); + pEditEngine->Draw( pTmpWindow, Point( 2000, 4000 ), nRotation ); + } + break; + + case TB_MOVE: + { + ESelection aESel = pEditView->GetSelection(); + USHORT nStartPara = Min( aESel.nStartPara, aESel.nEndPara ); + USHORT nEndPara = Max( aESel.nStartPara, aESel.nEndPara ); + pEditView->MoveParagraphs( Range(nStartPara,nEndPara), 2 ); + } + break; + case TB_PARATTR1: + { + pEditEngine->SetUpdateMode( FALSE ); + USHORT nPara = 0; + SfxItemSet aSet( pEditEngine->GetEmptyItemSet() ); + aSet.Put( SvxFontItem( FAMILY_DECORATIVE, String( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) ), String(),PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ) ); + aSet.Put( SvxColorItem( Color(COL_MAGENTA), EE_CHAR_COLOR ) ); + aSet.Put( SvxFontHeightItem(600, 100, EE_CHAR_FONTHEIGHT) ); + aSet.Put( SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC ) ); + aSet.Put( SvxLRSpaceItem( 0, 0, 1000, 0, EE_PARA_LRSPACE ) ); + pEditView->SetParaAttribs( aSet, nPara ); + pEditEngine->SetUpdateMode( TRUE ); + pEditView->ShowCursor(); + } + break; + case TB_BINOBJ1: + { + delete pBinObj; + pBinObj = pEditEngine->CreateTextObject(); + } + break; + case TB_BINOBJ1b: + { + delete pBinObj; + pBinObj = pEditView->CreateTextObject(); + } + break; + case TB_CLONEBIN: + { + if ( pBinObj ) + { + EditTextObject* p = pBinObj->Clone(); + delete pBinObj; + pBinObj = p; + } + } + break; + case TB_BINOBJ2b: + { + if ( pBinObj ) + { + pEditView->InsertText( *pBinObj ); + } + } + break; + case TB_BINOBJ3: + { + if ( !pFileDialogBox2->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox2->GetPath() ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC ); + EditTextObject* pTmpObj = pEditEngine->CreateTextObject(); + pTmpObj->Store( aStrm ); + DBG_ASSERT( !aStrm.GetError(), "Store: Error!" ); + delete pTmpObj; + } + break; + case TB_BINOBJ4: + { + if ( !pFileDialogBox->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox->GetPath() ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_READ ); + delete pBinObj; + pBinObj = EditTextObject::Create( aStrm ); +// EditTextObject* pTmpObj = pEditEngine->CreateTextObject( aStrm ); +// pEditEngine->SetText( *pTmpObj ); +// pEditView->ShowCursor(); +// delete pTmpObj; + } + break; + case TB_OPEN: + case TB_OPEN2: + { + if ( !pFileDialogBox->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox->GetPath() ); + aDirEntry.ToAbs(); + String aFileName( aDirEntry.GetFull() ); + SvFileStream aStrm( aFileName, STREAM_READ ); + if ( aStrm.GetError() ) + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "StreamError!" ) ) ).Execute(); + Application::EnterWait(); + if ( nId == TB_OPEN ) + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_RTF ); + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_HTML ); + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_BIN ); + else + pEditEngine->Read( aStrm, EE_FORMAT_TEXT ); + + pEditView->ShowCursor(); + } + else + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditView->Read( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditView->Read( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditView->Read( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditView->Read( aStrm, EE_FORMAT_HTML ); + else + pEditView->Read( aStrm, EE_FORMAT_TEXT ); + } + + Application::LeaveWait(); + + } + break; + case TB_PRINT: + { + pPrinter->SetPageQueueSize( 1 ); + PrintDialog aPrnDlg( this ); + aPrnDlg.SetPrinter( pPrinter ); + if ( aPrnDlg.Execute() ) + { + pPrinter->StartJob( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit - PrinterTest" ) ) ); + pPrinter->StartPage(); + Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Pen aPen( PEN_SOLID ); + aPen.SetColor( Color( COL_BLACK ) ); + pPrinter->SetPen( aPen ); + Rectangle aR( Point( 2000, 4000 ), aSz ); + pPrinter->DrawRect( aR ); + // So folgt auf IIISi, 75DPI kein Ausdruck! +// pPrinter->SetClipRegion( Region( aR ) ); + pEditEngine->Draw( pPrinter, Point( 2000, 4000 ), nRotation ); +// pPrinter->SetClipRegion(); + pPrinter->EndPage(); + pPrinter->EndJob(); + } + } + break; + case TB_SAVE: + case TB_SAVE2: + { + if ( !pFileDialogBox2->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox2->GetPath() ); +// DirEntry aDirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\xxx.rtf" ) ) ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC ); + Application::EnterWait(); + if ( nId == TB_SAVE ) + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf") ) + pEditEngine->Write( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_HTML ); + else + pEditEngine->Write( aStrm, EE_FORMAT_TEXT ); + } + else + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditView->Write( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditView->Write( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditView->Write( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditView->Write( aStrm, EE_FORMAT_HTML ); + else + pEditView->Write( aStrm, EE_FORMAT_TEXT ); + } + Application::LeaveWait(); + } + break; + case TB_ATTRIBS: + { + SfxItemSet aCurSet = pEditView->GetAttribs(); + XubString aDebStr( String( RTL_CONSTASCII_USTRINGPARAM( "Attribute in Selektion:" ) ) ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\nVorlage:" ) ); + XubString aStyle; +// pEditView->GetStyleSheet( aStyle, eFam ); + aDebStr += aStyle; + for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++) + { + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\n" ) ); + aDebStr += String::CreateFromInt32( nWhich ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\t" ) ); + if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "---" ) ); + else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE ) + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ); + else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON ) + { + const SfxPoolItem& rItem = aCurSet.Get( nWhich ); + switch ( nWhich ) + { + case EE_PARA_LRSPACE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", LI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtLeft() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", RI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetRight() ); + break; + case EE_PARA_ULSPACE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SB=" ) ); + aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetUpper() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", SA=" ) ); + aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetLower() ); + break; + case EE_PARA_SBL: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SBL=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLineSpacingItem&)rItem).GetInterLineSpace() ); + break; + case EE_PARA_JUST: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SvxAdust=" ) ); + aDebStr += String::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() ); + break; + case EE_PARA_TABS: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Tabs = ?" ) ); + break; + case EE_CHAR_COLOR: + { + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Color= " ) ); + Color aColor( ((SvxColorItem&)rItem).GetValue() ); + aDebStr += String::CreateFromInt32( aColor.GetRed() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aDebStr += String::CreateFromInt32( aColor.GetGreen() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aDebStr += String::CreateFromInt32( aColor.GetBlue() ); + } + break; + case EE_CHAR_FONTINFO: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Font=" ) ); + aDebStr += ((SvxFontItem&)rItem).GetFamilyName(); + break; + case EE_CHAR_FONTHEIGHT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Groesse=" ) ); + aDebStr += String::CreateFromInt32( ((SvxFontHeightItem&)rItem).GetHeight() ); + break; + case EE_CHAR_WEIGHT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontWeight=" ) ); + aDebStr += String::CreateFromInt32( ((SvxWeightItem&)rItem).GetWeight() ); + break; + case EE_CHAR_UNDERLINE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontUnderline=" ) ); + aDebStr += String::CreateFromInt32( ((SvxUnderlineItem&)rItem).GetLineStyle() ); + break; + case EE_CHAR_WLM: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "WordLineMode=" ) ); + aDebStr += String::CreateFromInt32( ((SvxWordLineModeItem&)rItem).GetValue() ); + break; + case EE_CHAR_STRIKEOUT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontStrikeout=" ) ); + aDebStr += String::CreateFromInt32( ((SvxCrossedOutItem&)rItem).GetStrikeout() ); + break; + case EE_CHAR_ITALIC: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontPosture=" ) ); + aDebStr += String::CreateFromInt32( ((SvxPostureItem&)rItem).GetPosture() ); + break; + case EE_CHAR_OUTLINE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOutline=" ) ); + aDebStr += String::CreateFromInt32( ((SvxContourItem&)rItem).GetValue() ); + break; + case EE_CHAR_SHADOW: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontShadowed=" ) ); + aDebStr += String::CreateFromInt32( ((SvxShadowedItem&)rItem).GetValue() ); + break; + } + } + else + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ); + } + InfoBox( 0, aDebStr ).Execute(); + } + break; + } + + if ( pNewItem ) + { + SfxItemSet aSet = pEditView->GetEmptyItemSet(); + aSet.Put( *pNewItem ); + pEditView->SetAttribs( aSet ); + delete pNewItem; + } + UpdateToolBox(); + return 0; +} + +void EditMainWindow::CreatePolygon() +{ + EditView* pEditView = aViewWin.GetEditView(); + Size aSz = pEditView->GetWindow()->GetOutputSize(); + Point aOffset( aSz.Width()/8, aSz.Height()/8 ); + aSz.Width() *= 3; + aSz.Width() /= 4; + aSz.Height() *= 3; + aSz.Height() /= 4; + Polygon aPoly( 5 ); + aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 0 ); + aPoly.SetPoint( Point( aSz.Width(), aSz.Height()/3 ), 1 ); + aPoly.SetPoint( Point( aSz.Width()/2, aSz.Height() ), 2 ); + aPoly.SetPoint( Point( 0, aSz.Height()/2 ), 3 ); + aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 4 ); + PolyPolygon aPPoly( aPoly ); + pEditView->GetEditEngine()->SetPolygon( aPPoly ); + pEditView->SetOutputArea( Rectangle( aOffset, aSz ) ); + ULONG nWord = pEditView->GetControlWord(); + nWord &= ~(EV_CNTRL_AUTOSCROLL); + pEditView->SetControlWord( nWord ); + aViewWin.Invalidate(); +} + +void __EXPORT EditMainWindow::GetFocus() +{ + aViewWin.GrabFocus(); +} + +IMPL_LINK_INLINE_START( EditMainWindow, HScrollHdl, ScrollBar *, pScrl ) +{ + EditView* pEditView = aViewWin.GetEditView(); + pEditView->Scroll( -pScrl->GetDelta(), 0, RGCHK_PAPERSZ1 ); + return 0; +} +IMPL_LINK_INLINE_END( EditMainWindow, HScrollHdl, ScrollBar *, pScrl ) + +IMPL_LINK_INLINE_START( EditMainWindow, VScrollHdl, ScrollBar *, pScrl ) +{ + EditView* pEditView = aViewWin.GetEditView(); + pEditView->Scroll( 0, -pScrl->GetDelta(), RGCHK_PAPERSZ1 ); + return 0; +} +IMPL_LINK_INLINE_END( EditMainWindow, VScrollHdl, ScrollBar *, pScrl ) + +void EditMainWindow::SetScrollBarRanges() +{ + EditView* pEditView = aViewWin.GetEditView(); + long y = pEditView->GetEditEngine()->GetTextHeight(); + long x = pEditView->GetEditEngine()->GetPaperSize().Width(); + + aHScrollBar.SetRange( Range( 0, x ) ); + aVScrollBar.SetRange( Range( 0, y ) ); +} + +void EditMainWindow::SetScrollBars() +{ + EditView* pEditView = aViewWin.GetEditView(); + Size aSz = GetOutputSizePixel(); + Size aRealSz( aSz ); + long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width(); + long nTBHeight = aToolBox.GetSizePixel().Height(); + aSz.Height() -= nTBHeight; + Size aOrgSz( aSz ); + + // VScroll... + aSz.Height() += 2; + Point aPoint( ( aSz.Width()- nScrollbarWidthPixel+1 ), -1+nTBHeight); + aSz.Width() = nScrollbarWidthPixel; + aVScrollBar.SetPosSizePixel( aPoint, aSz ); + + // HScroll... + aSz = aOrgSz; + Point aPoint2( 0, aRealSz.Height()-aHScrollBar.GetSizePixel().Height()+1 ); // TB-Height schon drin! + aSz.Width() -= aVScrollBar.GetSizePixel().Width(); + aSz.Width() += 2; + + aSz.Height() = nScrollbarWidthPixel; + aHScrollBar.SetPosSizePixel( aPoint2, aSz ); + + aHScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetWidth() ); + aVScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetHeight() ); + + SetScrollBarRanges(); + + aVScrollBar.Show(); + aHScrollBar.Show(); +} + +void __EXPORT EditMainWindow::Resize() +{ + long nBorder = aVScrollBar.GetSizePixel().Width(); + long nExtra = 10; + Size aTBSz = aToolBox.CalcWindowSizePixel(); + Size aOutSzPixel( GetOutputSizePixel() ); + aToolBox.SetSizePixel( Size( aOutSzPixel.Width(), aTBSz.Height()) ); + + aViewWin.SetSizePixel( Size( aOutSzPixel.Width()-nBorder-2*nExtra, aOutSzPixel.Height()-aTBSz.Height()-2*nExtra-nBorder) ); + + aViewWin.SetPosPixel( Point( nExtra, aTBSz.Height()+nExtra ) ); + + SetScrollBars(); + + EditView* pEditView = aViewWin.GetEditView(); + if ( pEditView && pEditView->GetEditEngine()->GetPolygon() ) + CreatePolygon(); +} + +IMPL_LINK( EditMainWindow, ShowStatus, EditStatus *, pStat ) +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + if ( ( pStat->GetStatusWord() & EE_STAT_TEXTWIDTHCHANGED ) || ( pStat->GetStatusWord() & EE_STAT_TEXTHEIGHTCHANGED ) ) + { + aViewWin.MarkOutputArea(); + if ( pEditEngine->GetTextHeight() < (ULONG)pEditView->GetOutputArea().GetHeight() ) + { + // Wird durch RGCHK_PAPERSZ1 'geklippt' + if ( !( pEditEngine->GetControlWord() & EE_CNTRL_AUTOPAGESIZE) ) + pEditView->Scroll( -(long)pEditEngine->CalcTextWidth(), -(long)pEditEngine->GetTextHeight(), RGCHK_PAPERSZ1 ); + } + SetScrollBarRanges(); + } + if ( pStat->GetStatusWord() & EE_STAT_HSCROLL ) + aHScrollBar.SetThumbPos( pEditView->GetVisArea().Left() ); + if ( pStat->GetStatusWord() & EE_STAT_VSCROLL ) + aVScrollBar.SetThumbPos( pEditView->GetVisArea().Top() ); + + return 0; +} + + +EditViewWindow::~EditViewWindow() +{ + // erst die angemeldeten Views zerstoeren + // (melden sich selbst ab) + MyView* pView = aViewList.First(); + while ( pView ) + { + delete pView; + pView = aViewList.Next(); + } + + pEditEngine->RemoveView( pEditView ); + delete pEditView; + // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt, + // wird der Handler gerufen, ich zerstore hier aber schon die View! + pEditEngine->SetStatusEventHdl( Link() ); +// SvxAutoCorrect* pAutoCorrekt = pEditEngine->GetAutoCorrect(); +// pEditEngine->SetAutoCorrect( 0 ); +// delete pAutoCorrekt; + delete pEditEngine; +} + +EditViewWindow::EditViewWindow( Window* pParent ) : + Window( pParent ), aURLPtr( POINTER_HAND ) +{ + SetBackgroundBrush( Brush( Color( COL_WHITE ) ) ); + SetMapMode( MAP_100TH_MM ); +// EnableDrop(); + + SfxItemPool* pPool = EditEngine::CreatePool(); + Font aFont = GetSettings().GetStyleSettings().GetAppFont(); + MapMode aPntMode( MAP_POINT ); + MapMode aCurrent( GetMapMode() ); + Size aSz( LogicToLogic( Size( 12, 0 ), &aPntMode, &aCurrent ) ); + aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) ); + pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(),aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); + pPool->SetPoolDefaultItem( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT ) ); + pEditEngine = new MyEditEngine( pPool ); + + Size aPaperSz( 10000,8000 ); + pEditEngine->SetPaperSize( aPaperSz ); + + pEditView = new EditView( pEditEngine, this ); + pEditView->SetBackgroundColor( Color( COL_WHITE ) ); + pEditView->SetOutputArea( Rectangle( Point( 100, 100 ), aPaperSz ) ); + pEditEngine->SetDefaultLanguage( LANGUAGE_ENGLISH ); + pEditEngine->InsertView( pEditView ); + + SetPosSizePixel( Point( 10, 10 ), Size( 600, 400 ) ); + SetPen( PEN_NULL ); + Show(); + + // Feldbefehle grau hinterlegen + ULONG n = pEditEngine->GetControlWord(); + n = n | (EE_CNTRL_MARKFIELDS|EE_CNTRL_AUTOCOMPLETE); + pEditEngine->SetControlWord( n ); + + // Test: Autozentrierung +// ULONG n = pEditEngine->GetControlWord(); +// n = n | EE_CNTRL_AUTOPAGESIZE; +// pEditEngine->SetControlWord( n ); + + // OneLineSpeling +#ifdef WNT +// pEditEngine->CreateSpeller( DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ), +// DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ) ); +// pEditEngine->GetSpeller()->SetActualLanguage( LANGUAGE_GERMAN ); +// pEditEngine->GetSpeller()->SetDefaultLanguage( LANGUAGE_GERMAN ); +// pEditEngine->GetSpeller()->SetMinTrail( 2 ); + + // AutoCorrect wird nie zerstoert +// pEditEngine->SetAutoCorrect( new SvxAutoCorrect( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\prj\\office\\autotext\\autocorr.dat" ) ) ) ); +#endif +} + +void __EXPORT EditViewWindow::Paint( const Rectangle& rRec ) +{ + if ( pEditView->GetEditEngine()->GetPolygon() ) + { + // Die Punkte des Polygons beziehen sich auf die View... + MapMode aMapMode( GetMapMode() ); + aMapMode.SetOrigin( pEditView->GetOutputArea().TopLeft() ); + SetMapMode( aMapMode ); + DrawPolyPolygon( *pEditView->GetEditEngine()->GetPolygon() ); + aMapMode.SetOrigin( Point() ); + SetMapMode( aMapMode ); + } + pEditView->Paint( rRec ); + MarkOutputArea(); +} + +void EditViewWindow::MarkOutputArea() +{ + static Rectangle aCurFrame; + Rectangle aOutArea( pEditView->GetOutputArea() ); + aOutArea = LogicToPixel( aOutArea ); + aOutArea.Left()--; + aOutArea.Right()++; + aOutArea.Top()--; + aOutArea.Bottom()++; + aOutArea = PixelToLogic( aOutArea ); + SetPen( Pen( Color( COL_RED ) ) ); + SetFillInBrush( Brush( BRUSH_NULL ) ); + DrawRect( aOutArea ); + if ( !aCurFrame.IsEmpty() ) + { + if ( aCurFrame.Left() < aOutArea.Left() ) + Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aOutArea.Left()-aCurFrame.Left(), aCurFrame.GetHeight() ) ) ); + if ( aCurFrame.Right() > aOutArea.Right() ) + { + long nW = aCurFrame.Right() - aOutArea.Right(); + Point aPos( aCurFrame.TopRight() ); + aPos.X() -= nW; + Invalidate( Rectangle( aPos, Size( nW, aCurFrame.GetHeight() ) ) ); + } + if ( aCurFrame.Top() < aOutArea.Top() ) + Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aCurFrame.GetWidth(), aOutArea.Top() - aCurFrame.Top() ) ) ); + if ( aCurFrame.Bottom() > aOutArea.Bottom() ) + { + long nH = aCurFrame.Bottom() - aOutArea.Bottom(); + Point aPos( aCurFrame.BottomLeft() ); + aPos.Y() -= nH; + Invalidate( Rectangle( aPos, Size( aCurFrame.GetWidth(), nH ) ) ); + } + } + aCurFrame = aOutArea; +} + +void __EXPORT EditViewWindow::Resize() +{ + Size aPaperSz( GetOutputSize() ); + pEditView->SetOutputArea( Rectangle( Point(0,0), aPaperSz ) ); + pEditEngine->SetPaperSize( Size( aPaperSz.Width()*1, aPaperSz.Height()*1 ) ); + pEditView->ShowCursor(); + Invalidate(); +} + +void __EXPORT EditViewWindow::KeyInput( const KeyEvent& rKEvt ) +{ + sal_Unicode nCharCode = rKEvt.GetCharCode(); + + USHORT nCode = rKEvt.GetKeyCode().GetCode(); + // Auswertung fuer besondere Einstellungen.... + if ( ( nCode == KEY_A) && rKEvt.GetKeyCode().IsMod1() ) + pEditView->SetSelection( ESelection( 0, 0, 0xFFFF, 0xFFFF ) ); + else if ( ( nCode == KEY_R ) && rKEvt.GetKeyCode().IsMod2() ) + Invalidate(); + else if ( ( nCode == KEY_L ) && rKEvt.GetKeyCode().IsMod2() ) + { + ULONG n = pEditEngine->GetControlWord(); + n = n | EE_CNTRL_ONECHARPERLINE; + pEditEngine->SetControlWord( n ); + pEditEngine->QuickFormatDoc(); + } + else if ( ( nCode == KEY_Z ) && rKEvt.GetKeyCode().IsMod2() ) + { + pEditView->RemoveAttribs(); + } + else if ( ( nCode == KEY_V ) && rKEvt.GetKeyCode().IsMod2() ) + { + pEditEngine->SetVertical( TRUE ); + Invalidate(); + } + else if ( ( ( nCode == KEY_ADD ) || ( nCode == KEY_SUBTRACT ) )&& rKEvt.GetKeyCode().IsMod2() ) + { + short nDiff = ( nCode == KEY_ADD ) ? (+5) : (-5); + if ( nZoom > 1000 ) + nDiff *= 20; + if ( nZoom <= 25 ) + nDiff /= 5; + if ( ( nZoom + nDiff ) > 0 ) + nZoom += nDiff; + MapMode aMapMode( MAP_100TH_MM, Point(0,0), Fraction(nZoom,100), Fraction(nZoom,100) ); + SetMapMode( aMapMode ); + ((EditMainWindow*)GetParent())->SetTitle(); + + if ( rKEvt.GetKeyCode().IsMod1() ) + { + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "ChangingRefMapMode..." ) ) ).Execute(); + pEditEngine->SetRefMapMode( aMapMode ); + } + Invalidate(); + } + else if ( rKEvt.GetKeyCode().IsMod2() && + ( ( nCode == KEY_UP) || ( nCode == KEY_DOWN ) || + ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) ) + { + if( rKEvt.GetKeyCode().IsMod1() ) + { + ULONG nCtrl = pEditEngine->GetControlWord(); + if ( ! ( nCtrl & EE_CNTRL_STRETCHING ) ) + { + nCtrl |= EE_CNTRL_STRETCHING; + pEditEngine->SetControlWord( nCtrl ); + } + USHORT nX, nY; + pEditEngine->GetGlobalCharStretching( nX, nY ); + if ( ( nCode == KEY_DOWN ) && ( nY > 5 ) ) + nY += 5; + else if ( nCode == KEY_UP ) + nY -= 5; + else if ( nCode == KEY_RIGHT ) + nX += 5; + else if ( ( nCode == KEY_LEFT ) && ( nX > 5 ) ) + nX -= 5; + pEditEngine->SetGlobalCharStretching( nX, nY ); + ((EditMainWindow*)GetParent())->SetTitle(); + } + else // ZeichenAttr + { + SfxItemSet aAttrs( pEditView->GetAttribs() ); + SfxItemSet aNewAttrs( pEditEngine->GetEmptyItemSet() ); + const SvxFontWidthItem& rItem = (const SvxFontWidthItem&)aAttrs.Get( EE_CHAR_FONTWIDTH ); + USHORT nProp = rItem.GetProp(); + if ( nCode == KEY_RIGHT ) + nProp += 5; + else if ( ( nCode == KEY_LEFT ) && ( nProp > 5 ) ) + nProp -= 5; + aNewAttrs.Put( SvxFontWidthItem( 0, nProp, EE_CHAR_FONTWIDTH ) ); + pEditView->SetAttribs( aNewAttrs ); + } + } + else if ( ( nCode == KEY_O ) && rKEvt.GetKeyCode().IsMod2() ) + { + MapMode aMapMode( GetMapMode() ); + aMapMode.SetOrigin( Point( 41, 41 ) ); + SetMapMode( aMapMode ); + Invalidate(); + } + else if ( ( nCode == KEY_B ) && rKEvt.GetKeyCode().IsMod2() ) + { + SfxItemSet aSet = pEditView->GetEmptyItemSet(); + aSet.Put( SvxFontHeightItem(800, 100, EE_CHAR_FONTHEIGHT) ); + pEditView->SetAttribs( aSet ); + } + else if ( ( nCode == KEY_P ) && rKEvt.GetKeyCode().IsMod2() ) + { +// ESelection aSel = pEditView->GetSelection(); +// for ( ULONG n = aSel.nStartPara; n <= aSel.nEndPara; n++ ) +// { +// InfoBox( 0, pEditEngine->GetText( n ) ).Execute(); +// } + InfoBox( 0, pEditView->GetSelected() ).Execute(); + + } + else if ( rKEvt.GetKeyCode().IsMod2() && + ( nCode >= KEY_1 ) && ( nCode <= KEY_9 ) ) + { + ULONG nEECtrl = pEditEngine->GetControlWord(); + nEECtrl = nEECtrl | EE_CNTRL_AUTOPAGESIZE; + pEditEngine->SetControlWord( nEECtrl ); + + ULONG nEVCtrl = pEditView->GetControlWord(); + nEVCtrl |= EV_CNTRL_AUTOSIZE; + pEditView->SetControlWord( nEVCtrl ); + + pEditView->SetAnchorMode( (EVAnchorMode)(nCode-KEY_1) ); + pEditView->SetOutputArea( Rectangle( Point(0,0), GetOutputSize() ) ); + pEditEngine->SetMaxAutoPaperSize( GetOutputSize() ); + pEditEngine->SetPaperSize( Size( 0, 0 ) ); + } + else if ( rKEvt.GetKeyCode().IsMod2() && ( nCode == KEY_0 ) ) + { + ULONG nEVCtrl = pEditView->GetControlWord(); + nEVCtrl = nEVCtrl | EV_CNTRL_AUTOSIZE; + pEditView->SetControlWord( nEVCtrl ); + + Size aOutSz( GetOutputSize() ); + Size aPaperSz( aOutSz.Width() / 2, 0 ); + pEditView->SetOutputArea( Rectangle( Point(), aPaperSz ) ); + pEditEngine->SetPaperSize( aPaperSz ); + // Max-Height wird bei View verwendet, + // MinSize/MaxSize nur, wenn AUTOPAGESIZE ( KEY_1 - KEY_9 ) + pEditEngine->SetMaxAutoPaperSize( Size( aOutSz.Width() / 2, aOutSz.Height() / 2 ) ); + pEditEngine->SetMinAutoPaperSize( Size( aOutSz.Width() / 8, aOutSz.Height() / 8 ) ); + } + else if ( ( nCode == KEY_J ) && rKEvt.GetKeyCode().IsMod2() ) + { + Size aTextSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Rectangle aRect( pEditView->GetOutputArea().TopLeft(), aTextSz ); + Brush aTmpBrush( Color( COL_LIGHTBLUE ), BRUSH_25 ); + Brush aOldBrush( GetFillInBrush() ); + SetFillInBrush( aTmpBrush ); + DrawRect( aRect ); + SetFillInBrush( aOldBrush ); + pEditView->Paint( aRect ); + } + else if ( ( nCode == KEY_H ) && rKEvt.GetKeyCode().IsMod2() ) + { + Push(); + Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Pen aPen( PEN_SOLID ); + Brush aBrush( Color( COL_GRAY ), BRUSH_SOLID ); + aPen.SetColor( Color( COL_BLACK ) ); + SetPen( aPen ); + SetFillInBrush( aBrush ); + Rectangle aR( pEditView->GetOutputArea().TopLeft(), aSz ); + DrawRect( aR ); + Pop(); + pEditEngine->Draw( this, pEditView->GetOutputArea() ); + pEditView->ShowCursor( TRUE, TRUE ); + } + + // Eingabe an EditEngine... + else + { + BOOL bDone = pEditView->PostKeyEvent( rKEvt ); + if ( !bDone ) + Window::KeyInput( rKEvt ); + } + + ((EditMainWindow*)GetParent())->UpdateToolBox(); +} + +void __EXPORT EditViewWindow::MouseMove( const MouseEvent& rMEvt ) +{ + Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); + if ( pEditView->GetOutputArea().IsInside( aPos ) ) + { + const SvxFieldItem* pField = pEditView->GetFieldUnderMousePointer(); + if ( pField ) + SetPointer( aURLPtr ); + else + SetPointer( pEditView->GetPointer() ); + +// aPos -= pEditView->GetOutputArea().TopLeft(); +// aPos += pEditView->GetVisArea().TopLeft(); +// if ( pEditView->GetEditEngine()->IsTextPos( aPos, PixelToLogic( Size( 5, 0 ) ).Width() ) ) +// SetPointer( pEditView->GetPointer() ); +// else +// SetPointer( Pointer( POINTER_REFHAND ) ); + + } + else + SetPointer( aStdPtr ); + +// static long x = 0; +// x++; +// DBG_ASSERT( x < 1000, String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ) ); + pEditView->MouseMove( rMEvt ); +} + +void __EXPORT EditViewWindow::MouseButtonDown( const MouseEvent& rMEvt ) +{ + GrabFocus(); + pEditView->MouseButtonDown( rMEvt ); +} + +void __EXPORT EditViewWindow::MouseButtonUp( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonUp( rMEvt ); + ((EditMainWindow*)GetParent())->UpdateToolBox(); +} + +void __EXPORT EditViewWindow::Command( const CommandEvent& rCEvt ) +{ + if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) + { + if( pEditView->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel() ) ) + pEditView->ExecuteSpellPopup( rCEvt.GetMousePosPixel() ); + } + else + pEditView->Command(rCEvt); + +} + +BOOL __EXPORT EditViewWindow::Drop( const DropEvent& rEvt ) +{ + return pEditView->Drop( rEvt ); +} + +BOOL __EXPORT EditViewWindow::QueryDrop( DropEvent& rEvt ) +{ + return pEditView->QueryDrop( rEvt ); +} + +// --- aEditApp ------------------------------------------------------ + +void __EXPORT EditApp::Main() +{ +#ifdef WNT + SvFactory::Init(); +#endif + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr = createApplicationServiceManager(); + ::comphelper::setProcessServiceFactory( xSMgr ); + + EditDLL aEditDll; + SvxGlobalItemData aItemData; + SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxDateField ); + SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxURLField ); + + Help::EnableQuickHelp(); + + EditMainWindow aWindow; + Execute(); +} + +EditApp aEditApp; diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk index 2ce9d573de..096955e294 100644 --- a/svx/workben/msview/makefile.mk +++ b/svx/workben/msview/makefile.mk @@ -40,28 +40,28 @@ TARGETTYPE=GUI # --- Files -------------------------------------------------------- OBJFILES= $(OBJ)$/msview.obj \ - $(OBJ)$/xmlconfig.obj + $(OBJ)$/xmlconfig.obj EXCEPTIONSFILES=$(OBJ)$/msview.obj \ - $(OBJ)$/xmlconfig.obj + $(OBJ)$/xmlconfig.obj APP1NOSAL= TRUE APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) APP1STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(SALLIB) \ - $(SOTLIB) \ - $(VCLLIB) \ - $(SVXLIB) \ - $(SFXLIB) + $(CPPUHELPERLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(TKLIB) \ + $(VCLLIB) \ + $(TOOLSLIB) \ + $(SVTOOLLIB) \ + $(SALLIB) \ + $(SOTLIB) \ + $(VCLLIB) \ + $(SVXLIB) \ + $(SFXLIB) |