diff options
Diffstat (limited to 'svx')
399 files changed, 2657 insertions, 2048 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/galbrws2.hxx b/svx/inc/galbrws2.hxx index 2549f2e8e7..65ca239e5a 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -36,7 +36,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/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 30d19ad230..2ab9811be2 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -55,7 +55,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" diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx deleted file mode 100644 index 7ae414c729..0000000000 --- a/svx/inc/srchitem.hxx +++ /dev/null @@ -1,34 +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 _SVX_SRCHITEM_HXX -#define _SVX_SRCHITEM_HXX - -#include <svl/srchitem.hxx> - -#endif - - diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 70f466b6eb..70f466b6eb 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 1ab616b7a6..1ab616b7a6 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 9853b5f1b7..9853b5f1b7 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 1961227844..1961227844 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 2d26f8d6bd..2d26f8d6bd 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 fc589e3586..fc589e3586 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 05a92f7c06..05a92f7c06 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 13d870991c..13d870991c 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 a7c814b8f4..a7c814b8f4 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 129e7e747f..129e7e747f 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 4ad3933603..4ad3933603 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 a55b929610..a55b929610 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 6ba07e23ae..6ba07e23ae 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 736dee6e72..736dee6e72 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 23da0627fc..23da0627fc 100644 --- a/svx/inc/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 861203c2bd..861203c2bd 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 2a816bc13c..2a816bc13c 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index b56d69fd02..b56d69fd02 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 1d255187c0..3b3793b1d0 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -37,7 +37,7 @@ #endif #include <sfx2/dockwin.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 31f391399a..31f391399a 100644 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx index 7e59fa175b..7e59fa175b 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 08982d8444..08982d8444 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 743dbfa378..743dbfa378 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 8621ac19e0..8621ac19e0 100644 --- a/svx/source/inc/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx index e8bcd3777c..e8bcd3777c 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 e3f531ddcc..e3f531ddcc 100644 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 81e7031a37..81e7031a37 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 01ba5ce90b..01ba5ce90b 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 a5a74d5881..a5a74d5881 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 2f42bc32fe..2f42bc32fe 100644 --- a/svx/inc/gallery.hxx +++ b/svx/inc/svx/gallery.hxx diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 6a51190ce6..6a51190ce6 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 0d965bdd2a..0d965bdd2a 100644 --- a/svx/inc/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index 97d8de5782..97d8de5782 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index 1beecda742..1beecda742 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 a701d03d39..a701d03d39 100644 --- a/svx/inc/htmlmode.hxx +++ b/svx/inc/svx/htmlmode.hxx diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index 457cb7c5e6..457cb7c5e6 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 0a1f5ad95a..0a1f5ad95a 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 dc587513b8..dc587513b8 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 c1e43e59fa..c1e43e59fa 100644 --- a/svx/inc/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 26e3f1fc74..26e3f1fc74 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 0a699a72aa..0a699a72aa 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 3daef66ffd..3daef66ffd 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 00e061b08e..00e061b08e 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 c03617ed55..c03617ed55 100644 --- a/svx/inc/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx index 63915d0500..63915d0500 100644 --- a/svx/inc/numvset.hxx +++ b/svx/inc/svx/numvset.hxx diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 34dcb8b094..34dcb8b094 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 668990b383..668990b383 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 c3afa9c847..c3afa9c847 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 9fbd0098e9..9fbd0098e9 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 1ffb1bb855..1ffb1bb855 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 617c89014d..617c89014d 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 b6f5ec7802..b6f5ec7802 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx index 466baf121b..466baf121b 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 e3d7867a23..e3d7867a23 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 a0f3fa725f..a0f3fa725f 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 15863f498e..15863f498e 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 6b281d3e80..6b281d3e80 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 51f83c79ac..51f83c79ac 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 7a3d42eebf..7a3d42eebf 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 be2518a685..b34df0bffb 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -95,6 +95,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 60fb360a2e..fdc57f7998 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 5b2224dfa8..5b2224dfa8 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 77c8f91898..77c8f91898 100644 --- a/svx/inc/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index b74e3e21c5..cc92f4848f 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -29,7 +29,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 856f3fc5c3..f767586559 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -118,7 +118,7 @@ public: // class SvxSearchDialog ------------------------------------------------- /* - {k:\svx\prototyp\dialog\srchdlg.hxx} + {k:\svx\prototyp\dialog\svx/srchdlg.hxx} [Beschreibung] In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 396ab1cff5..396ab1cff5 100644 --- a/svx/inc/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx index dcae622822..dcae622822 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 8032e5ad93..8032e5ad93 100644 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/inc/svx/svditext.hxx diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 410a1a8375..e18e879b2d 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -120,7 +120,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 5f2117b371..3efadcda2c 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -184,6 +184,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 8ed8b61af4..efc0df0262 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -375,6 +375,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 f5997b030b..f5997b030b 100644 --- a/svx/inc/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 43f8c0e14a..43f8c0e14a 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 7f4b4710f8..7f4b4710f8 100644 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx index 31baf42e2e..31baf42e2e 100644 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 120beaad6c..120beaad6c 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 fabd1b10c5..fabd1b10c5 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 ba73e3d017..ba73e3d017 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 0bd57c9747..0bd57c9747 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 d6229320d3..79b31cac28 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -31,7 +31,7 @@ #include <svtools/valueset.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 8015939271..eacd2dc739 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index bc674472aa..bc674472aa 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 3581093654..3581093654 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 eee93e3d7b..eee93e3d7b 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 4265b9af44..4265b9af44 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 d4aceb2c32..d4aceb2c32 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 a37cf0aad7..a37cf0aad7 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 a1d28b2695..a1d28b2695 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 2f9a16b91c..2f9a16b91c 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx index 5579c2202d..5579c2202d 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 670d575a53..670d575a53 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 49baf26ee4..49baf26ee4 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 8783cb9521..8783cb9521 100644 --- a/svx/inc/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 2fa88fe614..2fa88fe614 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 54b7eba0d6..54b7eba0d6 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 d4f4bd42e1..d4f4bd42e1 100644 --- a/svx/inc/xattr.hxx +++ b/svx/inc/svx/xattr.hxx diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx index bb18e46231..bb18e46231 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 4e4982d045..4e4982d045 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 eab60f07ad..eab60f07ad 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 7df268a39c..7df268a39c 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 cadcc55fc5..cadcc55fc5 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 21ab95e2f6..21ab95e2f6 100644 --- a/svx/inc/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index 2d2ce9408c..2d2ce9408c 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 b3386b207b..b3386b207b 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 fe15afbdf4..a07db5dbe0 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -2,6 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid mkdir: %COMMON_DEST%\res%_EXT% mkdir: %_DEST%\xml%_EXT%\uiconfig mkdir: %_DEST%\xml%_EXT%\uiconfig\global +mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator +mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US +mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* @@ -20,442 +23,12 @@ mkdir: %_DEST%\inc%_EXT%\svx ..\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\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\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx +..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h +..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.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\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 @@ -491,6 +64,7 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact ..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx ..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx ..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx +..\inc\svx\sdr\contact\vocbitmapbuffer.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\vocbitmapbuffer.hxx mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay ..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx @@ -512,6 +86,10 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d ..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation +..\inc\svx\sdr\animation\ainfographic.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfographic.hxx +..\inc\svx\sdr\animation\ainfoscrolltext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfoscrolltext.hxx +..\inc\svx\sdr\animation\ainfotext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfotext.hxx +..\inc\svx\sdr\animation\animationinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationinfo.hxx ..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx ..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx ..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx @@ -546,11 +124,9 @@ 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 diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk new file mode 100644 index 0000000000..2a0b99e72f --- /dev/null +++ b/svx/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -srj9 diff --git a/svx/prj/target_lib_svx.mk b/svx/prj/target_lib_svx.mk new file mode 100644 index 0000000000..6810f7f30f --- /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..f337588232 --- /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..5978c97e55 --- /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..67d3cfab1c --- /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/sdi/svx.sdi b/svx/sdi/svx.sdi index 74d965b4dc..cd23586cc6 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -15108,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 d717fa2a49..2265033742 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -29,7 +29,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> @@ -39,14 +39,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 1feb374c68..22d7f99563 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -28,7 +28,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> @@ -51,7 +51,7 @@ #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> @@ -59,7 +59,7 @@ #ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" #endif -#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 6a2466a6ce..e72d8a830c 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -28,7 +28,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> @@ -52,12 +52,12 @@ #ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" #endif -#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 82cc03d7da..b9ae169293 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -45,7 +45,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 29493f85f9..c2403c3499 100755 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -35,7 +35,7 @@ #include <vos/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/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 12123ecc58..53daf3628e 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -27,9 +27,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 c2f861ba2f..0ad13cb317 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -31,7 +31,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 272a46b49a..59873c7927 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -28,16 +28,16 @@ // 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> #ifndef _SVX_UNOPAGE_HXX #include "svx/unopage.hxx" #endif -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> @@ -49,7 +49,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 33d9bef294..15cceee496 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -38,7 +38,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> @@ -46,7 +46,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 dfb0752841..4d57a45ca3 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -27,7 +27,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 d7b8cef73c..12a27b086f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -27,7 +27,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 45f56e8e70..1fd49aa7fd 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -28,8 +28,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 5925cd0eed..7cd3169704 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -27,7 +27,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/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index d3c6ea3396..a791f8b75e 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -43,7 +43,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 2313f15ea6..d73b0faafa 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -52,7 +52,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> @@ -61,7 +61,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/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 25c362ad6f..be1a2d4528 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -37,9 +37,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/contwnd.cxx b/svx/source/dialog/contwnd.cxx index a398469a82..43784ebbf7 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -27,7 +27,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> @@ -40,7 +40,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 e9c65020fe..2d807f7b39 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" // === includes (declaration) ============================================ -#include "databaseregistrationui.hxx" +#include "svx/databaseregistrationui.hxx" // === includes (UNO) ==================================================== // === /includes (UNO) =================================================== diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 3968a946bc..bd202fead1 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -27,7 +27,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 5fa005d0dc..cdafb622e7 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 851321bc6a..ae6ddc84bc 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/fontlb.cxx b/svx/source/dialog/fontlb.cxx index c62749b4f6..a7f37eef6b 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -27,7 +27,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 8faf74ffe7..b0419dbd04 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -41,7 +41,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/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 248744758c..75496b2492 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -41,12 +41,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/hdft.cxx b/svx/source/dialog/hdft.cxx index 360f3199d4..aa64c47efa 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -48,9 +48,9 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> //CHINA001 #include "bbdlg.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/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 5342be0e13..fed065cba4 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> -#include "hyperdlg.hxx" +#include "svx/hyperdlg.hxx" #include <svx/svxdlg.hxx> //CHINA001 #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 985e2e4b9b..e69800cfa1 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -43,11 +43,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/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index a05a0d00b7..ae4c7f4da1 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -68,7 +68,7 @@ #endif #define _IMAPDLG_PRIVATE -#include "imapdlg.hxx" +#include "svx/imapdlg.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -76,7 +76,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/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index cdd1f90e26..31b1757350 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -37,7 +37,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/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 3aea007ca3..ba7c0deb74 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -33,9 +33,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 916c774dab..afc180a8d2 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -38,10 +38,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" /* -----------------18.08.98 17:41------------------- * local functions diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 0fb63234db..1d5b9d6ad6 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -27,7 +27,7 @@ // 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> @@ -35,7 +35,7 @@ #ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 3b365d4d5b..386681b6fe 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -36,7 +36,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/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index ae8b95344c..ae11f94ba5 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -35,7 +35,7 @@ #include <comphelper/processfactory.hxx> -#include "pfiledlg.hxx" +#include "svx/pfiledlg.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 7647129327..ccf932be6a 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -31,7 +31,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#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 002f55a484..7f627762fc 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -31,7 +31,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 706ca231e9..ad37ef2704 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -44,7 +44,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 e152afc2b9..bad0e1c2d1 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -27,7 +27,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/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 52c8ff2f55..9c01948296 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -30,7 +30,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/simptabl.cxx b/svx/source/dialog/simptabl.cxx index c3f9b5105f..c32d151d90 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -152,7 +152,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 19391edf2b..080e9b8621 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -40,7 +40,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 77856898f5..3e4d0d49f3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -56,7 +56,7 @@ #include <toolkit/unohlp.hxx> #define _SVX_SRCHDLG_CXX -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -69,7 +69,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> //CHINA001 diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index d2c83a4d68..51d7af6a11 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -41,7 +41,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> @@ -49,14 +49,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 aad28af5a8..d871d70d59 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -27,7 +27,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 ca3ffc5e80..23ef03dab5 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -48,7 +48,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" diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 65ebab216a..98ebe2a51c 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -33,7 +33,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 2b5d2d899f..936e38ed10 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -27,7 +27,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 25d6131cfa..2c632164bc 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -28,8 +28,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 2e4f0eef7a..5cfdc73d50 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -30,7 +30,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 b473c34cb1..8d797fa5ad 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -27,7 +27,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 616db93da6..7dcf215cc8 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -28,10 +28,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 d0cbaf14b3..30cc7f35d5 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -28,10 +28,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 c8001f8091..8870af6344 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -37,7 +37,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> @@ -48,9 +48,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 @@ -60,7 +60,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/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 86f172da7d..ca46e66fdd 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -32,7 +32,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 a8ee638100..c8cae7068d 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -28,11 +28,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/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 8543c9d247..dd3c8403ad 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -28,14 +28,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 717dd668c8..e4925cbbb4 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -28,14 +28,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 e496a23ee6..308f96067f 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -29,7 +29,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 b42c963ec3..0771c06cf5 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -30,14 +30,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 e5a55a6964..31c4aa947c 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -28,14 +28,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> diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 00f85df53a..f7fde7bab7 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -28,11 +28,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 8f56c8b331..85808a4a81 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -32,7 +32,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> @@ -43,7 +43,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> @@ -64,7 +64,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 22aa9583f1..ab2a25ca74 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -29,7 +29,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> @@ -37,7 +37,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 8d0c1d2fe5..21cc3e224d 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -28,12 +28,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 d7a264f354..21c27bf0cc 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -28,7 +28,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" diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index fa935b060a..33f50ca4f1 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -30,7 +30,7 @@ #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" #include "gridcell.hxx" #include "gridcols.hxx" @@ -2953,13 +2953,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) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 4a9ac64865..34d1e05906 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -61,7 +61,7 @@ #include <vcl/menu.hxx> #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #ifndef _SVX_SVXIDS_HRC diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index 883a452075..611df77f0b 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include "globlmn.hrc" #include "fmhelp.hrc" diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 98a9a365b8..fb9597ca69 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -27,7 +27,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 62937a29f6..a402be52b9 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#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 588a54b5dc..dddf4d5b46 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -31,7 +31,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 c1e5967936..25c0880a5d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -32,12 +32,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 a57398758c..c399620667 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -27,7 +27,7 @@ #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 ; }; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c1795f5938..925a4cac34 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -34,7 +34,7 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "gridcell.hxx" /** === begin UNO includes === **/ diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 5035b276e4..dc4e64388b 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" Menu RID_FM_FILTER_MENU @@ -60,30 +60,3 @@ Menu RID_FM_FILTER_MENU }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 7ab661c758..edd90acdc3 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -31,7 +31,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 b16af664c5..4337d20871 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include <svl/itempool.hxx> #ifndef _SVX_DBEXCH_HRC -#include <dbexch.hrc> +#include <svx/dbexch.hrc> #endif #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 52393a6e34..6691258c60 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #ifndef _SVX_FMEXPL_HRC #include "fmexpl.hrc" @@ -54,7 +54,7 @@ #include "fmprop.hrc" #endif #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 0fe0e38734..af8b9ec951 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" #include <svx/svxcommands.h> diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index eb747e0bf5..93c4a96b0d 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -31,7 +31,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 282dbd757e..d413a60081 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -33,7 +33,7 @@ #include "fmservs.hxx" #ifndef _FM_FMOBJFAC_HXX -#include "fmobjfac.hxx" +#include "svx/fmobjfac.hxx" #endif #ifndef _FM_FMGLOB_HXX @@ -56,7 +56,7 @@ #include <tools/resid.hxx> #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 90be1794a8..5cbd91fc68 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -44,7 +44,7 @@ #ifndef SVX_LIGHT #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #endif #include <tools/shl.hxx> @@ -61,7 +61,7 @@ #include <sfx2/objsh.hxx> #endif #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 3544a55def..296bb63b2b 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -28,7 +28,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" @@ -36,8 +36,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/fmshell.cxx b/svx/source/form/fmshell.cxx index 4a9a859c0e..7de248e0d8 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -64,7 +64,7 @@ #include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #ifndef _SVX_SVXIDS_HRC @@ -72,7 +72,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmexch.hxx" #include <svx/fmglob.hxx> @@ -288,7 +288,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 @@ -320,10 +320,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: diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 7d4dbef060..f79f19814f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -33,7 +33,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" @@ -42,7 +42,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" @@ -538,7 +538,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; @@ -549,7 +548,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; @@ -675,7 +673,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)); @@ -707,7 +704,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 @@ -729,14 +725,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!" ); @@ -748,7 +742,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; @@ -769,7 +762,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; @@ -782,19 +774,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) { @@ -811,7 +800,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) @@ -851,7 +839,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; @@ -888,7 +875,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; @@ -918,7 +904,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; @@ -930,7 +915,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; @@ -941,7 +925,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(); @@ -1019,7 +1002,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; @@ -1041,7 +1023,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; @@ -1062,7 +1043,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; @@ -1109,7 +1089,6 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) //------------------------------------------------------------------------------ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForceUpdateSelection" ); if ( impl_checkDisposed() ) return; @@ -1131,7 +1110,6 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) //------------------------------------------------------------------------------ PopupMenu* FmXFormShell::GetConversionMenu() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" ); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); BOOL bIsHiContrastMode = rSettings.GetHighContrastMode(); @@ -1150,7 +1128,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 < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i ) if (nConvertSlots[i] == nSlotId) return true; @@ -1160,7 +1137,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 +1148,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 +1354,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 +1392,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 +1400,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 +1469,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 +1486,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 +1534,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 +1680,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 +1719,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 +1793,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 +1814,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 +1829,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 +1857,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 +1872,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 +1907,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 +1920,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 +2028,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 +2045,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 +2132,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 +2152,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 +2170,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 +2249,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 +2272,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 +2602,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 +2615,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 +2628,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 +2640,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 +2665,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 +2697,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 +2733,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 +2774,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 +2784,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 +2794,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 +2801,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 +2837,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 +2969,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 +3023,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 +3039,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 +3099,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 +3116,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 +3160,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 +3237,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 +3252,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 +3269,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 +3683,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::createFromAscii("FormControlPilotsEnabled"); @@ -3758,7 +3694,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 +3714,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 +3726,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 +3797,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 +3845,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 +3875,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 +3982,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 +4059,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 +4095,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 +4206,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 fc710ddcbe..e859142ad9 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -27,7 +27,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 65fae03f60..c37fa76daf 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -29,10 +29,10 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/wldcrd.hxx> @@ -63,7 +63,7 @@ #include "fmprop.hrc" #endif #include "fmservs.hxx" -#include "fmsrcimp.hxx" +#include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> #include <comphelper/numbers.hxx> 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 751f699a32..5eef81a893 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -44,7 +44,7 @@ //#include "tabstpge.hxx" #endif -#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 501420329e..8a99070be3 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -29,7 +29,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 c674648e08..dbf6df9c18 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -31,10 +31,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 17c2776de0..438cab3c30 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -50,7 +50,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> @@ -76,7 +76,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; @@ -139,9 +139,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 802cbb59dd..6c5df886a0 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -32,15 +32,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" @@ -51,7 +51,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> @@ -173,20 +173,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 @@ -207,15 +206,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 @@ -249,39 +247,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(); @@ -292,7 +285,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) { ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); @@ -331,9 +324,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++) @@ -350,9 +342,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; @@ -410,10 +402,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; @@ -457,13 +448,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 ); @@ -492,7 +481,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(); @@ -501,7 +489,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(); @@ -513,7 +511,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(); } @@ -522,7 +519,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 ); } @@ -530,7 +526,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 ); } @@ -539,7 +534,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 ); @@ -554,11 +548,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& ) @@ -570,92 +562,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. @@ -674,7 +654,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 ) ); } @@ -682,7 +661,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; } @@ -690,7 +668,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; @@ -700,8 +677,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(); @@ -709,7 +686,7 @@ void FmXFormView::resumeTabOrderUpdate() ++form ) { - (*pos)->updateTabOrder( *form ); + pAdapter->updateTabOrder( *form ); } } m_aNeedTabOrderUpdate.clear(); @@ -730,41 +707,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; } } } @@ -775,7 +753,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); @@ -793,7 +770,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); @@ -808,13 +784,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); @@ -927,18 +901,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; } @@ -960,12 +936,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 { @@ -973,7 +947,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() ); @@ -1024,7 +998,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!" ); @@ -1155,7 +1128,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; @@ -1387,7 +1359,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; @@ -1523,7 +1494,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 ) @@ -1551,7 +1521,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; @@ -1717,7 +1686,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) @@ -1740,7 +1708,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(); @@ -1752,7 +1719,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 ); @@ -1769,7 +1735,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(); @@ -1828,7 +1793,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; @@ -1916,7 +1880,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() ); @@ -1925,7 +1888,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 ) @@ -1936,7 +1898,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); @@ -1951,7 +1912,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 e68d525f52..99b7dab4ce 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -31,7 +31,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 3ab380dc15..67ce99abcc 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -36,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" @@ -62,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> @@ -80,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> @@ -208,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 @@ -583,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 ); @@ -782,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() ); @@ -855,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& ) @@ -1494,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 diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index aca0a9e13c..5b9312a674 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 2adf2854ed..39a738a5bf 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -32,12 +32,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" @@ -57,7 +57,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> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index d552f55803..2f4a3ddde7 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -32,7 +32,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> @@ -42,7 +42,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 5fd57d5abd..bd5b5b0dd7 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -28,7 +28,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 8ecaa916ea..388cf761b2 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -61,7 +61,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 2548b7a901..65fb2bf97a 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,11 +45,11 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include "tbxctl.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" #include "tbxform.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmitems.hxx" #ifndef _SVX_FMHELP_HRC diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index ae2d45ca76..c3978e4785 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -38,7 +38,7 @@ #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> #ifndef _SVX_CLIPBOARDCTL_HXX_ -#include "clipfmtitem.hxx" +#include "svx/clipfmtitem.hxx" #endif #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 917b9d64fb..c1dd8ec4d8 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -38,7 +38,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 adc66750cf..fd219c6379 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -35,7 +35,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 4755a92933..a5354d8282 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -30,7 +30,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 20148bcf1d..5d89ca8c34 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -44,11 +44,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 e471f54718..8ff3ab275b 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -34,9 +34,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 3e0ad51584..476f4d5137 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -31,9 +31,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/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 178f6d8289..dc07276167 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -35,10 +35,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 16efcfdb72..21609ac1e5 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -51,7 +51,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 d9d696ede1..eb3098d968 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -52,7 +52,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> diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 7adf9236ae..f2a541b0f2 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -67,7 +67,7 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <galtheme.hxx> +#include <svx/galtheme.hxx> #include <svx/gallery1.hxx> using namespace ::vos; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e90391d138..28f951512c 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -65,7 +65,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 <vos/thread.hxx> #include <tools/debug.hxx> diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 4087d8b1f4..634cd17b05 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -51,6 +51,7 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/componentcontext.hxx> +#include <rtl/ref.hxx> //class SdrPageViewWinRec; class SdrPageWindow; @@ -79,13 +80,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; @@ -96,10 +97,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); @@ -130,7 +131,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; @@ -150,7 +152,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; @@ -168,7 +170,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; @@ -215,8 +218,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; @@ -246,7 +248,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 56fcf922ab..a581c048d4 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -214,7 +214,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 bd054e968b..1567530f90 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -29,7 +29,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/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 785f5f43e0..f910e6010c 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -44,7 +44,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 8f34ad3333..b98c9f3f0a 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -32,7 +32,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/drawitem.cxx b/svx/source/items/drawitem.cxx index bdd6c52d67..0104692ba6 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -33,7 +33,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 f955392681..8fbb46a2a0 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -44,7 +44,7 @@ #include <basic/sbxvar.hxx> #endif -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" // ----------------------------------------------------------------------- diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 13264a5bb7..2d3e7ccfb1 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -28,7 +28,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 a739f43600..c85e30e72c 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -31,7 +31,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 f15f7149d3..7cde5e3f4d 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 09c65b6c24..c89ac12a5a 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -31,7 +31,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 a2b472fbbf..9f7ab3b62c 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -36,8 +36,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 29846dc5be..cd8c8e1ef8 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -43,7 +43,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..31c8e53214 100644 --- a/svx/source/mnuctrls/makefile.mk +++ b/svx/source/mnuctrls/makefile.mk @@ -56,7 +56,7 @@ HXX1TARGET=mnuctrls HXX1EXT= hxx HXX1EXCL= -E:*include* HXX1DEPN=\ - $(INC)$/clipboardctl.hxx \ + $(INC)$/svx/clipboardctl.hxx \ $(INC)$/fntctl.hxx \ $(INC)$/fntszctl.hxx \ $(INC)$/SmartTagCtl.hxx diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index e53d767512..55694576da 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -37,7 +37,7 @@ #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -151,6 +151,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 9ead400f33..f7c03ae246 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -38,13 +38,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> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 019ec8d159..ca34f64c7a 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -44,8 +44,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> diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 002717b0a3..c4407a8f58 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -40,7 +40,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 c998a65591..fa09a765d8 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -31,7 +31,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/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index b8467266de..885bc46442 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -45,8 +45,8 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <vcl/lazydelete.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include <svx/svdstr.hrc> +#include <svx/svdglob.hxx> #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 1e34db7575..7522bd73e1 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -41,7 +41,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 57312df26a..6e80ea6ac5 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -177,7 +177,7 @@ namespace sdr if(rGrafObj.IsLinkedGraphic()) { // update graphic link - rGrafObj.ImpUpdateGraphicLink(); + rGrafObj.ImpUpdateGraphicLink( sal_False ); } else { @@ -196,7 +196,7 @@ namespace sdr rGrafObj.mbInsidePaint = sal_True; rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = sal_False; - } + } bRetval = true; } @@ -252,19 +252,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(); } @@ -293,10 +301,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 a1dcc0c2fe..4c3329cfd5 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -38,7 +38,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 bd6205e1f9..ec92742a2b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -39,7 +39,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/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 439568f213..d7457be620 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -38,7 +38,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/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index e1eeb9aac4..6b7d6de787 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -30,7 +30,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 2b8aa5c119..112fecf109 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -35,7 +35,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/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 02ca9ef4be..e83f154e9b 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -32,7 +32,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 99a41164e2..5da126f436 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -34,7 +34,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/properties.cxx b/svx/source/sdr/properties/properties.cxx index 496978904b..8b53fef186 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -31,7 +31,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..c41b3e492e 100644 --- a/svx/source/src/makefile.mk +++ b/svx/source/src/makefile.mk @@ -39,8 +39,6 @@ TARGET=ofa RES1FILELIST=\ $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/svtools.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs \ $(SOLARCOMMONRESDIR)$/basic.srs RESLIB1NAME=$(TARGET) @@ -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 785298fee9..324c54517f 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -41,7 +41,7 @@ #include <svx/dialogs.hrc> -#include "insctrl.hxx" +#include "svx/insctrl.hxx" #include <svx/dialmgr.hxx> #define PAINT_OFFSET 5 diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk index 4e125adcd9..71c639cecd 100644 --- a/svx/source/stbctrls/makefile.mk +++ b/svx/source/stbctrls/makefile.mk @@ -61,12 +61,12 @@ 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 9b4fbd3640..3453ac92ab 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -40,7 +40,7 @@ #include <svx/dialogs.hrc> -#include "modctrl.hxx" +#include "svx/modctrl.hxx" #include <svx/dialmgr.hxx> SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 338cab3001..ee85387298 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -45,13 +45,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" diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index f210948406..3def82ce1e 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -39,7 +39,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 b268ba8ea1..1e3bfa8eef 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -53,14 +53,14 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "xmlsecctrl.hxx" +#include "svx/xmlsecctrl.hxx" #include <tools/urlobj.hxx> #define PAINT_OFFSET 5 //#include <editeng/sizeitem.hxx> //#include <svx/dialmgr.hxx> -//#include "dlgutil.hxx" +//#include "svx/dlgutil.hxx" //#include "stbctrls.h" //#include <svx/dialogs.hrc> diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index af990f68fe..59db093eaf 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -39,7 +39,7 @@ #include <svx/dialogs.hrc> -#include "zoomctrl.hxx" +#include "svx/zoomctrl.hxx" //CHINA001 #include "zoom.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index d5c1745de7..fa3e5a22d5 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -28,9 +28,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/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 1be2bb61e3..d11a77187c 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -39,7 +39,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 <vos/mutex.hxx> @@ -192,6 +192,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 1b83413c7c..9bffe5c49a 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -27,7 +27,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 20af90e3ae..3071a70c80 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -54,11 +54,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 2ef55c7046..e68d699027 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -29,7 +29,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> @@ -45,7 +45,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 0710279c0f..be58efde7d 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -37,7 +37,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> @@ -45,8 +45,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> @@ -59,7 +59,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> @@ -68,7 +68,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> diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 91c2da7dd8..03d49bb97c 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -29,7 +29,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> @@ -38,12 +38,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 08cf1ada74..39454e1487 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -40,8 +40,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# diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index bd0f0473d3..fe00380253 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -40,8 +40,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> @@ -50,8 +50,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 5b49ae936f..2a370c60d6 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -36,11 +36,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 880c48ecfb..cbd24082d4 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 921880dfe4..d0eeccf43c 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -31,12 +31,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 d55e21e745..e174ee0d3d 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -57,7 +57,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 546bb10620..4024739119 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -32,8 +32,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 36eba23915..e77ccbef03 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -41,8 +41,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" @@ -62,7 +62,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 d9fd1a9a39..5d2f5937de 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -36,7 +36,7 @@ #define _STDLIB_H #endif -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> @@ -66,7 +66,7 @@ #include <svl/rectitem.hxx> #include <svl/rngitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index c1bcc090ed..f5c87aec44 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -27,7 +27,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 b9b874f728..9ffaa9f2f1 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -31,8 +31,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 89ef4c46de..c98ebaceca 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -34,13 +34,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 1699622f6b..8cf363bff2 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -49,12 +49,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> @@ -65,8 +65,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" @@ -207,6 +207,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 418a54925a..4c80ee2ba0 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -31,8 +31,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> @@ -48,14 +48,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 382493e4eb..92b181b36e 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -31,7 +31,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 6beb3dba74..bc7e2bc399 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -28,7 +28,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> @@ -52,22 +52,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 79148e549c..fbb0e12473 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -30,7 +30,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 ea643fe643..cf676f563e 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -47,8 +47,8 @@ #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/svdglob.hxx" // StringCache +#include <svx/svdstr.hrc> // Objektname #include <svx/svdogrp.hxx> // Factory #include <svx/svdopath.hxx> // Factory #include <svx/svdoedge.hxx> // Factory @@ -74,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> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 7e88f485d0..132d35ef8e 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -41,8 +41,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 58f4c6950d..df6beaba51 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -47,8 +47,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> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 6abb9b200b..3ee7083729 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -43,8 +43,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> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4225d599ff..cf99dd2fdf 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -45,15 +45,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> @@ -69,6 +70,8 @@ #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <osl/thread.hxx> +#include <vos/mutex.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -80,13 +83,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); @@ -95,16 +133,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); + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + 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 ); } @@ -113,6 +222,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; } // ----------------------------------------------------------------------------- @@ -135,9 +260,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(); } } } @@ -155,14 +279,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 ); } } @@ -447,8 +577,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 ) || @@ -558,24 +690,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() ) @@ -1095,7 +1239,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 ) { @@ -1180,7 +1324,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 428ff28482..7c5ed1637d 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -45,14 +45,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 794331c9b8..a5953bf170 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -30,7 +30,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> @@ -40,8 +40,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 88651ed5b2..a642f6049c 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -31,8 +31,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 0a4aef117b..49dd0d112a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -77,8 +77,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 a1a6ad8109..a1e0ddbace 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -29,8 +29,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 a96e6c272d..6ac8bba0e9 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -41,8 +41,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 e84b403cee..e6af868dde 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -45,8 +45,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 b65bde818f..c1d36afe40 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -29,15 +29,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> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 760287af46..8f2e21e9cf 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -53,7 +53,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 0b3fb3a2bf..de1e48c354 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -64,7 +64,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 03d7b9ffc8..5b5e94d8ec 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -30,7 +30,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 5c73038abd..dd08c4e080 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -33,8 +33,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 2681530be2..ffe6953f57 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -29,7 +29,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 786aaa1212..0a84a46d5e 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -34,7 +34,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 5b96e1b2dc..3f89a97821 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -29,7 +29,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> @@ -41,7 +41,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> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index f48a37fcad..a28b1dba87 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -47,17 +47,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 dcf1543adb..e687093291 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -49,7 +49,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 1ca0b0623f..c97b202166 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -47,7 +47,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> @@ -66,7 +66,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); @@ -358,6 +358,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()) diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 6b58e623e4..f9ab9e9a28 100755..100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -30,7 +30,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> @@ -54,7 +54,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> @@ -733,6 +733,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 a718ae5be1..e3f825dafe 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -34,8 +34,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 0943aec425..047a358e2d 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -35,13 +35,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 f665501a43..6aeec1d1b5 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -26,7 +26,7 @@ ************************************************************************/ /* StarView resource file */ -#include "svdstr.hrc" +#include "svx/svdstr.hrc" // Ab hier gecachte Strings String STR_ObjNameSingulNONE { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 2cb797ce2d..79a9c36626 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -29,15 +29,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> @@ -47,7 +47,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 4670b92c4b..1e1b352fbb 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -29,8 +29,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> @@ -55,7 +55,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> diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index b38007705f..b6260d2c8f 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,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> @@ -36,7 +36,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 f8b3efbab2..c9ae654211 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -30,11 +30,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> @@ -45,9 +45,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 dd79040992..ff2af501d3 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -30,7 +30,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 f9a1e86891..d3eebb8f73 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -33,8 +33,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 58bd1d2b6e..f599bcd502 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -55,7 +55,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/svdotable.cxx b/svx/source/table/svdotable.cxx index 9dac57ead2..ed5c3849c1 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -63,8 +63,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 39e6593d13..fbfcdbc296 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -59,15 +59,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 648f1fd6b4..26aa2fce2c 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -42,7 +42,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 7bb2122487..5a4af333b2 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -44,8 +44,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 5355995347..7c02473b17 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -46,8 +46,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 32970273ec..f5d4d0194b 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -40,12 +40,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.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 86efecf955..c0e630efb7 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -39,6 +39,7 @@ #include <vos/mutex.hxx> +#include <svtools/toolbarmenu.hxx> #include <vcl/toolbox.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> @@ -65,7 +66,7 @@ //////////// using ::rtl::OUString; -using ::svtools::ToolbarMenu; +//using ::svtools::ToolbarMenu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index c1d1e979a1..0a7b007bd4 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -44,8 +44,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 06d36f0d95..01cb08c9cc 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -53,10 +53,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> diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 7c8001f591..9f12bdd0fa 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -28,7 +28,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 2ba5e0c732..8282eb4257 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -64,8 +64,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; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index eabe997d33..2f0ca7fc7c 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -49,11 +49,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" diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 0ffa7de0f3..60ed2370f0 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -40,7 +40,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 c5d7d21142..f821116c65 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -46,7 +46,7 @@ #include <svl/slstitm.hxx> #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> -#include <lboxctrl.hxx> +#include <svx/lboxctrl.hxx> #ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> #endif diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f3a21c1ff6..f307a7b25d 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -42,10 +42,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/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index db1c5424ef..603117048f 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -72,7 +72,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> @@ -81,9 +81,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> @@ -1800,8 +1800,7 @@ struct SvxStyleToolBoxControl::Impl static const sal_Char* aCalcStyles[] = { "Default", - "Heading 1", - "Heading 2", + "Heading1", "Result", "Result2" }; @@ -1813,12 +1812,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 a12f8096c2..7e998fd02e 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -32,8 +32,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> #ifndef _SFX_IMAGEMGR_HXX diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 40082c4624..6a849f47ed 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -28,7 +28,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/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 75641be026..3c626387e5 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -42,9 +42,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 57327a6b07..89d2dd532b 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -30,7 +30,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 9b9a56dc48..126d624609 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -50,7 +50,7 @@ #endif #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/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index c856eec1f6..e2457c838d 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -32,7 +32,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> @@ -48,11 +48,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; @@ -349,7 +349,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/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 7ccf3b4daf..309fbb6700 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -116,7 +116,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/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 389db0454d..6d6c9fdf32 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -46,6 +46,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> @@ -65,9 +66,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 3d3b594cbe..a3511edee5 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -39,7 +39,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 87372cb4ae..eb48f1ea4b 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -30,7 +30,7 @@ #include <set> -#include "UnoNamespaceMap.hxx" +#include "svx/UnoNamespaceMap.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +41,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" diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 91bd768f35..cd5ce824ff 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -28,7 +28,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> @@ -42,7 +42,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/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index a35f825f9a..a0a033dea6 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -36,10 +36,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; diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 44b63a88a0..9358fa47c2 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -35,9 +35,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" diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 4779bc357a..fca8e0f936 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -38,7 +38,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 0791954d40..242f675d27 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -36,7 +36,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 38c9c585a5..4d68c31d3f 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -37,7 +37,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 97adf442eb..b0035e5f04 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -41,17 +41,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 f2dadb69f4..fb72806b32 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -50,9 +50,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; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index e62f770eb4..b2f4d44434 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -49,11 +49,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> diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index dc6575af02..585a9d604d 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -36,7 +36,7 @@ #include <rtl/uuid.h> #include <vos/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> @@ -48,7 +48,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 fd442018d4..aaaf16d481 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -45,11 +45,11 @@ #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> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index cd70bddc3a..5725f5bd2a 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -65,7 +65,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> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 10b31c06c2..439458eabc 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -45,7 +45,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 533943ae37..39652b74ef 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -60,11 +60,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 7790aa6a81..6e97a82b34 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -61,7 +61,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" @@ -72,7 +72,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" @@ -90,9 +90,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> diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 8f2fd4495f..1000952486 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -29,7 +29,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 7aa72bf0dd..387f5509a1 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> using namespace ::osl; using namespace ::vos; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 5d09dea4f6..a14862693a 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -35,7 +35,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/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index fe01e01449..f35250a9d6 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -30,7 +30,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 b461d0db85..26d4b19490 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -32,7 +32,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/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index a45583f3a6..d3863f70ae 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -56,7 +56,7 @@ #include <sot/clsids.hxx> #endif #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 25577a3fed..a90338c9bd 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -44,8 +44,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 76d63e9f35..84cb1135e1 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 b20083cb32..b7fbea30f6 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -54,7 +54,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 e09093d09e..2e407b5674 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -60,7 +60,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 8d65c5bbba..6862f33fb7 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,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/xattr.cxx b/svx/source/xoutdev/xattr.cxx index f69f6fd38d..c8629bc834 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -44,15 +44,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> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index d00606f4d2..36c42ee191 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -35,7 +35,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 d4456fbd43..a075419bda 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -38,13 +38,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 6acaa4a2ca..37864850c7 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -43,7 +43,7 @@ #endif #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 3c71725a72..4a2c70813d 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -29,7 +29,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> diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index efd1c2e6e1..fb82ea168b 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -31,7 +31,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 bcf0611bf3..3f3ccc1ccb 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -31,7 +31,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 af2c095ec2..0099dd948c 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -33,7 +33,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 afe584d706..00d0a75779 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -33,7 +33,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 7b65c0896f..8d1ddcf59a 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -33,7 +33,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> @@ -50,7 +50,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 ad699750e1..f2f21efb08 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -33,7 +33,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/makefile.mk b/svx/util/makefile.mk index 18f52487e4..277581a4a7 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -75,30 +75,33 @@ SHL1LIBS= \ SHL1STDLIBS= \ - $(EDITENGLIB) \ - $(AVMEDIALIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(BASEGFXLIB) \ - $(DRAWINGLAYERLIB) \ - $(LNGLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(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) @@ -132,29 +135,31 @@ 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) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) + $(BASEGFXLIB) \ + $(BASICLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(DRAWINGLAYERLIB) \ + $(EDITENGLIB) \ + $(GOODIESLIB) \ + $(I18NISOLANGLIB) \ + $(ICUUCLIB) \ + $(SALLIB) \ + $(SFX2LIB) \ + $(SOTLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(SVXCORELIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) \ + $(XMLOFFLIB) \ + $(XMLSCRIPTLIB) \ + .IF "$(GUI)"=="WNT" SHL2STDLIBS+=$(SHELLLIB) @@ -185,8 +190,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 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 |